From 664f2636f8f983c105eb9a7620f44eb8b1a2c0e2 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sun, 4 Sep 2011 17:27:29 +0200
Subject: [PATCH] Backport from openmamba (devel): sync livecd-root,
 livedvd-root and livegames-root platforms

---
 platforms/livecd-root/post.inc.sh    | 4 ++--
 platforms/livedvd-root/Makefile      | 4 ++--
 platforms/livedvd-root/post.inc.sh   | 2 +-
 platforms/livegames-root/Makefile    | 2 +-
 platforms/livegames-root/post.inc.sh | 5 +++++
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh
index ae167ee..872827a 100644
--- a/platforms/livecd-root/post.inc.sh
+++ b/platforms/livecd-root/post.inc.sh
@@ -57,8 +57,8 @@ mkdir -p $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/
 
-# configure firefox as favorite in kde menu
-for f in /usr/share/applications/mozilla-firefox3.desktop /opt/kde/share/applications/kaffeine.desktop; do
+# configure favorites in kde menu
+for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
 done
 
diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile
index c9ace64..5601186 100644
--- a/platforms/livedvd-root/Makefile
+++ b/platforms/livedvd-root/Makefile
@@ -21,8 +21,8 @@ $(MAKEDIST_TARGET)-livedvd-root: \
                   macbook-tools livecd-tools \
                   Mesa-tools driconf parted testdisk \
                   gnome-device-manager \
-                  compizconfig-settings-manager compiz-plugins-main \
-                  compiz-plugins-extra samba-server \
+                  compizconfig-settings-manager compiz-fusion-plugins-main \
+                  compiz-fusion-plugins-extra samba-server \
                   ndisgtk smart-gui cpufreqd mambatray \
                   $(MAKEDIST_TARGET)-livedvd-kde4 toptray testdisk photorec
 #                  libopensync-plugin-syncml libopensync-plugin-google-calendar \
diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh
index 7e3ed1c..ee146cc 100644
--- a/platforms/livedvd-root/post.inc.sh
+++ b/platforms/livedvd-root/post.inc.sh
@@ -58,7 +58,7 @@ mkdir -p $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/
 
-# configure firefox as favorite in kde menu
+# configure favorites in kde menu
 for f in /usr/share/applications/mozilla-firefox3.desktop \
          /opt/kde/share/applications/kaffeine.desktop /opt/kde/share/applications/amarok.desktop; do
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
diff --git a/platforms/livegames-root/Makefile b/platforms/livegames-root/Makefile
index 5530e4c..ccf8c0d 100644
--- a/platforms/livegames-root/Makefile
+++ b/platforms/livegames-root/Makefile
@@ -15,7 +15,7 @@ $(MAKEDIST_TARGET)-livegames-root: \
                   xorg-drv-input-synaptics \
                   ttf-freefont liberation-fonts-ttf \
                   gparted gag ntfs-3g samba-server \
-                  compiz compiz-fusion-plugins-main \
+                  firefox compiz compiz-fusion-plugins-main \
                   compiz-fusion-plugins-extra compizconfig-settings-manager \
                   macbook-tools livecd-tools \
                   kdebluetooth Mesa-tools driconf \
diff --git a/platforms/livegames-root/post.inc.sh b/platforms/livegames-root/post.inc.sh
index 7630c69..e7b2850 100644
--- a/platforms/livegames-root/post.inc.sh
+++ b/platforms/livegames-root/post.inc.sh
@@ -57,6 +57,11 @@ mkdir -p $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/
 
+# configure favorites in kde menu
+for f in /usr/share/applications/mozilla-firefox3.desktop; do
+   chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
+done
+
 # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
 [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
 echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh