[Pkg-ocaml-maint-commits] r2451 - trunk/packages/mysql-ocaml/trunk/debian

[Samuel Mimram]

Author: smimram
Date: 2006-01-08 18:29:33 +0000 (Sun, 08 Jan 2006)
New Revision: 2451

Added:
   trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install.in
   trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install.in
Removed:
   trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install
   trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install
Modified:
   trunk/packages/mysql-ocaml/trunk/debian/changelog
   trunk/packages/mysql-ocaml/trunk/debian/control
   trunk/packages/mysql-ocaml/trunk/debian/rules
Log:
Rebuild with OCaml 3.09.1 + handling OCaml's ABI.

Modified: trunk/packages/mysql-ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/mysql-ocaml/trunk/debian/changelog	2006-01-08 18:14:22 UTC (rev 2450)
+++ trunk/packages/mysql-ocaml/trunk/debian/changelog	2006-01-08 18:29:33 UTC (rev 2451)
@@ -1,3 +1,10 @@
+mysql-ocaml (1.0.3-9) unstable; urgency=low
+
+  * Rebuild with OCaml 3.09.1.
+  * Hanlding OCaml's ABI changes.
+
+ -- Samuel Mimram <smimram at debian.org>  Sun,  8 Jan 2006 19:24:16 +0100
+
 mysql-ocaml (1.0.3-8) unstable; urgency=low
 
   * Updated to OCaml 3.09.0.

Modified: trunk/packages/mysql-ocaml/trunk/debian/control
===================================================================
--- trunk/packages/mysql-ocaml/trunk/debian/control	2006-01-08 18:14:22 UTC (rev 2450)
+++ trunk/packages/mysql-ocaml/trunk/debian/control	2006-01-08 18:29:33 UTC (rev 2451)
@@ -2,13 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libmysqlclient14-dev, ocaml-nox-3.09.0, ocaml-findlib, dpatch
+Build-Depends: debhelper (>= 4.0.0), libmysqlclient14-dev, ocaml-nox (>= 3.09.1), ocaml-findlib, dpatch
 Standards-Version: 3.6.2
 
 Package: libmysql-ocaml
 Section: libs
 Architecture: any
-Depends: ocaml-base-nox-3.09.0, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
 Description: OCaml bindings for MySql
  This OCaml library interfaces the MySql C library. It can be used to access
  and modify MySql databases from OCaml programs.
@@ -18,7 +18,7 @@
 Package: libmysql-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-3.09.0, libmysqlclient14-dev, libmysql-ocaml (= ${Source-Version})
+Depends: ocaml-nox-${F:OCamlABI}, libmysqlclient14-dev, libmysql-ocaml (= ${Source-Version})
 Description: OCaml bindings for MySql
  This OCaml library interfaces the MySql C library. It can be used to access
  and modify MySql databases from OCaml programs.

Deleted: trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install
===================================================================
--- trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install	2006-01-08 18:14:22 UTC (rev 2450)
+++ trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install	2006-01-08 18:29:33 UTC (rev 2451)
@@ -1,4 +0,0 @@
-usr/lib/ocaml/3.09.0/mysql/META   usr/lib/ocaml/3.09.0/mysql/
-usr/lib/ocaml/3.09.0/mysql/*.a    usr/lib/ocaml/3.09.0/mysql/
-usr/lib/ocaml/3.09.0/mysql/*.cm*  usr/lib/ocaml/3.09.0/mysql/
-usr/lib/ocaml/3.09.0/mysql/*.ml*  usr/lib/ocaml/3.09.0/mysql/

Copied: trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install.in (from rev 1970, trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install)
===================================================================
--- trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install	2005-11-09 19:14:15 UTC (rev 1970)
+++ trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install.in	2006-01-08 18:29:33 UTC (rev 2451)
@@ -0,0 +1,4 @@
+usr/lib/ocaml/@OCamlABI@/mysql/META
+usr/lib/ocaml/@OCamlABI@/mysql/*.a
+usr/lib/ocaml/@OCamlABI@/mysql/*.cm*
+usr/lib/ocaml/@OCamlABI@/mysql/*.ml*

Deleted: trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install
===================================================================
--- trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install	2006-01-08 18:14:22 UTC (rev 2450)
+++ trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install	2006-01-08 18:29:33 UTC (rev 2451)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.09.0/mysql/dllmysql_stubs.so    usr/lib/ocaml/3.09.0/stublibs/

Copied: trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install.in (from rev 1970, trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install)
===================================================================
--- trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install	2005-11-09 19:14:15 UTC (rev 1970)
+++ trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install.in	2006-01-08 18:29:33 UTC (rev 2451)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/mysql/dllmysql_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/

Modified: trunk/packages/mysql-ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/mysql-ocaml/trunk/debian/rules	2006-01-08 18:14:22 UTC (rev 2450)
+++ trunk/packages/mysql-ocaml/trunk/debian/rules	2006-01-08 18:29:33 UTC (rev 2451)
@@ -6,6 +6,9 @@
 # We want to use dpatch
 include /usr/share/dpatch/dpatch.make
 
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+
 OCAML_LIB_DIR = $(shell ocamlc -where)
 DESTDIR = $(CURDIR)/debian/tmp$(OCAML_LIB_DIR)
 
@@ -20,13 +23,16 @@
         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
 	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
 	 --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
-build: patch-stamp build-stamp
-build-stamp:  config.status
+build: ocamlinit patch-stamp build-stamp
+build-stamp: config.status
 	dh_testdir
 
 	$(MAKE)
@@ -72,9 +78,9 @@
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install ocamlinit