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

josch pushed a commit to tag debian/3.3-3
in repository dose3.

commit 2cfe736096cdc55d3c1af3fd5232eef0a959bf45
Author: josch <j.scha...@email.de>
Date:   Tue Nov 11 08:48:08 2014 +0100

    add patches fixDebPrinter and fixMETA to fix botch FTBFS
---
 debian/changelog             |   9 ++++
 debian/patches/fixDebPrinter |  52 +++++++++++++++++++++
 debian/patches/fixMETA       | 109 +++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |   2 +
 4 files changed, 172 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 699d92b..62f0f8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dose3 (3.3~beta1-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * add two patches from upstream to fix botch FTBFS
+     - fixMETA fixes the installed META file
+     - fixDebPrinter restores original printing of Debian packages
+
+ -- Johannes Schauer <j.scha...@email.de>  Tue, 11 Nov 2014 08:46:19 +0100
+
 dose3 (3.3~beta1-3) unstable; urgency=medium
 
   [ Stefano Zacchiroli ]
diff --git a/debian/patches/fixDebPrinter b/debian/patches/fixDebPrinter
new file mode 100644
index 0000000..ae27617
--- /dev/null
+++ b/debian/patches/fixDebPrinter
@@ -0,0 +1,52 @@
+Author: Johannes Schauer <j.scha...@email.de>
+Upstream-commit: 60d5125f16ccab010ddfa3f26386055541fe0184
+Description: deb/printer.ml: separate vpkgs by comma and space and not only 
comma
+     - add a space after the separating comma as it is expected by a human
+       reader and allows to better visually distinguish individual
+       dependencies
+     - add spaces around the pipe symbol (OR) as well
+
+diff --git a/deb/printer.ml b/deb/printer.ml
+index 59facc7..abe6ae4 100644
+--- a/deb/printer.ml
++++ b/deb/printer.ml
+@@ -35,7 +35,7 @@ let string_of_vpkg = function
+ let pp_vpkg oc vpkg = Printf.fprintf oc "%s" (string_of_vpkg vpkg)
+ 
+ let string_of_vpkglist vpkglist =
+-  Util.string_of_list ~sep:"," string_of_vpkg vpkglist
++  Util.string_of_list ~sep:", " string_of_vpkg vpkglist
+ ;;
+ 
+ let pp_vpkglist oc vpkglist = 
+@@ -43,8 +43,8 @@ let pp_vpkglist oc vpkglist =
+ ;;
+ 
+ let string_of_vpkgformula vpkgformula =
+-  let string_of_OR = Util.string_of_list ~sep:" |" string_of_vpkg in
+-  let string_of_AND = Util.string_of_list ~sep:"," string_of_OR in
++  let string_of_OR = Util.string_of_list ~sep:" | " string_of_vpkg in
++  let string_of_AND = Util.string_of_list ~sep:", " string_of_OR in
+   string_of_AND vpkgformula
+ ;;
+ 
+@@ -112,8 +112,8 @@ let strinf_of_builddep (vpkg,archfilter,buildfilter) =
+ ;;
+ 
+ let string_of_builddepformula builddepformula =
+-  let string_of_OR = Util.string_of_list ~sep:" |" strinf_of_builddep in
+-  let string_of_AND = Util.string_of_list ~sep:"," string_of_OR in
++  let string_of_OR = Util.string_of_list ~sep:" | " strinf_of_builddep in
++  let string_of_AND = Util.string_of_list ~sep:", " string_of_OR in
+   string_of_AND builddepformula
+ ;;
+ 
+@@ -122,7 +122,7 @@ let pp_builddepformula oc builddepformula =
+ ;;
+ 
+ let string_of_builddeplist builddeplist =
+-  Util.string_of_list ~sep:"," strinf_of_builddep builddeplist
++  Util.string_of_list ~sep:", " strinf_of_builddep builddeplist
+ ;;
+ 
+ let pp_builddeplist oc builddeplist =
diff --git a/debian/patches/fixMETA b/debian/patches/fixMETA
new file mode 100644
index 0000000..01d20af
--- /dev/null
+++ b/debian/patches/fixMETA
@@ -0,0 +1,109 @@
+Author: Pietro Abate <pietro.ab...@pps.jussieu.fr>
+Description: Fix META.in file
+    - rename boileplate to doseparse
+    - add module cv
+    - add ocamlgraph dependency only if dose was compiled with
+      --with-ocamlgraph
+Upstream-commit: b10179dda8f65f2baa34bbf531ad90e5c47e3492
+
+diff --git a/META.in b/META.in
+index fba7dee..de6fa74 100644
+--- a/META.in
++++ b/META.in
+@@ -1,8 +1,8 @@
+ description = "Dose3 libraries"
+ version = "@PACKAGE_VERSION@"
+-archive(byte) = "common.cma algo.cma debian.cma eclipse.cma csw.cma"
+-archive(native) = "common.cmxa algo.cmxa debian.cmxa eclipse.cmxa csw.cmxa"
+-requires = "extlib, re.pcre, cudf, ocamlgraph, unix, @ZIP@, @BZ2@"
++archive(byte) = "common.cma algo.cma debian.cma eclipse.cma csw.cma cv.cma"
++archive(native) = "common.cmxa algo.cmxa debian.cmxa eclipse.cmxa csw.cmxa 
cv.cmxa"
++requires = "extlib, re.pcre, cudf, @OCAMLGRAPH@, unix, @ZIP@, @BZ2@"
+ 
+ package "common" (
+ version = "@PACKAGE_VERSION@"
+@@ -15,7 +15,7 @@ package "algo" (
+ version = "@PACKAGE_VERSION@"
+ archive(byte) = "algo.cma"
+ archive(native) = "algo.cmxa"
+-requires = "ocamlgraph, dose3.common"
++requires = "@OCAMLGRAPH@, dose3.common"
+ )
+ 
+ package "debian" (
+@@ -46,14 +46,21 @@ archive(native) = "rpm.cmxa"
+ requires = "dose3.common"
+ )
+ 
+-package "boilerplate" (
++package "cv" (
++version = "unreleased"
++archive(byte) = "cv.cma"
++archive(native) = "cv.cmxa"
++requires = "dose3.common"
++)
++
++package "doseparse" (
+ version = "@PACKAGE_VERSION@"
+-archive(byte) = "rpm.cma boilerplate.cma"
+-archive(native) = "rpm.cmxa boilerplate.cmxa"
++archive(byte) = "rpm.cma doseparse.cma"
++archive(native) = "rpm.cmxa doseparse.cmxa"
+ )
+ 
+-package "boilerplateNoRpm" (
++package "doseparseNoRpm" (
+ version = "@PACKAGE_VERSION@"
+-archive(byte) = "boilerplateNoRpm.cma"
+-archive(native) = "boilerplateNoRpm.cmxa"
++archive(byte) = "doseparseNoRpm.cma"
++archive(native) = "doseparseNoRpm.cmxa"
+ )
+diff --git a/configure b/configure
+index 5386d4c..55f8c0a 100755
+--- a/configure
++++ b/configure
+@@ -626,6 +626,7 @@ LIBOBJS
+ OCAMLEXT
+ PKG_XML
+ PKG_CURL
++OCAMLGRAPH
+ CONFIG_OCAMLGRAPH
+ PKG_OCAMLGRAPH
+ DOC_OCAMLGRAPH
+@@ -4454,6 +4455,7 @@ $as_echo "not found" >&6; }
+   MLPACK_OCAMLGRAPH="Defaultgraphs Statistics Dominators Strongdeps 
Strongdeps_int Strongconflicts Strongconflicts_int"
+   DOC_OCAMLGRAPH="algo/Strongdeps algo/Strongconflicts algo/Strongdeps_int 
algo/Strongconflicts_int algo/Defaultgraphs algo/Statistics"
+   CONFIG_OCAMLGRAPH="-DHASOCAMLGRAPH"
++  OCAMLGRAPH=ocamlgraph
+ fi
+ 
+ 
+@@ -5964,6 +5966,7 @@ fi
+ 
+ 
+ 
++
+ LDFLAGS="-fstack-protector"
+ 
+ 
+diff --git a/configure.ac b/configure.ac
+index 27097c2..fc98834 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -147,6 +147,7 @@ if test "$HAS_OCAMLGRAPH" = "yes" ; then
+   MLPACK_OCAMLGRAPH="Defaultgraphs Statistics Dominators Strongdeps 
Strongdeps_int Strongconflicts Strongconflicts_int"
+   DOC_OCAMLGRAPH="algo/Strongdeps algo/Strongconflicts algo/Strongdeps_int 
algo/Strongconflicts_int algo/Defaultgraphs algo/Statistics"
+   CONFIG_OCAMLGRAPH="-DHASOCAMLGRAPH"
++  OCAMLGRAPH=ocamlgraph
+ fi
+ 
+ AC_ARG_WITH(curl,
+@@ -286,6 +287,7 @@ AC_SUBST(MLPACK_OCAMLGRAPH)
+ AC_SUBST(DOC_OCAMLGRAPH)
+ AC_SUBST(PKG_OCAMLGRAPH)
+ AC_SUBST(CONFIG_OCAMLGRAPH)
++AC_SUBST(OCAMLGRAPH)
+ 
+ AC_SUBST(PKG_CURL)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cbf073d..15b4802 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ doc-target
 installcudf-target
 build-cmx
 manpages-typos
+fixMETA
+fixDebPrinter

-- 
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