[Pkg-samba-maint] [SCM] CTDB branch, debian-sid, updated. upstream/2.1-37-ge57653f
Mathieu Parent
math.parent at gmail.com
Thu Jun 6 20:19:52 UTC 2013
The following commit has been merged in the debian-sid branch:
commit d53a48216dfb664d8a6197f1b59807772ef8aab9
Author: Mathieu Parent <math.parent at gmail.com>
Date: Thu Jun 6 21:59:19 2013 +0200
Fix-tdb.h-path
diff --git a/debian/changelog b/debian/changelog
index 87f2525..4682672 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ctdb (2.2+debian0-1) UNRELEASED; urgency=low
- 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
+ - Requires 0005-Fix-tdb.h-path.patch
-- Mathieu Parent <sathieu at debian.org> Thu, 06 Jun 2013 21:06:59 +0200
diff --git a/debian/patches/0005-Fix-tdb.h-path.patch b/debian/patches/0005-Fix-tdb.h-path.patch
new file mode 100644
index 0000000..470bed6
--- /dev/null
+++ b/debian/patches/0005-Fix-tdb.h-path.patch
@@ -0,0 +1,347 @@
+From 5b7a2aa7d2400eda5059eac6a3baa6ded0337acb Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Thu, 6 Jun 2013 21:58:02 +0200
+Subject: [PATCH] Fix tdb.h path
+
+---
+ client/ctdb_client.c | 2 +-
+ common/ctdb_io.c | 2 +-
+ common/ctdb_logging.c | 2 +-
+ common/ctdb_ltdb.c | 2 +-
+ common/ctdb_message.c | 2 +-
+ common/ctdb_util.c | 2 +-
+ lib/util/db_wrap.c | 2 +-
+ server/ctdb_banning.c | 2 +-
+ server/ctdb_call.c | 2 +-
+ server/ctdb_control.c | 2 +-
+ server/ctdb_daemon.c | 2 +-
+ server/ctdb_freeze.c | 2 +-
+ server/ctdb_ltdb_server.c | 2 +-
+ server/ctdb_persistent.c | 2 +-
+ server/ctdb_recover.c | 2 +-
+ server/ctdb_server.c | 2 +-
+ server/ctdb_takeover.c | 2 +-
+ server/ctdb_traverse.c | 2 +-
+ server/ctdb_update_record.c | 2 +-
+ server/ctdb_vacuum.c | 2 +-
+ tcp/tcp_connect.c | 2 +-
+ tcp/tcp_init.c | 2 +-
+ tcp/tcp_io.c | 2 +-
+ tests/src/ctdbd_test.c | 2 +-
+ 24 files changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/client/ctdb_client.c b/client/ctdb_client.c
+index 334d830..51ca49b 100644
+--- a/client/ctdb_client.c
++++ b/client/ctdb_client.c
+@@ -20,7 +20,7 @@
+
+ #include "includes.h"
+ #include "db_wrap.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "lib/util/dlinklist.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+diff --git a/common/ctdb_io.c b/common/ctdb_io.c
+index 4e592b9..aee8864 100644
+--- a/common/ctdb_io.c
++++ b/common/ctdb_io.c
+@@ -21,7 +21,7 @@
+ */
+
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "lib/util/dlinklist.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+diff --git a/common/ctdb_logging.c b/common/ctdb_logging.c
+index 408fda8..9b69b38 100644
+--- a/common/ctdb_logging.c
++++ b/common/ctdb_logging.c
+@@ -18,7 +18,7 @@
+ */
+
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "system/time.h"
+ #include "../include/ctdb_private.h"
+ #include "../include/ctdb_client.h"
+diff --git a/common/ctdb_ltdb.c b/common/ctdb_ltdb.c
+index dab88f3..0bfc377 100644
+--- a/common/ctdb_ltdb.c
++++ b/common/ctdb_ltdb.c
+@@ -19,7 +19,7 @@
+ */
+
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+ #include "../include/ctdb_private.h"
+diff --git a/common/ctdb_message.c b/common/ctdb_message.c
+index b0d2ea0..0e19761 100644
+--- a/common/ctdb_message.c
++++ b/common/ctdb_message.c
+@@ -22,7 +22,7 @@
+ protocol design and packet details
+ */
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+ #include "../include/ctdb_private.h"
+diff --git a/common/ctdb_util.c b/common/ctdb_util.c
+index a910a0c..d2bce36 100644
+--- a/common/ctdb_util.c
++++ b/common/ctdb_util.c
+@@ -18,7 +18,7 @@
+ */
+
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+ #include "system/wait.h"
+diff --git a/lib/util/db_wrap.c b/lib/util/db_wrap.c
+index 7e7e17f..07b066c 100644
+--- a/lib/util/db_wrap.c
++++ b/lib/util/db_wrap.c
+@@ -28,7 +28,7 @@
+
+ #include "includes.h"
+ #include "lib/util/dlinklist.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "db_wrap.h"
+
+ static struct tdb_wrap *tdb_list;
+diff --git a/server/ctdb_banning.c b/server/ctdb_banning.c
+index 4e6db31..bb3facc 100644
+--- a/server/ctdb_banning.c
++++ b/server/ctdb_banning.c
+@@ -17,7 +17,7 @@
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "system/time.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+diff --git a/server/ctdb_call.c b/server/ctdb_call.c
+index a98903d..fe83bc1 100644
+--- a/server/ctdb_call.c
++++ b/server/ctdb_call.c
+@@ -21,7 +21,7 @@
+ protocol design and packet details
+ */
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "lib/util/dlinklist.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+diff --git a/server/ctdb_control.c b/server/ctdb_control.c
+index bf4a20d..229ccdd 100644
+--- a/server/ctdb_control.c
++++ b/server/ctdb_control.c
+@@ -17,7 +17,7 @@
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+ #include "system/wait.h"
+diff --git a/server/ctdb_daemon.c b/server/ctdb_daemon.c
+index cedee09..29c26f6 100644
+--- a/server/ctdb_daemon.c
++++ b/server/ctdb_daemon.c
+@@ -19,7 +19,7 @@
+
+ #include "includes.h"
+ #include "db_wrap.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "lib/util/dlinklist.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+diff --git a/server/ctdb_freeze.c b/server/ctdb_freeze.c
+index 88384f9..e65415c 100644
+--- a/server/ctdb_freeze.c
++++ b/server/ctdb_freeze.c
+@@ -17,7 +17,7 @@
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+ #include "system/wait.h"
+diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
+index 0426d96..b5a27de 100644
+--- a/server/ctdb_ltdb_server.c
++++ b/server/ctdb_ltdb_server.c
+@@ -18,7 +18,7 @@
+ */
+
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+ #include "system/dir.h"
+diff --git a/server/ctdb_persistent.c b/server/ctdb_persistent.c
+index 2b3da32..dcbb6e0 100644
+--- a/server/ctdb_persistent.c
++++ b/server/ctdb_persistent.c
+@@ -22,7 +22,7 @@
+ #include "system/filesys.h"
+ #include "system/wait.h"
+ #include "db_wrap.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "../include/ctdb_private.h"
+
+ struct ctdb_persistent_state {
+diff --git a/server/ctdb_recover.c b/server/ctdb_recover.c
+index d7741ab..1c18aca 100644
+--- a/server/ctdb_recover.c
++++ b/server/ctdb_recover.c
+@@ -18,7 +18,7 @@
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "system/time.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+diff --git a/server/ctdb_server.c b/server/ctdb_server.c
+index de3c690..d0c3461 100644
+--- a/server/ctdb_server.c
++++ b/server/ctdb_server.c
+@@ -18,7 +18,7 @@
+ */
+
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "lib/util/dlinklist.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
+index fda7c56..679177e 100644
+--- a/server/ctdb_takeover.c
++++ b/server/ctdb_takeover.c
+@@ -19,7 +19,7 @@
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "lib/util/dlinklist.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+diff --git a/server/ctdb_traverse.c b/server/ctdb_traverse.c
+index d9aed2b..8d8a517 100644
+--- a/server/ctdb_traverse.c
++++ b/server/ctdb_traverse.c
+@@ -21,7 +21,7 @@
+ #include "system/filesys.h"
+ #include "system/wait.h"
+ #include "db_wrap.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "../include/ctdb_private.h"
+ #include "lib/util/dlinklist.h"
+
+diff --git a/server/ctdb_update_record.c b/server/ctdb_update_record.c
+index 1543b46..ce8e8af 100644
+--- a/server/ctdb_update_record.c
++++ b/server/ctdb_update_record.c
+@@ -20,7 +20,7 @@
+
+ #include "includes.h"
+ #include "db_wrap.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "ctdb_private.h"
+
+ struct ctdb_persistent_write_state {
+diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
+index d7527d4..1f2fb01 100644
+--- a/server/ctdb_vacuum.c
++++ b/server/ctdb_vacuum.c
+@@ -20,7 +20,7 @@
+ */
+
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+ #include "system/dir.h"
+diff --git a/tcp/tcp_connect.c b/tcp/tcp_connect.c
+index 93111f3..e8cae58 100644
+--- a/tcp/tcp_connect.c
++++ b/tcp/tcp_connect.c
+@@ -19,7 +19,7 @@
+ */
+
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+ #include "../include/ctdb_private.h"
+diff --git a/tcp/tcp_init.c b/tcp/tcp_init.c
+index 3fec599..a65e732 100644
+--- a/tcp/tcp_init.c
++++ b/tcp/tcp_init.c
+@@ -18,7 +18,7 @@
+ */
+
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+ #include "../include/ctdb_private.h"
+diff --git a/tcp/tcp_io.c b/tcp/tcp_io.c
+index f8904af..5111195 100644
+--- a/tcp/tcp_io.c
++++ b/tcp/tcp_io.c
+@@ -19,7 +19,7 @@
+
+ #include "includes.h"
+ #include "lib/util/dlinklist.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "system/network.h"
+ #include "system/filesys.h"
+ #include "../include/ctdb_private.h"
+diff --git a/tests/src/ctdbd_test.c b/tests/src/ctdbd_test.c
+index 6f045a3..bf95e0b 100644
+--- a/tests/src/ctdbd_test.c
++++ b/tests/src/ctdbd_test.c
+@@ -21,7 +21,7 @@
+ #define _CTDBD_TEST_C
+
+ #include "includes.h"
+-#include "lib/tdb/include/tdb.h"
++#include "tdb.h"
+ #include "ctdb_private.h"
+
+ /*
+--
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 217fbe2..23f0d53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0002-Display-compiler-commands.patch
-0004-Include-config.h-in-libctdb-ctdb.c-Closes-703551.patch
+0005-Fix-tdb.h-path.patch
--
CTDB
More information about the Pkg-samba-maint
mailing list