martin f. krafft: add patch to disable incremental assembly enabled in 3.1. 3

[Martin F. Krafft]

Module: mdadm
Branch: master
Commit: ef9f23f684549eda28f6b15b64058c56af06e8b7
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=ef9f23f684549eda28f6b15b64058c56af06e8b7

Author: martin f. krafft <madduck at debian.org>
Date:   Thu Sep  2 16:21:19 2010 +0200

add patch to disable incremental assembly enabled in 3.1.3

Signed-off-by: martin f. krafft <madduck at debian.org>

---

 debian/changelog |    2 ++
 debian/rules     |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee47964..975b0d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ mdadm (3.1.4-1) unstable; urgency=low
     - prevent --remove faulty from skipping renumbered devices
       (closes: #587550).
     - fixed overflow when growing a RAID6 (closes: #589493).
+  * However, disable the incremental assembly upstream turned on in 3.1.3 for
+    now, this will have to wait until after the squeeze release.
   * initramfs/hook: make sure configuration file exists before accessing it;
     thanks to Michael Prokop for the fix and NMU (closes: #589836).
   * initramfs/hook: Match UUID case-insensitive while checking for running
diff --git a/debian/rules b/debian/rules
index 51cb59a..c40a4f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 
 #export DH_VERBOSE=1
 
-TG_BRANCHES="contrib/scripts/mdadd contrib/docs/raid5-vs-raid10 contrib/docs/superblock_formats contrib/docs/md.txt contrib/docs/jd-rebuilding-raid debian/conffile-location"
+TG_BRANCHES="contrib/scripts/mdadd contrib/docs/raid5-vs-raid10 contrib/docs/superblock_formats contrib/docs/md.txt contrib/docs/jd-rebuilding-raid debian/conffile-location debian/disable-incremental"
 -include /usr/share/topgit/tg2quilt.mk
 
 CXFLAGS = -ggdb