Move file-rc, gawk, grep, gpm + gzip to GRMLBASE. Drop e2fslibs, esound-common, espea...

diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index b957059..3ab6680 100644 (file)
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -9,6 +9,10 @@ diffutils
 dmidecode
 eject
 file
 dmidecode
 eject
 file

+file-rc
+gawk
+grep
+gpm

 grml2hd
 grml2hd-utils
 grml2usb
 grml2hd
 grml2hd-utils
 grml2usb


@@ -26,6 +30,7 @@ grml-scripts
 grml-shlib
 grml-usleep
 grml-vpn
 grml-shlib
 grml-usleep
 grml-vpn

+gzip

 hdparm
 hwinfo
 iw
 hdparm
 hwinfo
 iw

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index e32fcf4..4f5ab98 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -543,7 +543,6 @@ dwdiff
 dwm
 dwm-tools
 dzen2
 dwm
 dwm-tools
 dzen2

-e2fslibs

 e2fsprogs
 e2tools
 e2undel
 e2fsprogs
 e2tools
 e2undel


@@ -572,9 +571,7 @@ epdfview
 equivs
 erc
 es
 equivs
 erc
 es

-esound-common

 espeak
 espeak

-espeak-data

 espeakup
 etckeeper
 eterm
 espeakup
 etckeeper
 eterm


@@ -582,7 +579,6 @@ etherwake
 ethstatus
 ethtool
 etpan-ng
 ethstatus
 ethtool
 etpan-ng

-ettercap-common

 ettercap-gtk
 euro-support
 evilwm
 ettercap-gtk
 euro-support
 evilwm


@@ -623,9 +619,7 @@ fetchmail
 fgetty
 file
 filepp
 fgetty
 file
 filepp

-file-rc

 filetraq
 filetraq

-fileutils

 findutils
 finger
 firehol
 findutils
 finger
 firehol


@@ -672,11 +666,9 @@ fxload
 g++
 gaffitter
 gamin
 g++
 gaffitter
 gamin

-gawk

 gcal
 gcc
 gcolor2
 gcal
 gcc
 gcolor2

-gcom

 gdb
 gddrescue
 geeqie
 gdb
 gddrescue
 geeqie


@@ -740,7 +732,6 @@ gsm-utils
 gtkam
 guessnet
 gv
 gtkam
 guessnet
 gv

-gzip

 gzrt
 habak
 hal
 gzrt
 habak
 hal

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index 25bc8d0..4aa9d70 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -55,17 +55,13 @@ ed
 eterm
 ethtool
 file
 eterm
 ethtool
 file

-file-rc

 findutils
 firmware-iwlwifi
 firmware-ralink
 fluxbox
 fnord
 fuse-utils
 findutils
 firmware-iwlwifi
 firmware-ralink
 fluxbox
 fnord
 fuse-utils

-gawk

 genext2fs
 genext2fs

-gpm
-grep

 grml2hd
 grml2hd-utils
 grml2usb
 grml2hd
 grml2hd-utils
 grml2usb


@@ -98,7 +94,6 @@ grml-usleep
 grml-x
 grub
 guessnet
 grml-x
 grub
 guessnet

-gzip

 hostname
 htop
 hwinfo
 hostname
 htop
 hwinfo

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 7c3a2cc..93af3d7 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -43,13 +43,9 @@ e3
 ed
 ethtool
 file
 ed
 ethtool
 file

-file-rc

 findutils
 fnord
 # fuse-utils
 findutils
 fnord
 # fuse-utils

-gawk
-gpm
-grep

 grml2hd
 grml2hd-utils
 grml2usb
 grml2hd
 grml2hd-utils
 grml2usb


@@ -71,7 +67,6 @@ grml-tips
 grml-usleep
 grub
 guessnet
 grml-usleep
 grub
 guessnet

-gzip

 hostname
 htop
 hwinfo
 hostname
 htop
 hwinfo