Merge branch 'master' into Eden

Conflicts:
	Files/config/package-lists/packages.list.chroot

Files/config/hooks/10-setPlymouthTheme.chroot

@@ -23,7 +23,7 @@ echo "Set plymouth theme..."
 echo ""
 
 if [ -f /etc/alternatives/default.plymouth ]; then
-	if [ -f /lib/plymouth/themes/xbmc-logo/xbmc-logo.plymouth ]; then
+	if [ -f /lib/plymouth/themes/xbmcbuntu-logo/xbmcbuntu-logo.plymouth ]; then
 		echo ""
 		echo "Set default plymouth theme..."
 		echo ""

Files/config/hooks/90-fixPinkUbiquity.chroot

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+#      Copyright (C) 2005-2008 Team XBMC
+#      http://www.xbmc.org
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by                                                                                                                        
+#  the Free Software Foundation; either version 2, or (at your option)                                                                                                                         
+#  any later version.                                                                                                                                                                          
+#                                                                                                                                                                                              
+#  This Program is distributed in the hope that it will be useful,                                                                                                                             
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of                                                                                                                              
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                                                                                                                                
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with XBMC; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+
+echo ""
+echo "Fix pink bars in Ubiquity..."
+echo ""
+
+mkdir -p /root/.config
+chmod -R 755 /root
+
+ln -s /usr/share/themes/XBMCbuntu-default/gtk-3.0/ /root/.config/gtk-3.0

Files/config/includes.binary/preseed/ubuntu.seed

@@ -1,6 +1,3 @@
-ubiquity ubiquity/only-show-installable-languages
-ubiquity localechooser/translation/none-yet note
-ubiquity localechooser/translation/no-select note
 ubiquity ubiquity/online note
 ubiquity ubiquity/summary note
- 
+ubiquity ubiquity/custom_title_text string XBMCbuntu Installer

Files/config/includes.chroot/etc/xbmc/setup.d/11-mountDisks.sh → Files/config/includes.chroot/etc/init/xbmcbuntu-wait.conf

@@ -1,6 +1,9 @@
-#!/bin/bash
+# xbmcbuntu-wait
+#
+# init XBMCbuntu environment
+#
 
-#      Copyright (C) 2005-2008 Team XBMC
+#      Copyright (C) 2005-2012 Team XBMC
 #      http://www.xbmc.org
 #
 #  This Program is free software; you can redistribute it and/or modify
@@ -18,17 +21,25 @@
 #  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #  http://www.gnu.org/copyleft/gpl.html
 
-xbmcUser=$1
-xbmcParams=$2
+description     "XBMCbuntu job starter"
+author          "Luigi Capriotti"
+
+start on (starting lightdm or starting ubiquity)
+stop on stopped xbmcbuntu
 
-activationToken="nodiskmount"
+# We know that we have more than one job that needs to wait for service-a and
+# will make use of this service, so we need to instantiate.
+instance $JOB
 
-# if strings are the same the token is NOT part of the parameters list
-# here we want to stop script if the token is there
-if [ "$xbmcParams" != "${xbmcParams%$activationToken*}" ] ; then
-	exit 0
-fi
+# Needed to make starting the job successful despite being killed
+normal exit 2
+task
 
-/usr/bin/diskmounter 2>&1 &
+script
+    status xbmcbuntu | grep -q "start/running" && exit 0
+    start xbmcbuntu || true
 
-exit 0
+    # Waiting forever is ok.. upstart will kill this job when
+    # the service-a we tried to start above either starts or stops
+    while sleep 3600 ; do :; done
+end script

Files/config/includes.chroot/etc/init/xbmcbuntu.conf

@@ -24,12 +24,9 @@
 description     "XBMCbuntu"
 author          "Luigi Capriotti"
 
-start on (starting lightdm or 
-          starting ubiquity)
+# The script is started by the xbmcbuntu-wait job
 
-stop on runlevel [06]
-
-pre-start script
+script
 	kernelParams=$(cat /proc/cmdline)
 	subString=${kernelParams##*xbmc=}
 	xbmcParams=${subString%% *}
@@ -63,9 +60,7 @@ pre-start script
 		$hook $xbmcUser $xbmcParams || true
 	  done
 	fi
-end script
 
-script
 	if ! grep "firstTimeInit=done" /etc/default/xbmcbuntu ; then
         	echo "firstTimeInit=done" >> /etc/default/xbmcbuntu || true
 	fi

Files/config/includes.chroot/etc/pm/sleep.d/99lirc-resume

@@ -25,13 +25,19 @@
 case "$1" in
         hibernate|suspend)
                 /etc/init.d/lirc stop
+                echo "Unloading lirc kernel modules"
+                rmmod ir-lirc-codec
+                rmmod lirc_dev
                 ;;
         thaw|resume)
+                echo "Loading lirc kernel modules"
+                modprobe ir-lirc-codec
+                modprobe lirc_dev
                 /etc/init.d/lirc start
                 ;;
         *)
                 ;;
 
 esac
 
-exit $?
+exit $?