From 9388e327012baab3a5c742225a2eba5f26a803a4 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 25 Sep 2011 17:02:18 +0200 Subject: [PATCH] firefox -> chromium migration for more targets Define packagekitgui virtual requirement as kpackagekit or gnome-packagekit according to platform --- Makefile.defs | 2 ++ platforms/livecd-gnome-root/Makefile | 2 +- platforms/livecd-gnome-root/Makefile.defs | 1 + platforms/livecd-light-root/Makefile | 2 +- platforms/livecd-light-root/Makefile.defs | 1 + platforms/livedvd-root/Makefile | 8 +++++--- platforms/livedvd-root/post.inc.sh | 2 +- platforms/livegames-root/Makefile | 2 +- platforms/livegames-root/post.inc.sh | 2 +- 9 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index bb2b263..439e6dd 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -108,6 +108,8 @@ openofficei18n = OpenOffice-i18n-$(LANGUAGE) # vpn networkmanagervpnplugin = NetworkManager-vpnc NetworkManager-pptp +packagekitgui = kpackagekit + ifdef PLATFORM include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile.defs endif diff --git a/platforms/livecd-gnome-root/Makefile b/platforms/livecd-gnome-root/Makefile index bf5be6e..4f744e3 100644 --- a/platforms/livecd-gnome-root/Makefile +++ b/platforms/livecd-gnome-root/Makefile @@ -23,7 +23,7 @@ $(MAKEDIST_TARGET)-livecd-gnome-root: \ xorg-drv-input-synaptics xorg-apps-extra xterm \ ttf-freefont liberation-fonts-ttf \ gparted gag ntfs-3g libdvdcss \ - firefox compiz \ + compiz \ macbook-tools livecd-tools \ Mesa-tools driconf parted testdisk \ compizconfig-settings-manager compiz-fusion-plugins-main \ diff --git a/platforms/livecd-gnome-root/Makefile.defs b/platforms/livecd-gnome-root/Makefile.defs index e69de29..d6baaba 100644 --- a/platforms/livecd-gnome-root/Makefile.defs +++ b/platforms/livecd-gnome-root/Makefile.defs @@ -0,0 +1 @@ +packagekitgui = gnome-packagekit diff --git a/platforms/livecd-light-root/Makefile b/platforms/livecd-light-root/Makefile index b523315..363ba1c 100644 --- a/platforms/livecd-light-root/Makefile +++ b/platforms/livecd-light-root/Makefile @@ -18,7 +18,7 @@ $(MAKEDIST_TARGET)-livecd-light-root: \ xorg-drv-input-synaptics xorg-apps-extra xterm \ ttf-freefont liberation-fonts-ttf \ gparted gag ntfs-3g libdvdcss \ - firefox compiz \ + chromium compiz \ macbook-tools livecd-tools \ Mesa-tools driconf parted testdisk \ compizconfig-settings-manager compiz-fusion-plugins-main \ diff --git a/platforms/livecd-light-root/Makefile.defs b/platforms/livecd-light-root/Makefile.defs index e69de29..d6baaba 100644 --- a/platforms/livecd-light-root/Makefile.defs +++ b/platforms/livecd-light-root/Makefile.defs @@ -0,0 +1 @@ +packagekitgui = gnome-packagekit diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile index 5601186..515caae 100644 --- a/platforms/livedvd-root/Makefile +++ b/platforms/livedvd-root/Makefile @@ -17,7 +17,7 @@ $(MAKEDIST_TARGET)-livedvd-root: \ xorg-drv-input-synaptics xorg-apps-extra xterm \ ttf-freefont liberation-fonts-ttf \ gparted gag ntfs-3g libdvdcss \ - firefox compiz \ + chromium compiz \ macbook-tools livecd-tools \ Mesa-tools driconf parted testdisk \ gnome-device-manager \ @@ -34,9 +34,11 @@ $(MAKEDIST_TARGET)-livedvd-root: \ $(MAKEDIST_TARGET)-livedvd-root-en: \ kde-l10n-en_GB $(MAKEDIST_TARGET)-livedvd-root-es: \ - kde-l10n-es firefox-i18n-es-ES + kde-l10n-es +# firefox-i18n-es-ES $(MAKEDIST_TARGET)-livedvd-root-it: \ - kde-l10n-it firefox-i18n-it + kde-l10n-it +# firefox-i18n-it #OpenOffice-i18n-it # FIXME: add kdepim syslog-ng: diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh index ee146cc..28d5263 100644 --- a/platforms/livedvd-root/post.inc.sh +++ b/platforms/livedvd-root/post.inc.sh @@ -59,7 +59,7 @@ cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/D 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 \ +for f in /usr/share/applications/chromium-devel.desktop \ /opt/kde/share/applications/kaffeine.desktop /opt/kde/share/applications/amarok.desktop; do chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f done diff --git a/platforms/livegames-root/Makefile b/platforms/livegames-root/Makefile index ccf8c0d..a15eb03 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 \ - firefox compiz compiz-fusion-plugins-main \ + chromium 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 e7b2850..a4c9388 100644 --- a/platforms/livegames-root/post.inc.sh +++ b/platforms/livegames-root/post.inc.sh @@ -58,7 +58,7 @@ cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/D 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 +for f in /usr/share/applications/chromium-devel.desktop; do chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f done