diff -Nru sks-1.1.1+dpkgv3/debian/changelog sks-1.1.1+dpkgv3/debian/changelog --- sks-1.1.1+dpkgv3/debian/changelog 2012-07-02 13:13:02.000000000 +0000 +++ sks-1.1.1+dpkgv3/debian/changelog 2012-07-08 23:05:17.000000000 +0000 @@ -1,3 +1,10 @@ +sks (1.1.1+dpkgv3-7ubuntu0.2) precise-proposed; urgency=low + + * Look for ^.i not ^ii in libdbX.Y-dev packages for BDB_VERSION. And assert + that we have a value (LP: #1021650) + + -- Stefano Rivera Fri, 06 Jul 2012 22:43:42 +0200 + sks (1.1.1+dpkgv3-7ubuntu0.1) precise-proposed; urgency=low * Provide OLD_BDB versions for Ubuntu, so that Berkeley DB upgrades will diff -Nru sks-1.1.1+dpkgv3/debian/rules sks-1.1.1+dpkgv3/debian/rules --- sks-1.1.1+dpkgv3/debian/rules 2011-05-31 13:55:29.000000000 +0000 +++ sks-1.1.1+dpkgv3/debian/rules 2012-07-06 20:43:28.000000000 +0000 @@ -12,7 +12,7 @@ export DEB_BUILD_OPTIONS += $(if $(BYTECODE)," nostrip",) -BDB_VERSION ?= $(shell LC_ALL=C dpkg-query -l 'libdb[45].[0-9]-dev' | grep ^ii | sed -e 's|.*\s\libdb\([45]\.[0-9]\)-dev\s.*|\1|') +BDB_VERSION ?= $(shell LC_ALL=C dpkg-query -l 'libdb[45].[0-9]-dev' | grep ^.i | sed -e 's|.*\s\libdb\([45]\.[0-9]\)-dev\s.*|\1|') %: dh $@ --with=ocaml @@ -25,6 +25,8 @@ $(MAKE) PREFIX="$(TMP)/usr" MANDIR="$(TMP)/usr/share/man" $(install) # Debian specific cp -a debian/debcfg/* debian/sks/etc/sks + # Check that we have a value for BDB_VERSION + [ -n "$(BDB_VERSION)" ] echo $(BDB_VERSION) > debian/sks/usr/lib/sks/berkeley_db.txt # Use override_dh_* targets to customize this.