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

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 14:36:32 +0000 (Thu, 19 Jun 2008)
New Revision: 26

Added:
   sks/trunk/sks/sks-1.0.5.tgz
Modified:
   sks/trunk/sks/debian/TODO
   sks/trunk/sks/debian/control
   sks/trunk/sks/debian/patches/501_makefile_cflags
Log:
[project @ 27]
CFLAGS and libtool <-> ocaml interaction

Original author: fabbione
Date: 2003-12-01 18:25:29.581461+00:00

Modified: sks/trunk/sks/debian/TODO
===================================================================
--- sks/trunk/sks/debian/TODO	2008-06-19 14:36:22 UTC (rev 25)
+++ sks/trunk/sks/debian/TODO	2008-06-19 14:36:32 UTC (rev 26)
@@ -7,9 +7,10 @@
 	X Abandoned
 
 For the first upload:
-	- passing CFLAGS to cryptokit and numerix
-	  - we need to find an elegant solution. tho the bdb stuff is shipped
-	    both as tar.gz and unpacked..
+	. passing CFLAGS to cryptokit and numerix
+	  . now we ship both cryptokit and numerix unpacked also to fix
+	    a libtool <-> ocaml interaction but not everything all the
+	    CFLAGS are the same so we cannot really use a debian standard.
 	- debian fhs needs to be completed
 	  - where are the recon and db sockets?  do they still exist in 1.0.5?
 	- completing Build-Depends:

Modified: sks/trunk/sks/debian/control
===================================================================
--- sks/trunk/sks/debian/control	2008-06-19 14:36:22 UTC (rev 25)
+++ sks/trunk/sks/debian/control	2008-06-19 14:36:32 UTC (rev 26)
@@ -2,13 +2,13 @@
 Section: net
 Priority: optional
 Standards-Version: 3.6.1
-Maintainer: Peter Palfrader <weasel at debian.org>
+Maintainer: Debian SKS Maintainers Team <debian-sks at mirror.positive-internet.com>
 Uploaders: Fabio M. Di Nitto <fabbione at fabbione.net>, Peter Palfrader <weasel at debian.org>
 Build-Depends: ocaml (= 3.07-7) | ocaml (= 3.07-7.0.pp1), dbs, libdb4.1-dev (>= 4.1.25), debhelper (>= 4.0), zlib1g-dev
 
 Package: sks
 Architecture: any
-Depends: ${misc:Depends}
+Depends: ${shlibs:Depends}
 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/501_makefile_cflags
===================================================================
--- sks/trunk/sks/debian/patches/501_makefile_cflags	2008-06-19 14:36:22 UTC (rev 25)
+++ sks/trunk/sks/debian/patches/501_makefile_cflags	2008-06-19 14:36:32 UTC (rev 26)
@@ -1,6 +1,6 @@
 diff -ruN sks-1.0.5-old/bdb/Makefile sks-1.0.5/bdb/Makefile
 --- sks-1.0.5-old/bdb/Makefile	2003-07-05 17:16:29.000000000 +0200
-+++ sks-1.0.5/bdb/Makefile	2003-12-01 06:23:15.000000000 +0100
++++ sks-1.0.5/bdb/Makefile	2003-12-01 19:08:32.000000000 +0100
 @@ -16,8 +16,8 @@
  CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
  CC=gcc
@@ -12,9 +12,38 @@
  
  MKLIB=ocamlmklib
  RANLIB=ranlib
+diff -ruN sks-1.0.5-old/cryptokit-1.0/Makefile sks-1.0.5/cryptokit-1.0/Makefile
+--- sks-1.0.5-old/cryptokit-1.0/Makefile	2002-04-04 14:27:31.000000000 +0200
++++ sks-1.0.5/cryptokit-1.0/Makefile	2003-12-01 19:08:32.000000000 +0100
+@@ -13,7 +13,7 @@
+ INSTALLDIR=`$(OCAMLC) -where`
+ 
+ # Flags for the C compiler.
+-CFLAGS=-O -I$(ZLIB_INCLUDE)
++CFLAGS=$(DEBCFLAGS)
+ 
+ ### End of configuration section
+ 
+@@ -40,13 +40,13 @@
+ allopt: libcryptokit.a cryptokit.cmi cryptokit.cmxa 
+ 
+ libcryptokit.a: $(C_OBJS)
+-	$(MKLIB) -o cryptokit $(C_OBJS) -L$(ZLIB_LIBDIR) $(ZLIB_LIB)
++	$(MKLIB) -o cryptokit $(C_OBJS) $(ZLIB_LIB)
+ 
+ cryptokit.cma: $(CAML_OBJS)
+-	$(MKLIB) -o cryptokit $(CAML_OBJS) -L$(ZLIB_LIBDIR) $(ZLIB_LIB)
++	$(MKLIB) -o cryptokit $(CAML_OBJS) $(ZLIB_LIB)
+ 
+ cryptokit.cmxa: $(CAML_OBJS:.cmo=.cmx)
+-	$(MKLIB) -o cryptokit $(CAML_OBJS:.cmo=.cmx) -L$(ZLIB_LIBDIR) $(ZLIB_LIB)
++	$(MKLIB) -o cryptokit $(CAML_OBJS:.cmo=.cmx) $(ZLIB_LIB)
+ 
+ test: test.byt
+ 	$(OCAMLRUN) -I . ./test.byt
 diff -ruN sks-1.0.5-old/Makefile sks-1.0.5/Makefile
 --- sks-1.0.5-old/Makefile	2003-11-29 14:38:17.000000000 +0100
-+++ sks-1.0.5/Makefile	2003-12-01 06:23:57.000000000 +0100
++++ sks-1.0.5/Makefile	2003-12-01 19:12:57.000000000 +0100
 @@ -17,8 +17,8 @@
  CINCLUDES=-I`ocamlc -where`
  CC=gcc
@@ -39,3 +68,21 @@
  
  bdbclean:
  	cd bdb && $(MAKE) clean
+@@ -247,7 +247,7 @@
+ CKDIR=cryptokit-1.0
+ 
+ $(CKDIR)/README: 
+-	tar xmvfz $(CKDIR).tar.gz
++	#tar xmvfz $(CKDIR).tar.gz
+ 
+ $(CKDIR)/cryptokit.cma: $(CKDIR)/README
+ 	cd $(CKDIR) && $(MAKE) all
+@@ -273,7 +273,7 @@
+ NXDIR=numerix-0.19
+ 
+ $(NXDIR)/READ.ME:
+-	tar xvmfz $(NXDIR)-3.tar.gz
++	#tar xvmfz $(NXDIR)-3.tar.gz
+ 
+ $(NXDIR)/config.status: $(NXDIR)/READ.ME
+ 	cd $(NXDIR) && \

Added: sks/trunk/sks/sks-1.0.5.tgz
===================================================================
(Binary files differ)


Property changes on: sks/trunk/sks/sks-1.0.5.tgz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream