[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 617a4e6e8019e3aae1744c7e18f5f01340e695dc
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Thu Jun 6 21:09:16 2013 +0200

    Removed 0001-Add-missing-LDFLAGS.patch, merged

diff --git a/debian/changelog b/debian/changelog
index 0bbfe37..cb3f9c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ctdb (2.2+debian0-1) UNRELEASED; urgency=low
 
   * New upstream release 2.2
+    - Removed 0001-Add-missing-LDFLAGS.patch, merged
   * Use pristine-tar
   * Remove tdb, talloc and tevent from source and replace them by builddeps
 
diff --git a/debian/patches/0001-Add-missing-LDFLAGS.patch b/debian/patches/0001-Add-missing-LDFLAGS.patch
deleted file mode 100644
index 853b210..0000000
--- a/debian/patches/0001-Add-missing-LDFLAGS.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 793b90b2656abf8be13b3dc50c7d523f7c0263b7 Mon Sep 17 00:00:00 2001
-From: Mathieu Parent <math.parent at gmail.com>
-Date: Sat, 12 Jan 2013 15:14:48 +0100
-Subject: [PATCH 1/2] Add missing LDFLAGS
-
-Original Author: Simon Ruderich <simon at ruderich.org>
-Applied-Upstream: http://git.samba.org/?p=ctdb.git;a=commitdiff;h=506ecd186759675a1cf50a0a05a285fee03fc51e
----
- Makefile.in |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index fef2e45..5871557 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -173,7 +173,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.o tools/ctdb_vacuum.o libctdb/libctdb.a
- 
- bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ)
- 	@echo Linking $@
--	@$(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS)
-+	@$(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS)
- 
- bin/smnotify: utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o utils/smnotify/smnotify.o $(POPT_OBJ)
- 	@echo Linking $@
-@@ -195,7 +195,7 @@ 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
-+	@$(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o $(LIB_FLAGS)
- 
- bin/pmdactdb: $(CTDB_CLIENT_OBJ) utils/pmda/pmda_ctdb.o
- 	@echo Linking $@
--- 
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 339a5cb..9d334ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-Add-missing-LDFLAGS.patch
 0002-Display-compiler-commands.patch
 0003-Update-config.-sub-guess-to-2013-04-24.patch
 0004-Include-config.h-in-libctdb-ctdb.c-Closes-703551.patch

-- 
CTDB