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

chrism at alioth.debian.org chrism at alioth.debian.org
Tue Jun 24 09:14:37 UTC 2008 

Author: chrism
Date: 2008-06-24 09:14:37 +0000 (Tue, 24 Jun 2008)
New Revision: 186

Modified:
   sks/trunk/sks/debian/README.Debian
   sks/trunk/sks/debian/changelog
   sks/trunk/sks/debian/control
   sks/trunk/sks/debian/patches/502_makefile_install
   sks/trunk/sks/debian/rules
Log:
releasing version 1.1.0-2

Modified: sks/trunk/sks/debian/README.Debian
===================================================================
--- sks/trunk/sks/debian/README.Debian	2008-06-19 15:52:24 UTC (rev 185)
+++ sks/trunk/sks/debian/README.Debian	2008-06-24 09:14:37 UTC (rev 186)
@@ -3,11 +3,11 @@
 If you install a new keyserver you might need a fresh keydump to start
 with. You can get one e.g. from nynex.net:
 
- cd /var/lib/sks/dumps
+ cd /var/lib/sks/dump
  wget -q -r -np -nd -A bz2,SHA256,asc http://nynex.net/keydump/ -e robots=off
  bunzip2 *bz2
 
-The to build the database from the keydumps call:
+To build the database from the keydumps call:
 
  /usr/lib/sks/sks_build.sh
  chown -R debian-sks:debian-sks /var/lib/sks
@@ -30,9 +30,13 @@
 
 Then you can start the database with /etc/init.d/sks start.
 
+If you want to connect to the global sks-network, send a mail to
+pgp-keyserver-folk at flame.org or sks-devel at nongnu.org and ask for
+gossip partners. Include the partners in /etc/sks/membership.
+
 -----
 
 Thanks to Peter Palfrader <weasel at debian.org> for building the
 original Debian package.
 
