Merge lp:~soaringsky/ugr-ebuild/current into lp:ugr-ebuild

[JC Hulce]

Merge from upstream, fix fixes 797590

Merge with upstream, fixes #797590

[JC Hulce (soaringsky)]

Confirmed diff

review: Approve (diffconfirm)

[Team Pr0xy Tarmac Merge Bot (pr0xybot)]

review: Approve

=== modified file 'build.sh'
--- build.sh	2011-06-17 16:56:50 +0000
+++ build.sh	2011-06-21 01:18:29 +0000
@@ -19,7 +19,7 @@
 chmod +x conf.sh
 
 # Variables
-VERSION="0.2"
+VERSION="0.4"
 BASE_DISTRO="Ubuntu 11.04"
 IMAGE_NAME="UGR-dev"
 
@@ -93,11 +93,11 @@
 	uck-remaster-chroot-rootfs "$REMASTER_DIR" /bin/bash;
 fi
 
-# Change casper.conf
-sed -i 's/USERNAME="ubuntu"/USERNAME="me"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
-sed -i 's/USERFULLNAME="Live session user"/USERFULLNAME="me"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
-sed -i 's/HOST="ubuntu"/HOST="ugr"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
-sed -i 's/BUILD_SYSTEM="Ubuntu"/BUILD_SYSTEM="UGR"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
+# Change casper.conf - causes bug 797590
+# sed -i 's/USERNAME="ubuntu"/USERNAME="me"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
+# sed -i 's/USERFULLNAME="Live session user"/USERFULLNAME="me"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
+# sed -i 's/HOST="ubuntu"/HOST="elementary"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
+# sed -i 's/BUILD_SYSTEM="Ubuntu"/BUILD_SYSTEM="elementary"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
 
 # Rebranding ISO contents
 cp -t "$REMASTER_DIR"/remaster-iso/isolinux "$DATADIR"/resources/access.pcx "$DATADIR"/resources/blank.pcx "$DATADIR"/resources/splash.pcx "$DATADIR"/resources/gfxboot.cfg
 
=== modified file 'conf.sh'
--- conf.sh	2011-06-14 07:38:36 +0000
+++ conf.sh	2011-06-21 01:18:29 +0000
@@ -135,7 +135,7 @@
 pwd
 
 # Remove Unity:
-apt-get remove -f -y --purge unity* unity-2d*
+apt-get remove -f -y --purge unity* unity-2d* libunity*
 
 # Remove Branding stuff:
 apt-get remove -f -y --purge branding-ubuntu example-content  plymouth-theme-ubuntu-logo plymouth-theme-ubuntu-text ubuntu-wallpapers ubiquity-slideshow-ubuntu #gnome-themes-ubuntu light-themes plymouth-label ubuntu-artwork ubuntu-mono ubuntu-sounds 
@@ -255,7 +255,7 @@
 $setconf bool /apps/nautilus/preferences/show_desktop FALSE
 
 # Fix userrights of "me"
-sed -i 's/"Ubuntu"/"UGR"/' /usr/share/initramfs-tools/scripts/casper-bottom/10adduser
+sed -i 's/"Ubuntu"/"elementary"/' /usr/share/initramfs-tools/scripts/casper-bottom/10adduser
 
 # Plymouth
 echo FRAMEBUFFER=y >>/etc/initramfs-tools/conf.d/splash