Merge lp:~jbicha/deja-dup/rename-desktop-for-38 into lp:deja-dup/26

[Jeremy Bícha]

gnome-control-center 3.8 uses the format gnome-NAMEOFPANEL-panel.desktop

[Michael Terry (mterry)]

Looks great, thanks Jeremy!

review: Approve

[Michael Terry (mterry)]

(Note that I actually merged into lp:deja-dup/28, since that's the new trunk)

[Jeremy Bícha (jbicha)]

Thanks

How do you want to get this into Saucy? Backport this commit and run dh-autoreconf? Or will you be doing a new release soonish?

[Michael Terry (mterry)]

3.9.3 is Monday, I can cut a release for then. (or earlier if needed)

[Jeremy Bícha (jbicha)]

Monday is fine.

=== modified file '.bzrignore'
--- .bzrignore	2013-01-27 20:30:52 +0000
+++ .bzrignore	2013-06-12 22:38:34 +0000
@@ -137,9 +137,9 @@
 common/Checker.c
 common/PythonChecker.c
 deja-dup/Prompt.c
-data/deja-dup-ccpanel.desktop
 data/deja-dup-preferences.desktop
 data/deja-dup-preferences.desktop.in
+data/gnome-deja-dup-panel.desktop
 preferences/preferences-main.c
 tests/**/*.log
 .pc

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-12-05 04:16:10 +0000
+++ data/Makefile.am	2013-06-12 22:38:34 +0000
@@ -39,13 +39,13 @@
 desktop_DATA = deja-dup.desktop deja-dup-preferences.desktop
 
 if HAVE_CCPANEL
-desktop_DATA += deja-dup-ccpanel.desktop
+desktop_DATA += gnome-deja-dup-panel.desktop
 endif
 
 deja-dup-preferences.desktop.in: deja-dup-preferences.desktop.in.in
 	$(install_sh_DATA) $^ $@
 if HAVE_CCPANEL
-	sed -i "s/^Categories=.*/\0\n\nNotShowIn=$(shell grep OnlyShowIn $(srcdir)/deja-dup-ccpanel.desktop.in | cut -d= -f2)/" $@
+	sed -i "s/^Categories=.*/\0\n\nNotShowIn=$(shell grep OnlyShowIn $(srcdir)/gnome-deja-dup-panel.desktop.in | cut -d= -f2)/" $@
 endif
 
 deja-dup-monitor.desktop.in: deja-dup-monitor.desktop.in.in
@@ -57,8 +57,8 @@
 convertdir = $(datadir)/GConf/gsettings
 dist_convert_DATA = deja-dup.convert
 
-EXTRA_DIST = deja-dup.desktop.in deja-dup-ccpanel.desktop.in deja-dup-preferences.desktop.in.in deja-dup-monitor.desktop.in.in org.gnome.DejaDup.gschema.xml.in
-CLEANFILES = deja-dup.desktop deja-dup-ccpanel.desktop deja-dup-preferences.desktop deja-dup-preferences.desktop.in deja-dup-monitor.desktop deja-dup-monitor.desktop.in org.gnome.DejaDup.gschema.xml
+EXTRA_DIST = deja-dup.desktop.in gnome-deja-dup-panel.desktop.in deja-dup-preferences.desktop.in.in deja-dup-monitor.desktop.in.in org.gnome.DejaDup.gschema.xml.in
+CLEANFILES = deja-dup.desktop gnome-deja-dup-panel.desktop deja-dup-preferences.desktop deja-dup-preferences.desktop.in deja-dup-monitor.desktop deja-dup-monitor.desktop.in org.gnome.DejaDup.gschema.xml
 
 check: $(desktop_DATA) $(autostart_DATA)
 	@for desktop in $(desktop_DATA) $(autostart_DATA); do \

=== renamed file 'data/deja-dup-ccpanel.desktop.in' => 'data/gnome-deja-dup-panel.desktop.in'
=== modified file 'deja-dup/Prompt.vala'
--- deja-dup/Prompt.vala	2012-12-21 04:01:27 +0000
+++ deja-dup/Prompt.vala	2013-06-12 22:38:34 +0000
@@ -67,7 +67,7 @@
 {
   DejaDup.update_prompt_time(true);
 
-  var app = new DesktopAppInfo("deja-dup-ccpanel.desktop");
+  var app = new DesktopAppInfo("gnome-deja-dup-panel.desktop");
   if (app != null) {
     try {
       app.launch(null, Gdk.Screen.get_default().get_display().get_app_launch_context());

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-01-27 22:00:28 +0000
+++ po/POTFILES.in	2013-06-12 22:38:34 +0000
@@ -1,9 +1,9 @@
 [encoding: UTF-8]
 
 data/deja-dup.desktop.in
-data/deja-dup-ccpanel.desktop.in
 data/deja-dup-preferences.desktop.in.in
 data/deja-dup-monitor.desktop.in.in
+data/gnome-deja-dup-panel.desktop.in
 data/org.gnome.DejaDup.gschema.xml.in
 [type: gettext/glade]data/ui/restore-missing.ui