From: Michael Prokop <devnull@localhost>
Date: Sun, 18 Nov 2007 21:23:45 +0000 (+0100)
Subject: Merge branches
X-Git-Tag: 0.0.9
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=refs%2Ftags%2F0.0.9;hp=8f8fae2cca04b12d1158062bec377a0f8b9c6673;p=grml-live.git

Merge branches
---

diff --git a/debian/changelog b/debian/changelog
index 595d797..2df1812 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,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
@@ -17,7 +19,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
--- 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