[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.1-1-1-g1a89bb1

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 1a89bb13f9a8f81c99993bc6c1a635314c19633e
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue May 18 15:50:57 2010 +0200

    Fix build with OCaml 3.1x.*

diff --git a/debian/changelog b/debian/changelog
index 0db70e8..3ab6375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mldonkey (3.0.1-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - rename ocaml_3.11.1.dpatch into ocaml_3.1x.dpatch, and adapt it
+      so that all 3.1x.* are accepted (Closes: #580087)
+
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 18 May 2010 15:48:43 +0200
+
 mldonkey (3.0.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/00list b/debian/patches/00list
index d40d0c3..15f342e 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,3 @@
 01_see
-ocaml_3.11.1
+ocaml_3.1x
 remove_bashism
diff --git a/debian/patches/ocaml_3.11.1.dpatch b/debian/patches/ocaml_3.11.1.dpatch
deleted file mode 100755
index afdf986..0000000
--- a/debian/patches/ocaml_3.11.1.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ocaml_3.11.1.dpatch by Mehdi Dogguy <dogguy at pps.jussieu.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mldonkey~/config/configure mldonkey/config/configure
---- mldonkey~/config/configure	2009-07-04 21:12:20.000000000 +0200
-+++ mldonkey/config/configure	2009-07-04 21:17:10.000000000 +0200
-@@ -4580,7 +4580,7 @@
- else
-   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
-   case "$OCAMLVERSION" in
--    "$REQUIRED_OCAML"*|3.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
-+    "$REQUIRED_OCAML"*|3.11.*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
-     *)
-         echo "Need build"
-         BUILD_OCAML=yes
-diff -urNad mldonkey~/config/configure.in mldonkey/config/configure.in
---- mldonkey~/config/configure.in	2009-07-04 21:12:20.000000000 +0200
-+++ mldonkey/config/configure.in	2009-07-04 21:16:57.000000000 +0200
-@@ -486,7 +486,7 @@
- else
-   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
-   case "$OCAMLVERSION" in
--    "$REQUIRED_OCAML"*|3.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
-+    "$REQUIRED_OCAML"*|3.11.*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
-     *)
-         echo "Need build"
-         BUILD_OCAML=yes
diff --git a/debian/patches/ocaml_3.1x.dpatch b/debian/patches/ocaml_3.1x.dpatch
new file mode 100755
index 0000000..fbf75d8
--- /dev/null
+++ b/debian/patches/ocaml_3.1x.dpatch
@@ -0,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ocaml_3.11.1.dpatch by Mehdi Dogguy <dogguy at pps.jussieu.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mldonkey~/config/configure mldonkey/config/configure
+--- mldonkey~/config/configure	2009-07-04 21:12:20.000000000 +0200
++++ mldonkey/config/configure	2009-07-04 21:17:10.000000000 +0200
+@@ -4580,7 +4580,7 @@
+ else
+   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
+   case "$OCAMLVERSION" in
+-    "$REQUIRED_OCAML"*|3.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
++    "$REQUIRED_OCAML"*|3.1?.*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
+     *)
+         echo "Need build"
+         BUILD_OCAML=yes
+diff -urNad mldonkey~/config/configure.in mldonkey/config/configure.in
+--- mldonkey~/config/configure.in	2009-07-04 21:12:20.000000000 +0200
++++ mldonkey/config/configure.in	2009-07-04 21:16:57.000000000 +0200
+@@ -486,7 +486,7 @@
+ else
+   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
+   case "$OCAMLVERSION" in
+-    "$REQUIRED_OCAML"*|3.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
++    "$REQUIRED_OCAML"*|3.1?.*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
+     *)
+         echo "Need build"
+         BUILD_OCAML=yes
+diff --git a/config/configure b/config/configure
+index 3656d85..caac3ee 100755
+--- a/config/configure
++++ b/config/configure
+@@ -5263,7 +5263,7 @@ OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
+ OCAMLLIB=`$OCAMLC -where`
+ REBUILD_OCAML=no
+ case "$OCAMLVERSION" in
+-    3.10*|3.11*)
++    3.1?.*)
+       if test "$GUI" = "oldgui"; then
+         OLDGUI_NO_310=yes
+         GUI=no
+diff --git a/config/configure.in b/config/configure.in
+index 39af110..c313ee5 100644
+--- a/config/configure.in
++++ b/config/configure.in
+@@ -640,7 +640,7 @@ OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
+ OCAMLLIB=`$OCAMLC -where`
+ REBUILD_OCAML=no
+ case "$OCAMLVERSION" in
+-    3.10*|3.11*)
++    3.1?.*)
+       if test "$GUI" = "oldgui"; then
+         OLDGUI_NO_310=yes
+         GUI=no

-- 
mldonkey packaging