[Pkg-ocaml-maint-commits] [SCM] otags packaging branch, master, updated. debian/3.09.3-3-4-g1c3d202

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 30d02796fdd7022d4a1b0dd06b4efce6f65a1667
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue May 18 17:34:24 2010 +0200

    Add 0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch

diff --git a/debian/changelog b/debian/changelog
index 6b76767..24584cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ otags (3.09.3-4) UNRELEASED; urgency=low
 
   * Switch packaging to git
   * Switch source package format to 3.0 (quilt)
+  * Add 0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch
+    (Closes: #580084)
 
- -- Stéphane Glondu <glondu at debian.org>  Tue, 18 May 2010 16:59:26 +0200
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 18 May 2010 17:36:44 +0200
 
 otags (3.09.3-3) unstable; urgency=low
 
diff --git a/debian/patches/0002-Use-camlp5-instead-of-camlp4.patch b/debian/patches/0002-Use-camlp5-instead-of-camlp4.patch
index 02174b6..8e90c1e 100644
--- a/debian/patches/0002-Use-camlp5-instead-of-camlp4.patch
+++ b/debian/patches/0002-Use-camlp5-instead-of-camlp4.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Use camlp5 instead of camlp4
 ---
  Makefile          |    8 ++++----
  Makefile.here.tpl |    4 +++-
- configure         |    4 ++--
+ configure         |    2 +-
  editor.ml         |    2 +-
  mk_conf           |    2 +-
  pr.ml             |   23 ++++++++++++++++++-----
  splay.ml          |    4 ++--
- 7 files changed, 31 insertions(+), 16 deletions(-)
+ 7 files changed, 30 insertions(+), 15 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index 6bf9e94..7a8b949 100644
@@ -64,7 +64,7 @@ index 18ce6c1..52ced60 100644
  CAMLLEX=ocamllex
  CAMLDEP=ocamldep
 diff --git a/configure b/configure
-index 4c32abb..814f30f 100755
+index 4c32abb..5ffe2d5 100755
 --- a/configure
 +++ b/configure
 @@ -11,7 +11,7 @@ cmdline="$0 $*"
@@ -76,15 +76,6 @@ index 4c32abb..814f30f 100755
  #libdir=`camlp4 -where`
  libdir_spec=no
  #splaydir=$root/lib/ocaml
-@@ -72,7 +72,7 @@ fi
- 
- # check ocamlc version
- if [ $versioncheck = 1 ] ; then
--    if [ "$ocv" \< "3.09" -o "$ocv" \> "3.09.99" ] ; then
-+    if [ "$ocv" \< "3.09" -o "$ocv" \> "3.11.99" ] ; then
- 	echo ocaml version $ocv found. Need 3.09.x.
- 	exit 1
-     fi
 diff --git a/editor.ml b/editor.ml
 index 2359683..2c20069 100644
 --- a/editor.ml
diff --git a/debian/patches/0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch b/debian/patches/0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch
new file mode 100644
index 0000000..54c1745
--- /dev/null
+++ b/debian/patches/0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch
@@ -0,0 +1,22 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 18 May 2010 17:32:31 +0200
+Subject: [PATCH] Do not set an upper bound on supported OCaml versions
+
+---
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 5ffe2d5..0c87ae3 100755
+--- a/configure
++++ b/configure
+@@ -72,7 +72,7 @@ fi
+ 
+ # check ocamlc version
+ if [ $versioncheck = 1 ] ; then
+-    if [ "$ocv" \< "3.09" -o "$ocv" \> "3.09.99" ] ; then
++    if [ "$ocv" \< "3.09" ] ; then
+ 	echo ocaml version $ocv found. Need 3.09.x.
+ 	exit 1
+     fi
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 78a2e51..ea20ee1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Change-install-directory.patch
 0002-Use-camlp5-instead-of-camlp4.patch
+0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch

-- 
otags packaging