[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 23cba1ee8994a5c4eebfd77f99ffd6a79a597db2
Author: Samuel Thibault <address@hidden>
Date:   Tue Jul 10 01:44:09 2012 +0000

    patches/libdde_fixes.patch: Remove, merged upstream

diff --git a/debian/changelog b/debian/changelog
index cda5e33..a9fdf6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ hurd (20120710-1) UNRELEASED; urgency=low
   * New upstream snapshot.
     - patches/balloc.patch: Remove, merged upstream.
     - patches/libdde_config.patch: Remove, merged upstream.
+    - patches/libdde_fixes.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/libdde_fixes.patch 
b/debian/patches/libdde_fixes.patch
deleted file mode 100644
index 54d2cf1..0000000
--- a/debian/patches/libdde_fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libdde_linux26/contrib/mm/dmapool.c 
b/libdde_linux26/contrib/mm/dmapool.c
-index b1f0885..5c7aca4 100644
---- a/libdde_linux26/contrib/mm/dmapool.c
-+++ b/libdde_linux26/contrib/mm/dmapool.c
-@@ -37,6 +37,8 @@
- #include <linux/types.h>
- #include <linux/wait.h>
- 
-+#include <ddekit/timer.h>
-+
- #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB_DEBUG_ON)
- #define DMAPOOL_DEBUG 1
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index f55a110..5372552 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,7 +43,6 @@ libdde_workqueue.patch
 libdde_trans_start.patch
 libdde_devres.patch
 libdde_pr_cont.patch
-libdde_fixes.patch
 libdde_rx_queue.patch
 libdde_rcu.patch
 libmachdev.patch

-- 
Debian GNU Hurd packaging