[med-svn] [jellyfish] 02/02: Deactivate patch to eplace asm statements by C code to increase portability since it has syntax issues. Need to discuss with bug reporter first.

[Andreas Tille]

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

tille pushed a commit to branch master
in repository jellyfish.

commit 484584e4fcd07d454f1c0be25b937790b9505e5b
Author: Andreas Tille <tille at debian.org>
Date:   Fri Aug 25 14:20:28 2017 +0200

    Deactivate patch to eplace asm statements by C code to increase portability since it has syntax issues.  Need to discuss with bug reporter first.
---
 debian/changelog                 |  4 +---
 debian/control                   | 10 +++++-----
 debian/patches/portability.patch |  1 +
 debian/patches/series            |  2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 615756c..7e6f7e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,14 +9,12 @@ jellyfish (2.2.6-2) UNRELEASED; urgency=medium
     Closes: #872262
   * Enable full hardening
     Closes: #865608
-  * Replace asm statements by C code to increase portability
-    Closes: #871697
   * Enable reproducible builds (thanks for the patch to Chris Lamb
     <lamby at debian.org>)
     Closes: #863015
   * Standards-Version: 4.1.0 (no changes needed)
 
- -- Andreas Tille <tille at debian.org>  Fri, 25 Aug 2017 13:44:29 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 25 Aug 2017 14:03:42 +0200
 
 jellyfish (2.2.6-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 685524e..e7b39f5 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Vcs-Git: https://anonscm.debian.org/git/debian-med/jellyfish.git
 Homepage: http://www.cbcb.umd.edu/software/jellyfish/
 
 Package: jellyfish
-Architecture: any
+Architecture: any-amd64
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libjellyfish-2.0-2 (= ${binary:Version})
@@ -45,7 +45,7 @@ Description: count k-mers in DNA sequences
  format using the "jellyfish dump" command.
 
 Package: libjellyfish-2.0-2
-Architecture: any
+Architecture: any-amd64
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
@@ -68,7 +68,7 @@ Description: count k-mers in DNA sequences (dynamic library of jellyfish)
  jellyfish is linked to.
 
 Package: libjellyfish-2.0-dev
-Architecture: any
+Architecture: any-amd64
 Section: libdevel
 Depends: ${misc:Depends},
          libjellyfish-2.0-2 (= ${binary:Version})
@@ -91,7 +91,7 @@ Description: count k-mers in DNA sequences (development files of jellyfish)
  header files)
 
 Package: python3-dna-jellyfish
-Architecture: any
+Architecture: any-amd64
 Section: python
 Depends: ${python3:Depends},
          ${misc:Depends},
@@ -114,7 +114,7 @@ Description: count k-mers in DNA sequences (Python bindings of jellyfish)
  This package contains the Python bindings of jellyfish.
 
 Package: libjellyfish-perl
-Architecture: any
+Architecture: any-amd64
 Section: perl
 Depends: ${perl:Depends},
          ${misc:Depends},
diff --git a/debian/patches/portability.patch b/debian/patches/portability.patch
index a0a585f..583a77e 100644
--- a/debian/patches/portability.patch
+++ b/debian/patches/portability.patch
@@ -2,6 +2,7 @@ Author: Edmund Grimley Evans <edmund.grimley.evans at gmail.com>
 Last-Update: Thu, 10 Aug 2017 18:27:02 UTC
 Bug-Debian: https://bugs.debian.org/871697
 Description: Replace asm statements by C code to increase portability
+Note: Does not work as described - needs verification
 
 --- a/include/jellyfish/rectangular_binary_matrix.hpp
 +++ b/include/jellyfish/rectangular_binary_matrix.hpp
diff --git a/debian/patches/series b/debian/patches/series
index 7b1331e..12b4994 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,5 @@ modern-g++
 spelling
 rename-python-module-to-dna_jellyfish.patch 
 gcc-7.patch
-portability.patch
+# portability.patch
 reproducible.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/jellyfish.git