[Pkg-ocaml-maint-commits] r2437 - trunk/packages/pagodacf/trunk/debian

Sun Jan 8 17:45:08 UTC 2006

Author: smimram
Date: 2006-01-08 17:45:07 +0000 (Sun, 08 Jan 2006)
New Revision: 2437

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

Modified: trunk/packages/pagodacf/trunk/debian/changelog
===================================================================

--- trunk/packages/pagodacf/trunk/debian/changelog	2006-01-08 17:31:09 UTC (rev 2436)
+++ trunk/packages/pagodacf/trunk/debian/changelog	2006-01-08 17:45:07 UTC (rev 2437)
@@ -1,3 +1,10 @@
+pagodacf (0.7-3) unstable; urgency=low
+
+  * Rebuild with OCaml 3.09.1.
+  * Handling OCaml's ABI changes in package.
+
+ -- Samuel Mimram <smimram at debian.org>  Sun,  8 Jan 2006 18:32:06 +0100
+
 pagodacf (0.7-2) unstable; urgency=low
 
   * Updated to OCaml 3.09.0.

Modified: trunk/packages/pagodacf/trunk/debian/control
===================================================================
--- trunk/packages/pagodacf/trunk/debian/control	2006-01-08 17:31:09 UTC (rev 2436)
+++ trunk/packages/pagodacf/trunk/debian/control	2006-01-08 17:45:07 UTC (rev 2437)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.09.0, ocaml-findlib, dpatch
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.1), ocaml-findlib, dpatch
 Standards-Version: 3.6.2
 
 Package: libcf-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-3.09.0, libcf-ocaml (= ${Source-Version})
+Depends: ocaml-nox-${F:OCamlABI}, libcf-ocaml (= ${Source-Version})
 Description: OCaml library with miscellaneous utility functions
  The pagoda core foundation OCaml library provides various modules. Some of
  the highlighted features include:
@@ -36,7 +36,7 @@
 Package: libcf-ocaml
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ocaml-base-nox-3.09.0
+Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
 Description: OCaml library with miscellaneous utility functions
  The pagoda core foundation OCaml library provides various modules. Some of
  the highlighted features include:

Deleted: trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.dirs
===================================================================
--- trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.dirs	2006-01-08 17:31:09 UTC (rev 2436)
+++ trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.dirs	2006-01-08 17:45:07 UTC (rev 2437)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.09.0/cf

Copied: trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.dirs.in (from rev 1972, trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.dirs)
===================================================================
--- trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.dirs	2005-11-09 19:44:43 UTC (rev 1972)
+++ trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.dirs.in	2006-01-08 17:45:07 UTC (rev 2437)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/cf

Deleted: trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.install
===================================================================
--- trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.install	2006-01-08 17:31:09 UTC (rev 2436)
+++ trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.install	2006-01-08 17:45:07 UTC (rev 2437)
@@ -1,5 +0,0 @@
-usr/lib/ocaml/3.09.0/cf/META
-usr/lib/ocaml/3.09.0/cf/*.a
-usr/lib/ocaml/3.09.0/cf/*.cm*
-usr/lib/ocaml/3.09.0/cf/*.ml*
-usr/lib/ocaml/3.09.0/cf/*.h

Copied: trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.install.in (from rev 1972, trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.install)
===================================================================
--- trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.install	2005-11-09 19:44:43 UTC (rev 1972)
+++ trunk/packages/pagodacf/trunk/debian/libcf-ocaml-dev.install.in	2006-01-08 17:45:07 UTC (rev 2437)
@@ -0,0 +1,5 @@
+usr/lib/ocaml/@OCamlABI@/cf/META
+usr/lib/ocaml/@OCamlABI@/cf/*.a
+usr/lib/ocaml/@OCamlABI@/cf/*.cm*
+usr/lib/ocaml/@OCamlABI@/cf/*.ml*
+usr/lib/ocaml/@OCamlABI@/cf/*.h

Deleted: trunk/packages/pagodacf/trunk/debian/libcf-ocaml.dirs
===================================================================
--- trunk/packages/pagodacf/trunk/debian/libcf-ocaml.dirs	2006-01-08 17:31:09 UTC (rev 2436)
+++ trunk/packages/pagodacf/trunk/debian/libcf-ocaml.dirs	2006-01-08 17:45:07 UTC (rev 2437)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.09.0/stublibs

Copied: trunk/packages/pagodacf/trunk/debian/libcf-ocaml.dirs.in (from rev 1972, trunk/packages/pagodacf/trunk/debian/libcf-ocaml.dirs)
===================================================================
--- trunk/packages/pagodacf/trunk/debian/libcf-ocaml.dirs	2005-11-09 19:44:43 UTC (rev 1972)
+++ trunk/packages/pagodacf/trunk/debian/libcf-ocaml.dirs.in	2006-01-08 17:45:07 UTC (rev 2437)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/stublibs

Deleted: trunk/packages/pagodacf/trunk/debian/libcf-ocaml.install
===================================================================
--- trunk/packages/pagodacf/trunk/debian/libcf-ocaml.install	2006-01-08 17:31:09 UTC (rev 2436)
+++ trunk/packages/pagodacf/trunk/debian/libcf-ocaml.install	2006-01-08 17:45:07 UTC (rev 2437)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.09.0/cf/dllcf.so  usr/lib/ocaml/3.09.0/stublibs/

Copied: trunk/packages/pagodacf/trunk/debian/libcf-ocaml.install.in (from rev 1972, trunk/packages/pagodacf/trunk/debian/libcf-ocaml.install)
===================================================================
--- trunk/packages/pagodacf/trunk/debian/libcf-ocaml.install	2005-11-09 19:44:43 UTC (rev 1972)
+++ trunk/packages/pagodacf/trunk/debian/libcf-ocaml.install.in	2006-01-08 17:45:07 UTC (rev 2437)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/cf/dllcf.so  usr/lib/ocaml/@OCamlABI@/stublibs/

Modified: trunk/packages/pagodacf/trunk/debian/rules
===================================================================
--- trunk/packages/pagodacf/trunk/debian/rules	2006-01-08 17:31:09 UTC (rev 2436)
+++ trunk/packages/pagodacf/trunk/debian/rules	2006-01-08 17:45:07 UTC (rev 2437)
@@ -6,12 +6,19 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+
+# We want to use dpatch.
 include /usr/share/dpatch/dpatch.make
 
 TMPDIR=debian/tmp
 DESTDIR=$(TMPDIR)/$(shell ocamlc -where)
 
-build: patch-stamp build-stamp
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+
+build: ocamlinit patch-stamp build-stamp
 build-stamp:
 	dh_testdir
 
@@ -63,9 +70,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 configure
+.PHONY: build clean binary-indep binary-arch binary install configure ocamlinit


