[med-svn] [Git][med-team/racon][master] 2 commits: Add just created Build-Depends

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / racon


Commits:
e4ba0545 by Andreas Tille at 2018-06-10T10:01:04+02:00
Add just created Build-Depends

- - - - -
a571dd5d by Andreas Tille at 2018-06-10T10:08:06+02:00
Use debian packaged libs

- - - - -


4 changed files:

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


Changes:

=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,12 @@ Uploaders: Cédric Lood <cedric.lood at kuleuven.be>,
            Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 11~),
                cmake,
-               libgmock-dev
+               libgtest-dev,
+               libbioparser-dev,
+               libedlib-dev,
+               libspoa-dev,
+               libthread-pool-dev,
+               rampler
 Standards-Version: 4.1.4
 Vcs-Browser: https://salsa.debian.org/med-team/racon
 Vcs-Git: https://salsa.debian.org/med-team/racon.git


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_debian_packaged_libs.patch


=====================================
debian/patches/use_debian_packaged_libs.patch
=====================================
--- /dev/null
+++ b/debian/patches/use_debian_packaged_libs.patch
@@ -0,0 +1,40 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update:  Fri, 08 Jun 2018 13:20:51 +0200
+Description: Use Debian packaged libraries
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,20 +19,7 @@ add_executable(racon
+     src/sequence.cpp
+     src/window.cpp)
+ 
+-if (NOT TARGET bioparser)
+-    add_subdirectory(vendor/bioparser EXCLUDE_FROM_ALL)
+-endif()
+-if (NOT TARGET spoa)
+-    add_subdirectory(vendor/spoa EXCLUDE_FROM_ALL)
+-endif()
+-if (NOT TARGET thread_pool)
+-    add_subdirectory(vendor/thread_pool EXCLUDE_FROM_ALL)
+-endif()
+-if (NOT TARGET edlib)
+-    add_subdirectory(vendor/edlib EXCLUDE_FROM_ALL)
+-endif()
+-
+-target_link_libraries(racon bioparser spoa thread_pool pthread edlib_static)
++target_link_libraries(racon bioparser spoa thread_pool pthread edlib)
+ 
+ install(TARGETS racon DESTINATION bin)
+ 
+@@ -50,10 +37,8 @@ if (racon_build_tests)
+         src/sequence.cpp
+         src/window.cpp)
+ 
+-    add_subdirectory(vendor/googletest/googletest EXCLUDE_FROM_ALL)
+-
+     target_link_libraries(racon_test spoa thread_pool pthread
+-        edlib_static gtest_main)
++        edlib gtest_main gtest z)
+ endif(racon_build_tests)
+ 
+ if (racon_build_wrapper)


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,11 @@
 #!/usr/bin/make -f
 
-# DH_VERBOSE := 1
-export LC_ALL=C.UTF-8
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-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
-
-# for hardening you might like to uncomment this:
-# export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+DEB_CMAKE_EXTRA_FLAGS = -Dracon_build_tests=ON
 
 %:
 	dh $@
 
-#get-orig-source:
-#	. debian/get-orig-source
+override_dh_auto_configure:
+	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)



View it on GitLab: https://salsa.debian.org/med-team/racon/compare/a95eaafca052831343317ed2b0d06bab2a0bde83...a571dd5d795f3cc509641228114a236bc1053c9a

-- 
View it on GitLab: https://salsa.debian.org/med-team/racon/compare/a95eaafca052831343317ed2b0d06bab2a0bde83...a571dd5d795f3cc509641228114a236bc1053c9a
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/20180610/53ec3b37/attachment-0001.html>