[med-svn] [Git][med-team/tiddit][master] Fix build

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / tiddit


Commits:
367c6e78 by Andreas Tille at 2020-05-27T10:48:11+02:00
Fix build

- - - - -


3 changed files:

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


Changes:

=====================================
debian/control
=====================================
@@ -6,8 +6,9 @@ Priority: optional
 Build-Depends: debhelper-compat (= 12),
                cmake,
                dh-python,
-               python3,
-               libbamtools-dev,
+               cython3,
+               python3-dev,
+               libbamtools-dev (>= 2.5.1+dfsg-6),
                zlib1g-dev
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/tiddit


=====================================
debian/patches/use_debian_packaged_libs.patch
=====================================
@@ -1,3 +1,10 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 25 May 2020 11:58:02 +0200
+Description: Use Debian packaged bamtools
+ Note: Tiddit source came with a patched BamTools.  The Debian packaged bamtools
+       has taken it over in
+    https://salsa.debian.org/med-team/bamtools/-/blob/master/debian/patches/tiddit.patch
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -14,8 +14,8 @@ set( EXECUTABLE_OUTPUT_PATH "${CMAKE_SOU
@@ -11,7 +18,7 @@
  
  
  # source code
-@@ -28,8 +28,15 @@ file(GLOB TIDDIT_FILES
+@@ -28,10 +28,17 @@ file(GLOB TIDDIT_FILES
  )
  
  
@@ -29,3 +36,6 @@
  
  # TIDDIT executable
  add_executable(TIDDIT ${TIDDIT_FILES})
+ target_link_libraries(TIDDIT ${ZLIB_LIBRARIES})
+-target_link_libraries(TIDDIT  BamTools)
++target_link_libraries(TIDDIT  bamtools)


=====================================
debian/rules
=====================================
@@ -3,25 +3,23 @@
 # DH_VERBOSE := 1
 export LC_ALL=C.UTF-8
 
-include /usr/share/dpkg/default.mk
-# this provides:
-# DEB_SOURCE: the source package name
-# DEB_VERSION: the full version of the package (epoch + upstream vers. + revision)
-# DEB_VERSION_EPOCH_UPSTREAM: the package's version without the Debian revision
-# DEB_VERSION_UPSTREAM_REVISION: the package's version without the Debian epoch
-# DEB_VERSION_UPSTREAM: the package's upstream version
-# DEB_DISTRIBUTION: the distribution(s) listed in the current entry of debian/changelog
-# SOURCE_DATE_EPOCH: the source release date as seconds since the epoch, as
-#                    specified by <https://reproducible-builds.org/specs/source-date-epoch/>
-
 # for hardening you might like to uncomment this:
 # export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
-	dh $@ --buildsystem=cmake
+	dh $@ --with python3 --buildsystem=cmake
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+	dh_auto_configure --sourcedirectory=src --buildsystem=pybuild
+
+override_dh_auto_build:
+	dh_auto_build
+	dh_auto_build --sourcedirectory=src --buildsystem=pybuild
+
+override_dh_auto_install:
+	dh_auto_install
+	dh_auto_install --sourcedirectory=src --buildsystem=pybuild
 
 ### When overriding auto_test make sure DEB_BUILD_OPTIONS will be respected
 #override_dh_auto_test:



View it on GitLab: https://salsa.debian.org/med-team/tiddit/-/commit/367c6e78664672861465841c91b892965575b101

-- 
View it on GitLab: https://salsa.debian.org/med-team/tiddit/-/commit/367c6e78664672861465841c91b892965575b101
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/20200527/a14edf50/attachment-0001.html>