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

[Mathieu Parent]

The following commit has been merged in the debian-sid branch:
commit ed7ad0068317f64beb24b6ad695bc78182b7d4f1
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Wed Jun 5 20:16:27 2013 +0200

    Use pristine-tar, Remove tdb, talloc and tevent from source and replace them by builddeps

diff --git a/debian/changelog b/debian/changelog
index 5432085..ae781c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ctdb (2.1-3) UNRELEASED; urgency=low
+
+  * Use pristine-tar
+  * Remove tdb, talloc and tevent from source and replace them by builddeps
+
+ -- Mathieu Parent <sathieu at debian.org>  Wed, 05 Jun 2013 19:03:00 +0200
+
 ctdb (2.1-2) unstable; urgency=low
 
   * Upload to unstable (Closes: #706690)
diff --git a/debian/control b/debian/control
index 6887dec..17f044d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: extra
 Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
 Uploaders: Mathieu Parent <sathieu at debian.org>
-Build-Depends: debhelper (>= 9), libpopt-dev, libpcap-dev [hurd-i386 kfreebsd-any]
+Build-Depends: debhelper (>= 9), libpopt-dev, libpcap-dev [hurd-i386 kfreebsd-any], libtdb-dev, libtalloc-dev, libtevent-dev
 Homepage: http://ctdb.samba.org/
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-samba/ctdb.git
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 0848de8..4e9b082 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,11 @@
 [DEFAULT]
+pristine-tar = True
 upstream-branch = upstream-sid
 debian-branch = debian-sid
 
 [git-buildpackage]
 export-dir = ../build-area/
+
+[git-import-orig]
+filter = [ 'lib/popt', 'lib/talloc', 'lib/tdb', 'lib/tevent' ]
+filter-pristine-tar = True
diff --git a/debian/rules b/debian/rules
index fe49107..bcbc9b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,13 +52,14 @@ override_dh_strip:
 	dh_strip --dbg-package=ctdb-dbg
 
 check-external-libs:
-	if [ -e lib/popt ]; then \
+	@if [ -e lib/popt -o -e lib/tdb -o -e lib/talloc -o -e lib/tevent ]; then \
               echo " *****************************************"; \
 	      echo " **                                     **"; \
 	      echo " **  tar contains external libraries!   **"; \
 	      echo " **                                     **"; \
               echo " *****************************************"; \
-	      echo "The tarball should be made by using uscan or"; \
+	      echo "The tarball should be made by using"; \
+	      echo "git-import-orig, uscan or"; \
 	      echo "debian/uupdate-wrapper"; \
 	      echo ""; \
 	      exit 1; \
diff --git a/debian/uupdate-wrapper b/debian/uupdate-wrapper
index ea00148..51262b6 100755
--- a/debian/uupdate-wrapper
+++ b/debian/uupdate-wrapper
@@ -41,8 +41,11 @@ cd "ctdb-$version.dfsg"
 ./autogen.sh
 cd ..
 
-#remove included popt
+#remove included popt, tdb, talloc, tevent
 rm -rf "ctdb-$version.dfsg/lib/popt"
+rm -rf "ctdb-$version.dfsg/lib/tdb"
+rm -rf "ctdb-$version.dfsg/lib/talloc"
+rm -rf "ctdb-$version.dfsg/lib/tevent"
 
 #tar.gz
 tar cfz "$file" "ctdb-$version.dfsg"

-- 
CTDB