[cheese] Rename desktop file and set DBusActivatable=true

[David King <davidk src gnome org>]

commit 7ac8c728ebc050522aee527469df55fd83d888da
Author: David King <amigadave amigadave com>
Date:   Tue Apr 1 14:00:13 2014 +0100

    Rename desktop file and set DBusActivatable=true
    
    Rename AppData and GResource XML in line with desktop file changes.

 .gitignore                                         |    8 ++++----
 Makefile.am                                        |   10 +++++-----
 configure.ac                                       |    2 +-
 ...data.xml.in => org.gnome.Cheese.appdata.xml.in} |    0
 ...esktop.in.in => org.gnome.Cheese.desktop.in.in} |    3 ++-
 ...resource.xml => org.gnome.Cheese.gresource.xml} |    0
 po/POTFILES.in                                     |    4 ++--
 po/POTFILES.skip                                   |    2 +-
 8 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 976ca07..93da871 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,12 +17,12 @@ Makefile.in*
 /build-aux/
 /cheese-lcov/
 /cheese-lcov.info
-/data/cheese.appdata.xml
-/data/cheese.appdata.valid
-/data/*.desktop
-/data/*.desktop.in
 /data/cheese-gtk.pc
 /data/cheese.pc
+/data/org.gnome.Cheese.appdata.xml
+/data/org.gnome.Cheese.appdata.valid
+/data/org.gnome.Cheese.desktop
+/data/org.gnome.Cheese.desktop.in
 /data/org.gnome.Cheese.gschema.valid
 /data/org.gnome.Cheese.service
 /docs/reference/html/
diff --git a/Makefile.am b/Makefile.am
index bc2f5aa..fa69074 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,7 @@ AM_VALAFLAGS = \
        --target-glib=2.38 \
        --thread \
        --vapidir $(top_srcdir)/src/vapi \
-       --gresources $(top_srcdir)/data/cheese.gresource.xml \
+       --gresources $(top_srcdir)/data/org.gnome.Cheese.gresource.xml \
        --pkg config \
        --pkg posix \
        --pkg gtk+-3.0 \
@@ -206,7 +206,7 @@ noinst_resource_files = \
        data/pixmaps/cheese-3.svg \
        data/pixmaps/thumbnail-frame.png
 
-src/cheese-resource.c src/cheese-resource.h: data/cheese.gresource.xml Makefile $(noinst_resource_files)
+src/cheese-resource.c src/cheese-resource.h: data/org.gnome.Cheese.gresource.xml Makefile 
$(noinst_resource_files)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/data --generate --c-name 
cheese $<
 
 bin_PROGRAMS = cheese
@@ -312,12 +312,12 @@ tests_test_webcam_button_LDADD = $(XTEST_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
-desktop_in_files = data/cheese.desktop.in
+desktop_in_files = data/org.gnome.Cheese.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @APPDATA_XML_RULES@
 @INTLTOOL_XML_RULE@
-appdata_in_files = data/cheese.appdata.xml.in
+appdata_in_files = data/org.gnome.Cheese.appdata.xml.in
 appdata_XML = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
 
 servicedir = $(datadir)/dbus-1/services
@@ -488,7 +488,7 @@ dist_noinst_DATA = \
        $(gsettings_SCHEMAS) \
        $(noinst_resource_files) \
        $(appdata_in_files) \
-       data/cheese.gresource.xml \
+       data/org.gnome.Cheese.gresource.xml \
        build-aux/test-driver \
        $(gtkdoc_srcdir)/cheese-docs.xml \
        $(gtkdoc_srcdir)/cheese-sections.txt \
diff --git a/configure.ac b/configure.ac
index 4e1e67d..b60ffd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,7 +217,7 @@ docs/reference/Makefile
 docs/reference/version.xml
 data/cheese.pc
 data/cheese-gtk.pc
-data/cheese.desktop.in
+data/org.gnome.Cheese.desktop.in
 data/org.gnome.Cheese.service
 help/Makefile
 po/Makefile.in
diff --git a/data/cheese.appdata.xml.in b/data/org.gnome.Cheese.appdata.xml.in
similarity index 100%
rename from data/cheese.appdata.xml.in
rename to data/org.gnome.Cheese.appdata.xml.in
diff --git a/data/cheese.desktop.in.in b/data/org.gnome.Cheese.desktop.in.in
similarity index 85%
rename from data/cheese.desktop.in.in
rename to data/org.gnome.Cheese.desktop.in.in
index 78efc90..1f26478 100644
--- a/data/cheese.desktop.in.in
+++ b/data/org.gnome.Cheese.desktop.in.in
@@ -12,4 +12,5 @@ Categories=GNOME;AudioVideo;Video;Recorder;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=cheese
 X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version= VERSION@
+X-GNOME-Bugzilla-Version= PACKAGE_VERSION@
+DBusActivatable=true
diff --git a/data/cheese.gresource.xml b/data/org.gnome.Cheese.gresource.xml
similarity index 100%
rename from data/cheese.gresource.xml
rename to data/org.gnome.Cheese.gresource.xml
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 557b60a..c31d873 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,8 +4,8 @@
 [type: gettext/glade]data/cheese-appmenu.ui
 [type: gettext/glade]data/cheese-main-window.ui
 [type: gettext/glade]data/cheese-prefs.ui
-data/cheese.appdata.xml.in
-data/cheese.desktop.in.in
+data/org.gnome.Cheese.appdata.xml.in
+data/org.gnome.Cheese.desktop.in.in
 data/org.gnome.Cheese.gschema.xml
 libcheese/cheese-avatar-chooser.c
 libcheese/cheese-avatar-widget.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 81dacd3..149cb1c 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,6 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
-data/cheese.desktop.in
+data/org.gnome.Cheese.desktop.in
 src/cheese-application.c
 src/cheese-countdown.c
 src/cheese-effects-manager.c