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

[Christoph Martin]

Author: chrism
Date: 2011-05-31 15:06:06 +0000 (Tue, 31 May 2011)
New Revision: 224

Modified:
   sks/trunk/sks/debian/changelog
   sks/trunk/sks/debian/sks.cron.daily
   sks/trunk/sks/debian/sks.postinst
Log:
releasing version 1.1.1+dpkgv3-7

Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog	2011-05-31 14:33:30 UTC (rev 223)
+++ sks/trunk/sks/debian/changelog	2011-05-31 15:06:06 UTC (rev 224)
@@ -1,9 +1,11 @@
-sks (1.1.1+dpkgv3-7) UNRELEASED; urgency=low
+sks (1.1.1+dpkgv3-7) unstable; urgency=low
 
   * remove default mailsync entry to prevent sks from sending email syncs
     per default (Thanks to Graham Dunn <grdunn at rim.com> for the hint)
+  * fix sks.daily to not depend on db4.7 (closes: #627767)
+  * fix sks.postinst to only upgrade the db if the version changes
 
- -- Christoph Martin <christoph.martin at uni-mainz.de>  Tue, 31 May 2011 16:04:02 +0200
+ -- Christoph Martin <christoph.martin at uni-mainz.de>  Tue, 31 May 2011 17:05:32 +0200
 
 sks (1.1.1+dpkgv3-6.2) unstable; urgency=low
 

Modified: sks/trunk/sks/debian/sks.cron.daily
===================================================================
--- sks/trunk/sks/debian/sks.cron.daily	2011-05-31 14:33:30 UTC (rev 223)
+++ sks/trunk/sks/debian/sks.cron.daily	2011-05-31 15:06:06 UTC (rev 224)
@@ -26,7 +26,7 @@
 	dir=$1
 	if [ -d "$dir" ]
 	then
-		db4.7_archive -h $dir -d
+		db_archive -h $dir -d
 	fi
 	return 0
 }

Modified: sks/trunk/sks/debian/sks.postinst
===================================================================
--- sks/trunk/sks/debian/sks.postinst	2011-05-31 14:33:30 UTC (rev 223)
+++ sks/trunk/sks/debian/sks.postinst	2011-05-31 15:06:06 UTC (rev 224)
@@ -85,6 +85,8 @@
 	# Read the compiled-in Berkeley DB version
 	NEW_BDB=$(cat /usr/lib/sks/berkeley_db.txt)
 
+	if [ "$OLD_BDB" != "$NEW_BDB" ]; then
+
 	# Upgrade Berkeley DB in place
 	BACKUP_DIR=/var/backup/sks/$(date +%Y%m%d-%H%M%S)
 	SKS_DIR=/var/lib/sks
@@ -134,6 +136,7 @@
 	# Note the active Berkeley DB version
 	cp -f /usr/lib/sks/berkeley_db.txt /var/lib/sks/berkeley_db.active
 
+	fi
     fi
 fi