[Pkg-samba-maint] [samba] 01/02: Revert previous patch, since ldb has an active module version check. Instead, just depend on ldb 1.1.18.

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch master
in repository samba.

commit 1fc7a76b905d665bdbbed080816f317b9fa3a363
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Dec 10 18:13:45 2014 +0000

    Revert previous patch, since ldb has an active module version check. Instead, just depend on ldb 1.1.18.
    
    Change-Id: Ibc73bd7fed13b810a04e9c23abf2f9117b22779b
---
 debian/changelog          |  7 +++++++
 debian/control            |  6 +++---
 debian/ldb-compat.py      | 47 -----------------------------------------------
 debian/ldb-equiv-versions |  1 -
 debian/rules              |  5 ++---
 5 files changed, 12 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 525bed2..87c930c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+samba (2:4.1.13+dfsg-4) UNRELEASED; urgency=medium
+
+  * Revert previous patch, since ldb has an active module version check.
+    Instead, just depend on ldb 1.1.18. Closes: #771991
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Wed, 10 Dec 2014 18:13:42 +0000
+
 samba (2:4.1.13+dfsg-3) unstable; urgency=medium
 
   * Update debian/rules to allow support for multiple upstream ldb
diff --git a/debian/control b/debian/control
index 50089ea..ab1ba61 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends: bison,
                libgnutls28-dev,
                libheimntlm0-heimdal (>= 1.6~),
                libldap2-dev,
-               libldb-dev (>= 1:1.1.16~),
+               libldb-dev (>= 1:1.1.18~),
                libncurses5-dev,
                libntdb-dev (>= 1.0),
                libpam0g-dev,
@@ -48,8 +48,8 @@ Build-Depends: bison,
                po-debconf,
                python-all-dev (>= 2.6.6-3),
                python-dnspython,
-               python-ldb (>= 1:1.1.16~),
-               python-ldb-dev (>= 1:1.1.16~),
+               python-ldb (>= 1:1.1.18~),
+               python-ldb-dev (>= 1:1.1.18~),
                python-ntdb,
                python-talloc-dev (>= 2.0.8~),
                python-tdb (>= 1.2.11~),
diff --git a/debian/ldb-compat.py b/debian/ldb-compat.py
deleted file mode 100755
index 99fa28a..0000000
--- a/debian/ldb-compat.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/python
-# LDB has an unstable ABI for plugins that can change at a whim.
-# By default, the Samba package is conservative and only allows use of
-# the version against which it was built.
-#
-# debian/ldb-equiv-versions can list ldb versions for which the ABI hasn't changed.
-
-import optparse
-parser = optparse.OptionParser("[options] ldb-version")
-parser.add_option("--equivfile", dest="equivfile", type=str,
-                  default="debian/ldb-equiv-versions",
-                  help="File with ldb versions considered to be equivalent.")
-(opts, args) = parser.parse_args()
-
-if len(args) != 1:
-    parser.error("No version specified.")
-
-def parse_version(version):
-    return map(int, version.split('.'))
-
-def format_version(version):
-    return '.'.join(map(str, version))
-
-ldb_version = parse_version(args[0])
-
-def next_version(version):
-    x = list(version)
-    x[-1] = x[-1]+1
-    return format_version(x)
-
-f = open(opts.equivfile, 'r')
-try:
-    for l in f.readlines():
-        if l[0] == '#':
-            continue
-        (begin, end) = l.strip().split('-')
-        if (ldb_version < parse_version(begin) or
-            ldb_version > parse_version(end)):
-            continue
-        print begin
-        print next_version(parse_version(end))
-        break
-    else:
-        print format_version(ldb_version)
-        print next_version(ldb_version)
-finally:
-    f.close()
diff --git a/debian/ldb-equiv-versions b/debian/ldb-equiv-versions
deleted file mode 100644
index 0ae28a7..0000000
--- a/debian/ldb-equiv-versions
+++ /dev/null
@@ -1 +0,0 @@
-1.1.17-1.1.18
diff --git a/debian/rules b/debian/rules
index 08f7bbb..383385c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,8 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 PYVERS=$(shell pyversions -vr)
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-LDB_BUILD_VERSION = $(shell pkg-config --modversion ldb)
-LDB_VERSION = $(shell ./debian/ldb-compat.py $(LDB_BUILD_VERSION) | head -1)
-LDB_NEXT_VERSION = $(shell ./debian/ldb-compat.py $(LDB_BUILD_VERSION) | tail -1)
+LDB_VERSION = $(shell pkg-config --modversion ldb)
+LDB_NEXT_VERSION = $(shell python -c "x = '$(LDB_VERSION)'.split('.'); x[-1] = str(int(x[-1])+1); print '.'.join(x)")
 # samba ships ldb modules, which are specific to the ldb version, so we need a
 # strict dependency on the upstream ldb version
 # this also mean samba needs a rebuild when the upstream ldb version changes

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git