[Pkg-ocaml-maint-commits] [dose3] 01/01: update patch add-gnuhardened1-linux

[Ralf Treinen]

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

treinen pushed a commit to branch experimental/master
in repository dose3.

commit 945e9e870be8af201518a04f2e0768e13b9182de
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Feb 10 08:55:30 2016 +0100

    update patch add-gnuhardened1-linux
---
 debian/changelog                      | 4 +++-
 debian/patches/add-gnuhardened1-linux | 8 +++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 32095a7..7c82b9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,12 +8,14 @@ dose3 (4.2-1) UNRELEASED; urgency=medium
       * fix_ftbfs_on_bytecode_arch
       * fix_META
       * cudf_max_int
+   * fixed patch add-gnuhardened1-linux, thanks to Balint Reczey
+     (closes: #812786, again)
    * d/rules: upstream has renamed manpage buildcheck into deb-buildcheck
    * drop build-dependency on graphviz, since generation of dot files is
      deliberately disabled (by patch disable_dot).
    * Standards-Version 3.9.7 (no change)
    
- -- Ralf Treinen <treinen at debian.org>  Tue, 09 Feb 2016 21:49:41 +0100
+ -- Ralf Treinen <treinen at debian.org>  Wed, 10 Feb 2016 08:50:18 +0100
 
 dose3 (4.1-4) unstable; urgency=medium
 
diff --git a/debian/patches/add-gnuhardened1-linux b/debian/patches/add-gnuhardened1-linux
index c7007f4..6cee4c5 100644
--- a/debian/patches/add-gnuhardened1-linux
+++ b/debian/patches/add-gnuhardened1-linux
@@ -1,17 +1,15 @@
 Author: Balint Reczey <balint at balintreczey.hu>
 Description: add support for hardened1-linux-amd64
 Debian-bug: 812786
-Upstream-commit: 9f3933227cc52a995c2d08595d99cb7ee1501c07
+Upstream-commit: 21fe9e264454323c3fe917bbbe95da5d6adf777b
 
-diff --git a/deb/architecture.ml b/deb/architecture.ml
-index 1fd7d0f..b7c1c27 100644
 --- a/deb/architecture.ml
 +++ b/deb/architecture.ml
-@@ -52,6 +52,7 @@ let triplettable = ref [
+@@ -52,6 +52,7 @@
    (("gnuabi64","linux","mips64"),    "mips64");             (* line 15 *)
    (("gnuspe","linux","powerpc"),     "powerpcspe");
    (("gnux32","linux","amd64"),       "x32");
-+  (("gnuhardened1","linux","<cpu>"), "<cpu>");
++  (("gnuhardened1","linux","<cpu>"), "hardened1-linux-<cpu>");
    (("gnu","linux","<cpu>"),          "<cpu>");
    (("gnu","kfreebsd","<cpu>"),       "kfreebsd-<cpu>");
    (("gnu","knetbsd","<cpu>"),        "knetbsd-<cpu>");      (* line 20 *)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git