[Pkg-samba-maint] [SCM] CTDB branch, debian-sid, updated. upstream/2.1-38-g33a8774

[Mathieu Parent]

The following commit has been merged in the debian-sid branch:
commit 0c68e68944422792c025a3844d3169283e14fb1b
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Thu Jun 6 21:44:24 2013 +0200

    Updated 0004-Include-config.h-in-libctdb-ctdb.c-Closes-703551.patch

diff --git a/debian/changelog b/debian/changelog
index e906f2b..5bcb020 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ctdb (2.2+debian0-1) UNRELEASED; urgency=low
   * New upstream release 2.2
     - Removed 0001-Add-missing-LDFLAGS.patch, merged
     - Updated 0002-Display-compiler-commands.patch
+    - Updated 0004-Include-config.h-in-libctdb-ctdb.c-Closes-703551.patch
   * Use pristine-tar
   * Remove tdb, talloc and tevent from source and replace them by builddeps
 
diff --git a/debian/patches/0004-Include-config.h-in-libctdb-ctdb.c-Closes-703551.patch b/debian/patches/0004-Include-config.h-in-libctdb-ctdb.c-Closes-703551.patch
index c1ab9f7..9651f66 100644
--- a/debian/patches/0004-Include-config.h-in-libctdb-ctdb.c-Closes-703551.patch
+++ b/debian/patches/0004-Include-config.h-in-libctdb-ctdb.c-Closes-703551.patch
@@ -1,7 +1,8 @@
-From f622e98ab586201be0b9b26cef5eed3df33a7717 Mon Sep 17 00:00:00 2001
+From 12a4bd73d46ef5165f62ebff4a49697301b06046 Mon Sep 17 00:00:00 2001
 From: Mathieu Parent <math.parent at gmail.com>
-Date: Mon, 6 May 2013 15:10:06 +0200
+Date: Thu, 6 Jun 2013 21:43:08 +0200
 Subject: [PATCH] Include config.h in libctdb/ctdb.c (Closes: #703551)
+
 Bug-Debian: http://bugs.debian.org/703551
 Forwarded: TODO
 ---
@@ -9,7 +10,7 @@ Forwarded: TODO
  1 file changed, 1 insertion(+)
 
 diff --git a/libctdb/ctdb.c b/libctdb/ctdb.c
-index 191b097..6f02474 100644
+index dd1b572..4462fe4 100644
 --- a/libctdb/ctdb.c
 +++ b/libctdb/ctdb.c
 @@ -17,6 +17,7 @@
@@ -17,9 +18,9 @@ index 191b097..6f02474 100644
     along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 +#include "config.h"
+ #include <sys/time.h>
  #include <sys/socket.h>
  #include <string.h>
- #include <ctdb.h>
 -- 
 1.7.10.4
 

-- 
CTDB