[gnome-packagekit] Use new-style application IDs for flatpak

[Richard Hughes <rhughes src gnome org>]

commit 5f9ee1a1a3052c2f10d7b38cc96cf8c4978799f9
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jul 18 13:50:08 2016 +0100

    Use new-style application IDs for flatpak

 contrib/gnome-packagekit.spec.in                   |    8 ++++----
 data/Makefile.am                                   |   12 ++++++------
 data/appdata/Makefile.am                           |    4 ++--
 ....in => org.gnome.PackageUpdater.appdata.xml.in} |    2 +-
 ...ta.xml.in => org.gnome.Packages.appdata.xml.in} |    2 +-
 ...ktop.in => org.gnome.PackageUpdater.desktop.in} |    0
 ...on.desktop.in => org.gnome.Packages.desktop.in} |    0
 po/POTFILES.in                                     |    8 ++++----
 8 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/contrib/gnome-packagekit.spec.in b/contrib/gnome-packagekit.spec.in
index 364cef9..a6c92f3 100644
--- a/contrib/gnome-packagekit.spec.in
+++ b/contrib/gnome-packagekit.spec.in
@@ -136,15 +136,15 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files installer
 %{_bindir}/gpk-application
-%{_datadir}/appdata/gpk-application.appdata.xml
-%{_datadir}/applications/gpk-application.desktop
+%{_datadir}/appdata/org.gnome.Packages.appdata.xml
+%{_datadir}/applications/org.gnome.Packages.desktop
 %{_datadir}/gnome-packagekit/gpk-application.ui
 %{_datadir}/man/man1/gpk-application.1*
 
 %files updater
 %{_bindir}/gpk-update-viewer
-%{_datadir}/appdata/gpk-update-viewer.appdata.xml
-%{_datadir}/applications/gpk-update-viewer.desktop
+%{_datadir}/appdata/org.gnome.PackageUpdater.appdata.xml
+%{_datadir}/applications/org.gnome.PackageUpdater.desktop
 %{_datadir}/gnome-packagekit/gpk-update-viewer.ui
 %{_datadir}/man/man1/gpk-update-viewer.1*
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 4f79fb6..ef5d923 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,10 +9,10 @@ dist_migration_DATA = org.gnome.packagekit.gschema.migrate
 desktopdir = $(datadir)/applications
 desktop_in_files =                                     \
        gpk-install-local-file.desktop.in               \
-       gpk-prefs.desktop.in                            \
-       gpk-application.desktop.in                      \
-       gpk-update-viewer.desktop.in                    \
        gpk-log.desktop.in                              \
+       gpk-prefs.desktop.in                            \
+       org.gnome.Packages.desktop.in                   \
+       org.gnome.PackageUpdater.desktop.in             \
        $(NULL)
 
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -45,11 +45,11 @@ clean-local :
        rm -f *~
 
 DISTCLEANFILES =                                       \
-       gpk-prefs.desktop                               \
-       gpk-update-viewer.desktop                       \
        gpk-install-local-file.desktop                  \
        gpk-log.desktop                                 \
-       gpk-application.desktop                         \
+       gpk-prefs.desktop                               \
        org.freedesktop.PackageKit.service              \
+       org.gnome.Packages.desktop                      \
+       org.gnome.PackageUpdater.desktop                \
        $(NULL)
 
diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
index 08ea553..a801816 100644
--- a/data/appdata/Makefile.am
+++ b/data/appdata/Makefile.am
@@ -2,8 +2,8 @@
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files =                                     \
-       gpk-application.appdata.xml.in                  \
-       gpk-update-viewer.appdata.xml.in
+       org.gnome.Packages.appdata.xml.in               \
+       org.gnome.PackageUpdater.appdata.xml.in
 EXTRA_DIST = $(appdata_in_files)
 CLEANFILES = $(appdata_DATA)
 
diff --git a/data/appdata/gpk-update-viewer.appdata.xml.in 
b/data/appdata/org.gnome.PackageUpdater.appdata.xml.in
similarity index 98%
rename from data/appdata/gpk-update-viewer.appdata.xml.in
rename to data/appdata/org.gnome.PackageUpdater.appdata.xml.in
index 40df53b..99eb30e 100644
--- a/data/appdata/gpk-update-viewer.appdata.xml.in
+++ b/data/appdata/org.gnome.PackageUpdater.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013 Richard Hughes <richard hughsie com> -->
 <application>
-  <id type="desktop">gpk-update-viewer.desktop</id>
+  <id type="desktop">org.gnome.PackageUpdater.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
   <_name>GNOME Package Updater</_name>
diff --git a/data/appdata/gpk-application.appdata.xml.in b/data/appdata/org.gnome.Packages.appdata.xml.in
similarity index 98%
rename from data/appdata/gpk-application.appdata.xml.in
rename to data/appdata/org.gnome.Packages.appdata.xml.in
index 466be74..7e7e891 100644
--- a/data/appdata/gpk-application.appdata.xml.in
+++ b/data/appdata/org.gnome.Packages.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013 Richard Hughes <richard hughsie com> -->
 <application>
-  <id type="desktop">gpk-application.desktop</id>
+  <id type="desktop">org.gnome.Packages.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
   <_name>GNOME Packages</_name>
diff --git a/data/gpk-update-viewer.desktop.in b/data/org.gnome.PackageUpdater.desktop.in
similarity index 100%
rename from data/gpk-update-viewer.desktop.in
rename to data/org.gnome.PackageUpdater.desktop.in
diff --git a/data/gpk-application.desktop.in b/data/org.gnome.Packages.desktop.in
similarity index 100%
rename from data/gpk-application.desktop.in
rename to data/org.gnome.Packages.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 72a5f6e..be2b7a4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,9 +1,9 @@
 [encoding: UTF-8]
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/appdata/gpk-application.appdata.xml.in
-data/appdata/gpk-update-viewer.appdata.xml.in
-data/gpk-application.desktop.in
+data/appdata/org.gnome.Packages.appdata.xml.in
+data/appdata/org.gnome.PackageUpdater.appdata.xml.in
+data/org.gnome.Packages.desktop.in
 [type: gettext/glade]data/gpk-application.ui
 [type: gettext/glade]data/gpk-client.ui
 [type: gettext/glade]data/gpk-error.ui
@@ -14,7 +14,7 @@ data/gpk-log.desktop.in
 data/gpk-prefs.desktop.in
 [type: gettext/glade]data/gpk-prefs.ui
 [type: gettext/glade]data/gpk-signature.ui
-data/gpk-update-viewer.desktop.in
+data/org.gnome.PackageUpdater.desktop.in
 [type: gettext/glade]data/gpk-update-viewer.ui
 data/org.gnome.packagekit.gschema.xml
 src/gpk-application.c