- -- Christoph Martin <christoph.martin at uni-mainz.de>, Mon,  9 Jun 2008 14:21:34 +0200
+ -- Christoph Martin <Christoph.Martin at Uni-Mainz.DE>, Tue, 24 Jun 2008 10:24:25 +0200

Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog	2008-06-19 15:52:24 UTC (rev 185)
+++ sks/trunk/sks/debian/changelog	2008-06-24 09:14:37 UTC (rev 186)
@@ -1,3 +1,12 @@
+sks (1.1.0-2) unstable; urgency=low
+
+  * Make sks build on architectures which are non native ocaml archs
+    (closes: #486847)
+  * update to standards version 3.8.0
+  * some changes to README.Debian
+
+ -- Christoph Martin <christoph.martin at uni-mainz.de>  Tue, 24 Jun 2008 11:01:10 +0200
+
 sks (1.1.0-1) unstable; urgency=low
 
   * First official Debian release (closes: #484785)

Modified: sks/trunk/sks/debian/control
===================================================================
--- sks/trunk/sks/debian/control	2008-06-19 15:52:24 UTC (rev 185)
+++ sks/trunk/sks/debian/control	2008-06-24 09:14:37 UTC (rev 186)
@@ -1,14 +1,14 @@
 Source: sks
 Section: net
 Priority: optional
-Standards-Version: 3.7.3.0
+Standards-Version: 3.8.0
 Maintainer: Peter Palfrader <weasel at debian.org>
 Uploaders: Fabio M. Di Nitto <fabbione at fabbione.net>, Peter Palfrader <weasel at debian.org>, Christoph Martin <christoph.martin at uni-mainz.de>
 Build-Depends: ocaml (>= 3.08), camlp4, dbs, libdb-dev, debhelper (>= 4.0), zlib1g-dev, libcryptokit-ocaml-dev (>= 1.2-4), ocaml-nox (>= 1.3-4), perl, perl-doc
 
 Package: sks
 Architecture: any
-Depends: ${shlibs:Depends}, db4.6-util, postfix | mail-transport-agent, procmail, adduser, logrotate
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlRun}, db4.6-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

Modified: sks/trunk/sks/debian/patches/502_makefile_install
===================================================================
--- sks/trunk/sks/debian/patches/502_makefile_install	2008-06-19 15:52:24 UTC (rev 185)
+++ sks/trunk/sks/debian/patches/502_makefile_install	2008-06-24 09:14:37 UTC (rev 186)
@@ -1,6 +1,6 @@
 diff -ruN sks-1.1.0-old/Makefile sks-1.1.0/Makefile
---- sks-1.1.0-old/Makefile	2008-06-03 17:43:20.000000000 +0200
-+++ sks-1.1.0/Makefile	2008-06-04 10:26:03.000000000 +0200
+--- sks-1.1.0-old/Makefile	2008-06-23 17:19:01.000000000 +0200
++++ sks-1.1.0/Makefile	2008-06-23 17:35:12.000000000 +0200
 @@ -54,8 +54,8 @@
  OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 $(CAMLLIBS:.cma=.cmxa) 
  
@@ -12,7 +12,7 @@
  
  all: $(ALL) 
  all.bc: $(ALL.bc) 
-@@ -125,8 +125,9 @@
+@@ -125,14 +125,17 @@
  # Special targets 
  
  install: 
@@ -24,7 +24,17 @@
  	mkdir -p $(MANDIR)/man8
  	install sks.8.gz $(MANDIR)/man8
  
-@@ -148,7 +149,7 @@
+ install.bc: 
+-	mkdir -p $(PREFIX)/bin
+-	install sks_build.bc.sh sks.bc sks_add_mail.bc $(PREFIX)/bin
++	mkdir -p $(PREFIX)/sbin $(PREFIX)/lib/sks
++	install sks.bc $(PREFIX)/sbin/sks
++	install sks_build.sh $(PREFIX)/lib/sks/
++	install sks_add_mail.bc $(PREFIX)/lib/sks/sks_add_mail
+ 	mkdir -p $(MANDIR)/man8
+ 	install sks.8.gz $(MANDIR)/man8
+ 
+@@ -148,7 +151,7 @@
  # Ordinary targets
  
  sks.8.gz: sks.8
@@ -33,7 +43,7 @@
  
  sks.8: sks.pod
  	pod2man -c "SKS OpenPGP Key server" --section 8 -r 0.1 -name sks sks.pod sks.8
-@@ -360,6 +361,7 @@
+@@ -360,6 +363,7 @@
  clean: mlclean
  	rm -f *.o
  	rm -f prepared

Modified: sks/trunk/sks/debian/rules
===================================================================
--- sks/trunk/sks/debian/rules	2008-06-19 15:52:24 UTC (rev 185)
+++ sks/trunk/sks/debian/rules	2008-06-24 09:14:37 UTC (rev 186)
@@ -10,6 +10,12 @@
 
 TMP     =$(CURDIR)/debian/sks
 
+OCAMLABI = $(shell ocamlc -version)
+BYTECODE = $(shell [ -x /usr/bin/ocamlopt ] || echo yes)
+all      = $(if $(BYTECODE),all.bc,all)
+install  = $(if $(BYTECODE),install.bc,install)
+OCAMLRUN = $(if $(BYTECODE),ocaml-base-nox-$(OCAMLABI))
+
 DEBCFLAGS = -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	DEBCFLAGS += -O0
@@ -29,7 +35,8 @@
 build: debug configure-stamp build-stamp
 build-stamp: $(patched)
 	dh_testdir
-	cd $(BUILD_TREE) && $(MAKE) DEBCFLAGS="$(DEBCFLAGS)" all
+	cat /usr/lib/ocaml/*/native-archs
+	cd $(BUILD_TREE) && $(MAKE) DEBCFLAGS="$(DEBCFLAGS)" $(all)
 	touch build-stamp
 
 install: build
@@ -41,7 +48,7 @@
 	dh_installchangelogs
 
 	# from upstream
-	cd $(BUILD_TREE) && $(MAKE) PREFIX="$(TMP)/usr" MANDIR="$(TMP)/usr/share/man" install
+	cd $(BUILD_TREE) && $(MAKE) PREFIX="$(TMP)/usr" MANDIR="$(TMP)/usr/share/man" $(install)
 	#install -m 755 $(BUILD_TREE)/sks debian/sks/usr/sbin/sks
 	#install -m 755 $(BUILD_TREE)/sks_add_mail debian/sks/usr/lib/sks/sks_add_mail
 
@@ -53,14 +60,16 @@
 	dh_testroot
 	dh_compress
 	dh_fixperms
-	dh_strip
+	if [ -z $(BYTECODE) ]; then \
+		dh_strip; \
+	fi
 	dh_shlibdeps
 	dh_installdebconf
 	dh_installlogrotate
 	dh_installinit
 	dh_installcron
 	dh_installdeb
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlRun="$(OCAMLRUN)"
 	dh_md5sums
 	dh_builddeb

More information about the Pkg-sks-commit mailing list