[Pkg-ocaml-maint-commits] r1938 - trunk/packages/calendar/trunk/debian

[Stefano Zacchiroli]

Author: zack
Date: 2005-11-08 21:55:04 +0000 (Tue, 08 Nov 2005)
New Revision: 1938

Added:
   trunk/packages/calendar/trunk/debian/control.in
   trunk/packages/calendar/trunk/debian/dirs.in
Modified:
   trunk/packages/calendar/trunk/debian/changelog
   trunk/packages/calendar/trunk/debian/control
   trunk/packages/calendar/trunk/debian/dirs
   trunk/packages/calendar/trunk/debian/rules
Log:
ocaml 3.09 transition


Modified: trunk/packages/calendar/trunk/debian/changelog
===================================================================
--- trunk/packages/calendar/trunk/debian/changelog	2005-11-08 21:49:49 UTC (rev 1937)
+++ trunk/packages/calendar/trunk/debian/changelog	2005-11-08 21:55:04 UTC (rev 1938)
@@ -1,3 +1,11 @@
+calendar (1.09.3-2) unstable; urgency=low
+
+  * Rebuilt with ocaml 3.09
+  * debian/*
+    - removed hard coding of ocaml abi version
+
+ -- Stefano Zacchiroli <zack at debian.org>  Tue,  8 Nov 2005 22:54:00 +0100
+
 calendar (1.09.3-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/calendar/trunk/debian/control
===================================================================
--- trunk/packages/calendar/trunk/debian/control	2005-11-08 21:49:49 UTC (rev 1937)
+++ trunk/packages/calendar/trunk/debian/control	2005-11-08 21:55:04 UTC (rev 1938)
@@ -2,12 +2,12 @@
 Section: libdevel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.08.3, ocaml-findlib, dpatch
+Build-Depends: debhelper (>= 4.0.0), ocaml (>= 3.09), ocaml-findlib, dpatch
 Standards-Version: 3.6.1.1
 
 Package: libcalendar-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-3.08.3, ocaml-findlib
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib
 Description: OCaml library providing operations over dates and times
  OCaml library implementing common date/time operations with
  timezones and pretty printing support.

Added: trunk/packages/calendar/trunk/debian/control.in
===================================================================
--- trunk/packages/calendar/trunk/debian/control.in	2005-11-08 21:49:49 UTC (rev 1937)
+++ trunk/packages/calendar/trunk/debian/control.in	2005-11-08 21:55:04 UTC (rev 1938)
@@ -0,0 +1,13 @@
+Source: calendar
+Section: libdevel
+Priority: optional
+Maintainer: Stefano Zacchiroli <zack at debian.org>
+Build-Depends: debhelper (>= 4.0.0), ocaml (>= @OCamlABI@), ocaml-findlib, dpatch
+Standards-Version: 3.6.1.1
+
+Package: libcalendar-ocaml-dev
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib
+Description: OCaml library providing operations over dates and times
+ OCaml library implementing common date/time operations with
+ timezones and pretty printing support.

Modified: trunk/packages/calendar/trunk/debian/dirs
===================================================================
--- trunk/packages/calendar/trunk/debian/dirs	2005-11-08 21:49:49 UTC (rev 1937)
+++ trunk/packages/calendar/trunk/debian/dirs	2005-11-08 21:55:04 UTC (rev 1938)
@@ -1 +1 @@
-usr/lib/ocaml/3.08.3
+usr/lib/ocaml/3.09

Copied: trunk/packages/calendar/trunk/debian/dirs.in (from rev 1937, trunk/packages/calendar/trunk/debian/dirs)
===================================================================
--- trunk/packages/calendar/trunk/debian/dirs	2005-11-08 21:49:49 UTC (rev 1937)
+++ trunk/packages/calendar/trunk/debian/dirs.in	2005-11-08 21:55:04 UTC (rev 1938)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@

Modified: trunk/packages/calendar/trunk/debian/rules
===================================================================
--- trunk/packages/calendar/trunk/debian/rules	2005-11-08 21:49:49 UTC (rev 1937)
+++ trunk/packages/calendar/trunk/debian/rules	2005-11-08 21:55:04 UTC (rev 1938)
@@ -3,9 +3,16 @@
 
 include /usr/share/dpatch/dpatch.make
 
-OCAML_LIB_DIR = /usr/lib/ocaml/3.08.3
+OCAML_LIB_DIR = := $(shell ocamlc -where)
 PKGNAME = libcalendar-ocaml-dev
+OCAMLABI := $(shell ocamlc -version)
+IN_FILES := $(shell ls debian/*.in)
+GEN_FILES = $(patsubst %.in,%,$(IN_FILES))
 
+init: $(GEN_FILES)
+%: %.in
+	sed -e 's/@OCamlABI@/$(OCAMLABI)/' $< > $@
+
 config.status: configure
 	dh_testdir
 	./configure
@@ -51,7 +58,7 @@
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums
 	dh_builddeb