[med-svn] [seqan2] 02/03: Another typo fix from upstream

[Michael Crusoe]

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

misterc-guest pushed a commit to tag debian/2.3.0_1.20161019_af07bc1+dfsg-4
in repository seqan2.

commit 9460525176e546b3436280450edf08cbf85f2860
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Wed Oct 26 03:25:07 2016 -0700

    Another typo fix from upstream
    
    https://github.com/seqan/seqan/pull/1892
---
 debian/changelog        |  5 +++--
 debian/patches/typo-fix | 13 +++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 52ffdbe..a91ad5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-seqan2 (2.3.0~1.20161019~af07bc1+dfsg-4) UNRELEASED; urgency=medium
+seqan2 (2.3.0~1.20161019~af07bc1+dfsg-4) experimental; urgency=medium
 
   * Skip unneeded build for -indep.
   * Fix architecture detection logic.
+  * Fix from upstream for another sparc64 related typo.
 
- -- Michael R. Crusoe <michael.crusoe at gmail.com>  Mon, 24 Oct 2016 11:30:34 -0700
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Wed, 26 Oct 2016 03:31:54 -0700
 
 seqan2 (2.3.0~1.20161019~af07bc1+dfsg-3) experimental; urgency=medium
 
diff --git a/debian/patches/typo-fix b/debian/patches/typo-fix
index 2ffd14e..2d8ff2d 100644
--- a/debian/patches/typo-fix
+++ b/debian/patches/typo-fix
@@ -2,7 +2,7 @@ From: Michael R. Crusoe <michael.crusoe at gail.com
 Subject: Fix typo
 --- seqan2.orig/include/seqan/parallel/parallel_lock.h
 +++ seqan2/include/seqan/parallel/parallel_lock.h
-@@ -218,7 +218,7 @@
+@@ -218,14 +218,14 @@
  #elif defined(__arm__) || defined(__aarch64__)  // ARM.
      __asm__ __volatile__ ("yield" ::: "memory");
  #elif defined(__sparc) || defined(__sparc__)  // SPARC
@@ -10,4 +10,13 @@ Subject: Fix typo
 +#if defined(__SUNPRO_C)
      __asm __volatile__ ("rd %%ccr, %%g0\n\t"
                          "rd %%ccr, %%g0\n\t"
-                         "rd %%ccr, %%g0")
+-                        "rd %%ccr, %%g0")
++                        "rd %%ccr, %%g0");
+ #else
+     __asm __volatile__ ("rd %ccr, %g0\n\t"
+                         "rd %ccr, %g0\n\t"
+-                        "rd %ccr, %g0")
++                        "rd %ccr, %g0");
+ #endif  // defined(__SUNPRO_C)
+ #elif defined(__ppc__) || defined(__ppc64__) || defined(_ARCH_PPC)  || defined(_ARCH_PPC64)  // PowerPC
+     __asm__ __volatile__ ("or 27,27,27" ::: "memory");

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