Adjust GRML* classes: unify packages in GRMLBASE, drop grml-scanpartitions, add grml...

diff --git a/debian/changelog b/debian/changelog
index 3a50ae7..97ba6ce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,14 @@ grml-live (0.9.33) UNRELEASED; urgency=low
     Thanks for the hint, formorer.
   * Write current date to last output line of grml-live so the user
     knows how "old" his build is while sitting at the shell prompt.
-
- -- Michael Prokop <mika@grml.org>  Fri, 13 Nov 2009 21:48:22 +0100
+  * GRML* classes:
+    - drop grml-scanpartitions
+    - add grml-udev-config
+    - move all grml-* packages that used to be part of all Grml
+      flavours to GRMLBASE and drop them from the flavour specific
+      configuration instead
+
+ -- Michael Prokop <mika@grml.org>  Sat, 14 Nov 2009 12:20:17 +0100
 
 grml-live (0.9.32) unstable; urgency=low
 

diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index 33706e4..504496a 100644 (file)
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -18,6 +18,7 @@ grml2hd-utils
 grml2usb
 grml-autoconfig
 grml-crypt
+grml-debian-keyring
 grml-debootstrap
 grml-docs
 grml-etc
@@ -26,9 +27,10 @@ grml-hwinfo
 grml-network
 grml-policyrcd
 grml-rebuildfstab
-grml-scanpartitions
 grml-scripts
 grml-shlib
+grml-tips
+grml-udev-config
 grml-usleep
 grml-vpn
 grub-pc

diff --git a/etc/grml/fai/config/package_config/GRML_FORENSIC b/etc/grml/fai/config/package_config/GRML_FORENSIC
index 96cb0f8..69451fd 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FORENSIC
+++ b/etc/grml/fai/config/package_config/GRML_FORENSIC
@@ -162,14 +162,7 @@ ext3rminator
 firescope
 gatling
 gifshuffle
-grml2hd
-grml2usb
-grml-crypt
-grml-debootstrap
-grml-network
 grml-terminalserver
-grml-tips
-grml-vpn
 md5deep
 nat-traverse
 ncp

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 6b646f1..47e0c94 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -47,38 +47,18 @@ gateguardian
 gatling
 gifshuffle
 glipper-nognome
-grml2hd
-grml2hd-utils
-grml2usb
-grml-autoconfig
-grml-crypt
-grml-debian-keyring
-grml-debootstrap
 grml-debugtools
 grml-desktop
-grml-docs
-grml-etc
-grml-etc-core
 grml-files
 grml-firefox
 grml-laptop
 grml-live
 grml-mercurial-utils
-grml-network
 grml-paste
-grml-policyrcd
 grml-pylib
-grml-rebuildfstab
-grml-scanpartitions
-grml-scripts
 grml-sectools
-grml-shlib
 grml-templates
 grml-terminalserver
-grml-terminalserver-data
-grml-tips
-grml-usleep
-grml-vpn
 grml-x
 heirloom-sh
 histring

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index e37f594..82e00a7 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -63,34 +63,17 @@ fnord
 fuse-utils
 gcc
 genext2fs
-grml2hd
-grml2hd-utils
-grml2usb
-grml-autoconfig
-grml-debian-keyring
-grml-debootstrap
 grml-debugtools
 grml-desktop
-grml-docs
-grml-etc
-grml-etc-core
 grml-files
 grml-laptop
 grml-live
 grml-mercurial-utils
-grml-network
-grml-policyrcd
 grml-pylib
-grml-rebuildfstab
-grml-scanpartitions
-grml-scripts
 grml-sectools
-grml-shlib
 grml-small
 grml-templates
 grml-terminalserver
-grml-tips
-grml-usleep
 grml-x
 guessnet
 htop

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 4a88abf..e85cea8 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -46,24 +46,7 @@ file
 findutils
 fnord
 # fuse-utils
-grml2hd
-grml2hd-utils
-grml2usb
-grml-autoconfig
-grml-debian-keyring
-grml-debootstrap
-grml-docs
-grml-etc
-grml-etc-core
-grml-network
-grml-policyrcd
-grml-rebuildfstab
-grml-scanpartitions
-grml-scripts
-grml-shlib
 # grml-small
-grml-tips
-grml-usleep
 guessnet
 htop
 ifplugd