[Pkg-ocaml-maint-commits] r1203 - trunk/packages/cryptokit/trunk/debian

Samuel Mimram smimram-guest@costa.debian.org
Tue, 05 Apr 2005 21:28:29 +0000


Author: smimram-guest
Date: 2005-04-05 21:28:28 +0000 (Tue, 05 Apr 2005)
New Revision: 1203

Modified:
   trunk/packages/cryptokit/trunk/debian/changelog
   trunk/packages/cryptokit/trunk/debian/control
   trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml.files
   trunk/packages/cryptokit/trunk/debian/rules
Log:
Updated to OCaml 3.08.3.

Modified: trunk/packages/cryptokit/trunk/debian/changelog
===================================================================
--- trunk/packages/cryptokit/trunk/debian/changelog	2005-04-05 21:22:41 UTC (rev 1202)
+++ trunk/packages/cryptokit/trunk/debian/changelog	2005-04-05 21:28:28 UTC (rev 1203)
@@ -1,3 +1,12 @@
+cryptokit (1.2-8) unstable; urgency=medium
+
+  * Updated to OCaml 3.08.3.
+  * Using dh_shlibdeps.
+  * Added -g and -fPIC to the CFLAGS.
+  * Installing META in /usr/lib/ocaml/XXX/cryptokit.
+
+ -- Samuel Mimram <smimram@debian.org>  Tue,  5 Apr 2005 22:02:17 +0200
+
 cryptokit (1.2-7) unstable; urgency=high
 
   * Rebuilding with ocaml 3.08.2 to get rid of the inconsistent assumptions over

Modified: trunk/packages/cryptokit/trunk/debian/control
===================================================================
--- trunk/packages/cryptokit/trunk/debian/control	2005-04-05 21:22:41 UTC (rev 1202)
+++ trunk/packages/cryptokit/trunk/debian/control	2005-04-05 21:28:28 UTC (rev 1203)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders: Ralf Treinen <treinen@debian.org>, Sven Luther <luther@debian.org>, Remi Vanicat <vanicat@debian.org>, Stefano Zacchiroli <zack@debian.org>, Sylvain Le Gall <sylvain.le-gall@polytechnique.org>, Michael K. Edwards <medwards-debian@sane.net>, Mike Furr <mfurr@debian.org>, Samuel Mimram <smimram@debian.org>
-Build-Depends: ocaml-nox-3.08, libnumerix-ocaml-dev (>= 0.19-4), zlib1g-dev, debhelper (>> 4.0.0), dpatch
-Standards-Version: 3.6.1.0
+Build-Depends: ocaml-nox-3.08.3, libnumerix-ocaml-dev (>= 0.19-4), zlib1g-dev, debhelper (>> 4.0.0), dpatch
+Standards-Version: 3.6.1.1
 
 Package: libcryptokit-ocaml
 Section: libs
 Architecture: any
-Depends: ocaml-nox-3.08, libnumerix-ocaml (>= 0.19-4), ${shlibs:Depends}
+Depends: ocaml-nox-3.08.3, libnumerix-ocaml (>= 0.19-4), ${shlibs:Depends}
 Description: cryptographic algorithm library for OCaml - runtime
  The Cryptokit library for Objective Caml provides a variety of
  cryptographic primitives that can be used to implement cryptographic
@@ -17,7 +17,7 @@
  include:
  .
    - Symmetric-key ciphers: AES, DES, Triple-DES, ARCfour,
-       in ECB, CBC, CFB and OFB modes.
+     in ECB, CBC, CFB and OFB modes.
    - Public-key cryptography: RSA encryption, Diffie-Hellman key agreement.
    - Hash functions and MACs: SHA-1, MD5, and MACs based on AES and DES.
    - Random number generation.
@@ -35,7 +35,7 @@
 Package: libcryptokit-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-3.08, libcryptokit-ocaml (= ${Source-Version}), libnumerix-ocaml-dev (>= 0.19-4)
+Depends: ocaml-nox-3.08.3, libcryptokit-ocaml (= ${Source-Version}), libnumerix-ocaml-dev (>= 0.19-4)
 Description: cryptographic algorithm library for OCaml - development
  The Cryptokit library for Objective Caml provides a variety of
  cryptographic primitives that can be used to implement cryptographic
@@ -43,7 +43,7 @@
  include:
  .
    - Symmetric-key ciphers: AES, DES, Triple-DES, ARCfour,
-       in ECB, CBC, CFB and OFB modes.
+     in ECB, CBC, CFB and OFB modes.
    - Public-key cryptography: RSA encryption, Diffie-Hellman key agreement.
    - Hash functions and MACs: SHA-1, MD5, and MACs based on AES and DES.
    - Random number generation.

Modified: trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml.files
===================================================================
--- trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml.files	2005-04-05 21:22:41 UTC (rev 1202)
+++ trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml.files	2005-04-05 21:28:28 UTC (rev 1203)
@@ -1 +1 @@
-usr/lib/ocaml/3.08/stublibs/dllcryptokit.so
+usr/lib/ocaml/3.08.3/stublibs/dllcryptokit.so

Modified: trunk/packages/cryptokit/trunk/debian/rules
===================================================================
--- trunk/packages/cryptokit/trunk/debian/rules	2005-04-05 21:22:41 UTC (rev 1202)
+++ trunk/packages/cryptokit/trunk/debian/rules	2005-04-05 21:28:28 UTC (rev 1203)
@@ -9,6 +9,19 @@
 # Don't forget to update debian/META if this version number changes.
 VERSION = 1.2
 
+
+CFLAGS = -Wall -g -fPIC
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -O0
+else
+        CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+        INSTALL_PROGRAM += -s
+endif
+
+
 include /usr/share/dpatch/dpatch.make
 
 build: build-stamp
@@ -37,8 +50,8 @@
 	dh_testroot
 
 	$(MAKE) install DESTDIR=$(PKGDIR)-dev
-	mkdir -p $(PKGDIR)-dev$(OCAML_STDLIB_DIR)/METAS
-	cp -p debian/META $(PKGDIR)-dev$(OCAML_STDLIB_DIR)/METAS/META.cryptokit
+	mkdir -p $(PKGDIR)-dev$(OCAML_STDLIB_DIR)/cryptokit
+	cp -p debian/META $(PKGDIR)-dev$(OCAML_STDLIB_DIR)/cryptokit/META
 
 binary: binary-indep binary-arch
 binary-indep: install
@@ -47,8 +60,7 @@
 	dh_testdir
 	dh_testroot
 	dh_movefiles -s --sourcedir=debian/$(PKGNAME)-dev
-	dh_installchangelogs -p$(PKGNAME)
-	dh_installchangelogs -p$(PKGNAME)-dev Changes
+	dh_installchangelogs Changes
 	dh_installdocs -s
 	cp -p debian/speed $(DOCDIR)
 	mv $(DOCDIR)/doc $(DOCDIR)/html
@@ -59,6 +71,7 @@
 	dh_compress -s
 	dh_fixperms -s
 	dh_installdeb -s
+	dh_shlibdeps -s
 	dh_gencontrol -s
 	dh_md5sums -s
 	dh_builddeb -s