[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/1.0.0_rc7.deb-5-5-g3461b11

[Євгеній Мещеряков]

The following commit has been merged in the master branch:
commit 3461b110b0ba6f9659f5b5506d6a8871c12b4caa
Author: Євгеній Мещеряков <eugen at debian.org>
Date:   Sat Jan 14 21:42:03 2012 +0100

    Updated patches:
    
    * Updated patches:
      - pycaml-build-check.diff

diff --git a/debian/changelog b/debian/changelog
index 8d7563c..e2585c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 coccinelle (1.0.0~rc9.deb-1) unstable; urgency=low
 
   * New upstream RC
+  * Updated patches:
+    - pycaml-build-check.diff
 
- -- Євгеній Мещеряков <eugen at debian.org>  Sat, 14 Jan 2012 21:36:12 +0100
+ -- Євгеній Мещеряков <eugen at debian.org>  Sat, 14 Jan 2012 21:41:43 +0100
 
 coccinelle (1.0.0~rc7.deb-6) unstable; urgency=low
 
diff --git a/debian/patches/pycaml-build-check.diff b/debian/patches/pycaml-build-check.diff
index 831ccf5..92aa2f0 100644
--- a/debian/patches/pycaml-build-check.diff
+++ b/debian/patches/pycaml-build-check.diff
@@ -1,12 +1,12 @@
 --- a/configure
 +++ b/configure
-@@ -213,20 +213,6 @@
+@@ -259,20 +259,6 @@
      {
  	$python=0;
      }
 -    if($python) {
--	my $PY_PREFIX = `python pycaml/getprefix.py | tr -d '\n'`;
--	$PY_VERSION = `python pycaml/getversion.py | tr -d '\n'`;
+-	my $PY_PREFIX = `$python_cmd pycaml/getprefix.py | tr -d '\n'`;
+-	$PY_VERSION = `$python_cmd pycaml/getversion.py | tr -d '\n'`;
 -	my $python_hdr = "$PY_PREFIX/include/python$PY_VERSION/Python.h";
 -	if(check_config(
 -	    "ls $python_hdr 2> /dev/null | ",
@@ -21,13 +21,13 @@
  }
  
  my $ocamlfind=!check_config(
-@@ -244,6 +230,20 @@
-     pr2 "'pycaml' library is present in $pydir";
+@@ -295,6 +281,20 @@
+     }
  } else {
      pr2 "'pycaml' library is not present. A local copy will be used.";
 +    if($python) {
-+	my $PY_PREFIX = `python pycaml/getprefix.py | tr -d '\n'`;
-+	$PY_VERSION = `python pycaml/getversion.py | tr -d '\n'`;
++	my $PY_PREFIX = `$python_cmd pycaml/getprefix.py | tr -d '\n'`;
++	$PY_VERSION = `$python_cmd pycaml/getversion.py | tr -d '\n'`;
 +	my $python_hdr = "$PY_PREFIX/include/python$PY_VERSION/Python.h";
 +	if(check_config(
 +	    "ls $python_hdr 2> /dev/null | ",

-- 
Debian packaging for coccinelle