[med-svn] [jellyfish] 01/02: Make jellyfish portable

[Andreas Tille]

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

tille pushed a commit to tag debian/2.2.6-5
in repository jellyfish.

commit 1d44c137fd4b1423a5ccffc1141da9783c142cca
Author: Andreas Tille <tille at debian.org>
Date:   Fri Sep 1 00:09:09 2017 +0200

    Make jellyfish portable
---
 debian/changelog                 |  8 ++++++++
 debian/control                   | 12 ++++++------
 debian/patches/portability.patch |  3 ++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed21224..ddd47ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jellyfish (2.2.6-5) UNRELEASED; urgency=medium
+
+  * Make jellyfish portable (Thanks for the patch to Edmund Grimley Evans
+    <edmund.grimley.evans at gmail.com>)
+    Closes: #871697
+
+ -- Andreas Tille <tille at debian.org>  Fri, 01 Sep 2017 00:01:07 +0200
+
 jellyfish (2.2.6-4) unstable; urgency=medium
 
   * Make sure reproducible patch will not break test suite (Thanks to
diff --git a/debian/control b/debian/control
index ba61ab6..d5137a3 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Vcs-Git: https://anonscm.debian.org/git/debian-med/jellyfish.git
 Homepage: http://www.cbcb.umd.edu/software/jellyfish/
 
 Package: jellyfish
-Architecture: any-amd64
+Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libjellyfish-2.0-2 (= ${binary:Version})
@@ -44,7 +44,7 @@ Description: count k-mers in DNA sequences
  format using the "jellyfish dump" command.
 
 Package: libjellyfish-2.0-2
-Architecture: any-amd64
+Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
@@ -67,7 +67,7 @@ Description: count k-mers in DNA sequences (dynamic library of jellyfish)
  jellyfish is linked to.
 
 Package: libjellyfish-2.0-dev
-Architecture: any-amd64
+Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
          libjellyfish-2.0-2 (= ${binary:Version})
@@ -90,7 +90,7 @@ Description: count k-mers in DNA sequences (development files of jellyfish)
  header files)
 
 Package: python3-dna-jellyfish
-Architecture: any-amd64
+Architecture: any
 Section: python
 Depends: ${python3:Depends},
          ${misc:Depends},
@@ -113,7 +113,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-amd64
+Architecture: any
 Section: perl
 Depends: ${perl:Depends},
          ${misc:Depends},
@@ -136,7 +136,7 @@ Description: count k-mers in DNA sequences (Perl bindings of jellyfish)
  This package contains the Perl bindings of jellyfish.
 
 Package: jellyfish-examples
-Architecture: any-amd64
+Architecture: any
 Depends: jellyfish,
          ${shlibs:Depends},
          ${misc:Depends}
diff --git a/debian/patches/portability.patch b/debian/patches/portability.patch
index 583a77e..4f0a9bd 100644
--- a/debian/patches/portability.patch
+++ b/debian/patches/portability.patch
@@ -13,7 +13,8 @@ Note: Does not work as described - needs verification
 +#ifdef __x86_64__
  #define AND_XOR(off)                                                    \
      asm("movdqa (%[s],%[i]), %[load]\n\t"                               \
-         "pand " off "(%[p]),%[load]\n\t"                                \
+-        "pand " off "(%[p]),%[load]\n\t"                                \
++        "pand " #off "(%[p]),%[load]\n\t"                               \
          "pxor %[load],%[acc]\n\t"                                       \
          : [acc]"=&x"(acc)                                               \
          : "[acc]"(acc),  [i]"r"(i), [p]"r"(p), [s]"r"(smear), [load]"x"(load))

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