[Pkg-ocaml-maint-commits] r2511 - trunk/packages/regexp-pp/trunk/debian

[Mike Furr]

Author: mfurr
Date: 2006-01-18 01:26:46 +0000 (Wed, 18 Jan 2006)
New Revision: 2511

Added:
   trunk/packages/regexp-pp/trunk/debian/control.in
Removed:
   trunk/packages/regexp-pp/trunk/debian/control
Modified:
   trunk/packages/regexp-pp/trunk/debian/changelog
   trunk/packages/regexp-pp/trunk/debian/rules
Log:
3.09.1 transition


Modified: trunk/packages/regexp-pp/trunk/debian/changelog
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/changelog	2006-01-17 16:25:31 UTC (rev 2510)
+++ trunk/packages/regexp-pp/trunk/debian/changelog	2006-01-18 01:26:46 UTC (rev 2511)
@@ -1,3 +1,10 @@
+regexp-pp (1.0.0-2) unstable; urgency=low
+
+  * Remove hardcoded ABI strings
+  * Rebuild against 3.09.1
+
+ -- Mike Furr <mfurr at debian.org>  Tue, 17 Jan 2006 20:11:48 -0500
+
 regexp-pp (1.0.0-1) unstable; urgency=low
 
   * New upstream release

Deleted: trunk/packages/regexp-pp/trunk/debian/control
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/control	2006-01-17 16:25:31 UTC (rev 2510)
+++ trunk/packages/regexp-pp/trunk/debian/control	2006-01-18 01:26:46 UTC (rev 2511)
@@ -1,29 +0,0 @@
-Source: regexp-pp
-Section: devel
-Priority: optional
-Maintainer: Mike Furr <mfurr at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.09.0, ocaml-findlib, libpcre-ocaml-dev, ocaml-tools, dpatch
-Standards-Version: 3.6.1.1
-
-Package: libregexp-pp-ocaml-dev
-Architecture: any
-Depends: libpcre-ocaml-dev, ocaml-nox-3.09.0, ocaml-findlib
-Description: Syntax extension for OCaml to make Regexp usage much easier
- Regexp/OCaml provides convenient syntax sugar for regular expression
- match for strings using PCRE/OCaml library. The features of this macro
- package are the following: 
- .
-  * Convenient syntax: similar to standard match-with expression 
- .
-  * Binding matching substrings to variables: no more $1, $2, ... 
- .
-  * Automagical easy-to-use type-coercion: no flood of int_of_string etc. 
- .
-  * Support for optional-patterns: gives string option type etc. 
- .
-  * Default values for optional-patterns 
- .
- A regular expression which appears in the source file will be evaluated
- only once; it is pre-compiled before actual execution and then cached.
- The package contains a small macro, called "once", makes any value to
- be evaluated only once. 

Added: trunk/packages/regexp-pp/trunk/debian/control.in
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/control.in	2006-01-17 16:25:31 UTC (rev 2510)
+++ trunk/packages/regexp-pp/trunk/debian/control.in	2006-01-18 01:26:46 UTC (rev 2511)
@@ -0,0 +1,29 @@
+Source: regexp-pp
+Section: devel
+Priority: optional
+Maintainer: Mike Furr <mfurr at debian.org>
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox  (>= #OCamlABI#), ocaml-findlib, libpcre-ocaml-dev, ocaml-tools, dpatch
+Standards-Version: 3.6.1.1
+
+Package: libregexp-pp-ocaml-dev
+Architecture: any
+Depends: libpcre-ocaml-dev, ocaml-nox-${F:OCamlABI}, ocaml-findlib
+Description: Syntax extension for OCaml to make Regexp usage much easier
+ Regexp/OCaml provides convenient syntax sugar for regular expression
+ match for strings using PCRE/OCaml library. The features of this macro
+ package are the following: 
+ .
+  * Convenient syntax: similar to standard match-with expression 
+ .
+  * Binding matching substrings to variables: no more $1, $2, ... 
+ .
+  * Automagical easy-to-use type-coercion: no flood of int_of_string etc. 
+ .
+  * Support for optional-patterns: gives string option type etc. 
+ .
+  * Default values for optional-patterns 
+ .
+ A regular expression which appears in the source file will be evaluated
+ only once; it is pre-compiled before actual execution and then cached.
+ The package contains a small macro, called "once", makes any value to
+ be evaluated only once. 

Modified: trunk/packages/regexp-pp/trunk/debian/rules
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/rules	2006-01-17 16:25:31 UTC (rev 2510)
+++ trunk/packages/regexp-pp/trunk/debian/rules	2006-01-18 01:26:46 UTC (rev 2511)
@@ -8,6 +8,8 @@
 
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
+OCAMLABI = $(shell ocamlc -version)
+ABI_FILES = $(wildcard debian/*.in)
 
 OCAML_DIR=`ocamlc -where`
 CFLAGS = -Wall -g
@@ -21,6 +23,14 @@
 	INSTALL_PROGRAM += -s
 endif
 
+
+.PHONY: transition
+
+transition: $(ABI_FILES)
+	for t in $^; do \
+	    sed -e 's%#OCamlABI#%$(OCAMLABI)%' $$t >$${t%.in}; \
+	done
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -76,7 +86,7 @@
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums
 	dh_builddeb