[med-svn] [Git][med-team/savvy][master] 2 commits: Cleanup d/rules

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / savvy


Commits:
89979123 by Nilesh Patra at 2022-10-15T09:32:12+00:00
Cleanup d/rules

- - - - -
e38501e0 by Nilesh Patra at 2022-10-15T09:34:09+00:00
Prefer shared obj and not static

- - - - -


2 changed files:

- debian/patches/enable_zstd.patch
- debian/rules


Changes:

=====================================
debian/patches/enable_zstd.patch
=====================================
@@ -4,8 +4,12 @@ Description: Make sure libzstd will be linked
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -29,8 +29,8 @@ endif()
-     set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;${CMAKE_FIND_LIBRARY_SUFFIXES}") # Prefer libz.a when both are available
+@@ -26,11 +26,11 @@
+ #list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX})
+ #find_package(shrinkwrap CONFIG REQUIRED)
+ #if (NOT BUILD_SHARED_LIBS)
+-    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;${CMAKE_FIND_LIBRARY_SUFFIXES}") # Prefer libz.a when both are available
++#    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;${CMAKE_FIND_LIBRARY_SUFFIXES}") # Prefer libz.a when both are available
  #endif()
  
 -#find_library(ZLIB_LIBRARY z)
@@ -15,7 +19,7 @@ Description: Make sure libzstd will be linked
  find_package(shrinkwrap REQUIRED)
  find_package(Threads)
  
-@@ -58,7 +58,8 @@ add_library(savvy INTERFACE)
+@@ -58,7 +58,8 @@
  #        include/savvy/varint.hpp #src/savvy/varint.cpp include/savvy/varint.hpp
  #        include/savvy/vcf_reader.hpp) #src/savvy/vcf_reader.cpp include/savvy/vcf_reader.hpp)
  


=====================================
debian/rules
=====================================
@@ -3,29 +3,5 @@
 # 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 $@
-
-### 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/savvy/-/compare/f71736931493cb5778c5926ec4ee2c99412cb1f3...e38501e011374ec5a6ad82a37f07b021ef29e54d

-- 
View it on GitLab: https://salsa.debian.org/med-team/savvy/-/compare/f71736931493cb5778c5926ec4ee2c99412cb1f3...e38501e011374ec5a6ad82a37f07b021ef29e54d
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/20221015/c4f53047/attachment-0001.htm>