Merge lp:~jbicha/ubuntu/saucy/casper/adjust-to-ubiquity-desktop-rename into lp:ubuntu/saucy/casper

[Jeremy Bícha]

See https://code.launchpad.net/~jbicha/ubiquity/rename-gtk-desktop/+merge/178149

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-25 23:36:34 +0000
+++ debian/changelog	2013-08-01 19:12:32 +0000
@@ -1,3 +1,9 @@
+casper (1.336) UNRELEASED; urgency=low
+
+  * 25adduser: Adjust to rename of ubiquity-gtkui.desktop to ubiquity.desktop
+
+ -- Jeremy Bicha <[e-mail]>  Thu, 01 Aug 2013 15:08:13 -0400
+
 casper (1.335) saucy; urgency=low
 
   * 22desktop_settings:
 
=== modified file 'scripts/casper-bottom/25adduser'
--- scripts/casper-bottom/25adduser	2013-06-24 02:26:12 +0000
+++ scripts/casper-bottom/25adduser	2013-08-01 19:12:32 +0000
@@ -78,7 +78,7 @@
 if [ "$LTS" = "LTS" ] && [ -n "$RELEASE" ]; then
 	RELEASE="$RELEASE LTS"
 fi
-for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde4/ubiquity-kdeui.desktop; do
+for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde4/ubiquity-kdeui.desktop; do
     if [ -f "/root/$file" ]; then
         sed -i "s/RELEASE/$RELEASE/" "/root$file"
         chroot /root install -d -o $USERNAME -g $USERNAME /home/$USERNAME/Desktop
@@ -112,15 +112,15 @@
 
 #Ubuntu MID wants to be installed with --automatic
 if [ -f "/root/usr/share/ubuntu-mid-default-settings/mid-gui-start" ]; then
-  if [ -f "/root/usr/share/applications/ubiquity-gtkui.desktop" ]; then
-    sed -i 's/--desktop/--automatic --desktop/' "/root/usr/share/applications/ubiquity-gtkui.desktop"
+  if [ -f "/root/usr/share/applications/ubiquity.desktop" ]; then
+    sed -i 's/--desktop/--automatic --desktop/' "/root/usr/share/applications/ubiquity.desktop"
   fi
 fi
 
 #Ubuntu MID uses kourou, and the ubiquity icon should be easy to find
 if [ -f "/root/usr/lib/hildon-desktop/kourou.py" ]; then
   if [ -f "/root/etc/xdg/menus/home.menu" ]; then
-    sed -i '/<\/Include>/i\		<Filename>ubiquity-gtkui.desktop</Filename>' "/root/etc/xdg/menus/home.menu"
+    sed -i '/<\/Include>/i\		<Filename>ubiquity.desktop</Filename>' "/root/etc/xdg/menus/home.menu"
   fi
 fi