[Pkg-ocaml-maint-commits] r2063 - trunk/packages/ocamlagrep/trunk/debian

[Julien Cristau]

Author: jcristau-guest
Date: 2005-11-17 06:25:42 +0000 (Thu, 17 Nov 2005)
New Revision: 2063

Added:
   trunk/packages/ocamlagrep/trunk/debian/dirs.in
   trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml-dev.install.in
   trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml.install.in
Removed:
   trunk/packages/ocamlagrep/trunk/debian/dirs
   trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml-dev.install
   trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml.install
Modified:
   trunk/packages/ocamlagrep/trunk/debian/changelog
   trunk/packages/ocamlagrep/trunk/debian/control
   trunk/packages/ocamlagrep/trunk/debian/rules
Log:
Don't hardcode the ocaml version number

Modified: trunk/packages/ocamlagrep/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlagrep/trunk/debian/changelog	2005-11-16 23:01:57 UTC (rev 2062)
+++ trunk/packages/ocamlagrep/trunk/debian/changelog	2005-11-17 06:25:42 UTC (rev 2063)
@@ -1,3 +1,9 @@
+ocamlagrep (1.0-6) unstable; urgency=low
+
+  * Stop hardcoding the ocaml version number in the package.
+
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Thu, 17 Nov 2005 07:23:31 +0100
+
 ocamlagrep (1.0-5) unstable; urgency=low
 
   * Updated to OCaml 3.09.0.

Modified: trunk/packages/ocamlagrep/trunk/debian/control
===================================================================
--- trunk/packages/ocamlagrep/trunk/debian/control	2005-11-16 23:01:57 UTC (rev 2062)
+++ trunk/packages/ocamlagrep/trunk/debian/control	2005-11-17 06:25:42 UTC (rev 2063)
@@ -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
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.0)
 Standards-Version: 3.6.2
 
 Package: libagrep-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: libagrep-ocaml (= ${Source-Version}), ocaml-nox-3.09.0
+Depends: libagrep-ocaml (= ${Source-Version}), ocaml-nox-{F:OCamlABI}
 Description: Wu-Manber algorithm for string searching with errors
  This OCaml library implements the Wu-Manber algorithm for string searching
  with errors, popularized by the "agrep" Unix command and the "glimpse" file
@@ -36,7 +36,7 @@
 Package: libagrep-ocaml
 Section: libs
 Architecture: any
-Depends: ocaml-base-nox-3.09.0, ${shlibs:Depends}
+Depends: ocaml-base-nox-{F:OCamlABI}, ${shlibs:Depends}
 Description: Wu-Manber algorithm for string searching with errors
  This OCaml library implements the Wu-Manber algorithm for string searching
  with errors, popularized by the "agrep" Unix command and the "glimpse" file

Deleted: trunk/packages/ocamlagrep/trunk/debian/dirs
===================================================================
--- trunk/packages/ocamlagrep/trunk/debian/dirs	2005-11-16 23:01:57 UTC (rev 2062)
+++ trunk/packages/ocamlagrep/trunk/debian/dirs	2005-11-17 06:25:42 UTC (rev 2063)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.09.0

Copied: trunk/packages/ocamlagrep/trunk/debian/dirs.in (from rev 2049, trunk/packages/ocamlagrep/trunk/debian/dirs)
===================================================================
--- trunk/packages/ocamlagrep/trunk/debian/dirs	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/ocamlagrep/trunk/debian/dirs.in	2005-11-17 06:25:42 UTC (rev 2063)
@@ -0,0 +1 @@
+usr/lib/ocaml/#OCamlABI#

Deleted: trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml-dev.install
===================================================================
--- trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml-dev.install	2005-11-16 23:01:57 UTC (rev 2062)
+++ trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml-dev.install	2005-11-17 06:25:42 UTC (rev 2063)
@@ -1,3 +0,0 @@
-*.a   usr/lib/ocaml/3.09.0/agrep
-*.cm* usr/lib/ocaml/3.09.0/agrep
-*.ml* usr/lib/ocaml/3.09.0/agrep

Copied: trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml-dev.install.in (from rev 2049, trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml-dev.install)
===================================================================
--- trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml-dev.install	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml-dev.install.in	2005-11-17 06:25:42 UTC (rev 2063)
@@ -0,0 +1,3 @@
+*.a   usr/lib/ocaml/#OCamlABI#/agrep
+*.cm* usr/lib/ocaml/#OCamlABI#/agrep
+*.ml* usr/lib/ocaml/#OCamlABI#/agrep

Deleted: trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml.install
===================================================================
--- trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml.install	2005-11-16 23:01:57 UTC (rev 2062)
+++ trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml.install	2005-11-17 06:25:42 UTC (rev 2063)
@@ -1 +0,0 @@
-dllagrep.so usr/lib/ocaml/3.09.0/stublibs/

Copied: trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml.install.in (from rev 2049, trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml.install)
===================================================================
--- trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml.install	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/ocamlagrep/trunk/debian/libagrep-ocaml.install.in	2005-11-17 06:25:42 UTC (rev 2063)
@@ -0,0 +1 @@
+dllagrep.so usr/lib/ocaml/#OCamlABI#/stublibs/

Modified: trunk/packages/ocamlagrep/trunk/debian/rules
===================================================================
--- trunk/packages/ocamlagrep/trunk/debian/rules	2005-11-16 23:01:57 UTC (rev 2062)
+++ trunk/packages/ocamlagrep/trunk/debian/rules	2005-11-17 06:25:42 UTC (rev 2063)
@@ -14,10 +14,15 @@
 	INSTALL_PROGRAM += -s
 endif
 
+OCAMLABI = $(shell ocamlc -version)
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
+	for t in debian/*.in; do sed -e 's/#OCamlABI#/$(OCAMLABI)/g' \
+		$$t > $${t%.in}; done
+
 	touch configure-stamp
 
 build: build-stamp
@@ -33,7 +38,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-
+	rm -f libagrep-ocaml-dev.install libagrep-ocaml.install dirs
 	-$(MAKE) clean
 	rm -rf debian/doc
 
@@ -71,7 +76,7 @@
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums
 	dh_builddeb