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 3bb579f43b2873350d475acedf2a8ed071a05fd7 Author: josch <j.scha...@email.de> Date: Wed Mar 25 20:54:36 2015 +0100 remove fixDebPrinter and fixMETA from debian/patches as they were unused --- debian/changelog | 2 + debian/patches/fixDebPrinter | 52 --------------------- debian/patches/fixMETA | 109 ------------------------------------------- 3 files changed, 2 insertions(+), 161 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2000a23..e30965f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ dose3 (3.3-2) UNRELEASED; urgency=medium * backport patch cudfSolver-fix-leaking-fds to work around libcudf bug https://gforge.inria.fr/tracker/index.php?func=detail&aid=18789&group_id=4385&atid=13811 * added myself to the Uploaders field + * remove fixDebPrinter and fixMETA from debian/patches as they were + unused -- Johannes Schauer <jo...@debian.org> Tue, 24 Mar 2015 07:44:19 +0100 diff --git a/debian/patches/fixDebPrinter b/debian/patches/fixDebPrinter deleted file mode 100644 index ae27617..0000000 --- a/debian/patches/fixDebPrinter +++ /dev/null @@ -1,52 +0,0 @@ -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 deleted file mode 100644 index 01d20af..0000000 --- a/debian/patches/fixMETA +++ /dev/null @@ -1,109 +0,0 @@ -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) - -- 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