This is an automated email from the git hooks/post-receive script.
josch pushed a commit to branch experimental/master
in repository dose3.
commit a2de1dbee6db23232b64df4877a336e3c6b70a88
Author: josch <j.scha...@email.de>
Date: Wed Mar 25 21:03:37 2015 +0100
backport patch encode-package-name-in-cudf_extras
---
debian/changelog | 2 ++
debian/patches/encode-package-name-in-cudf_extras | 35 +++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 38 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 8ff8b5a..d95f888 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dose3 (3.3-2) UNRELEASED; urgency=medium
* added myself to the Uploaders field
* remove fixDebPrinter and fixMETA from debian/patches as they were
unused
+ * backport patch encode-package-name-in-cudf_extras to prepare for switch
+ of cudf encoding of Debian package names in next dose3 release
-- Johannes Schauer <jo...@debian.org> Tue, 24 Mar 2015 07:44:19 +0100
diff --git a/debian/patches/encode-package-name-in-cudf_extras
b/debian/patches/encode-package-name-in-cudf_extras
new file mode 100644
index 0000000..c280b70
--- /dev/null
+++ b/debian/patches/encode-package-name-in-cudf_extras
@@ -0,0 +1,35 @@
+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 a5bda8a..40cf834 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
binaries-prefix-edos
coinstall-binary-name
cudfSolver-fix-leaking-fds
+encode-package-name-in-cudf_extras
--
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
