summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2010-07-09 17:26:06 +0200
committermaximilian attems <maks@debian.org>2010-07-09 17:27:33 +0200
commit6fa6a6b9ce1492caedb621c1bcfd5d3735c218e9 (patch)
treeb6bda80d6b3c040750e508f5c8eabb45d53db3b8
parentb65a48670ef4ec22dd7801ad377ce19741f2387a (diff)
parentd78e243c8f73a16a307579c6df7683af6db8227a (diff)
downloadinitramfs-tools-6fa6a6b9ce1492caedb621c1bcfd5d3735c218e9.tar.gz
initramfs-tools-6fa6a6b9ce1492caedb621c1bcfd5d3735c218e9.zip
Merge branch 'sid'
Conflicts: mkinitramfs scripts/functions
-rw-r--r--debian/changelog14
1 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a3e8189..9d667e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+initramfs-tools (0.97.2) unstable; urgency=high
+
+ * [ce732c3] initramfs-tools: output name of script that errexits.
+ (Closes: 586554)
+
+ -- maximilian attems <maks@debian.org> Tue, 06 Jul 2010 12:58:37 +0200
+
+initramfs-tools (0.97.1) unstable; urgency=high
+
+ * [90d99e4] mkinitramfs: Fix initramfs generation without COMPRESS set.
+ (Closes: 587608) - thanks Valentin QUEQUET <valentin.quequet@orange.fr>
+
+ -- maximilian attems <maks@debian.org> Mon, 05 Jul 2010 21:50:47 +0200
+
initramfs-tools (0.97) unstable; urgency=low
[ Martin Michlmayr ]