[med-svn] [Git][med-team/seqwish][master] gzip_reader is definitely not needed. The header is inside libgzstream-dev

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / seqwish


Commits:
7c383501 by Andreas Tille at 2020-06-04T09:52:33+02:00
gzip_reader is definitely not needed.  The header is inside libgzstream-dev

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/use_debian_packaged_libs.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -9,8 +9,6 @@ seqwish (0.6-1) UNRELEASED; urgency=medium
    * https://github.com/ekg/atomicbitvector
    
    * https://github.com/Taywee/args
-   * https://github.com/gatoravi/gzip_reader
-   
    ... and more
 
  -- Andreas Tille <tille at debian.org>  Sun, 24 May 2020 16:17:07 +0200


=====================================
debian/control
=====================================
@@ -6,7 +6,8 @@ Priority: optional
 Build-Depends: debhelper-compat (= 12),
                cmake,
                libsdsl-dev,
-               libbbhash-dev
+               libbbhash-dev,
+               libgzstream-dev
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/seqwish
 Vcs-Git: https://salsa.debian.org/med-team/seqwish.git


=====================================
debian/patches/use_debian_packaged_libs.patch
=====================================
@@ -21,3 +21,18 @@
  
  # taywee's C++ args library, header only
  ExternalProject_Add(tayweeargs
+@@ -46,12 +53,14 @@ ExternalProject_Get_property(tayweeargs
+ set(tayweeargs_INCLUDE "${SOURCE_DIR}")
+ 
+ # gzip file reader, header only
++if(!DEBIAN_BUILD)
+ ExternalProject_Add(gzipreader
+   SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/gzip_reader"
+   UPDATE_COMMAND ""
+   INSTALL_COMMAND "")
+ ExternalProject_Get_property(gzipreader SOURCE_DIR)
+ set(gzipreader_INCLUDE "${SOURCE_DIR}")
++endif
+ 
+ # mmmulti (memory mapped multimap, multiset, and interval tree)
+ ExternalProject_Add(mmmulti


=====================================
debian/rules
=====================================
@@ -17,15 +17,16 @@ include /usr/share/dpkg/default.mk
 # for hardening you might like to uncomment this:
 # export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+CMAKE_EXTRA_FLAGS += -DDEBIAN_BUILD=1 
+
 %:
 	dh $@
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo $(CMAKE_EXTRA_FLAGS)
+
 ### When overriding auto_test make sure DEB_BUILD_OPTIONS will be respected
 #override_dh_auto_test:
 #ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 #	do_stuff_for_testing
 #endif
-
-### If you **really** can not use uscan (even not with mode=git) use a debian/get-orig-script
-#get-orig-source:
-#	. debian/get-orig-source



View it on GitLab: https://salsa.debian.org/med-team/seqwish/-/commit/7c38350109746dab34f6cc0c579ff8547376ebb2

-- 
View it on GitLab: https://salsa.debian.org/med-team/seqwish/-/commit/7c38350109746dab34f6cc0c579ff8547376ebb2
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/20200604/f0b2ba22/attachment-0001.html>