[med-svn] [seqan2] 05/05: test upstream's develop branch

[Michael Crusoe]

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

misterc-guest pushed a commit to branch debian-experimental
in repository seqan2.

commit 91b27295fe9c43f9ef1185214672512707e0681a
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Tue Oct 11 07:09:45 2016 -0700

    test upstream's develop branch
---
 debian/changelog               |  7 +++----
 debian/control                 |  2 +-
 debian/patches/pthread-linking | 34 ----------------------------------
 debian/patches/series          |  1 -
 4 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa997ab..acbfc32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
-seqan2 (2.2.0+dfsg-4) UNRELEASED; urgency=medium
+seqan2 (2.3.0~0.20161011~73a5aaf+dfsg-1) experimental; urgency=low
 
-  * Restrict archs for now. Closes: #840025
-  * Patch from upstream to fix kfreebsd/hurd builds. Closes: #840026
+  * Experimental build to test fix for #840030
 
- -- Michael R. Crusoe <michael.crusoe at gmail.com>  Mon, 10 Oct 2016 06:52:15 -0700
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Tue, 11 Oct 2016 07:08:05 -0700
 
 seqan2 (2.2.0+dfsg-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 343f8dc..aa33275 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Vcs-Git: https://anonscm.debian.org/git/debian-med/seqan2.git
 Homepage: http://www.seqan.de/
 
 Package: seqan-apps
-Architecture: any-amd64 any-i386 any-x32
+Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: C++ library for the analysis of biological sequences
diff --git a/debian/patches/pthread-linking b/debian/patches/pthread-linking
deleted file mode 100644
index 394132c..0000000
--- a/debian/patches/pthread-linking
+++ /dev/null
@@ -1,34 +0,0 @@
-From: rrahn <rene.rahn at fu-berlin.de>
-Date: Mon, 10 Oct 2016 16:55:04 +0200
-Subject: Fix static linking against pthread on some linux kernels.
---- seqan2.orig/manual/source/Infrastructure/Use/CustomBuildSystem.rst
-+++ seqan2/manual/source/Infrastructure/Use/CustomBuildSystem.rst
-@@ -45,6 +45,10 @@
- 
- Add ``-lrt -lpthread`` to the compiler call.
- 
-+Note static linking against pthread might cause issues on some linux distributions.
-+In this case you need to explicitly link against the whole archive like: ``-Wl,--whole-archive -lpthread -Wl,--no-whole-archive``.
-+You can read more about this issue `here <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52590>`_.
-+
- BSD
- ^^^
- 
---- seqan2.orig/util/cmake/FindSeqAn.cmake
-+++ seqan2/util/cmake/FindSeqAn.cmake
-@@ -287,8 +287,13 @@
- 
- # librt, libpthread -- implicit, on Linux only
- 
--if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
--  set (SEQAN_LIBRARIES ${SEQAN_LIBRARIES} rt pthread)
-+if ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") OR (${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD") OR (${CMAKE_SYSTEM_NAME} STREQUAL "GNU"))
-+  set (SEQAN_LIBRARIES ${SEQAN_LIBRARIES} rt)
-+  if ((CMAKE_CXX_FLAGS MATCHES "-static") OR (SEQAN_CXX_FLAGS MATCHES "-static") OR (CMAKE_EXE_LINKER_FLAGS MATCHES "-static"))
-+    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--whole-archive -lpthread -Wl,--no-whole-archive")
-+  else ()
-+    set (SEQAN_LIBRARIES ${SEQAN_LIBRARIES} pthread)
-+  endif ()
- elseif ((${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") OR (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD"))
-   set (SEQAN_LIBRARIES ${SEQAN_LIBRARIES} pthread)
-   set (SEQAN_DEFINITIONS ${SEQAN_DEFINITIONS} "-D_GLIBCXX_USE_C99=1")
diff --git a/debian/patches/series b/debian/patches/series
index 00d3385..366f163 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-pthread-linking
 spelling.patch
 short-description
 

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