[med-svn] [Git][med-team/pbseqlib][master] 5 commits: routine-update: Standards-Version: 4.4.1

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / pbseqlib


Commits:
8663c859 by Andreas Tille at 2019-12-19T10:30:58Z
routine-update: Standards-Version: 4.4.1

- - - - -
0d538a07 by Andreas Tille at 2019-12-19T10:31:00Z
debian/copyright: use spaces rather than tabs to start continuation lines.

Fixes lintian: tab-in-licence-text
See https://lintian.debian.org/tags/tab-in-licence-text.html for more details.

- - - - -
ab4105e5 by Andreas Tille at 2019-12-19T11:17:38Z
There is no point to check for gtest since its installed via Build-Depends

- - - - -
07290a0d by Andreas Tille at 2019-12-19T16:55:39Z
Make sure hdf5 headers will be included, todo: link to hdf5 lib

- - - - -
2b5192df by Andreas Tille at 2019-12-19T16:56:36Z
Polish changelog

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/meson.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,15 +1,17 @@
 pbseqlib (5.3.3+dfsg-1) UNRELEASED; urgency=medium
 
+  [ Helmut Grohne ]
+  * Covnert libpbseq-dev to Architecture: any. (Closes: #940327)
+
   [ Andreas Tille ]
   * Add myself to Uploaders to have at least one human uploader after
     Afif removed himself.
   * New upstream version
   * debhelper-compat 12
-  * Standards-Version: 4.4.0
   * Add new Build-Depends needed for testing
-
-  [ Helmut Grohne ]
-  * Covnert libpbseq-dev to Architecture: any. (Closes: #940327)
+  * Standards-Version: 4.4.1
+  * debian/copyright: use spaces rather than tabs to start continuation
+    lines.
 
  -- Andreas Tille <tille at debian.org>  Mon, 05 Aug 2019 16:53:23 +0200
 


=====================================
debian/control
=====================================
@@ -16,7 +16,7 @@ Build-Depends: debhelper-compat (= 12),
                libpbbam-dev (>= 0.18.0+dfsg-1~),
                libhts-dev,
                libgtest-dev <!nocheck>
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/med-team/pbseqlib
 Vcs-Git: https://salsa.debian.org/med-team/pbseqlib.git
 Homepage: https://github.com/PacificBiosciences/blasr_libcpp


=====================================
debian/copyright
=====================================
@@ -22,7 +22,7 @@ License: Larsson
 Files: pbdata/MD5Utils.cpp
        pbdata/MD5Utils.hpp
 Copyright: 1991-1992 RSA Data Security, Inc.
-	   1995	     Mordechai T. Abzug
+           1995	     Mordechai T. Abzug
 License: RSA
 
 Files: debian/*


=====================================
debian/patches/meson.patch
=====================================
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 13 Dec 2019 22:17:15 +0100
+Description: There is no point to check for gtest since its installed via Build-Depends
+
+--- a/unittest/meson.build
++++ b/unittest/meson.build
+@@ -11,7 +11,7 @@ subdir('pbdata')
+ # Sources #
+ ###########
+ 
+-libblasr_gtest_dep = dependency('gtest_main', fallback : ['gtest', 'gtest_main_dep'])
++libblasr_gtest_dep = dependency('gtest', main: true)
+ 
+ libblasr_unittest = executable(
+   'libblasr_unittest', [


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 hdf5-1.10.1-support.patch
 hdf5-1.10.0-support.patch
+meson.patch


=====================================
debian/rules
=====================================
@@ -8,7 +8,7 @@ export HDF5_LIB = /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
 export GTEST_INC = /usr/include
 export GTEST_SRCDIR = /usr/src/gtest
 
-export DEB_CFLAGS_MAINT_APPEND=-O3
+export DEB_CFLAGS_MAINT_APPEND=-O3 -I$(HDF5_INC)
 export DEB_CXXFLAGS_MAINT_APPEND=-O3
 
 export LDLIBS += -lpbbam
@@ -16,7 +16,7 @@ export LDLIBS += -lpbbam
 # Needed for patch hdf5-1.10.1-support.patch
 HDF5_VERSION := $(shell grep 'HDF5 Version' $(HDF5_LIB)/libhdf5.settings | awk '{print $$3}')
 ifeq (yes,$(shell dpkg --compare-versions $(HDF5_VERSION) '>=' 1.10.1 && echo yes))
-export DEB_CPPFLAGS_MAINT_APPEND=-DHAVE_HDF5_1_10_1
+export DEB_CPPFLAGS_MAINT_APPEND+=-DHAVE_HDF5_1_10_1 $(DEB_CFLAGS_MAINT_APPEND)
 endif
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
@@ -24,9 +24,6 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 %:
 	dh $@
 
-override_dh_auto_build:
-	dh_auto_build -- PREFIX_INC=..
-
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 # Ignore the return code because some tests



View it on GitLab: https://salsa.debian.org/med-team/pbseqlib/compare/c856ecf05cf78f6b4e58452ce0b97ad76dac4e16...2b5192df0d9df3a3babb85a7853f52ab5c7c54e4

-- 
View it on GitLab: https://salsa.debian.org/med-team/pbseqlib/compare/c856ecf05cf78f6b4e58452ce0b97ad76dac4e16...2b5192df0d9df3a3babb85a7853f52ab5c7c54e4
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191219/ac520a3b/attachment-0001.html>