[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-6-3-g43fbf0c

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 43fbf0c9e53333a3c775af6bfc04921cc2a1b631
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue May 18 17:55:26 2010 +0200

    Make OCaml version requirement a lower bound

diff --git a/debian/changelog b/debian/changelog
index 6eae9a0..3c3aa64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ galax (1.1-7) UNRELEASED; urgency=low
   * debian/control:
     - update Homepage
     - bump Standards-Version to 3.8.4 (no changes)
+  * debian/patches:
+    - replace 0002-bump-expected-OCaml-version-to-3.11.patch by
+      0002-Make-OCaml-version-requirement-a-lower-bound.patch
   * Update debian/watch
 
  -- Stéphane Glondu <glondu at debian.org>  Mon, 15 Feb 2010 12:05:19 +0100
diff --git a/debian/patches/0002-Make-OCaml-version-requirement-a-lower-bound.patch b/debian/patches/0002-Make-OCaml-version-requirement-a-lower-bound.patch
new file mode 100644
index 0000000..f02dd4a
--- /dev/null
+++ b/debian/patches/0002-Make-OCaml-version-requirement-a-lower-bound.patch
@@ -0,0 +1,22 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 18 May 2010 17:54:37 +0200
+Subject: [PATCH] Make OCaml version requirement a lower bound
+
+---
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 9a7fa2b..fcd9393 100755
+--- a/configure
++++ b/configure
+@@ -552,7 +552,7 @@ then
+ 
+ 	ocamlv=`$ocaml_bin/ocaml -version | sed -e 's/.*version //g'`
+ 	ocaml_major_version=`echo ${ocamlv} | sed -e 's/\.[0-9]$//g'`
+-        if [ "${ocaml_major_version}" != "${ocaml_version}" ] 
++        if [ "${ocaml_major_version}" \< "${ocaml_version}" ]
+ 	then
+           echo "ERROR: Expected OCaml major version ${ocaml_version}, found ${ocaml_major_version}"
+           exit 1
+-- 
diff --git a/debian/patches/0002-bump-expected-OCaml-version-to-3.11.patch b/debian/patches/0002-bump-expected-OCaml-version-to-3.11.patch
deleted file mode 100644
index be48820..0000000
--- a/debian/patches/0002-bump-expected-OCaml-version-to-3.11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Tue, 6 Oct 2009 22:44:43 +0200
-Subject: [PATCH] bump expected OCaml version to 3.11
-
----
- configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 9a7fa2b..65863bd 100755
---- a/configure
-+++ b/configure
-@@ -18,7 +18,7 @@
- # value	 2:	on by command line ("forced")
- 
- version="1.0"
--ocaml_version="3.10"
-+ocaml_version="3.11"
- # Function:	print_options()
- # Description:
- #		Print the current values of all options
--- 
diff --git a/debian/patches/series b/debian/patches/series
index ac44481..3050c13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 0001-add-a-empty-BUGS-document-as-it-is-sourced-by-other-.patch
-0002-bump-expected-OCaml-version-to-3.11.patch
+0002-Make-OCaml-version-requirement-a-lower-bound.patch
 0003-port-code-to-build-against-PXP-1.2.patch
 0004-fix-syntax-errors-in-ocamldoc-tags.patch

-- 
galax packaging