From: Michael Prokop <mika@grml.org>
Date: Mon, 19 Nov 2007 11:50:18 +0000 (+0100)
Subject: Merge branches
X-Git-Tag: 0.0.10~23
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;ds=sidebyside;h=13f6b16723413b3a6f7dc4dbb43916619cbcc891;hp=-c;p=grml-live.git

Merge branches
---

13f6b16723413b3a6f7dc4dbb43916619cbcc891
diff --combined debian/changelog
index 91a83d3,2df1812..5c5c7be
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,3 +1,10 @@@
 +grml-live (0.0.10) unstable; urgency=low
 +
 +  * Do not enable apt-listbugs if the binary is not available.
 +    [Testing: issue340]
 +
 + -- Michael Prokop <mika@grml.org>  Mon, 19 Nov 2007 12:49:37 +0100
 +
  grml-live (0.0.9) unstable; urgency=low
  
    * Remove all files inside /root/ when using class RELEASE.
@@@ -17,6 -10,8 +17,8 @@@
    * 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 -19,9 +26,9 @@@
        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.