Merge lp:~persia/casper/trunk into lp:casper

[Emmet Hikory]

[Emmet Hikory (persia)]

This is a nice-to-have wishlist feature for MID. Doesn't block anything, but oughtn't hurt anything else.

[Colin Watson (cjwatson)]

Missing closing quote at end of line.

I don't think the i\\t\t stuff works with busybox sed, which is probably what's going to be in use here; in my tests it seems to result in 'tt' at the start of the line. Perhaps you just need to embed a hard tab in the file instead?

review: Needs Fixing

[lp:~persia/casper/trunk]

582. By Emmet Hikory on 2009-03-06

Adjust syntax to work with busybox sed
Fix missing quotation mark

583. By Emmet Hikory on 2009-03-17

Merge with trunk

[Emmet Hikory (persia)]

Fixed the closing quote. Replaced \t\t with real tabs. Updated against current trunk.

[lp:~persia/casper/trunk]

584. By Emmet Hikory on 2009-03-23

Merge with trunk

[Colin Watson (cjwatson)]

> Fixed the closing quote. Replaced \t\t with real tabs. Updated against
> current trunk.

Thanks, but now I notice that there's a missing "; then" at the end of each if line as well. I'm a bit concerned that syntactic errors mean that this hasn't been tested - perhaps you could build a test image with this and run it through before we merge, to make sure that it really does the right thing?

[lp:~persia/casper/trunk]

585. By Emmet Hikory on 2009-03-23

Use commit target for testing directly, rather than trusting tired eyes.
Correct remaining syntax errors, confirm display of install icon.

[Emmet Hikory (persia)]

> I'm a bit concerned that syntactic errors mean that this hasn't been tested -
> perhaps you could build a test image with this and run it through before we merge,
> to make sure that it really does the right thing?

Right. No more attempts to go faster, as it seems to both take longer, and waste other people's time as well.

Test procedure was as follows:

update files
copy changes to loop-mounted image
regenerate initramfs
extract to /casper/initrd.gz on image
boot result
repeat

    I didn't go so far as to rebuild casper, and install the rebuilt casper into the image prior to update.

[Colin Watson (cjwatson)]

Looks happier now, thanks; I'll go ahead and merge this.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-03-03 04:49:29 +0000
+++ debian/changelog	2009-03-06 12:48:37 +0000
@@ -1,3 +1,9 @@
+casper (1.158) UNRELEASED; urgency=low
+
+  * Show the ubiquity icon in kourou (LP: #338730)
+
+ -- Emmet Hikory <persia@sigyn>  Fri, 06 Mar 2009 21:45:54 +0900
+
 casper (1.157) jaunty; urgency=low
 
   [ Emmet Hikory ]

=== modified file 'scripts/casper-bottom/10adduser'
--- scripts/casper-bottom/10adduser	2009-02-06 15:02:11 +0000
+++ scripts/casper-bottom/10adduser	2009-03-06 12:48:37 +0000
@@ -83,6 +83,13 @@
   fi
 fi
 
+#Ubuntu MID uses kourou, and the ubiquity icon should be easy to find
+if [ -f "/root/usr/lib/hildon-desktop/kourou.py" ]
+  if [ -f "/root/etc/xdg/menus/home.menu" ]
+    sed -i '/<\/Include>/i\\t\t<Filename>ubiquity-gtkui.desktop</Filename>' "/root/etc/xdg/menus/home.menu
+  fi
+fi
+
 #Ubuntu Netbook Remix needs Categories=Favorites for ubiquity
 if grep -q "Categories=Favorites;" "/root/usr/share/applications/firefox-fav.desktop"; then
   if [ -f "/root/usr/share/applications/ubiquity-gtkui.desktop" ]; then