[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20120605-2-100-ga97dded

[Samuel Thibault]

The following commit has been merged in the master branch:
commit 12cfb493f1cb073b2ab04ee36b336b6a24fe0300
Author: Samuel Thibault <address@hidden>
Date:   Tue Jul 10 01:42:14 2012 +0000

    patches/balloc.patch: Remove, merged upstream

diff --git a/debian/changelog b/debian/changelog
index df6622c..cda5e33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 hurd (20120710-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.
-    - patches/ext2fs_large_stores.patch: Refresh.
+    - patches/balloc.patch: Remove, merged upstream.
     - patches/libdde_config.patch: Remove, merged upstream.
+    - patches/ext2fs_large_stores.patch: Refresh.
 
  -- Samuel Thibault <address@hidden>  Tue, 10 Jul 2012 01:36:55 +0000
 
diff --git a/debian/patches/balloc.patch b/debian/patches/balloc.patch
deleted file mode 100644
index 8d51603..0000000
--- a/debian/patches/balloc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: hurd-debian/ext2fs/balloc.c
-===================================================================
---- hurd-debian.orig/ext2fs/balloc.c   2012-06-05 11:29:37.000000000 +0000
-+++ hurd-debian/ext2fs/balloc.c        2012-06-05 11:29:40.000000000 +0000
-@@ -199,7 +199,7 @@
-          * The goal was occupied; search forward for a free
-          * block within the next 32 blocks
-          */
--        if (j & 31 == 31)
-+        if ((j & 31) == 31)
-           lmap = 0;
-         else
-           lmap = ((((unsigned long *) bh)[j >> 5]) >>
diff --git a/debian/patches/libdde_config.patch 
b/debian/patches/libdde_config.patch
deleted file mode 100644
index 9adfc4b..0000000
--- a/debian/patches/libdde_config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/libdde_linux26/include/linux/autoconf.h 
b/libdde_linux26/include/linux/autoconf.h
-index cf45b2b..908b8da 100644
---- a/libdde_linux26/include/linux/autoconf.h
-+++ b/libdde_linux26/include/linux/autoconf.h
-@@ -94,3 +94,5 @@
- #undef CONFIG_BLK_DEV_IO_TRACE
- 
- #undef CONFIG_FW_LOADER
-+#undef CONFIG_DMI
-+#undef CONFIG_PCIEAER
diff --git a/debian/patches/series b/debian/patches/series
index e6c373d..f55a110 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,4 +50,3 @@ libmachdev.patch
 exec_filename_exec.patch
 exec_filename_fs.patch
 exec_filename_use.patch
-balloc.patch

-- 
Debian GNU Hurd packaging