X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=f5c6589a5f9022a396599064894368b71c21535f;hp=ff6499aba919f5f2fc5b7c4d38950e63bf79b3d6;hb=94f225af4b9e560ccbca1e336e79d6757133ee87;hpb=dfdc9b2fd4aff37d3d9815d0ca21f31d1f97d50d

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index ff6499a..f5c6589 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -13,9 +13,6 @@ PACKAGES aptitude
 #dpkg: error processing vifm (--configure):
 # subprocess post-installation script returned error exit status 1
 
-# ivtv-utils (< 1.0.3-1):
-# ships /usr/include/linux/ivtv.h => #443165
-
 ## }}}
 
 ## grml specific packages {{{
@@ -65,6 +62,7 @@ grml-desktop
 grml-docs
 grml-etc
 grml-etc-core
+grml-files
 grml-firefox
 grml-hwinfo
 grml-laptop
@@ -444,7 +442,6 @@ cups-pdf
 cupsys
 cupsys-bsd
 cupsys-client
-cupsys-common
 curl
 curlftpfs
 cvs
@@ -901,6 +898,7 @@ ipppd
 iprelay
 iproute
 ipsec-tools
+ipset
 iptables
 iptraf
 iptstate
@@ -1616,7 +1614,7 @@ splint
 splitvt
 sqlite
 sqlite3
-squashfs-tools
+squashfs-lzma-tools
 squid
 squid-common
 squidview
@@ -1712,6 +1710,7 @@ textdraw
 tgt
 thttpd
 tidy
+tig
 timelimit
 timeout
 tin
@@ -2079,7 +2078,6 @@ PACKAGES aptitude I386
 
 ## general:
 grml
-grml-files
 # we want to use linux-kernel-headers-grml instead of linux-libc-dev:
 linux-kernel-headers-grml
 
@@ -2094,7 +2092,6 @@ exmap-modules-2.6.26-grml
 grml-kerneladdons-2.6.26
 gspca-modules-2.6.26-grml
 iscsitarget-module-2.6.26-grml
-ivtv-modules-2.6.26-grml
 kqemu-modules-2.6.26-grml
 linux-doc-2.6.26-grml
 linux-headers-2.6.26-grml
@@ -2103,7 +2100,6 @@ linux-image-2.6.26-grml
 linux-uvc-modules-2.6.26-grml
 linux-wlan-ng-modules-2.6.26-grml
 loop-aes-modules-2.6.26-grml
-lzma-modules-2.6.26-grml
 madwifi-modules-2.6.26-grml
 ndiswrapper-modules-2.6.26-grml
 #nvidia-kernel-2.6.26-grml
@@ -2115,7 +2111,6 @@ rt2500-modules-2.6.26-grml
 rt73-modules-2.6.26-grml
 sl-modem-modules-2.6.26-grml
 speakup-modules-2.6.26-grml
-squashfs-modules-2.6.26-grml
 sysprof-module-2.6.26-grml
 tp-smapi-modules-2.6.26-grml
 truecrypt-2.6.26-grml
@@ -2129,7 +2124,6 @@ PACKAGES aptitude AMD64
 
 ## general:
 grml64
-grml-files64
 
 ## current kernel version 2.6.26-grml64:
 acx100-2.6.26-grml64
@@ -2140,21 +2134,18 @@ drbd8-2.6.26-grml64
 exmap-modules-2.6.26-grml64
 # grml64-kerneladdons-2.6.26
 gspca-modules-2.6.26-grml64
-ivtv-modules-2.6.26-grml64
 kqemu-modules-2.6.26-grml64
 linux-doc-2.6.26-grml64
 linux-headers-2.6.26-grml64
 linux-image-2.6.26-grml64
 #linux-source-2.6.26-grml
 loop-aes-modules-2.6.26-grml64
-lzma-modules-2.6.26-grml64
 madwifi-modules-2.6.26-grml64
 ndiswrapper-modules-2.6.26-grml64
 openafs-modules-2.6.26-grml64
 qc-usb-modules-2.6.26-grml64
 rt2400-modules-2.6.26-grml64
 rt2500-modules-2.6.26-grml64
-squashfs-modules-2.6.26-grml64
 sysprof-module-2.6.26-grml64
 truecrypt-2.6.26-grml64
 ## }}}