diff -Nru sks-1.1.3/debian/changelog sks-1.1.3/debian/changelog --- sks-1.1.3/debian/changelog 2012-07-04 06:58:56.000000000 +0000 +++ sks-1.1.3/debian/changelog 2012-07-08 18:29:58.000000000 +0000 @@ -1,8 +1,15 @@ -sks (1.1.3-1ubuntu1~ubuntu12.04.1) precise-backports; urgency=low +sks (1.1.3-1ubuntu2~ubuntu12.04.1) precise-backports; urgency=low - * No-change backport to precise (LP: #1020098) + * No-change backport to precise (LP: #1022285) - -- Micah Gersten Wed, 04 Jul 2012 01:58:56 -0500 + -- Iain Lane Sun, 08 Jul 2012 19:29:58 +0100 + +sks (1.1.3-1ubuntu2) quantal; 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:30:42 +0200 sks (1.1.3-1ubuntu1) quantal; urgency=low diff -Nru sks-1.1.3/debian/rules sks-1.1.3/debian/rules --- sks-1.1.3/debian/rules 2012-06-20 07:07:08.000000000 +0000 +++ sks-1.1.3/debian/rules 2012-07-06 20:30:39.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 @@ -26,6 +26,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 cp -a sampleWeb/OpenPKG/* debian/sks/var/lib/sks/www/