This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository dose3.
commit c1f893e7a582327081d54a63dadbb4c5a088d75a
Author: Ralf Treinen <trei...@free.fr>
Date: Sun Sep 14 19:54:15 2014 +0200
accept multiarch=no in debian metadata
---
debian/changelog | 5 ++++-
debian/patches/multiarch-accept-value-no | 20 ++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index bac32d6..65756e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ dose3 (3.2.2-3) UNRELEASED; urgency=medium
* add patch buildcheck-manpage-native-arch: specify in the manpage that
the --deb-native-arch argument is mandatory to debbuildcheck
(closes: #757641).
+ * add patch multiarch-accept-value-no: when parsing debian metadata,
+ accept "no" as alias for "none" as value of Multiarch. Thanks to
+ Pietro Abate for the patch (closes: #759372).
- -- Ralf Treinen <trei...@debian.org> Mon, 11 Aug 2014 19:32:32 +0200
+ -- Ralf Treinen <trei...@debian.org> Sun, 14 Sep 2014 19:51:14 +0200
dose3 (3.2.2-2) unstable; urgency=medium
diff --git a/debian/patches/multiarch-accept-value-no
b/debian/patches/multiarch-accept-value-no
new file mode 100644
index 0000000..4a442b5
--- /dev/null
+++ b/debian/patches/multiarch-accept-value-no
@@ -0,0 +1,20 @@
+Author: Pietro Abate <pietro.ab...@pps.jussieu.fr>
+Debian-bug: #759372
+Description: when parsing debian package data, accept "no" as alias
+ for "none" as value for Multiarch
+Upstream-commit: f453cd423c181e4549742fbcb12b54377938f601
+
+
+Index: dose3/deb/packages_parser.mly
+===================================================================
+--- dose3.orig/deb/packages_parser.mly 2014-09-14 19:57:40.833179444 +0200
++++ dose3/deb/packages_parser.mly 2014-09-14 19:57:40.829179444 +0200
+@@ -13,7 +13,7 @@
+ | _ -> assert false (* lexer shouldn't have returned such a RELOP! *)
+
+ let parse_multiarch = function
+- |("None"|"none") -> `None
++ |("None"|"none"|"no") -> `None
+ |("Allowed"|"allowed") -> `Allowed
+ |("Foreign"|"foreign") -> `Foreign
+ |("Same"|"same") -> `Same
diff --git a/debian/patches/series b/debian/patches/series
index 3bbab94..d3e447d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ binaries-prefix-edos
coinstall-binary-name
buildcheck-manpage
buildcheck-manpage-native-arch
+multiarch-accept-value-no
--
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
