[med-svn] [Git][med-team/seqwish][master] Adjusted changelog

[Steffen Möller (@moeller)]

Steffen Möller pushed to branch master at Debian Med / seqwish


Commits:
d566dc0d by Steffen Möller at 2021-06-20T23:45:04+02:00
Adjusted changelog

- - - - -


2 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -7,12 +7,12 @@ seqwish (0.7-1) UNRELEASED; urgency=medium
 	  path = deps/gzip_reader
 	  url = https://github.com/gatoravi/gzip_reader.git
 
-  [ Steffen Möller ]
-  * Standards-Version: 4.5.1 (routine-update)
-  * debhelper-compat 13 (routine-update)
-  * Remove trailing whitespace in debian/rules (routine-update)
-  * Rules-Requires-Root: no (routine-update)
+  [ routine-update ]
+  * Standards-Version: 4.5.1
+  * debhelper-compat 13
+  * Remove trailing whitespace in debian/rules
+  * Rules-Requires-Root: no
   * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
     Repository-Browse.
 
- -- Andreas Tille <tille at debian.org>  Sun, 24 May 2020 16:17:07 +0200
+ -- Steffen Möller <moeller at debian.org>  Sun, 20 Jun 2021 23:28:06 +0200


=====================================
debian/patches/use_debian_packaged_libs.patch
=====================================
@@ -1,6 +1,8 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,6 +25,7 @@ include_directories("${PROJECT_SOURCE_DI
+Index: seqwish/CMakeLists.txt
+===================================================================
+--- seqwish.orig/CMakeLists.txt
++++ seqwish/CMakeLists.txt
+@@ -27,6 +27,7 @@ include_directories("${PROJECT_SOURCE_DI
  # Add external projects
  include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
  
@@ -8,7 +10,7 @@
  # sdsl-lite (full build using its cmake config)
  ExternalProject_Add(sdsl-lite
    SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/sdsl-lite"
-@@ -36,7 +37,14 @@ set(sdsl-lite_INCLUDE "${INSTALL_DIR}/sr
+@@ -38,7 +39,14 @@ set(sdsl-lite_INCLUDE "${INSTALL_DIR}/sr
  set(sdsl-lite-divsufsort_INCLUDE "${INSTALL_DIR}/src/sdsl-lite-build/external/libdivsufsort/include")
  set(sdsl-lite_LIB "${INSTALL_DIR}/src/sdsl-lite-build/lib")
  set(sdsl-lite-divsufsort_LIB "${INSTALL_DIR}/src/sdsl-lite-build/external/libdivsufsort/lib")
@@ -23,8 +25,8 @@
  # taywee's C++ args library, header only
  ExternalProject_Add(tayweeargs
    SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/args"
-@@ -44,7 +52,14 @@ ExternalProject_Add(tayweeargs
-   INSTALL_COMMAND "")
+@@ -48,7 +56,14 @@ ExternalProject_Add(tayweeargs
+   CONFIGURE_COMMAND "")
  ExternalProject_Get_property(tayweeargs SOURCE_DIR)
  set(tayweeargs_INCLUDE "${SOURCE_DIR}")
 +else()
@@ -38,7 +40,7 @@
  # gzip file reader, header only
  ExternalProject_Add(gzipreader
    SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/gzip_reader"
-@@ -52,7 +67,14 @@ ExternalProject_Add(gzipreader
+@@ -56,7 +71,14 @@ ExternalProject_Add(gzipreader
    INSTALL_COMMAND "")
  ExternalProject_Get_property(gzipreader SOURCE_DIR)
  set(gzipreader_INCLUDE "${SOURCE_DIR}")
@@ -53,7 +55,7 @@
  # mmmulti (memory mapped multimap, multiset, and interval tree)
  ExternalProject_Add(mmmulti
    SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/mmmulti"
-@@ -62,7 +84,14 @@ ExternalProject_Add(mmmulti
+@@ -66,7 +88,14 @@ ExternalProject_Add(mmmulti
    CONFIGURE_COMMAND "")
  ExternalProject_Get_property(mmmulti SOURCE_DIR)
  set(mmmulti_INCLUDE "${SOURCE_DIR}/src")
@@ -68,7 +70,7 @@
  # iitii, like cgranges but with interpolation and memory mapping
  ExternalProject_Add(iitii
    SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/iitii"
-@@ -80,7 +109,14 @@ ExternalProject_Add(mmap_allocator
+@@ -84,7 +113,14 @@ ExternalProject_Add(mmap_allocator
  ExternalProject_Get_property(mmap_allocator INSTALL_DIR)
  set(mmap_allocator_INCLUDE "${INSTALL_DIR}/include/mmap_allocator")
  set(mmap_allocator_LIB "${INSTALL_DIR}/lib")
@@ -83,7 +85,7 @@
  # In-place Parallel Super Scalar Samplesort (IPS⁴o), header only
  ExternalProject_Add(ips4o
    SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/ips4o"
-@@ -109,7 +145,9 @@ ExternalProject_Add(atomicbitvector
+@@ -113,7 +149,9 @@ ExternalProject_Add(atomicbitvector
    CONFIGURE_COMMAND "")
  ExternalProject_Get_property(atomicbitvector SOURCE_DIR)
  set(atomicbitvector_INCLUDE "${SOURCE_DIR}/include")
@@ -93,7 +95,7 @@
  # atomic queue library
  ExternalProject_Add(atomicqueue
    SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/atomic_queue"
-@@ -119,6 +157,12 @@ ExternalProject_Add(atomicqueue
+@@ -123,6 +161,12 @@ ExternalProject_Add(atomicqueue
    CONFIGURE_COMMAND "")
  ExternalProject_Get_property(atomicqueue SOURCE_DIR)
  set(atomicqueue_INCLUDE "${SOURCE_DIR}")



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

-- 
View it on GitLab: https://salsa.debian.org/med-team/seqwish/-/commit/d566dc0d67b8cadf33b597fb124d6d2d97581b46
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/20210620/87c632d3/attachment-0001.htm>