[Pkg-ocaml-maint-commits] r2209 - trunk/packages/ocaml-benchmark/trunk/debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-12-02 21:28:27 +0000 (Fri, 02 Dec 2005)
New Revision: 2209

Added:
   trunk/packages/ocaml-benchmark/trunk/debian/control.in
Modified:
   trunk/packages/ocaml-benchmark/trunk/debian/changelog
   trunk/packages/ocaml-benchmark/trunk/debian/control
   trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.doc-base
   trunk/packages/ocaml-benchmark/trunk/debian/rules
Log:
Remove hardcoded ocaml ABI -- SLG


Modified: trunk/packages/ocaml-benchmark/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/changelog	2005-12-02 01:00:22 UTC (rev 2208)
+++ trunk/packages/ocaml-benchmark/trunk/debian/changelog	2005-12-02 21:28:27 UTC (rev 2209)
@@ -1,16 +1,3 @@
-ocaml-benchmark (0.6-3) unstable; urgency=low
-
-  * Remove direct reference to ocaml library dir
-  * Upgrade standards version to 3.6.2.0 (no change)
-
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 16:45:08 +0100
-
-ocaml-benchmark (0.6-2) unstable; urgency=low
-
-  * Transition to svn-buildpackage
-
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Mon, 22 Aug 2005 23:51:08 +0200
-
 ocaml-benchmark (0.6-1) unstable; urgency=high
 
   * Initial Release. ( Closes: #303310 )

Modified: trunk/packages/ocaml-benchmark/trunk/debian/control
===================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/control	2005-12-02 01:00:22 UTC (rev 2208)
+++ trunk/packages/ocaml-benchmark/trunk/debian/control	2005-12-02 21:28:27 UTC (rev 2209)
@@ -2,13 +2,13 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, dpatch
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.0), dpatch
 Standards-Version: 3.6.2.0
 
 Package: libbenchmark-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-3.08.3
+Depends: ocaml-nox-${F:OCamlABI}
 Description: OCaml benchmarking library
  This library implements benchmarking functions for measuring the
  run-time of one or many functions using latency (multiple

Copied: trunk/packages/ocaml-benchmark/trunk/debian/control.in (from rev 2188, trunk/packages/ocaml-benchmark/trunk/debian/control)
===================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/control	2005-11-29 22:29:10 UTC (rev 2188)
+++ trunk/packages/ocaml-benchmark/trunk/debian/control.in	2005-12-02 21:28:27 UTC (rev 2209)
@@ -0,0 +1,18 @@
+Source: ocaml-benchmark
+Section: libdevel
+Priority: optional
+Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= #OCamlABI#), dpatch, ocaml-findlib
+Standards-Version: 3.6.2.0
+
+Package: libbenchmark-ocaml-dev
+Architecture: any
+Section: libdevel
+Depends: ocaml-nox-${F:OCamlABI}
+Description: OCaml benchmarking library
+ This library implements benchmarking functions for measuring the
+ run-time of one or many functions using latency (multiple
+ repetitions) or throughput (repeat until some time period has
+ passed) tests.
+ .
+ It is inspired by the Perl module of the same name ( benchmark ).

Modified: trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.doc-base
===================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.doc-base	2005-12-02 01:00:22 UTC (rev 2208)
+++ trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.doc-base	2005-12-02 21:28:27 UTC (rev 2209)
@@ -3,7 +3,7 @@
 Author: Christophe Troestler
 Abstract: This manual documents the API of ocaml-benchmark,
  a library providing benchmarking functions for OCaml.
-Section: Devel
+Section: Apps/Programming
 
 Format: HTML
 Index: /usr/share/doc/libbenchmark-ocaml-dev/html/index.html

Modified: trunk/packages/ocaml-benchmark/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/rules	2005-12-02 01:00:22 UTC (rev 2208)
+++ trunk/packages/ocaml-benchmark/trunk/debian/rules	2005-12-02 21:28:27 UTC (rev 2209)
@@ -8,7 +8,11 @@
 DESTDIR_DEV=$(CURDIR)/debian/libbenchmark-ocaml-dev/
 
 OCAMLIBDIR=`ocamlc -where`
+OCAMLABI=$(shell ocamlc -version)
 
+debian/control: debian/control.in
+	 sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
+
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
@@ -55,7 +59,7 @@
 	dh_fixperms -s
 	dh_installdeb -s
 	dh_shlibdeps -s 
-	dh_gencontrol -s
+	dh_gencontrol -s -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums -s 
 	dh_builddeb -s