[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging branch, master, updated. debian/5.12-2-5-g46b6f22

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 0042e7b22f74492adf4fff4b06f91c89085e8e5c
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jan 5 16:53:15 2010 +0100

    Add support for OCaml 3.11.2

diff --git a/debian/patches/0001-Add-partial-OCaml-3.11.2-support.patch b/debian/patches/0001-Add-partial-OCaml-3.11.2-support.patch
new file mode 100644
index 0000000..542ef44
--- /dev/null
+++ b/debian/patches/0001-Add-partial-OCaml-3.11.2-support.patch
@@ -0,0 +1,46 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 5 Jan 2010 17:17:57 +0100
+Subject: [PATCH] Add (partial) OCaml 3.11.2 support
+
+The full support is achieved by running the following commands after
+extracting the tarball of version 5.12, before runing ./configure:
+
+  cp -a ocaml_stuff/3.11.1 ocaml_stuff/3.11.2
+  sed -i \
+    -e 's/let ocaml_version = "3.11.1"/let ocaml_version = "3.11.2"/' \
+    ocaml_stuff/3.11.2/utils/pconfig.ml
+  cp -a ocaml_src/main/ast2pt.ml_3.11.1 ocaml_src/main/ast2pt.ml_3.11.2
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ main/ast2pt.ml |    2 +-
+ top/rprint.ml  |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/main/ast2pt.ml b/main/ast2pt.ml
+index 3c1ae43..9f3af38 100644
+--- a/main/ast2pt.ml
++++ b/main/ast2pt.ml
+@@ -14,7 +14,7 @@ THEN
+ END;
+ 
+ IFDEF
+-  OCAML_3_11 OR OCAML_3_11_0 OR OCAML_3_11_1 OR OCAML_3_12_0
++  OCAML_3_11 OR OCAML_3_11_0 OR OCAML_3_11_1 OR OCAML_3_11_2 OR OCAML_3_12_0
+ THEN
+   DEFINE AFTER_OCAML_3_11
+ END;
+diff --git a/top/rprint.ml b/top/rprint.ml
+index c011b07..1a67480 100644
+--- a/top/rprint.ml
++++ b/top/rprint.ml
+@@ -11,7 +11,7 @@ THEN
+   DEFINE OCAML_3_08
+ END;
+ 
+-IFDEF OCAML_3_11 OR OCAML_3_11_0 OR OCAML_3_11_1 OR OCAML_3_12_0 THEN
++IFDEF OCAML_3_11 OR OCAML_3_11_0 OR OCAML_3_11_1 OR OCAML_3_11_2 OR OCAML_3_12_0 THEN
+   DEFINE AFTER_OCAML_3_11
+ END;
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..753615b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Add-partial-OCaml-3.11.2-support.patch
diff --git a/debian/rules b/debian/rules
index ff693f5..891fcc2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,11 @@ endif
 
 configure/$(PKGNAME):: debian/configure-stamp
 debian/configure-stamp:
+	cp -a ocaml_stuff/3.11.1 ocaml_stuff/3.11.2
+	sed -i \
+	  -e 's/let ocaml_version = "3.11.1"/let ocaml_version = "3.11.2"/' \
+	  ocaml_stuff/3.11.2/utils/pconfig.ml
+	cp -a ocaml_src/main/ast2pt.ml_3.11.1 ocaml_src/main/ast2pt.ml_3.11.2
 	./configure $(CONFIGURE_FLAGS)
 	touch debian/configure-stamp
 clean::
@@ -31,6 +36,7 @@ clean::
 	rm -f doc/html/*.html config/Makefile config/Makefile.cnf myconfig
 	rm -Rf doc/html/rss
 	rm -f ocaml_src/main/ast2pt.ml
+	rm -Rf ocaml_stuff/3.11.2 ocaml_src/main/ast2pt.ml_3.11.2
 
 pre-build:: debian/META
 debian/META: debian/META.src

-- 
camlp5 packaging