[apr-util] 01/01: strip epoch from the db version

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apr-util.

commit efc4935d257c346565c025fd5007303a9eb669d4
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Fri Nov 8 16:22:35 2013 +0100

    strip epoch from the db version
    
    Ubuntu needs that
---
 debian/changelog |    7 +++++++
 debian/rules     |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6fe1b1a..59888c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apr-util (1.5.2-3) UNRELEASED; urgency=low
+
+  * When querying the berkley db version, strip the epoch from the
+    version number.
+
+ -- Stefan Fritsch <sf at debian.org>  Fri, 08 Nov 2013 16:20:50 +0100
+
 apr-util (1.5.2-2) unstable; urgency=low
 
   * Remove dbd-freetds driver because it has security issues.
diff --git a/debian/rules b/debian/rules
index 29f9955..3836f71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 # configure takes ages to test for all db versions. Provide the installed
 # version to speed things up.
 DB_VERSION = $(shell dpkg-query -W -f '$${Version}' libdb-dev | \
-	       perl -pe 's/^(\d+)[.](\d+)[.].*/$$1$$2/')
+	       perl -pe 's/^(?:[^:]*:)?(\d+)[.](\d+)[.].*/$$1$$2/')
 
 %:
 	dh $@ -B$(BUILDDIR) --parallel --with autotools_dev

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