[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.2.4.deb-3-8-g448256a
The following commit has been merged in the master branch: commit 448256a9d087baa90e02332de5351110d1178c38 Author: Eugeniy Meshcheryakov Date: Tue Apr 5 21:59:45 2011 +0200 Do not pass "--with-python --without-trac" to configure, those options do not exist anymore diff --git a/debian/changelog b/debian/changelog index f818655..f756a37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,10 @@ coccinelle (0.2.5.deb-1) experimental; urgency=low * New patch: - pycaml-build-check.diff - check for python version only if pycaml is not installed + * Do not pass "--with-python --without-trac" to configure, those options +do not exist anymore - -- Євгеній Мещеряков Tue, 05 Apr 2011 21:55:18 +0200 + -- Євгеній Мещеряков Tue, 05 Apr 2011 21:58:39 +0200 coccinelle (0.2.4.deb-3) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 188d208..4506fb1 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ COCCI_FLAGS = BYTECODE_STATIC="" MANDIR=/usr/share/man VIM_ADIR = $(CURDIR)/debian/coccinelle/usr/share/vim/addons VIM_RDIR = $(CURDIR)/debian/coccinelle/usr/share/vim/registry -COMMON_CONFIG = --prefix=/usr --with-python --without-trac +COMMON_CONFIG = --prefix=/usr ifeq ($(OCAML_HAVE_OCAMLOPT),yes) CONFIG_FLAGS = $(COMMON_CONFIG) --opt -- Debian packaging for coccinelle ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.2.4.deb-3-8-g448256a
The following commit has been merged in the master branch: commit 6b0c4d79f0c2f67bd3658d18bf7814315373c881 Author: Eugeniy Meshcheryakov Date: Tue Apr 5 21:56:12 2011 +0200 breaks some semantic pathes that use python, experimental for now diff --git a/debian/changelog b/debian/changelog index e14100c..f818655 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,14 @@ -coccinelle (0.2.5.deb-1) unstable; urgency=low +coccinelle (0.2.5.deb-1) experimental; urgency=low * New upstream release - better handling of multiple declarations in one statement (Closes: #618555) +- breaks some semantic pathes that use python, experimental for now * New patch: - pycaml-build-check.diff - check for python version only if pycaml is not installed - -- Євгеній Мещеряков Tue, 05 Apr 2011 20:08:39 +0200 + -- Євгеній Мещеряков Tue, 05 Apr 2011 21:55:18 +0200 coccinelle (0.2.4.deb-3) unstable; urgency=low -- Debian packaging for coccinelle ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.2.4.deb-3-8-g448256a
The following commit has been merged in the master branch: commit cca8d4b738286520279389589bc01b083214a065 Author: Eugeniy Meshcheryakov Date: Tue Apr 5 20:09:20 2011 +0200 better handling of multiple declarations in one statement (Closes: #618555) diff --git a/debian/changelog b/debian/changelog index 7f85c3f..e14100c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,13 @@ coccinelle (0.2.5.deb-1) unstable; urgency=low * New upstream release +- better handling of multiple declarations in one statement + (Closes: #618555) * New patch: - pycaml-build-check.diff - check for python version only if pycaml is not installed - -- Євгеній Мещеряков Tue, 05 Apr 2011 19:41:48 +0200 + -- Євгеній Мещеряков Tue, 05 Apr 2011 20:08:39 +0200 coccinelle (0.2.4.deb-3) unstable; urgency=low -- Debian packaging for coccinelle ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.2.4.deb-3-8-g448256a
The following commit has been merged in the master branch:
commit 1fc3979d5f909e9bf081f28ac8668cdbab3a5d3e
Author: Eugeniy Meshcheryakov
Date: Tue Apr 5 19:42:26 2011 +0200
New patch:
* New patch:
- pycaml-build-check.diff - check for python version only if pycaml is not
installed
diff --git a/debian/changelog b/debian/changelog
index c8092ae..7f85c3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
coccinelle (0.2.5.deb-1) unstable; urgency=low
* New upstream release
+ * New patch:
+- pycaml-build-check.diff - check for python version only if pycaml is not
+ installed
- -- Євгеній Мещеряков Tue, 05 Apr 2011 19:34:46 +0200
+ -- Євгеній Мещеряков Tue, 05 Apr 2011 19:41:48 +0200
coccinelle (0.2.4.deb-3) unstable; urgency=low
diff --git a/debian/patches/pycaml-build-check.diff
b/debian/patches/pycaml-build-check.diff
new file mode 100644
index 000..38ff436
--- /dev/null
+++ b/debian/patches/pycaml-build-check.diff
@@ -0,0 +1,44 @@
+--- a/configure
b/configure
+@@ -206,20 +206,6 @@ if($python) {
+ {
+ $python=0;
+ }
+-if($python) {
+- my $PY_PREFIX = `python pycaml/getprefix.py | tr -d '\n'`;
+- $PY_VERSION = `python 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(
+@@ -237,6 +223,20 @@ if($syspydir) {
+ pr2 "'pycaml' library is present in $pydir";
+ } 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 $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 e69de29..9475bed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+pycaml-build-check.diff
--
Debian packaging for coccinelle
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.2.4.deb-3-8-g448256a
The following commit has been merged in the master branch: commit a4216c71bb4003e94615deda635c3fa6e953bcaa Author: Eugeniy Meshcheryakov Date: Tue Apr 5 19:35:01 2011 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 97c8cf6..c8092ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +coccinelle (0.2.5.deb-1) unstable; urgency=low + + * New upstream release + + -- Євгеній Мещеряков Tue, 05 Apr 2011 19:34:46 +0200 + coccinelle (0.2.4.deb-3) unstable; urgency=low * Upload to unstable -- Debian packaging for coccinelle ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.2.4.deb-3-8-g448256a
The following commit has been merged in the master branch: commit 4462fe29fa27e2b7c5edbe665ff112defc194e0b Merge: ee2948e5b6582bd2be9b0c1f3811c3e34dfd691f 88dddb22e78be7c25c0f19f9ed8dd25e1c86d961 Author: Eugeniy Meshcheryakov Date: Tue Apr 5 19:27:28 2011 +0200 Merge commit 'upstream/0.2.5.deb' -- Debian packaging for coccinelle ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.2.4.deb-3-8-g448256a
The following commit has been merged in the master branch: commit ee2948e5b6582bd2be9b0c1f3811c3e34dfd691f Author: Eugeniy Meshcheryakov Date: Tue Apr 5 19:26:39 2011 +0200 Do not remove dll file — not present in the new version diff --git a/debian/repack.sh b/debian/repack.sh index ab2c76f..8307e06 100644 --- a/debian/repack.sh +++ b/debian/repack.sh @@ -21,8 +21,6 @@ pycaml/ menhirlib/ # provided by the libsexplib-camlp4-dev package ocamlsexp/ -# compiled file -dllpycaml_stubs.so END # TODO do something about globals/config.ml # remove some junk and autogenerated files -- Debian packaging for coccinelle ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
