[med-svn] [seqan2] 03/03: 2.4.0

[Michael Crusoe]

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

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

commit 22b00e1b51f02c17e6a8e2d56f6ded4e8534c060
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Mon Feb 5 07:48:02 2018 -0800

    2.4.0
---
 debian/README.Debian                        |  7 +++++++
 debian/changelog                            |  6 ++++++
 debian/patches/skip-seqan-revision          |  2 +-
 debian/patches/skip-some-apps-on-some-archs | 30 ++++++++++++++++++++++++++---
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 4825b8b..21a1f4a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -70,6 +70,7 @@ Apps not built for armhf:
 
 Apps not built for sh4:
  - yara
+ - razers3
 
 Apps not built for armel:
  - yara
@@ -77,6 +78,12 @@ Apps not built for armel:
 Apps not built for kfreebsd-i386:
  - yara
 
+Apps not built for hurd-i386:
+ - yara
+
+Apps not built for ia64:
+ - searchjoin (assembler errors)
+
 Sending patches to improve the build experience on any of these architectures
 would be welcome by the Debian-Med team and upstream.
 
diff --git a/debian/changelog b/debian/changelog
index e646631..79f198e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+seqan2 (2.4.0+dfsg-1) unstable; urgency=medium
+
+  * 2.4.0 is released!
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Mon, 05 Feb 2018 07:52:07 -0800
+
 seqan2 (2.4.0~rc2+dfsg-1) experimental; urgency=medium
 
   * Testing upstream's 3rd formal release candidate for 2.4.0
diff --git a/debian/patches/skip-seqan-revision b/debian/patches/skip-seqan-revision
index b6f5077..fbb11e7 100644
--- a/debian/patches/skip-seqan-revision
+++ b/debian/patches/skip-seqan-revision
@@ -3,7 +3,7 @@ Description: Don't look for a git directory, as the Debian packaging confuses
 the build system
 --- seqan2.orig/util/cmake/SeqAnBuildSystem.cmake
 +++ seqan2/util/cmake/SeqAnBuildSystem.cmake
-@@ -686,14 +686,15 @@
+@@ -692,14 +692,15 @@
    set (_SEQAN_GIT_DIR "${CMAKE_SOURCE_DIR}/.git")
    message (STATUS "  Selected repository dir: ${CMAKE_SOURCE_DIR}")
    # Get Git information.
diff --git a/debian/patches/skip-some-apps-on-some-archs b/debian/patches/skip-some-apps-on-some-archs
index 9ac3b75..c9946c7 100644
--- a/debian/patches/skip-some-apps-on-some-archs
+++ b/debian/patches/skip-some-apps-on-some-archs
@@ -27,9 +27,9 @@ then update debian/README.Debian
  # ----------------------------------------------------------------------------
 --- seqan2.orig/apps/razers3/CMakeLists.txt
 +++ seqan2/apps/razers3/CMakeLists.txt
-@@ -12,6 +12,16 @@
+@@ -12,6 +12,21 @@
  
- set (SEQAN_APP_VERSION "3.5.7")
+ set (SEQAN_APP_VERSION "3.5.8")
  
 +if ("$ENV{DEB_BUILD_ARCH}" STREQUAL "mips")
 +    message (STATUS "  Not building razers3 on mips due to memory requirements.")
@@ -39,6 +39,11 @@ then update debian/README.Debian
 +    message (STATUS "  Not building razers3 on mipsel due to memory requirements.")
 +    return ()
 +endif ()
++if ("$ENV{DEB_BUILD_ARCH}" STREQUAL "sh4")
++    message (STATUS "  Not building razers3 on sh4 due to memory requirements.")
++    return ()
++endif ()
++
 +
 +
  # ----------------------------------------------------------------------------
@@ -46,7 +51,7 @@ then update debian/README.Debian
  # ----------------------------------------------------------------------------
 --- seqan2.orig/apps/yara/CMakeLists.txt
 +++ seqan2/apps/yara/CMakeLists.txt
-@@ -10,6 +10,35 @@
+@@ -10,6 +10,40 @@
  project (seqan_apps_yara CXX)
  message (STATUS "Configuring apps/yara")
  
@@ -74,6 +79,11 @@ then update debian/README.Debian
 +    message (STATUS "  Not building yara on kfreebsd-i386 due to memory requirements.")
 +    return ()
 +endif ()
++if ("$ENV{DEB_BUILD_ARCH}" STREQUAL "hurd-i386")
++    message (STATUS "  Not building yara on hurd-i386 due to memory requirements.")
++    return ()
++endif ()
++
 +
 +
 +
@@ -82,3 +92,17 @@ then update debian/README.Debian
  # ----------------------------------------------------------------------------
  # Dependencies
  # ----------------------------------------------------------------------------
+--- seqan2.orig/apps/searchjoin/CMakeLists.txt
++++ seqan2/apps/searchjoin/CMakeLists.txt
+@@ -16,6 +16,11 @@
+     message (STATUS "  Skipping build and test of searchjoin on Travis CI.")
+     return ()
+ endif (SEQAN_TRAVIS_BUILD)
++if ("$ENV{DEB_BUILD_ARCH}" STREQUAL "ia64")
++    message (STATUS "  Not building searchjoin on ia64 due to assembler errors.")
++    return ()
++endif ()
++
+ 
+ # ----------------------------------------------------------------------------
+ # Dependencies

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