[Pkg-samba-maint] [ctdb] 03/10: New upstream release 2.3
Mathieu Parent
sathieu at alioth.debian.org
Thu Aug 15 18:42:46 UTC 2013
This is an automated email from the git hooks/post-receive script.
sathieu pushed a commit to branch debian-sid
in repository ctdb.
commit 34ea612d9be08289c358f26e65bf3f174772f53c
Author: Mathieu Parent <math.parent at gmail.com>
Date: Sat Aug 10 19:24:02 2013 +0200
New upstream release 2.3
---
debian/changelog | 11 +
.../patches/0002-Display-compiler-commands.patch | 201 ------------
...-config.h-in-libctdb-ctdb.c-Closes-703551.patch | 26 --
debian/patches/0005-Fix-tdb.h-path.patch | 347 --------------------
debian/patches/series | 1 -
debian/rules | 3 +
6 files changed, 14 insertions(+), 575 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f8506f1..a2463b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ctdb (2.3+debian0-1) UNRELEASED; urgency=low
+
+ * New upstream release 2.3
+ - Removed 0005-Fix-tdb.h-path.patch, merged
+ - Removed 0002-Display-compiler-commands.patch, merged
+ - Removed 0004-Include-config.h-in-libctdb-ctdb.c-Closes-703551.patch,
+ merged
+ * d/rules: set VERBOSE=1 (replaces 0002-Display-compiler-commands.patch)
+
+ -- Mathieu Parent <sathieu at debian.org> Sat, 10 Aug 2013 19:22:53 +0200
+
ctdb (2.2+debian0-1) unstable; urgency=low
* New upstream release 2.2
diff --git a/debian/patches/0002-Display-compiler-commands.patch b/debian/patches/0002-Display-compiler-commands.patch
deleted file mode 100644
index e51d2fd..0000000
--- a/debian/patches/0002-Display-compiler-commands.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From: Mathieu Parent <math.parent at gmail.com>
-Date: Thu, 6 Jun 2013 21:11:31 +0200
-Subject: [PATCH] Display compiler commands
-
-Necessary to detect missing (hardening) flags (automatically).
-
-Original Author: Simon Ruderich <simon at ruderich.org>
-Forwarded: https://lists.samba.org/archive/samba-technical/2013-January/089944.html
----
- Makefile.in | 64 +++++++++++++++++++++++++++++------------------------------
- 1 file changed, 32 insertions(+), 32 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index bfeccf8..6c4f44d 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -145,7 +145,7 @@ showlayout::
- .c.o:
- @echo Compiling $*.c
- @mkdir -p `dirname $@`
-- @$(CC) $(CFLAGS) -c $< -o $@
-+ $(CC) $(CFLAGS) -c $< -o $@
-
- dirs:
- @mkdir -p $(DIRS)
-@@ -156,17 +156,17 @@ $(CTDB_VERSION_H):
-
- bin/ctdbd: $(CTDB_SERVER_OBJ)
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS)
-
- libctdb/libctdb.a: $(CTDB_LIB_OBJ)
- @echo Linking $@
- -rm -f libctdb.a
-- @$(AR) $(ARFLAGS) libctdb/libctdb.a $(CTDB_LIB_OBJ)
-- @$(RANLIB) libctdb/libctdb.a
-+ $(AR) $(ARFLAGS) libctdb/libctdb.a $(CTDB_LIB_OBJ)
-+ $(RANLIB) libctdb/libctdb.a
-
- libctdb/libctdb.so.0: $(CTDB_LIB_OBJ)
- @echo Linking $@
-- @$(SHLD) -Wl,-soname=libctdb.so.0 $(CTDB_LIB_OBJ)
-+ $(SHLD) -Wl,-soname=libctdb.so.0 $(CTDB_LIB_OBJ)
-
- libctdb/libctdb.so: libctdb/libctdb.so.0
- @echo Creating $@
-@@ -175,23 +175,23 @@ libctdb/libctdb.so: libctdb/libctdb.so.0
-
- bin/scsi_io: $(CTDB_CLIENT_OBJ) utils/scsi_io/scsi_io.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ utils/scsi_io/scsi_io.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ utils/scsi_io/scsi_io.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.o tools/ctdb_vacuum.o libctdb/libctdb.a
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) libctdb/libctdb.a
-+ $(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) libctdb/libctdb.a
-
- bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ)
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS)
-
- bin/ctdb_lock_helper: server/ctdb_lock_helper.o lib/util/util_file.o $(CTDB_EXTERNAL_OBJ)
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ server/ctdb_lock_helper.o lib/util/util_file.o $(CTDB_EXTERNAL_OBJ) $(TDB_LIBS) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ server/ctdb_lock_helper.o lib/util/util_file.o $(CTDB_EXTERNAL_OBJ) $(TDB_LIBS) $(LIB_FLAGS)
-
- bin/smnotify: utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o utils/smnotify/smnotify.o $(POPT_OBJ)
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ utils/smnotify/smnotify.o utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o $(POPT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ utils/smnotify/smnotify.o utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o $(POPT_OBJ) $(LIB_FLAGS)
-
- utils/smnotify/smnotify.o: utils/smnotify/smnotify.c utils/smnotify/smnotify.h
-
-@@ -209,75 +209,75 @@ utils/smnotify/gen_smnotify.c: utils/smnotify/smnotify.x utils/smnotify/smnotify
-
- bin/ping_pong: utils/ping_pong/ping_pong.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o $(LIB_FLAGS)
-
- bin/pmdactdb: $(CTDB_CLIENT_OBJ) utils/pmda/pmda_ctdb.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ utils/pmda/pmda_ctdb.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) $(PMDA_LIBS)
-+ $(CC) $(CFLAGS) -o $@ utils/pmda/pmda_ctdb.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) $(PMDA_LIBS)
-
- tests/bin/rb_test: $(CTDB_CLIENT_OBJ) tests/src/rb_test.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/rb_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/rb_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ctdb_bench: $(CTDB_CLIENT_OBJ) tests/src/ctdb_bench.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_bench.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_bench.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ctdb_fetch: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ctdb_fetch_one: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch_one.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_one.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_one.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ctdb_fetch_lock_once: libctdb/libctdb.a tests/src/ctdb_fetch_lock_once.o $(CTDB_EXTERNAL_OBJ)
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_lock_once.o $(CTDB_EXTERNAL_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_lock_once.o $(CTDB_EXTERNAL_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
-
- tests/bin/ctdb_fetch_readonly_once: libctdb/libctdb.a tests/src/ctdb_fetch_readonly_once.o $(CTDB_EXTERNAL_OBJ)
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_once.o $(CTDB_EXTERNAL_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_once.o $(CTDB_EXTERNAL_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
-
- tests/bin/ctdb_fetch_readonly_loop: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch_readonly_loop.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_loop.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_loop.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ctdb_trackingdb_test: $(CTDB_CLIENT_OBJ) tests/src/ctdb_trackingdb_test.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_trackingdb_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_trackingdb_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ctdb_update_record: $(CTDB_CLIENT_OBJ) tests/src/ctdb_update_record.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_update_record.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_update_record.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ctdb_update_record_persistent: $(CTDB_CLIENT_OBJ) tests/src/ctdb_update_record_persistent.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_update_record_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_update_record_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ctdb_store: $(CTDB_CLIENT_OBJ) tests/src/ctdb_store.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_store.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_store.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ctdb_traverse: $(CTDB_CLIENT_OBJ) tests/src/ctdb_traverse.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_traverse.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_traverse.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ctdb_randrec: $(CTDB_CLIENT_OBJ) tests/src/ctdb_randrec.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_randrec.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_randrec.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ctdb_persistent: $(CTDB_CLIENT_OBJ) tests/src/ctdb_persistent.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ctdb_porting_tests: $(CTDB_CLIENT_OBJ) tests/src/ctdb_porting_tests.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_porting_tests.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_porting_tests.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ctdb_transaction: $(CTDB_CLIENT_OBJ) tests/src/ctdb_transaction.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_transaction.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_transaction.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- CTDB_SERVER_MOST_OBJ = $(CTDB_SERVER_OBJ:server/ctdbd.o=)
- CTDBD_TEST_C = $(CTDB_SERVER_MOST_OBJ:.o=.c) tests/src/ctdbd_test.c
-@@ -291,23 +291,23 @@ tests/src/ctdb_takeover_tests.o: tests/src/ctdb_takeover_tests.c $(CTDBD_TEST_C)
-
- tests/bin/ctdb_takeover_tests: $(CTDB_TEST_OBJ) tests/src/ctdb_takeover_tests.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_takeover_tests.o $(CTDB_TEST_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_takeover_tests.o $(CTDB_TEST_OBJ) $(LIB_FLAGS)
-
- tests/src/ctdb_tool_libctdb.o: tests/src/ctdb_tool_libctdb.c tests/src/libctdb_test.c $(CTDB_TEST_C)
-
- tests/bin/ctdb_tool_libctdb: $(CTDB_TEST_OBJ) tests/src/ctdb_tool_libctdb.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_libctdb.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_libctdb.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS)
-
- tests/src/ctdb_tool_stubby.o: tests/src/ctdb_tool_stubby.c tests/src/libctdb_test.c $(CTDB_TEST_C)
-
- tests/bin/ctdb_tool_stubby: $(CTDB_TEST_OBJ) tests/src/ctdb_tool_stubby.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_stubby.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_stubby.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS)
-
- tests/bin/ibwrapper_test: $(CTDB_CLIENT_OBJ) ib/ibwrapper_test.o
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+ $(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
- manpages:
- $(MAKE) -C doc
---
-1.7.10.4
-
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
deleted file mode 100644
index 9651f66..0000000
--- a/debian/patches/0004-Include-config.h-in-libctdb-ctdb.c-Closes-703551.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 12a4bd73d46ef5165f62ebff4a49697301b06046 Mon Sep 17 00:00:00 2001
-From: Mathieu Parent <math.parent at gmail.com>
-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
----
- libctdb/ctdb.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libctdb/ctdb.c b/libctdb/ctdb.c
-index dd1b572..4462fe4 100644
---- a/libctdb/ctdb.c
-+++ b/libctdb/ctdb.c
-@@ -17,6 +17,7 @@
- You should have received a copy of the GNU General Public License
- 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>
---
-1.7.10.4
-
diff --git a/debian/patches/0005-Fix-tdb.h-path.patch b/debian/patches/0005-Fix-tdb.h-path.patch
deleted file mode 100644
index 470bed6..0000000
--- a/debian/patches/0005-Fix-tdb.h-path.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-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 23f0d53..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0005-Fix-tdb.h-path.patch
diff --git a/debian/rules b/debian/rules
index bcbc9b4..1fb5e5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# Show command in Makefile
+export VERBOSE=1
+
# The build system doesn't use CPPFLAGS, pass them to CFLAGS to enable the
# missing (hardening) flags.
export DEB_CFLAGS_MAINT_APPEND := -Wall $(shell dpkg-buildflags --get CPPFLAGS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/ctdb.git
More information about the Pkg-samba-maint
mailing list