Merge branches

diff --git a/.hgtags b/.hgtags
index 1a03546..d4a8c0a 100644 (file)
--- a/.hgtags
+++ b/.hgtags
@@ -6,3 +6,4 @@ a08e44fd566ec06e4fe9962bda7cc915e8fdbb6b 0.0.3
 eee4e6cfffc71de796d58374cf6282e7edfbcee1 0.0.6
 37555117e8379da8ac397caacbd5642d754a7322 0.0.7
 2cf43c6306828dd36ade5bef0b5bb1cd6956ca41 0.0.8
+676c6dd7088a5fad4c46b8d015686f7e9c233434 0.0.9

diff --git a/debian/changelog b/debian/changelog
index 91a83d3..5c5c7be 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ grml-live (0.0.9) unstable; urgency=low
   * Improve initrd+kernel copy process: ignore .bak files (and get rid
     of them) and copy always exactly one image.
   * Add new packages to GRML_FULL:
+    - awesome
+    - cereal
     - etckeeper
     - hdapsd
     - hdaps-utils
@@ -24,7 +26,9 @@ grml-live (0.0.9) unstable; urgency=low
       binaries from commercial vendors; thanks to
       Christian Hofstaedtler]
     - mkelfimage
+    - runit
     - rutilt
+    - supercat
     - truecrypt-2.6.23-grml
   * Drop centericq-common, centerim-common, irssi-text, rt2400
     and rt2500 from GRML_FULL package list.

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index fa80c3b..9941477 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -263,6 +263,7 @@ avahi-daemon
 aview
 away
 awesfx
+awesome
 axel
 axp
 backup-manager
@@ -369,6 +370,7 @@ cdrskin
 cdtool
 cedet-common
 centerim-utf8
+cereal
 cfengine2
 cfv
 cgdb
@@ -1493,6 +1495,7 @@ ruby-prof
 ruby1.8
 ruby1.8-examples
 rungetty
+runit
 rutilt
 rxvt-beta
 rxvt-unicode
@@ -1630,6 +1633,7 @@ sucrack
 sudo
 sudoku
 super
+supercat
 sux
 swaks
 swapd