[Pkg-sks-commit] r199 - in sks/trunk/sks/debian: . patches

[Christoph Martin]

Author: chrism
Date: 2009-07-15 22:51:08 +0000 (Wed, 15 Jul 2009)
New Revision: 199

Added:
   sks/trunk/sks/debian/patches/203_db4.7
   sks/trunk/sks/debian/watch
Modified:
   sks/trunk/sks/debian/README.Debian
   sks/trunk/sks/debian/changelog
   sks/trunk/sks/debian/control
   sks/trunk/sks/debian/sks.cron.daily
   sks/trunk/sks/debian/sks.init
Log:
releasing version 1.1.0-7

Modified: sks/trunk/sks/debian/README.Debian
===================================================================
--- sks/trunk/sks/debian/README.Debian	2009-07-10 21:35:33 UTC (rev 198)
+++ sks/trunk/sks/debian/README.Debian	2009-07-15 22:51:08 UTC (rev 199)
@@ -16,15 +16,15 @@
 
  vi /etc/default/sks
 
-If you have an old database from a Berkely DB Version (e.g 4.1) prior to the
-current version (at the moment 4.6) you have to do the following in
+If you have an old database from a Berkely DB Version (e.g 4.6) prior to the
+current version (at the moment 4.7) you have to do the following in
 /var/lib/sks/DB and /var/lib/sks/PTree:
 
- db4.1_checkpoint -1
- db4.1_recover
- db4.6_recover -e
  db4.6_checkpoint -1
- db4.6_archive | xargs --no-run-if-empty rm -f
+ db4.6_recover
+ db4.7_recover -e
+ db4.7_checkpoint -1
+ db4.7_archive | xargs --no-run-if-empty rm -f
 
  chown -R debian-sks:debian-sks /var/lib/sks /var/log/sks
 

Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog	2009-07-10 21:35:33 UTC (rev 198)
+++ sks/trunk/sks/debian/changelog	2009-07-15 22:51:08 UTC (rev 199)
@@ -1,3 +1,11 @@
+sks (1.1.0-7) unstable; urgency=low
+
+  * fix patch for PIDDIR
+  * link against libdb4.7
+  * really include watch file
+
+ -- Christoph Martin <christoph.martin at uni-mainz.de>  Thu, 16 Jul 2009 00:22:06 +0200
+
 sks (1.1.0-6) unstable; urgency=low
 
   * remove Peter Palfrader from Maintainer and Uploaders

Modified: sks/trunk/sks/debian/control
===================================================================
--- sks/trunk/sks/debian/control	2009-07-10 21:35:33 UTC (rev 198)
+++ sks/trunk/sks/debian/control	2009-07-15 22:51:08 UTC (rev 199)
@@ -8,7 +8,7 @@
 
 Package: sks
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlRun}, db4.6-util, postfix | mail-transport-agent, procmail, adduser, logrotate
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlRun}, db4.7-util, postfix | mail-transport-agent, procmail, adduser, logrotate
 Description: Synchronizing OpenPGP Key Server
  SKS is an OpenPGP key server that correctly handles all OpenPGP features
  defined in RFC2440 and RFC2440bis, including photoID packages and multiple

Added: sks/trunk/sks/debian/patches/203_db4.7
===================================================================
--- sks/trunk/sks/debian/patches/203_db4.7	                        (rev 0)
+++ sks/trunk/sks/debian/patches/203_db4.7	2009-07-15 22:51:08 UTC (rev 199)
@@ -0,0 +1,12 @@
+diff -ruN sks-1.1.0-old/bdb/Makefile sks-1.1.0/bdb/Makefile
+--- sks-1.1.0-old/bdb/Makefile	2009-07-15 23:41:52.889448000 +0200
++++ sks-1.1.0/bdb/Makefile	2009-07-15 23:43:04.008447926 +0200
+@@ -29,7 +29,7 @@
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 
+ 
+ ifndef LIBDB
+-LIBDB=-ldb-4.6
++LIBDB=-ldb-4.7
+ endif
+ 
+ COBJS = bdb_stubs.o

Modified: sks/trunk/sks/debian/sks.cron.daily
===================================================================
--- sks/trunk/sks/debian/sks.cron.daily	2009-07-10 21:35:33 UTC (rev 198)
+++ sks/trunk/sks/debian/sks.cron.daily	2009-07-15 22:51:08 UTC (rev 199)
@@ -26,7 +26,7 @@
 	dir=$1
 	if [ -d "$dir" ]
 	then
-		db4.6_archive -h $dir -d
+		db4.7_archive -h $dir -d
 	fi
 	return 0
 }

Modified: sks/trunk/sks/debian/sks.init
===================================================================
--- sks/trunk/sks/debian/sks.init	2009-07-10 21:35:33 UTC (rev 198)
+++ sks/trunk/sks/debian/sks.init	2009-07-15 22:51:08 UTC (rev 199)
@@ -68,8 +68,8 @@
 	    exit 0
 	fi
 
-	mkdir -p dirname `"$SKSDBPID"`
-	chown debian-sks dirname `"$SKSDBPID"`
+	mkdir -p `dirname "$SKSDBPID"`
+	chown debian-sks `dirname "$SKSDBPID"`
 
 	echo -n " sksdb.."
 

Added: sks/trunk/sks/debian/watch
===================================================================
--- sks/trunk/sks/debian/watch	                        (rev 0)
+++ sks/trunk/sks/debian/watch	2009-07-15 22:51:08 UTC (rev 199)
@@ -0,0 +1,2 @@
+version=3
+http://minskyprimus.net/sks/releases/sks-(\d.*)\.tgz