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

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-24 15:17:32 +0000 (Tue, 24 Jun 2008)
New Revision: 188

Added:
   sks/trunk/sks/debian/patches/201_makefile_man
   sks/trunk/sks/debian/patches/202_makefile_bytecode
Modified:
   sks/trunk/sks/debian/changelog
   sks/trunk/sks/debian/patches/502_makefile_install
Log:
* make separate patches for manpage install for upstream
* patch to correctly build bdb on non native ocaml archs

Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog	2008-06-24 09:14:47 UTC (rev 187)
+++ sks/trunk/sks/debian/changelog	2008-06-24 15:17:32 UTC (rev 188)
@@ -1,3 +1,10 @@
+sks (1.1.0-3) unstable; urgency=low
+
+  * make separate patches for manpage install for upstream
+  * patch to correctly build bdb on non native ocaml archs
+
+ -- Christoph Martin <christoph.martin at uni-mainz.de>  Tue, 24 Jun 2008 17:16:49 +0200
+
 sks (1.1.0-2) unstable; urgency=low
 
   * Make sks build on architectures which are non native ocaml archs

Added: sks/trunk/sks/debian/patches/201_makefile_man
===================================================================
--- sks/trunk/sks/debian/patches/201_makefile_man	                        (rev 0)
+++ sks/trunk/sks/debian/patches/201_makefile_man	2008-06-24 15:17:32 UTC (rev 188)
@@ -0,0 +1,22 @@
+diff -ruN sks-1.1.0-old/Makefile sks-1.1.0/Makefile
+--- sks-1.1.0-old/Makefile	2008-06-24 16:56:07.000000000 +0200
++++ sks-1.1.0/Makefile	2008-06-24 16:57:03.000000000 +0200
+@@ -54,8 +54,8 @@
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 $(CAMLLIBS:.cma=.cmxa) 
+ 
+ EXE=sks sks_add_mail
+-ALL=$(EXE)
+-ALL.bc=$(EXE:=.bc)
++ALL=$(EXE) sks.8.gz
++ALL.bc=$(EXE:=.bc) sks.8.gz
+ 
+ all: $(ALL) 
+ all.bc: $(ALL.bc) 
+@@ -383,6 +383,7 @@
+ clean: mlclean
+ 	rm -f *.o
+ 	rm -f prepared
++	rm -f sks.8.gz
+ 
+ cleanall: clean bdbclean
+ 	rm -f lib/*

Added: sks/trunk/sks/debian/patches/202_makefile_bytecode
===================================================================
--- sks/trunk/sks/debian/patches/202_makefile_bytecode	                        (rev 0)
+++ sks/trunk/sks/debian/patches/202_makefile_bytecode	2008-06-24 15:17:32 UTC (rev 188)
@@ -0,0 +1,24 @@
+diff -ruN sks-1.1.0-old/bdb/Makefile sks-1.1.0/bdb/Makefile
+--- sks-1.1.0-old/bdb/Makefile	2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/bdb/Makefile	2008-06-24 16:59:21.000000000 +0200
+@@ -35,7 +35,7 @@
+ COBJS = bdb_stubs.o
+ 
+ ocextr: ocextr.ml
+-	$(OCAMLOPT) -o ocextr ocextr.ml
++	$(OCAMLC) -o ocextr ocextr.ml
+ 
+ libbdb.a: $(COBJS)
+ 	$(MKLIB) -custom -o bdb $(COBJS)
+diff -ruN sks-1.1.0-old/Makefile sks-1.1.0/Makefile
+--- sks-1.1.0-old/Makefile	2008-06-24 16:57:40.000000000 +0200
++++ sks-1.1.0/Makefile	2008-06-24 16:57:40.000000000 +0200
+@@ -132,7 +132,7 @@
+ 
+ install.bc: 
+ 	mkdir -p $(PREFIX)/bin
+-	install sks_build.bc.sh sks.bc sks_add_mail.bc $(PREFIX)/bin
++	install sks_build.bc sks.bc sks_add_mail.bc $(PREFIX)/bin
+ 	mkdir -p $(MANDIR)/man8
+ 	install sks.8.gz $(MANDIR)/man8
+ 

Modified: sks/trunk/sks/debian/patches/502_makefile_install
===================================================================
--- sks/trunk/sks/debian/patches/502_makefile_install	2008-06-24 09:14:47 UTC (rev 187)
+++ sks/trunk/sks/debian/patches/502_makefile_install	2008-06-24 15:17:32 UTC (rev 188)
@@ -1,17 +1,6 @@
 diff -ruN sks-1.1.0-old/Makefile sks-1.1.0/Makefile
---- 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) 
- 
- EXE=sks sks_add_mail
--ALL=$(EXE)
--ALL.bc=$(EXE:=.bc)
-+ALL=$(EXE) sks.8.gz
-+ALL.bc=$(EXE:=.bc) sks.8.gz
- 
- all: $(ALL) 
- all.bc: $(ALL.bc) 
+--- sks-1.1.0-old/Makefile	2008-06-24 17:00:11.000000000 +0200
++++ sks-1.1.0/Makefile	2008-06-24 17:04:05.000000000 +0200
 @@ -125,14 +125,17 @@
  # Special targets 
  
@@ -26,7 +15,7 @@
  
  install.bc: 
 -	mkdir -p $(PREFIX)/bin
--	install sks_build.bc.sh sks.bc sks_add_mail.bc $(PREFIX)/bin
+-	install sks_build.bc 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/
@@ -43,11 +32,3 @@
  
  sks.8: sks.pod
  	pod2man -c "SKS OpenPGP Key server" --section 8 -r 0.1 -name sks sks.pod sks.8
-@@ -360,6 +363,7 @@
- clean: mlclean
- 	rm -f *.o
- 	rm -f prepared
-+	rm -f sks.8.gz
- 
- cleanall: clean bdbclean
- 	rm -f lib/*