[Pkg-ocaml-maint-commits] r2044 - trunk/packages/ocaml-ssl/trunk/debian

[Samuel Mimram]

Author: smimram-guest
Date: 2005-11-13 19:28:47 +0000 (Sun, 13 Nov 2005)
New Revision: 2044

Added:
   trunk/packages/ocaml-ssl/trunk/debian/control.in
   trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml-dev.install.in
   trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml.install.in
Modified:
   trunk/packages/ocaml-ssl/trunk/debian/changelog
   trunk/packages/ocaml-ssl/trunk/debian/control
   trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml-dev.install
   trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml.install
   trunk/packages/ocaml-ssl/trunk/debian/rules
Log:
Updated to OCaml 3.09.0.

Modified: trunk/packages/ocaml-ssl/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/changelog	2005-11-13 18:35:48 UTC (rev 2043)
+++ trunk/packages/ocaml-ssl/trunk/debian/changelog	2005-11-13 19:28:47 UTC (rev 2044)
@@ -1,3 +1,10 @@
+ocaml-ssl (0.3.1-2) unstable; urgency=low
+
+  * Rebuild with OCaml 3.09.0.
+  * No longer hardcoding OCaml's ABI in debian/* files.
+
+ -- Samuel Mimram <smimram at debian.org>  Sun, 13 Nov 2005 20:24:13 +0100
+
 ocaml-ssl (0.3.1-1) unstable; urgency=low
 
   * Initial release, closes: #319287.

Modified: trunk/packages/ocaml-ssl/trunk/debian/control
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/control	2005-11-13 18:35:48 UTC (rev 2043)
+++ trunk/packages/ocaml-ssl/trunk/debian/control	2005-11-13 19:28:47 UTC (rev 2044)
@@ -2,13 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libssl-dev (>= 0.9.6), ocaml-nox-3.08.3, ocaml-findlib
+Build-Depends: debhelper (>= 4.0.0), libssl-dev (>= 0.9.6), ocaml-nox (>= 3.09.0), ocaml-findlib
 Standards-Version: 3.6.2
 
 Package: libssl-ocaml
 Section: libs
 Architecture: any
-Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
 Description: OCaml bindings for OpenSSL
  OCaml library for communicating using SSL/TLS encrypted connections.
  .
@@ -17,7 +17,7 @@
 Package: libssl-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-3.08.3, libssl-dev (>= 0.9.6), libssl-ocaml (= ${Source-Version})
+Depends: ocaml-nox-${F:OCamlABI}, libssl-dev (>= 0.9.6), libssl-ocaml (= ${Source-Version})
 Recommends: ocaml-findlib
 Description: OCaml bindings for OpenSSL
  OCaml library for communicating using SSL/TLS encrypted connections.

Copied: trunk/packages/ocaml-ssl/trunk/debian/control.in (from rev 1467, trunk/packages/ocaml-ssl/trunk/debian/control)
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/control	2005-07-21 08:31:15 UTC (rev 1467)
+++ trunk/packages/ocaml-ssl/trunk/debian/control.in	2005-11-13 19:28:47 UTC (rev 2044)
@@ -0,0 +1,26 @@
+Source: ocaml-ssl
+Section: devel
+Priority: optional
+Maintainer: Samuel Mimram <smimram at debian.org>
+Build-Depends: debhelper (>= 4.0.0), libssl-dev (>= 0.9.6), ocaml-nox (>= @OCamlABI@), ocaml-findlib
+Standards-Version: 3.6.2
+
+Package: libssl-ocaml
+Section: libs
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Description: OCaml bindings for OpenSSL
+ OCaml library for communicating using SSL/TLS encrypted connections.
+ .
+ This package contains only the shared runtime stub libraries.
+
+Package: libssl-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, libssl-dev (>= 0.9.6), libssl-ocaml (= ${Source-Version})
+Recommends: ocaml-findlib
+Description: OCaml bindings for OpenSSL
+ OCaml library for communicating using SSL/TLS encrypted connections.
+ .
+ This package contains all the development stuff you need to use
+ the ssl OCaml library in your programs.

Modified: trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml-dev.install
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml-dev.install	2005-11-13 18:35:48 UTC (rev 2043)
+++ trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml-dev.install	2005-11-13 19:28:47 UTC (rev 2044)
@@ -1,4 +1,4 @@
-usr/lib/ocaml/3.08.3/ssl/META
-usr/lib/ocaml/3.08.3/ssl/*.a
-usr/lib/ocaml/3.08.3/ssl/*.cm*
-usr/lib/ocaml/3.08.3/ssl/*.ml*
+usr/lib/ocaml/3.09.0/ssl/META
+usr/lib/ocaml/3.09.0/ssl/*.a
+usr/lib/ocaml/3.09.0/ssl/*.cm*
+usr/lib/ocaml/3.09.0/ssl/*.ml*

Copied: trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml-dev.install.in (from rev 1467, trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml-dev.install)
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml-dev.install	2005-07-21 08:31:15 UTC (rev 1467)
+++ trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml-dev.install.in	2005-11-13 19:28:47 UTC (rev 2044)
@@ -0,0 +1,4 @@
+usr/lib/ocaml/@OCamlABI@/ssl/META
+usr/lib/ocaml/@OCamlABI@/ssl/*.a
+usr/lib/ocaml/@OCamlABI@/ssl/*.cm*
+usr/lib/ocaml/@OCamlABI@/ssl/*.ml*

Modified: trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml.install
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml.install	2005-11-13 18:35:48 UTC (rev 2043)
+++ trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml.install	2005-11-13 19:28:47 UTC (rev 2044)
@@ -1,2 +1,2 @@
-usr/lib/ocaml/3.08.3/ssl/dllssl_stubs.so usr/lib/ocaml/3.08.3/stublibs/
-usr/lib/ocaml/3.08.3/ssl/dllssl_threads_stubs.so usr/lib/ocaml/3.08.3/stublibs/
+usr/lib/ocaml/3.09.0/ssl/dllssl_stubs.so usr/lib/ocaml/3.09.0/stublibs/
+usr/lib/ocaml/3.09.0/ssl/dllssl_threads_stubs.so usr/lib/ocaml/3.09.0/stublibs/

Copied: trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml.install.in (from rev 1467, trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml.install)
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml.install	2005-07-21 08:31:15 UTC (rev 1467)
+++ trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml.install.in	2005-11-13 19:28:47 UTC (rev 2044)
@@ -0,0 +1,2 @@
+usr/lib/ocaml/@OCamlABI@/ssl/dllssl_stubs.so usr/lib/ocaml/@OCamlABI@/stublibs/
+usr/lib/ocaml/@OCamlABI@/ssl/dllssl_threads_stubs.so usr/lib/ocaml/@OCamlABI@/stublibs/

Modified: trunk/packages/ocaml-ssl/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/rules	2005-11-13 18:35:48 UTC (rev 2043)
+++ trunk/packages/ocaml-ssl/trunk/debian/rules	2005-11-13 19:28:47 UTC (rev 2044)
@@ -6,6 +6,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+
 DESTDIR = $(CURDIR)/debian/tmp/$(shell ocamlc -where)
 
 CFLAGS = -Wall -g
@@ -19,6 +22,9 @@
         INSTALL_PROGRAM += -s
 endif
 
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+
 config.status: configure
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
@@ -70,7 +76,7 @@
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums
 	dh_builddeb