[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 2e1c99c3a0cd029f115de069e44b1238e06f4a9c

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 2e1c99c3a0cd029f115de069e44b1238e06f4a9c
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Apr 19 20:56:04 2009 +0200

    Dynamic setting of packages not to be installed
    
    The installation of xserver-xorg-core drags in a lot of
    files that can be shut off when explicitly mentioning
    them as unwanted be attaching the "-" suffix to their
    package name with apt-get.
    
    This patch eases the maintenance of these extra packages
    across versions of the xserver-xorg package.

diff --git a/install.sh b/install.sh
index 42bcd11..d2049bf 100755
--- a/install.sh
+++ b/install.sh
@@ -86,11 +86,14 @@ CDEBOOTSTRAP_EXTRA_PACKAGES=ifupdown,dropbear,udev,procps,netbase,vim-tiny,modul
 # This gets passed to cdebuildstrap. currently not used
 CDEBOOTSTRAP_EXCLUDE_PACKAGES=hello
 
-# fso-specific packages
-# With work around for some APT/aptitude bug (http://bugs.debian.org/435662)
+intern_unwanted_input="xserver-xorg-input-all- xserver-xorg-input-synaptics- xserver-xorg-input-wacom-"
+intern_unwanted_video="xserver-xorg-video-all- `chroot $INST_DIR apt-cache show xserver-xorg-video-all | grep ^Depends | cut -f2 -d:  | sed -e 's/$/,/'| tr ", " "-\n" | grep ^xserver-xorg-video | sort -u | egrep -v 'intel|fbdev' | tr "\n" " " | tr -d "|" `"
+
 FSO_PACKAGES="matchbox-window-manager zhone fso-frameworkd fso-gpsd openmoko-panel-plugin dbus-x11 trayer fso-utils mtd-utils \
-xserver-xorg-video-fbdev xserver-xorg-input-tslib xterm xinit xfonts-base x11-xserver-utils \
-xserver-xorg-input-all- xserver-xorg-input-synaptics- xserver-xorg-input-wacom- xserver-xorg-video-all- xserver-xorg-video-v4l- xserver-xorg-video-voodoo- xserver-xorg-video-vesa- xserver-xorg-video-tseng- xserver-xorg-video-trident- xserver-xorg-video-tga- xserver-xorg-video-tdfx- xserver-xorg-video-sisusb- xserver-xorg-video-sis- xserver-xorg-video-siliconmotion- xserver-xorg-video-savage- xserver-xorg-video-s3virge- xserver-xorg-video-s3- xserver-xorg-video-rendition- xserver-xorg-video-radeonhd- xserver-xorg-video-nv- xserver-xorg-video-nsc- xserver-xorg-video-neomagic- xserver-xorg-video-mga- xserver-xorg-video-imstt- xserver-xorg-video-i740- xserver-xorg-video-i128- xserver-xorg-video-glint- xserver-xorg-video-dummy- xserver-xorg-video-cyrix- xserver-xorg-video-chips- xserver-xorg-video-ati- xserver-xorg-video-radeon- xserver-xorg-video-mach64- xserver-xorg-video-r128- xserver-xorg-video-cirrus- xserver-xorg-video-ark- xserver-xorg-video-apm-"
+xserver-xorg-video-fbdev xserver-xorg-input-tslib xserver-xorg-core xserver-xorg xterm xinit xfonts-base x11-xserver-utils \
+$intern_unwanted_input  $intern_unwanted_video"
+
+#echo "unwanted video: $intern_unwanted_video"
 
 # well-suited software for the FreeRunner
 PACKAGES_TASK_GAMES="mokomaze sgt-puzzles"

-- 
Various non-packaged files