[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/1.0.0_rc11.deb-1-14-ge1f61b4
Eugeniy Meshcheryakov
eugen at debian.org
Mon Apr 9 17:33:04 UTC 2012
The following commit has been merged in the master branch:
commit 1b85204f4ad8a4c6a3af35e81c7554d21fa8235f
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Mon Apr 9 16:12:05 2012 +0200
Remove patches:
* Remove patches:
- pycaml-build-check.diff
diff --git a/debian/changelog b/debian/changelog
index 149010e..96c8546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ coccinelle (1.0.0~rc12.deb-1) unstable; urgency=low
* New upstream RC
* Adapt repack.sh to the new upstream RC
+ * Remove patches:
+ - pycaml-build-check.diff
- -- Євгеній Мещеряков <eugen at debian.org> Mon, 09 Apr 2012 15:28:48 +0200
+ -- Євгеній Мещеряков <eugen at debian.org> Mon, 09 Apr 2012 16:11:50 +0200
coccinelle (1.0.0~rc11.deb-1) unstable; urgency=low
diff --git a/debian/patches/pycaml-build-check.diff b/debian/patches/pycaml-build-check.diff
deleted file mode 100644
index 92aa2f0..0000000
--- a/debian/patches/pycaml-build-check.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -259,20 +259,6 @@
- {
- $python=0;
- }
-- if($python) {
-- 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 | ",
-- $python_hdr,
-- "Python.h found",
-- "Python.h missing - You need to install python-dev"
-- ))
-- {
-- $python=0
-- }
-- }
- }
-
- my $ocamlfind=!check_config(
-@@ -295,6 +281,20 @@
- }
- } else {
- pr2 "'pycaml' library is not present. A local copy will be used.";
-+ if($python) {
-+ 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 | ",
-+ $python_hdr,
-+ "Python.h found",
-+ "Python.h missing - You need to install python-dev"
-+ ))
-+ {
-+ $python=0
-+ }
-+ }
- }
-
- # menhirLib. Runtime system for the parsers generated with menhir
diff --git a/debian/patches/series b/debian/patches/series
index a1ae6a0..87fc0b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-pycaml-build-check.diff
pdf-docs-build.diff
--
Debian packaging for coccinelle
More information about the Pkg-ocaml-maint-commits
mailing list