[med-svn] [seqan2] 02/02: re-enable armel

[Michael Crusoe]

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

misterc-guest pushed a commit to tag debian/2.3.2+dfsg-1
in repository seqan2.

commit 6d28a626f8f71d0fae36d956ebb959067b947a5d
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Thu Sep 28 08:01:34 2017 -0700

    re-enable armel
---
 debian/changelog                        |  9 +++++++++
 debian/control                          |  6 +++---
 debian/copyright                        |  1 -
 debian/patches/series                   |  1 -
 debian/patches/skip-SEQAN_PKGCFG_CFLAGS | 12 ------------
 debian/rules                            |  6 +++---
 debian/source.lintian-overrides         |  1 +
 7 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4f5a1a..d9b0d71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+seqan2 (2.3.2+dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Re-enable armel, now that upstream bug fixed in
+    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735
+  * removed debian/patches/skip-SEQAN_PKGCFG_CFLAGS, incorporated upstream
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Thu, 28 Sep 2017 09:15:34 -0700
+
 seqan2 (2.3.1+dfsg-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 62eb17b..b392bdc 100644
--- a/debian/control
+++ b/debian/control
@@ -19,14 +19,13 @@ Build-Depends: debhelper (>= 10),
                python-nose,
                default-jdk,
                dh-linktree
-Standards-Version: 3.9.8
+Standards-Version: 4.1.0
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/seqan2.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/seqan2.git
 Homepage: http://www.seqan.de/
 
 Package: seqan-apps
-Architecture: any-amd64 arm64 any-i386 mips64el powerpc ppc64el s390x alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32
-# armel, not until std::future works https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735
+Architecture: any-amd64 arm64 any-i386 armel mips64el powerpc ppc64el s390x alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: C++ library for the analysis of biological sequences
@@ -44,6 +43,7 @@ Architecture: all
 Section: libdevel
 Depends: ${misc:Depends}
 Conflicts: seqan-dev
+Multi-Arch: foreign
 Description: C++ library for the analysis of biological sequences (development)
  SeqAn is a C++ template library of efficient algorithms and data
  structures for the analysis of sequences with the focus on
diff --git a/debian/copyright b/debian/copyright
index 56e5eab..ef27695 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,6 @@ Source: http://packages.seqan.de/
 Files-Excluded: util/py_lib
                 util/mingw
                 .*
-                */.*.swp
                 */*.bak
                 */*HUGE.png
                 */*LARGE.png
diff --git a/debian/patches/series b/debian/patches/series
index b8e0f8a..74f65e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-skip-SEQAN_PKGCFG_CFLAGS
 spelling
 short-description
 skip-seqan-revision
diff --git a/debian/patches/skip-SEQAN_PKGCFG_CFLAGS b/debian/patches/skip-SEQAN_PKGCFG_CFLAGS
deleted file mode 100644
index 4169f54..0000000
--- a/debian/patches/skip-SEQAN_PKGCFG_CFLAGS
+++ /dev/null
@@ -1,12 +0,0 @@
-From: Michael R. Crusoe <michael.crusoe at gmail.com>
-Subject: Skip seemingly unused CMAKE variable
-Forwarded: https://github.com/seqan/seqan/pull/2000
---- seqan2.orig/util/pkgconfig/seqan.pc.in
-+++ seqan2/util/pkgconfig/seqan.pc.in
-@@ -7,5 +7,5 @@
- URL: http://www.seqan.de
- Version: @SEQAN_VERSION_STRING@
- Requires: zlib
--Cflags: -I${includedir}  @SEQAN_PKGCFG_CFLAGS@ -DSEQAN_HAS_ZLIB=1 -DSEQAN_HAS_BZIP2=1
-+Cflags: -I${includedir} -DSEQAN_HAS_ZLIB=1 -DSEQAN_HAS_BZIP2=1
- Libs: -lbz2
diff --git a/debian/rules b/debian/rules
index 1cf86a8..6d1016b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,8 @@
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-UPSTREAM_VERSION = $(shell dpkg-parsechangelog -SVersion | egrep -o '^[0-9.]+')
+export DH_BUILD_MAINT_OPTIONS = hardening=+all
+include /usr/share/dpkg/pkg-info.mk
 export HOME=$(shell echo $$PWD"/fakehome")
 
 # import hardening, adding CPPFLAGS to CFLAGS, in case dh doesn't
@@ -59,7 +59,7 @@ override_dh_auto_build-arch:
 
 override_dh_auto_build-indep:
 	sed -e "s#@CMAKE_INSTALL_PREFIX@#/usr#g" \
-	    -e "s/@SEQAN_VERSION_STRING@/$(UPSTREAM_VERSION)/g" \
+	    -e "s/@SEQAN_VERSION_STRING@/$(DEB_VERSION_UPSTREAM_REVISION)/g" \
 	    -e "s/@CMAKE_PROJECT_NAME@/seqan/g" \
 	    util/pkgconfig/seqan.pc.in > seqan-2.pc
 
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..c493f4b
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1 @@
+seqan2 source: debian-rules-sets-DEB_BUILD_OPTIONS line 32

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