[med-svn] [Git][med-team/hinge][master] 6 commits: Fix FTBFS against spdlog 1.5.0

Andreas Tille gitlab at salsa.debian.org
Thu Mar 19 17:26:15 GMT 2020 


Andreas Tille pushed to branch master at Debian Med / hinge


Commits:
929ac17d by Andreas Tille at 2020-03-19T18:18:30+01:00
Fix FTBFS against spdlog 1.5.0

- - - - -
06a58d6a by Andreas Tille at 2020-03-19T18:18:41+01:00
routine-update: Standards-Version: 4.5.0

- - - - -
664359fc by Andreas Tille at 2020-03-19T18:18:49+01:00
routine-update: Add salsa-ci file

- - - - -
49bfec86 by Andreas Tille at 2020-03-19T18:18:49+01:00
routine-update: Rules-Requires-Root: no

- - - - -
0a104d82 by Andreas Tille at 2020-03-19T18:18:50+01:00
Set upstream metadata fields: Bug-Database, Bug-Submit, Repository.
- - - - -
2786d27d by Andreas Tille at 2020-03-19T18:22:05+01:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/spdlog-1.5.0.patch
- + debian/salsa-ci.yml
- debian/upstream/metadata


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+hinge (0.5.0-6) unstable; urgency=medium
+
+  [ Gilles Filippini ]
+  * Fix FTBFS against spdlog 1.5.0 (closes: #952615)
+
+  [ Andreas Tille ]
+  * Standards-Version: 4.5.0 (routine-update)
+  * Add salsa-ci file (routine-update)
+  * Rules-Requires-Root: no (routine-update)
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository.
+
+ -- Andreas Tille <tille at debian.org>  Thu, 19 Mar 2020 18:18:50 +0100
+
 hinge (0.5.0-5) unstable; urgency=medium
 
   * Afif removed himself from Uploaders


=====================================
debian/control
=====================================
@@ -23,10 +23,11 @@ Build-Depends: debhelper-compat (= 12),
                python3-pbcore,
                python3-networkx,
                python3-matplotlib
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/hinge
 Vcs-Git: https://salsa.debian.org/med-team/hinge.git
 Homepage: https://github.com/HingeAssembler/HINGE
+Rules-Requires-Root: no
 
 Package: hinge
 Architecture: any


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ external-spdlog.patch
 libspdlog-14.0.patch
 libspdlog-1:1.3.0
 2to3.patch
+spdlog-1.5.0.patch


=====================================
debian/patches/spdlog-1.5.0.patch
=====================================
@@ -0,0 +1,62 @@
+Description: Fix FTBFS against spdlog 1.5.0
+Bug-Debian: https://bugs.debian.org/952615
+Author: Gilles Filippini <pini at debian.org>
+Last-Update: Thu, 19 Mar 2020 17:07:48 +0100
+
+Index: hinge-0.5.0/src/consensus/CMakeLists.txt
+===================================================================
+--- hinge-0.5.0.orig/src/consensus/CMakeLists.txt
++++ hinge-0.5.0/src/consensus/CMakeLists.txt
+@@ -1,9 +1,10 @@
+ cmake_minimum_required(VERSION 3.2)
+ 
++add_definitions(-DSPDLOG_FMT_EXTERNAL)
+ add_executable(draft_assembly draft)
+-target_link_libraries(draft_assembly LAInterface ini falcon )
++target_link_libraries(draft_assembly fmt LAInterface ini falcon )
+ 
+ add_executable(consensus consensus.cpp)
+-target_link_libraries(consensus LAInterface falcon ini)
++target_link_libraries(consensus fmt LAInterface falcon ini)
+ 
+ install(TARGETS draft_assembly consensus DESTINATION ${libexec})
+Index: hinge-0.5.0/src/filter/CMakeLists.txt
+===================================================================
+--- hinge-0.5.0.orig/src/filter/CMakeLists.txt
++++ hinge-0.5.0/src/filter/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ cmake_minimum_required(VERSION 3.2)
+ 
++add_definitions(-DSPDLOG_FMT_EXTERNAL)
+ add_executable(Reads_filter filter)
+-target_link_libraries(Reads_filter LAInterface ini )
++target_link_libraries(Reads_filter fmt LAInterface ini )
+ 
+ install(TARGETS Reads_filter DESTINATION ${libexec})
+Index: hinge-0.5.0/src/layout/CMakeLists.txt
+===================================================================
+--- hinge-0.5.0.orig/src/layout/CMakeLists.txt
++++ hinge-0.5.0/src/layout/CMakeLists.txt
+@@ -5,7 +5,8 @@ set(Boost_USE_STATIC_LIBS   ON)
+ FIND_PACKAGE( Boost COMPONENTS graph REQUIRED )
+ INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
+ 
++add_definitions(-DSPDLOG_FMT_EXTERNAL)
+ add_executable(hinging hinging)
+-target_link_libraries(hinging LAInterface ini  ${Boost_LIBRARIES})
++target_link_libraries(hinging fmt LAInterface ini  ${Boost_LIBRARIES})
+ 
+ install(TARGETS hinging DESTINATION ${libexec})
+Index: hinge-0.5.0/src/maximal/CMakeLists.txt
+===================================================================
+--- hinge-0.5.0.orig/src/maximal/CMakeLists.txt
++++ hinge-0.5.0/src/maximal/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ cmake_minimum_required(VERSION 3.2)
+ 
++add_definitions(-DSPDLOG_FMT_EXTERNAL)
+ add_executable(get_maximal_reads maximal)
+-target_link_libraries(get_maximal_reads LAInterface ini )
++target_link_libraries(get_maximal_reads fmt LAInterface ini )
+ 
+ install(TARGETS get_maximal_reads DESTINATION ${libexec})


=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,4 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml


=====================================
debian/upstream/metadata
=====================================
@@ -1,3 +1,5 @@
+Bug-Database: https://github.com/HingeAssembler/HINGE/issues
+Bug-Submit: https://github.com/HingeAssembler/HINGE/issues/new
 Reference:
   Author: >
     Govinda M Kamath and Ilan Shomorony and Fei Xia and Thomas Courtade
@@ -17,5 +19,5 @@ Registry:
   Entry: NA
 - Name: SciCrunch
   Entry: NA
-Repository: https://github.com/HingeAssembler/HINGE
+Repository: https://github.com/HingeAssembler/HINGE.git
 Repository-Browse: https://github.com/HingeAssembler/HINGE



View it on GitLab: https://salsa.debian.org/med-team/hinge/-/compare/94c3ea1318bdb83402da2d4c948bc515bf5e6881...2786d27d88f9b610afe575649428d91f5c766895

-- 
View it on GitLab: https://salsa.debian.org/med-team/hinge/-/compare/94c3ea1318bdb83402da2d4c948bc515bf5e6881...2786d27d88f9b610afe575649428d91f5c766895
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/20200319/1a0ccc62/attachment-0001.html>

More information about the debian-med-commit mailing list