Merge lp:~jbicha/ubiquity/rename-gtk-desktop into lp:ubiquity

[Jeremy Bícha]

Fix inspired by bug 1206687.

This will need updates to casper, unity, and ubuntu-gnome-default-settings.

https://code.launchpad.net/~jbicha/ubuntu/saucy/casper/adjust-to-ubiquity-desktop-rename/+merge/178150

https://code.launchpad.net/~jbicha/unity/adjust-to-ubiquity-desktop-rename/+merge/178152

[Dimitri John Ledkov (xnox)]

unity, ubuntu-gnome-default-settings can land later, but ubiquity & casper should match/land together.

I am ok with this change. So I will coordinate uploads of casper and ubiquity.

[Dimitri John Ledkov (xnox)]

review: Approve

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-07-11 18:23:07 +0000
+++ data/Makefile.am	2013-08-01 19:12:25 +0000
@@ -7,7 +7,7 @@
 desktop_in_files = \
 	oem-config-prepare-gtk.desktop.in \
 	oem-config-prepare-kde.desktop.in \
-	ubiquity-gtkui.desktop.in \
+	ubiquity.desktop.in \
 	ubiquity-kdeui.desktop.in
 
 @INTLTOOL_POLICY_RULE@

=== renamed file 'data/ubiquity-gtkui.desktop.in' => 'data/ubiquity.desktop.in'
=== modified file 'debian/changelog'
--- debian/changelog	2013-07-31 12:57:08 +0000
+++ debian/changelog	2013-08-01 19:12:25 +0000
@@ -5,6 +5,9 @@
   * Refactor network manager code to create a separte GTK class and
     base class for both frontends to use
 
+  [ Jeremy Bicha ]
+  * Rename ubiquity-gtkui.desktop to ubiquity.desktop (LP: #1203223, #1203224)
+
  -- Jonathan Riddell <[e-mail]>  Wed, 31 Jul 2013 13:55:44 +0100
 
 ubiquity (2.15.12) saucy; urgency=low

=== modified file 'debian/oem-config-gtk.postrm'
--- debian/oem-config-gtk.postrm	2009-07-16 16:56:18 +0000
+++ debian/oem-config-gtk.postrm	2013-08-01 19:12:25 +0000
@@ -7,7 +7,7 @@
 case "$1" in
     remove)
         dpkg-divert --package oem-config-gtk --remove \
-                    --rename --divert /usr/share/ubiquity/ubiquity-gtkui.desktop.diverted /usr/share/applications/ubiquity-gtkui.desktop
+                    --rename --divert /usr/share/ubiquity/ubiquity.desktop.diverted /usr/share/applications/ubiquity.desktop
         ;;
 esac
 

=== modified file 'debian/oem-config-gtk.preinst'
--- debian/oem-config-gtk.preinst	2009-07-16 16:44:20 +0000
+++ debian/oem-config-gtk.preinst	2013-08-01 19:12:25 +0000
@@ -7,7 +7,7 @@
 case "$1" in
     install|upgrade)
         dpkg-divert --package oem-config-gtk --add --rename \
-                    --divert /usr/share/ubiquity/ubiquity-gtkui.desktop.diverted /usr/share/applications/ubiquity-gtkui.desktop
+                    --divert /usr/share/ubiquity/ubiquity.desktop.diverted /usr/share/applications/ubiquity.desktop
         ;;
 esac
 

=== modified file 'debian/ubiquity-frontend-gtk.install'
--- debian/ubiquity-frontend-gtk.install	2013-07-11 18:23:07 +0000
+++ debian/ubiquity-frontend-gtk.install	2013-08-01 19:12:25 +0000
@@ -1,4 +1,4 @@
-data/ubiquity-gtkui.desktop usr/share/applications
+data/ubiquity.desktop usr/share/applications
 gui/gtk usr/share/ubiquity
 ubiquity/frontend/gtk* usr/lib/ubiquity/ubiquity/frontend
 

=== modified file 'debian/ubiquity-gtkui.lintian-overrides'
--- debian/ubiquity-gtkui.lintian-overrides	2010-02-12 18:22:18 +0000
+++ debian/ubiquity-gtkui.lintian-overrides	2013-08-01 19:12:25 +0000
@@ -1,1 +1,1 @@
-ubiquity-frontend-gtk: desktop-command-not-in-package /usr/share/applications/ubiquity-gtkui.desktop ubiquity
+ubiquity-frontend-gtk: desktop-command-not-in-package /usr/share/applications/ubiquity.desktop ubiquity

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-06-12 16:41:04 +0000
+++ po/POTFILES.in	2013-08-01 19:12:25 +0000
@@ -1,5 +1,5 @@
 # files added by intltool-prepare
-desktop/ubiquity-gtkui.desktop.in
+desktop/ubiquity.desktop.in
 desktop/ubiquity-kdeui.desktop.in
 desktop/oem-config-prepare-kde.desktop.in
 desktop/oem-config-prepare-gtk.desktop.in

=== modified file 'po/ubiquity.pot'
--- po/ubiquity.pot	2013-06-12 16:41:04 +0000
+++ po/ubiquity.pot	2013-08-01 19:12:25 +0000
@@ -18,12 +18,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Do not translate the word "RELEASE".  It is used as a marker by casper.
-#: ../desktop/ubiquity-gtkui.desktop.in.h:2
+#: ../desktop/ubiquity.desktop.in.h:2
 #: ../desktop/ubiquity-kdeui.desktop.in.h:2
 msgid "Install RELEASE"
 msgstr ""
 
-#: ../desktop/ubiquity-gtkui.desktop.in.h:3
+#: ../desktop/ubiquity.desktop.in.h:3
 #: ../desktop/ubiquity-kdeui.desktop.in.h:3
 msgid "Install this system permanently to your hard disk"
 msgstr ""