[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.0-2-8-g3f44d2f

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit af317bc09e0ecead89c825740da045c80cc22c87
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Sat Jul 4 21:18:21 2009 +0200

    Add a patch ocaml_3.11.1 to let mldonkey build with OCaml 3.11.1

diff --git a/debian/changelog b/debian/changelog
index 4821cfa..434724b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mldonkey (3.0.0-3) UNRELEASED; urgency=low
   [ Mehdi Dogguy ]
   * Remove useless file: /var/log/mldonkey/mldonkey-server.log.
   * Update build-dependencies to ease OCaml 3.11.1 transition.
+  * Add a patch ocaml_3.11.1 to let mldonkey build with OCaml 3.11.1.
 
  -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Mon, 20 Apr 2009 14:25:17 +0200
 
diff --git a/debian/patches/00list b/debian/patches/00list
index e3142cf..f112b77 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 01_see
+ocaml_3.11.1
diff --git a/debian/patches/ocaml_3.11.1.dpatch b/debian/patches/ocaml_3.11.1.dpatch
new file mode 100755
index 0000000..ac937f4
--- /dev/null
+++ b/debian/patches/ocaml_3.11.1.dpatch
@@ -0,0 +1,31 @@
+#! /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.1*|3.11.0*|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.1*|3.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
+     *)
+         echo "Need build"
+         BUILD_OCAML=yes

-- 
mldonkey packaging