This is an automated email from the git hooks/post-receive script. josch pushed a commit to branch master in repository dose3.
commit 8260abe50d0b95e5c7bfc9895ab1e4ce6ad5fa36 Author: Johannes Schauer <jo...@debian.org> Date: Thu Aug 27 07:12:15 2015 +0200 remove patches cudfSolver-fix-leaking-fds and encode-package-name-in-cudf_extras --- debian/changelog | 5 ++++ debian/patches/cudfSolver-fix-leaking-fds | 21 -------------- debian/patches/encode-package-name-in-cudf_extras | 35 ----------------------- debian/patches/series | 2 -- 4 files changed, 5 insertions(+), 58 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2d49b0a..0f0b192 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ dose3 (4.0-1) unstable; urgency=medium + [ Ralf Treinen ] * New upstream release: - refresh patches: binaries-prefix-edos, coinstall-binary-name - deactivate patches: cudfSolver-fix-leaking-fds, @@ -11,6 +12,10 @@ dose3 (4.0-1) unstable; urgency=medium - debian/rules - debian/libdose3-ocaml-dev.docs + [ Johannes Schauer ] + * remove patches cudfSolver-fix-leaking-fds and + encode-package-name-in-cudf_extras which have been integrated upstream + -- Ralf Treinen <trei...@debian.org> Wed, 26 Aug 2015 21:36:52 +0200 dose3 (3.3-4) unstable; urgency=low diff --git a/debian/patches/cudfSolver-fix-leaking-fds b/debian/patches/cudfSolver-fix-leaking-fds deleted file mode 100644 index 346d8b4..0000000 --- a/debian/patches/cudfSolver-fix-leaking-fds +++ /dev/null @@ -1,21 +0,0 @@ -Author: Johannes Schauer <jo...@debian.org> -Description: cudfSolver.ml: workaround for libcudf fd leak: - https://gforge.inria.fr/tracker/index.php?func=detail&aid=18789&group_id=4385&atid=13811 -Origin: commit:73a6c13b73b37efa084686673c6948b653fde01f - -diff --git a/common/cudfSolver.ml b/common/cudfSolver.ml -index a33aa7e..46c86cd 100644 ---- a/common/cudfSolver.ml -+++ b/common/cudfSolver.ml -@@ -132,9 +132,8 @@ let execsolver exec_pat criteria cudf = - raise Unsat - else - try begin -- let cudf_parser = Cudf_parser.from_file solver_out in -- Sys.remove solver_in; Sys.remove solver_out ; -- try Cudf_parser.load_solution cudf_parser universe with -+ let f p = Cudf_parser.load_solution_from_file p universe in -+ try finally (fun () -> Sys.remove solver_in; Sys.remove solver_out) f solver_out with - |Cudf_parser.Parse_error _ - |Cudf.Constraint_violation _ -> - fatal "(CRASH) Solution file contains an invalid solution" diff --git a/debian/patches/encode-package-name-in-cudf_extras b/debian/patches/encode-package-name-in-cudf_extras deleted file mode 100644 index c280b70..0000000 --- a/debian/patches/encode-package-name-in-cudf_extras +++ /dev/null @@ -1,35 +0,0 @@ -commit 16f3b42c824a7a6610794607f48a815d9a93598a -Author: josch <j.scha...@email.de> -Date: Wed Mar 25 10:53:25 2015 +0100 - - encode Debian package name in cudf_extras - ---- a/deb/debcudf.ml -+++ b/deb/debcudf.ml -@@ -302,7 +302,8 @@ let loadlp ?(enc=false) tables l = - - let preamble = - let l = [ -- (* number,type,architecture are mandatory properties -- no default *) -+ (* name,number,type,architecture are mandatory properties -- no default *) -+ ("name", (`String None)); - ("number",(`String None)); - ("type",(`String None)); - ("architecture",(`String None)); -@@ -324,6 +325,7 @@ let preamble = - - let add_extra_default extras tables pkg = - let check = function [] :: _ -> failwith (Printf.sprintf "Malformed dep (%s %s)" pkg.name pkg.version) |l -> l in -+ let name = ("name",`String pkg.name) in - let number = ("number",`String pkg.version) in - let architecture = ("architecture",`String pkg.architecture) in - let priority = ("priority",`String pkg.priority) in -@@ -363,7 +365,7 @@ let add_extra_default extras tables pkg - |(_,`String "") -> None - |e -> Some e - ) -- [priority; architecture; number; -+ [priority; name; architecture; number; - source; sourcenumber; sourceversion; - recommends; replaces; - essential;build_essential]@ l diff --git a/debian/patches/series b/debian/patches/series index 27278cb..b7e42fd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ binaries-prefix-edos coinstall-binary-name -# cudfSolver-fix-leaking-fds -# encode-package-name-in-cudf_extras # librpm-4.12 -- 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