This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository dose3.

commit d4bd1194ffceba5c3c0abf019e88646600701b16
Author: Ralf Treinen <trei...@free.fr>
Date:   Mon Dec 9 21:27:33 2013 +0100

    patch _tags.in to account for multiple pp options
---
 debian/changelog             |  7 +++++++
 debian/patches/ocaml-4.1-zip | 17 +++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5286be9..a15b24b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dose3 (3.1.3-7) unstable; urgency=low
+
+  * patch ocaml-4.1-zip: fix _tags.in to avoid multiple pp options
+    (closes: #731701).
+
+ -- Ralf Treinen <trei...@debian.org>  Mon, 09 Dec 2013 21:32:31 +0100
+
 dose3 (3.1.3-6) unstable; urgency=low
 
   * patch ocaml-4.1: fix FTBFS with ocaml 4.01. Thanks a lot to Pietro
diff --git a/debian/patches/ocaml-4.1-zip b/debian/patches/ocaml-4.1-zip
new file mode 100644
index 0000000..e1ef424
--- /dev/null
+++ b/debian/patches/ocaml-4.1-zip
@@ -0,0 +1,17 @@
+Author: Ralf Treinen <trei...@debian.org>
+Description: avoid multiple pp options in ocamlbuild configuration
+Debian-bug: #731701 
+
+Index: dose3/_tags.in
+===================================================================
+--- dose3.orig/_tags.in        2013-12-09 21:24:19.276880599 +0100
++++ dose3/_tags.in     2013-12-09 21:25:16.245092521 +0100
+@@ -1,7 +1,7 @@
+ true: -traverse
+ <{common,algo,doseparse,deb,rpm,applications,experimental}/**>: traverse
+ 
+-<*/*.ml{i,}>: pp(@CAMLP4OMACRO@)
++<*/*.ml{i,}> and not<{common,algo}/*.ml{i,}> : pp(@CAMLP4OMACRO@)
+ <*/*.ml{i,}>: package(extlib), @PKG_CUDF@, package(pcre)
+ 
+ <doseparse/boilerplateNoRpm.ml>: pp(@CAMLP4OMACRO@ @CONFIG_ZIP@ @CONFIG_BZ2@ 
@CONFIG_DB@ @CONFIG_OCAMLGRAPH@)
diff --git a/debian/patches/series b/debian/patches/series
index 6e59d78..4ade999 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ binaries-prefix-edos
 doc-makefile-html
 configure-dynlink
 ocaml-4.1
+ocaml-4.1-zip

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to