openmamba/makedist-openmamba-milestone3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firefox -> chromium migration for more targets

Browse Source 
Define packagekitgui virtual requirement as kpackagekit or gnome-packagekit according to platform
This commit is contained in:
Silvan Calarco 2011-09-25 17:02:18 +02:00
parent 3bf7cd9c23
commit 9388e32701
9 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.defs
View File

@ -108,6 +108,8 @@ openofficei18n = OpenOffice-i18n-$(LANGUAGE)
# vpn # vpn
networkmanagervpnplugin = NetworkManager-vpnc NetworkManager-pptp networkmanagervpnplugin = NetworkManager-vpnc NetworkManager-pptp
packagekitgui = kpackagekit
ifdef PLATFORM ifdef PLATFORM
include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile.defs include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile.defs
endif endif

2
platforms/livecd-gnome-root/Makefile
View File

@ -23,7 +23,7 @@ $(MAKEDIST_TARGET)-livecd-gnome-root: \
xorg-drv-input-synaptics xorg-apps-extra xterm \ xorg-drv-input-synaptics xorg-apps-extra xterm \
ttf-freefont liberation-fonts-ttf \ ttf-freefont liberation-fonts-ttf \
gparted gag ntfs-3g libdvdcss \ gparted gag ntfs-3g libdvdcss \
firefox compiz \ compiz \
macbook-tools livecd-tools \ macbook-tools livecd-tools \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk \
compizconfig-settings-manager compiz-fusion-plugins-main \ compizconfig-settings-manager compiz-fusion-plugins-main \

1
platforms/livecd-gnome-root/Makefile.defs
View File

@ -0,0 +1 @@
packagekitgui = gnome-packagekit

2
platforms/livecd-light-root/Makefile
View File

@ -18,7 +18,7 @@ $(MAKEDIST_TARGET)-livecd-light-root: \
xorg-drv-input-synaptics xorg-apps-extra xterm \ xorg-drv-input-synaptics xorg-apps-extra xterm \
ttf-freefont liberation-fonts-ttf \ ttf-freefont liberation-fonts-ttf \
gparted gag ntfs-3g libdvdcss \ gparted gag ntfs-3g libdvdcss \
firefox compiz \ chromium compiz \
macbook-tools livecd-tools \ macbook-tools livecd-tools \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk \
compizconfig-settings-manager compiz-fusion-plugins-main \ compizconfig-settings-manager compiz-fusion-plugins-main \

1
platforms/livecd-light-root/Makefile.defs
View File

@ -0,0 +1 @@
packagekitgui = gnome-packagekit

8
platforms/livedvd-root/Makefile
View File

@ -17,7 +17,7 @@ $(MAKEDIST_TARGET)-livedvd-root: \
xorg-drv-input-synaptics xorg-apps-extra xterm \ xorg-drv-input-synaptics xorg-apps-extra xterm \
ttf-freefont liberation-fonts-ttf \ ttf-freefont liberation-fonts-ttf \
gparted gag ntfs-3g libdvdcss \ gparted gag ntfs-3g libdvdcss \
firefox compiz \ chromium compiz \
macbook-tools livecd-tools \ macbook-tools livecd-tools \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk \
gnome-device-manager \ gnome-device-manager \
@ -34,9 +34,11 @@ $(MAKEDIST_TARGET)-livedvd-root: \
$(MAKEDIST_TARGET)-livedvd-root-en: \ $(MAKEDIST_TARGET)-livedvd-root-en: \
kde-l10n-en_GB kde-l10n-en_GB
$(MAKEDIST_TARGET)-livedvd-root-es: \ $(MAKEDIST_TARGET)-livedvd-root-es: \
kde-l10n-es firefox-i18n-es-ES kde-l10n-es
# firefox-i18n-es-ES
$(MAKEDIST_TARGET)-livedvd-root-it: \ $(MAKEDIST_TARGET)-livedvd-root-it: \
kde-l10n-it firefox-i18n-it kde-l10n-it
# firefox-i18n-it
#OpenOffice-i18n-it #OpenOffice-i18n-it
# FIXME: add kdepim # FIXME: add kdepim
syslog-ng: syslog-ng:

2
platforms/livedvd-root/post.inc.sh
View File

@ -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/ cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/
# configure favorites in kde menu # 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 /opt/kde/share/applications/kaffeine.desktop /opt/kde/share/applications/amarok.desktop; do
chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
done done

2
platforms/livegames-root/Makefile
View File

@ -15,7 +15,7 @@ $(MAKEDIST_TARGET)-livegames-root: \
xorg-drv-input-synaptics \ xorg-drv-input-synaptics \
ttf-freefont liberation-fonts-ttf \ ttf-freefont liberation-fonts-ttf \
gparted gag ntfs-3g samba-server \ 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 \ compiz-fusion-plugins-extra compizconfig-settings-manager \
macbook-tools livecd-tools \ macbook-tools livecd-tools \
kdebluetooth Mesa-tools driconf \ kdebluetooth Mesa-tools driconf \

2
platforms/livegames-root/post.inc.sh
View File

@ -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/ cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/
# configure favorites in kde menu # 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 chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
done done