[Pkg-ocaml-maint-commits] r2261 - trunk/packages/numerix/trunk/debian

Julien Cristau jcristau-guest at costa.debian.org
Wed Dec 7 09:51:47 UTC 2005 

Author: jcristau-guest
Date: 2005-12-07 09:51:43 +0000 (Wed, 07 Dec 2005)
New Revision: 2261

Added:
   trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.dirs.in
   trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.install.in
   trunk/packages/numerix/trunk/debian/libnumerix-ocaml.dirs.in
   trunk/packages/numerix/trunk/debian/libnumerix-ocaml.install.in
Removed:
   trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.dirs
   trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.install
   trunk/packages/numerix/trunk/debian/libnumerix-ocaml.dirs
   trunk/packages/numerix/trunk/debian/libnumerix-ocaml.install
Modified:
   trunk/packages/numerix/trunk/debian/changelog
   trunk/packages/numerix/trunk/debian/control
   trunk/packages/numerix/trunk/debian/rules
Log:
Stop hardcoding the ocaml version number in the source package.


Modified: trunk/packages/numerix/trunk/debian/changelog
===================================================================
--- trunk/packages/numerix/trunk/debian/changelog	2005-12-07 08:41:45 UTC (rev 2260)
+++ trunk/packages/numerix/trunk/debian/changelog	2005-12-07 09:51:43 UTC (rev 2261)
@@ -3,8 +3,10 @@
   * Add 25_bug-335881.dpatch to fix segfaults in tests (Closes: #335881).
     Thanks, Florian Weimer and Michel Quercia!
   * Switch to svn-buildpackage.
+  * Stop hardcoding the ocaml version number in the source package, and
+    rebuild with ocaml 3.09.0.
 
- -- Julien Cristau <julien.cristau at ens-lyon.org>  Wed,  7 Dec 2005 09:39:55 +0100
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Wed,  7 Dec 2005 09:54:33 +0100
 
 numerix (0.21-1) unstable; urgency=low
 

Modified: trunk/packages/numerix/trunk/debian/control
===================================================================
--- trunk/packages/numerix/trunk/debian/control	2005-12-07 08:41:45 UTC (rev 2260)
+++ trunk/packages/numerix/trunk/debian/control	2005-12-07 09:51:43 UTC (rev 2261)
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Jerome Marant <jerome at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <sylvain.le-gall at polytechnique.org>, Michael K. Edwards <medwards-debian at sane.net>, Mike Furr <mfurr at debian.org>
-Build-Depends: ocaml-nox-3.08.3, libgmp3-dev, debhelper (>> 4.0.0), dpatch, autotools-dev
+Build-Depends: ocaml-nox, libgmp3-dev, debhelper (>> 4.0.0), dpatch, autotools-dev
 Build-Depends-Indep: tetex-bin, tetex-extra, gs-common
 Standards-Version: 3.6.2.0
 
 Package: libnumerix-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
+Depends: ocaml-base-nox-{F:OCamlABI}, ${shlibs:Depends}
 Description: Numerix "big integer" library for OCaml - runtime
  The Numerix library provides unlimited precision integer arithmetic
  facilities for use in OCaml programs.  This package contains only

Deleted: trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.dirs
===================================================================
--- trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.dirs	2005-12-07 08:41:45 UTC (rev 2260)
+++ trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.dirs	2005-12-07 09:51:43 UTC (rev 2261)
@@ -1,2 +0,0 @@
-usr/lib/ocaml/3.08.3/numerix/
-usr/lib/ocaml/3.08.3/METAS/
\ No newline at end of file

Copied: trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.dirs.in (from rev 2259, trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.dirs)
===================================================================
--- trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.dirs	2005-12-07 08:38:23 UTC (rev 2259)
+++ trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.dirs.in	2005-12-07 09:51:43 UTC (rev 2261)
@@ -0,0 +1,2 @@
+usr/lib/ocaml/#OCamlABI#/numerix/
+usr/lib/ocaml/#OCamlABI#/METAS/

Deleted: trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.install
===================================================================
--- trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.install	2005-12-07 08:41:45 UTC (rev 2260)
+++ trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.install	2005-12-07 09:51:43 UTC (rev 2261)
@@ -1,4 +0,0 @@
-usr/lib/ocaml/3.08.3/METAS/*	usr/lib/ocaml/3.08.3/METAS/
-usr/lib/numerix.*	usr/lib/ocaml/3.08.3/numerix/
-usr/include/numerix.mli	usr/lib/ocaml/3.08.3/numerix/
-

Copied: trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.install.in (from rev 2259, trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.install)
===================================================================
--- trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.install	2005-12-07 08:38:23 UTC (rev 2259)
+++ trunk/packages/numerix/trunk/debian/libnumerix-ocaml-dev.install.in	2005-12-07 09:51:43 UTC (rev 2261)
@@ -0,0 +1,4 @@
+usr/lib/ocaml/#OCamlABI#/METAS/*	usr/lib/ocaml/#OCamlABI#/METAS/
+usr/lib/numerix.*	usr/lib/ocaml/#OCamlABI#/numerix/
+usr/include/numerix.mli	usr/lib/ocaml/#OCamlABI#/numerix/
+

Deleted: trunk/packages/numerix/trunk/debian/libnumerix-ocaml.dirs
===================================================================
--- trunk/packages/numerix/trunk/debian/libnumerix-ocaml.dirs	2005-12-07 08:41:45 UTC (rev 2260)
+++ trunk/packages/numerix/trunk/debian/libnumerix-ocaml.dirs	2005-12-07 09:51:43 UTC (rev 2261)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3/stublibs/
\ No newline at end of file

Copied: trunk/packages/numerix/trunk/debian/libnumerix-ocaml.dirs.in (from rev 2259, trunk/packages/numerix/trunk/debian/libnumerix-ocaml.dirs)
===================================================================
--- trunk/packages/numerix/trunk/debian/libnumerix-ocaml.dirs	2005-12-07 08:38:23 UTC (rev 2259)
+++ trunk/packages/numerix/trunk/debian/libnumerix-ocaml.dirs.in	2005-12-07 09:51:43 UTC (rev 2261)
@@ -0,0 +1 @@
+usr/lib/ocaml/#OCamlABI#/stublibs/

Deleted: trunk/packages/numerix/trunk/debian/libnumerix-ocaml.install
===================================================================
--- trunk/packages/numerix/trunk/debian/libnumerix-ocaml.install	2005-12-07 08:41:45 UTC (rev 2260)
+++ trunk/packages/numerix/trunk/debian/libnumerix-ocaml.install	2005-12-07 09:51:43 UTC (rev 2261)
@@ -1 +0,0 @@
-usr/lib/dll* usr/lib/ocaml/3.08.3/stublibs/

Copied: trunk/packages/numerix/trunk/debian/libnumerix-ocaml.install.in (from rev 2259, trunk/packages/numerix/trunk/debian/libnumerix-ocaml.install)
===================================================================
--- trunk/packages/numerix/trunk/debian/libnumerix-ocaml.install	2005-12-07 08:38:23 UTC (rev 2259)
+++ trunk/packages/numerix/trunk/debian/libnumerix-ocaml.install.in	2005-12-07 09:51:43 UTC (rev 2261)
@@ -0,0 +1 @@
+usr/lib/dll* usr/lib/ocaml/#OCamlABI#/stublibs/

Modified: trunk/packages/numerix/trunk/debian/rules
===================================================================
--- trunk/packages/numerix/trunk/debian/rules	2005-12-07 08:41:45 UTC (rev 2260)
+++ trunk/packages/numerix/trunk/debian/rules	2005-12-07 09:51:43 UTC (rev 2261)
@@ -6,9 +6,11 @@
 export DH_ALWAYS_EXCLUDE=CVS:.svn
 
 OCAMLLIB = $(shell ocamlc -where)
+OCAMLABI = $(shell ocamlc -version)
 OCAMLDIR = $(CURDIR)/debian/tmp$(OCAMLLIB)
 DOCDIR   = $(CURDIR)/debian/numerix-doc
 
+PACKAGE = numerix
 # Don't forget to update debian/META if this version number changes.
 VERSION = 0.22
 
@@ -26,8 +28,13 @@
 
 include /usr/share/dpatch/dpatch.make
 
+ocamlabi:
+	for i in $(wildcard debian/*.in); do \
+		sed -e 's/#OCamlABI#/$(OCAMLABI)/g' < $$i > $${i%.in}; \
+	done
+
 config: config-stamp
-config-stamp: patch-stamp
+config-stamp: ocamlabi patch-stamp
 	dh_testdir
 	dh_clean -k

More information about the Pkg-ocaml-maint-commits mailing list