From 7862d943f1859552aabeff0c8044b8de6dd4dcbd Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 4 May 2009 23:06:32 +0200 Subject: [PATCH] Drop atl2* packages; rework cups selection --- debian/changelog | 14 +++++++++----- etc/grml/fai/config/package_config/GRML_FULL | 7 ++----- etc/grml/fai/config/package_config/GRML_MEDIUM | 2 -- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index fd98e0a..ca602c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,6 @@ grml-live (0.9.13) UNRELEASED; urgency=low * Bump Standard-Version to 3.8.1 (no further changes). - * Add virtualbox-ose-guest-x11 to GRML_FULL and GRML_MEDIUM. - * Add virtualbox-ose-guest-modules-2.6.28-grml to GRML_MEDIUM. - * Add speakup-tools to GRML_FULL. * Install /etc/grml/fai/live-initramfs/live.conf only if /etc/live.conf does not exist in the target yet. * Update isolinux.bin to version 2:3.75+dfsg-1 (3.75 Debian-2009-04-17) @@ -15,8 +12,15 @@ grml-live (0.9.13) UNRELEASED; urgency=low * Mention bsd and hdt in isolinux' bootsplash f3. * Mention readonly, hdt and bsd bootoptions in grml-cheatcodes.txt. * Slightly improve 'grml2ram' vs 'grml toram' description in bootsplash. - - -- Michael Prokop Mon, 04 May 2009 21:48:00 +0200 + * Software related changes: + - Add virtualbox-ose-guest-x11 to GRML_FULL and GRML_MEDIUM. + - Add virtualbox-ose-guest-modules-2.6.28-grml to GRML_MEDIUM. + - Add speakup-tools to GRML_FULL. + - Drop atl2-modules-2.6.28* from package list (merged in mainline) + - Drop cupsys transitional package. + - Replace cupsys-bsd with cups-bsd and cupsys-client with cups-client. + + -- Michael Prokop Mon, 04 May 2009 22:50:30 +0200 grml-live (0.9.12) unstable; urgency=low diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL index d2af90e..e2c9b0c 100644 --- a/etc/grml/fai/config/package_config/GRML_FULL +++ b/etc/grml/fai/config/package_config/GRML_FULL @@ -436,10 +436,9 @@ ctorrent ctrlproxy cu cuetools +cups-bsd +cups-client cups-pdf -cupsys -cupsys-bsd -cupsys-client curl curlftpfs cvs @@ -2087,7 +2086,6 @@ grml ## current kernel version 2.6.28-grml: acx100-2.6.28-grml at76-usb-modules-2.6.28-grml -atl2-modules-2.6.28-grml aufs-modules-2.6.28-grml drbd8-2.6.28-grml exmap-modules-2.6.28-grml @@ -2131,7 +2129,6 @@ grml64 ## current kernel version 2.6.28-grml64: acx100-2.6.28-grml64 at76-usb-modules-2.6.28-grml64 -atl2-modules-2.6.28-grml64 aufs-modules-2.6.28-grml64 drbd8-2.6.28-grml64 exmap-modules-2.6.28-grml64 diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM index a22c0f6..ba6f9fc 100644 --- a/etc/grml/fai/config/package_config/GRML_MEDIUM +++ b/etc/grml/fai/config/package_config/GRML_MEDIUM @@ -295,7 +295,6 @@ PACKAGES aptitude I386 linux-kernel-headers-grml at76-usb-modules-2.6.28-grml -atl2-modules-2.6.28-grml aufs-modules-2.6.28-grml aufs-tools #grml-kerneladdons-2.6.28 linux-image-2.6.28-grml @@ -306,7 +305,6 @@ rt2400-modules-2.6.28-grml rt2500-modules-2.6.28-grml rt73-modules-2.6.28-grml f virtualbox-ose-guest-modules-2.6.28-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11 PACKAGES aptitude AMD64 -atl2-modules-2.6.28-grml64 aufs-modules-2.6.28-grml64 aufs-tools linux-image-2.6.28-grml64 #madwifi-modules-2.6.28-grml64 madwifi-tools -- 2.1.4