[Pkg-ocaml-maint-commits] r2182 - in trunk/packages/camlidl/trunk/debian: . patches

[Julien Cristau]

Author: jcristau-guest
Date: 2005-11-29 16:02:37 +0000 (Tue, 29 Nov 2005)
New Revision: 2182

Modified:
   trunk/packages/camlidl/trunk/debian/changelog
   trunk/packages/camlidl/trunk/debian/control
   trunk/packages/camlidl/trunk/debian/patches/37_make.dpatch
   trunk/packages/camlidl/trunk/debian/rules
Log:
Update for ocaml 3.09, and stop hardcoding the ocaml version number in the
source package.


Modified: trunk/packages/camlidl/trunk/debian/changelog
===================================================================
--- trunk/packages/camlidl/trunk/debian/changelog	2005-11-27 22:02:25 UTC (rev 2181)
+++ trunk/packages/camlidl/trunk/debian/changelog	2005-11-29 16:02:37 UTC (rev 2182)
@@ -1,3 +1,10 @@
+camlidl (1.05-6) unstable; urgency=low
+
+  * Update for ocaml 3.09, and stop hardcoding the ocaml version number in the
+    source package.
+
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Tue, 29 Nov 2005 15:41:57 +0100
+
 camlidl (1.05-5) unstable; urgency=low
 
   * Remove direct reference to ocaml library dir

Modified: trunk/packages/camlidl/trunk/debian/control
===================================================================
--- trunk/packages/camlidl/trunk/debian/control	2005-11-27 22:02:25 UTC (rev 2181)
+++ trunk/packages/camlidl/trunk/debian/control	2005-11-29 16:02:37 UTC (rev 2182)
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sven Luther <luther at debian.org>, Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
-Build-Depends: debhelper (>> 4.0.0), cpp, binutils, ocaml-nox-3.08.3, dpatch
+Build-Depends: debhelper (>> 4.0.0), cpp, binutils, ocaml-nox, dpatch
 Standards-Version: 3.6.2.0
 
 Package: camlidl
 Section: devel
 Architecture: any
 Suggests: camlidl-doc
-Depends: ocaml-nox-3.08.3, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: camlidl-doc (<< 1.04)
 Description: Stub code generator for Objective Caml
  CamlIDL generates stub code for interfacing Caml with C from an IDL

Modified: trunk/packages/camlidl/trunk/debian/patches/37_make.dpatch
===================================================================
--- trunk/packages/camlidl/trunk/debian/patches/37_make.dpatch	2005-11-27 22:02:25 UTC (rev 2181)
+++ trunk/packages/camlidl/trunk/debian/patches/37_make.dpatch	2005-11-29 16:02:37 UTC (rev 2182)
@@ -113,7 +113,7 @@
 +#RANLIB=:
 +
 +# Location of the header files
-+DEBIANOCAMLINCDIR=/usr/lib/ocaml/3.08.3
++DEBIANOCAMLINCDIR=$(shell ocamlc -where)
 +OCAMLINCDIR=$(DESTDIR)$(DEBIANOCAMLINCDIR)/caml
 +
 +# Location of the Objective Caml library in your installation

Modified: trunk/packages/camlidl/trunk/debian/rules
===================================================================
--- trunk/packages/camlidl/trunk/debian/rules	2005-11-27 22:02:25 UTC (rev 2181)
+++ trunk/packages/camlidl/trunk/debian/rules	2005-11-29 16:02:37 UTC (rev 2182)
@@ -8,6 +8,7 @@
 include /usr/share/dpatch/dpatch.make
 
 OCAMLIBDIR=$(shell ocamlc -where)
+OCAMLABI=$(shell ocamlc -version)
 
 build: build-stamp
 build-stamp: patch-stamp
@@ -50,7 +51,7 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums
 	dh_builddeb