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=68b5fe1c463f4b2daeb511260c662a278a52b5c8;hb=94f225af4b9e560ccbca1e336e79d6757133ee87;hpb=a1205bfa98b810f51f2691af54b46c3dba9cbd4c

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 68b5fe1..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
@@ -1442,7 +1440,6 @@ qc-usb-utils
 qjackctl
 qprof
 qpxtool
-qtparted
 quilt
 quota
 racoon
@@ -1617,7 +1614,7 @@ splint
 splitvt
 sqlite
 sqlite3
-squashfs-tools
+squashfs-lzma-tools
 squid
 squid-common
 squidview
@@ -1713,6 +1710,7 @@ textdraw
 tgt
 thttpd
 tidy
+tig
 timelimit
 timeout
 tin
@@ -2059,7 +2057,6 @@ firmware-ipw3945
 firmware-iwlwifi
 firmware-qlogic
 firmware-ralink
-glimpse
 iozone3
 ipw3945d
 irpas
@@ -2081,52 +2078,45 @@ PACKAGES aptitude I386
 
 ## general:
 grml
-grml-files
 # we want to use linux-kernel-headers-grml instead of linux-libc-dev:
 linux-kernel-headers-grml
 
-## current kernel version 2.6.23-grml:
-acx100-2.6.23-grml
-at76-usb-modules-2.6.23-grml
-atl2-modules-2.6.23-grml
-aufs-modules-2.6.23-grml
-bcm5700-module-2.6.23-grml
-drbd8-2.6.23-grml
-exmap-modules-2.6.23-grml
-#fglrx-kernel-2.6.23-grml
-grml-kerneladdons-2.6.23
-gspca-modules-2.6.23-grml
-ipw3945-modules-2.6.23-grml
-iscsitarget-module-2.6.23-grml
-ivtv-modules-2.6.23-grml
-kqemu-modules-2.6.23-grml
-linux-doc-2.6.23-grml
-linux-headers-2.6.23-grml
-linux-image-2.6.23-grml
-#linux-source-2.6.23-grml
-linux-wlan-ng-modules-2.6.23-grml
-loop-aes-modules-2.6.23-grml
-lzma-modules-2.6.23-grml
-madwifi-modules-2.6.23-grml
-ndiswrapper-modules-2.6.23-grml
-nozomi-modules-2.6.23-grml
-#nvidia-kernel-2.6.23-grml
-openafs-modules-2.6.23-grml
-#open-vm-modules-2.6.23-grml
-qc-usb-modules-2.6.23-grml
-r6040-modules-2.6.23-grml
-realtime-lsm-module-2.6.23-grml
-rt2400-modules-2.6.23-grml
-rt2500-modules-2.6.23-grml
-rt73-module-2.6.23-grml
-sl-modem-modules-2.6.23-grml
-squashfs-modules-2.6.23-grml
-sysprof-module-2.6.23-grml
-tp-smapi-modules-2.6.23-grml
-truecrypt-2.6.23-grml
-#virtualbox-ose-modules-2.6.23-grml
-virtualbox-ose-guest-modules-2.6.23-grml virtualbox-ose-guest-utils
-#zaptel-modules-2.6.23-grml
+## current kernel version 2.6.26-grml:
+acx100-2.6.26-grml
+at76-usb-modules-2.6.26-grml
+atl2-modules-2.6.26-grml
+aufs-modules-2.6.26-grml
+drbd8-2.6.26-grml
+exmap-modules-2.6.26-grml
+#fglrx-kernel-2.6.26-grml
+grml-kerneladdons-2.6.26
+gspca-modules-2.6.26-grml
+iscsitarget-module-2.6.26-grml
+kqemu-modules-2.6.26-grml
+linux-doc-2.6.26-grml
+linux-headers-2.6.26-grml
+linux-image-2.6.26-grml
+#linux-source-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
+madwifi-modules-2.6.26-grml
+ndiswrapper-modules-2.6.26-grml
+#nvidia-kernel-2.6.26-grml
+openafs-modules-2.6.26-grml
+#open-vm-modules-2.6.26-grml
+qc-usb-modules-2.6.26-grml
+rt2400-modules-2.6.26-grml
+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
+sysprof-module-2.6.26-grml
+tp-smapi-modules-2.6.26-grml
+truecrypt-2.6.26-grml
+virtualbox-ose-guest-modules-2.6.26-grml virtualbox-ose-guest-utils
+#virtualbox-ose-modules-2.6.26-grml
+#zaptel-modules-2.6.26-grml
 ## }}}
 
 ## amd64 specific packages {{{
@@ -2134,38 +2124,30 @@ PACKAGES aptitude AMD64
 
 ## general:
 grml64
-grml-files64
 
-## current kernel version 2.6.23-grml64:
-acx100-2.6.23-grml64
-at76-usb-modules-2.6.23-grml64
-atl2-modules-2.6.23-grml64
-aufs-modules-2.6.23-grml64
-drbd8-2.6.23-grml64
-exmap-modules-2.6.23-grml64
-# grml64-kerneladdons-2.6.23
-gspca-modules-2.6.23-grml64
-ipw3945-modules-2.6.23-grml64
-ivtv-modules-2.6.23-grml64
-kqemu-modules-2.6.23-grml64
-linux-doc-2.6.23-grml64
-linux-headers-2.6.23-grml64
-linux-image-2.6.23-grml64
-#linux-source-2.6.23-grml
-linux-uvc-modules-2.6.23-grml
-loop-aes-modules-2.6.23-grml64
-lzma-modules-2.6.23-grml64
-madwifi-modules-2.6.23-grml64
-ndiswrapper-modules-2.6.23-grml64
-nozomi-modules-2.6.23-grml64
-openafs-modules-2.6.23-grml64
-qc-usb-modules-2.6.23-grml64
-realtime-lsm-module-2.6.23-grml64
-rt2400-modules-2.6.23-grml64
-rt2500-modules-2.6.23-grml64
-squashfs-modules-2.6.23-grml64
-sysprof-module-2.6.23-grml64
-truecrypt-2.6.23-grml64
+## current kernel version 2.6.26-grml64:
+acx100-2.6.26-grml64
+at76-usb-modules-2.6.26-grml64
+atl2-modules-2.6.26-grml64
+aufs-modules-2.6.26-grml64
+drbd8-2.6.26-grml64
+exmap-modules-2.6.26-grml64
+# grml64-kerneladdons-2.6.26
+gspca-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
+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
+sysprof-module-2.6.26-grml64
+truecrypt-2.6.26-grml64
 ## }}}
 
 # vim: foldmethod=marker