[Pkg-sks-commit] r245 - sks/trunk/sks/debian

[Christoph Martin]

Author: chrism
Date: 2013-04-18 12:55:36 +0000 (Thu, 18 Apr 2013)
New Revision: 245

Modified:
   sks/trunk/sks/debian/changelog
   sks/trunk/sks/debian/rules
   sks/trunk/sks/debian/sks.postinst
Log:
* merge Ubuntu changes
* Look for ^.i not ^ii in libdbX.Y-dev packages for BDB_VERSION. And
  assert that we have a value (LP: #1021650)
* Create /var/lib/sks/berkeley_db.active even when we aren't upgrading BDB
  versions.

Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog	2013-04-10 14:10:51 UTC (rev 244)
+++ sks/trunk/sks/debian/changelog	2013-04-18 12:55:36 UTC (rev 245)
@@ -1,3 +1,13 @@
+sks (1.1.3-3) UNRELEASED; urgency=low
+
+  * merge Ubuntu changes
+  * Look for ^.i not ^ii in libdbX.Y-dev packages for BDB_VERSION. And
+    assert that we have a value (LP: #1021650)
+  * Create /var/lib/sks/berkeley_db.active even when we aren't upgrading BDB
+    versions.
+
+ -- Christoph Martin <christoph.martin at uni-mainz.de>  Thu, 18 Apr 2013 14:55:16 +0200
+
 sks (1.1.3-2) unstable; urgency=high
 
   * add Vcs tags to control file

Modified: sks/trunk/sks/debian/rules
===================================================================
--- sks/trunk/sks/debian/rules	2013-04-10 14:10:51 UTC (rev 244)
+++ sks/trunk/sks/debian/rules	2013-04-18 12:55:36 UTC (rev 245)
@@ -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/
 

Modified: sks/trunk/sks/debian/sks.postinst
===================================================================
--- sks/trunk/sks/debian/sks.postinst	2013-04-10 14:10:51 UTC (rev 244)
+++ sks/trunk/sks/debian/sks.postinst	2013-04-18 12:55:36 UTC (rev 245)
@@ -136,6 +136,8 @@
 	# Note the active Berkeley DB version
 	cp -f /usr/lib/sks/berkeley_db.txt /var/lib/sks/berkeley_db.active
 
+	elif [ ! -e /var/lib/sks/berkeley_db.active ]; then
+	    cp -f /usr/lib/sks/berkeley_db.txt /var/lib/sks/berkeley_db.active
 	fi
     fi
 fi