Package: sks
Version: 1.1.3-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Look for ^.i not ^ii in libdbX.Y-dev packages for BDB_VERSION. And assert
that we have a value (LP: #1021650)
It looks like the sbuild in Ubuntu's buildds does things slight
differently (it's an ancient fork of sbuild). The libdbX.Y-dev packages
are listed as pi not ii. So we should grep for ^.i, or find a slightly
more sophisticated way to determine BDB_VERSION.
Thanks for considering the patch.
SR
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru sks-1.1.3/debian/rules sks-1.1.3/debian/rules
--- sks-1.1.3/debian/rules 2012-06-20 01:07:08.000000000 -0600
+++ sks-1.1.3/debian/rules 2012-07-06 14:30:39.000000000 -0600
@@ -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/
