Merge branch 'sid'

Conflicts:
	debian/control

2 files changed, 27 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 5a30a2a..3fbdc8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+initramfs-tools (0.94.4) unstable; urgency=low
+
+  * init: fix hardcoded resume handling. (Closes: #576700)
+
+ -- maximilian attems <maks@debian.org>  Thu, 08 Apr 2010 06:02:28 +0200
+
+initramfs-tools (0.94.3) unstable; urgency=low
+
+  * debian/control: Add Breaks against experimental findutils.
+    (closes: #576677)
+
+ -- maximilian attems <maks@debian.org>  Thu, 08 Apr 2010 03:50:28 +0200
+
+initramfs-tools (0.94.2) unstable; urgency=low
+
+  * debian/control: amend Breaks for exp mdadm.
+
+ -- maximilian attems <maks@debian.org>  Tue, 06 Apr 2010 23:50:06 +0200
+
+initramfs-tools (0.94.1) unstable; urgency=low
+
+  * debian/control: Add a breaks mdadm.
+  * debian/control: Fix Breaks version comparison.
+
+ -- maximilian attems <maks@debian.org>  Tue, 06 Apr 2010 16:18:25 +0200
+
 initramfs-tools (0.94) unstable; urgency=low
 
   * The "Litte Bang" release
diff --git a/debian/control b/debian/control
index 909b7da..79ffcf6 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Package: initramfs-tools
 Architecture: all
 Recommends: busybox (>= 1:1.01-3) | busybox-initramfs
 Depends: klibc-utils (>= 1.5.9-1), cpio, module-init-tools, udev (>= 0.086-1), findutils (>= 4.2.24), ${misc:Depends}
-Breaks: cryptsetup (<= 2:1.1.0-2), mdadm (= 3.1.1-1+incremental+4), mdadm (= 3.1.1-1+incremental+3), mdadm (= 3.1.1-1+incremental+2), mdadm (= 3.1.1-1+incremental+1)
+Breaks: cryptsetup (<= 2:1.1.0-2), mdadm (= 3.1.1-1+incremental+4), mdadm (= 3.1.1-1+incremental+3), mdadm (= 3.1.1-1+incremental+2), mdadm (= 3.1.1-1+incremental+1), findutils (= 4.5.7-1)
 Provides: linux-initramfs-tool
 Description: tools for generating an initramfs
  This package contains tools to create and boot an initramfs for packaged 2.6