[med-svn] [Git][med-team/terraphast][master] 3 commits: Build package somehow successfully

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / terraphast


Commits:
cce4b5f8 by Andreas Tille at 2022-01-21T18:49:05+01:00
Build package somehow successfully

- - - - -
dd435cbd by Andreas Tille at 2022-01-21T19:00:34+01:00
Fix copyright

- - - - -
1db961c6 by Andreas Tille at 2022-01-21T19:03:14+01:00
Proper SOVERSION for C library, no RPATH for libraries

- - - - -


3 changed files:

- debian/control
- debian/copyright
- debian/patches/dynamic_lib.patch


Changes:

=====================================
debian/control
=====================================
@@ -6,6 +6,7 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                cmake,
                d-shlibs,
+               dh-exec,
                libgmp3-dev
 Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/terraphast


=====================================
debian/copyright
=====================================
@@ -3,7 +3,8 @@ Upstream-Name: terraphast-one
 Source: https://github.com/amkozlov/terraphast-one
 
 Files: *
-Copyright: 2014-2020 <upstream>
+Copyright: 2014-2020 Peter Boszoky, Tobias Ribizel, Fedor Scholz, Florian Weber
+                     Michael Hamann, Bui Quang Minh, Alexandros Stamatakis
 License: GPL-3+
 
 Files: catch/*


=====================================
debian/patches/dynamic_lib.patch
=====================================
@@ -16,7 +16,7 @@ Description: Attempt to create shared library
  		lib/advanced.cpp
  		lib/bigint.cpp
  		lib/bipartitions.cpp
-@@ -74,6 +74,17 @@ add_library(terraces
+@@ -74,6 +74,18 @@ add_library(terraces
  		include/terraces/subtree_extraction.hpp
  		include/terraces/trees.hpp
  )
@@ -25,6 +25,7 @@ Description: Attempt to create shared library
 +set_target_properties(terraces PROPERTIES
 +        VERSION ${VERSION}
 +        SOVERSION ${SOVERSION}
++        SKIP_BUILD_RPATH TRUE
 +)
 +
 +target_include_directories(terraces_static
@@ -34,7 +35,7 @@ Description: Attempt to create shared library
  target_include_directories(terraces
  		PUBLIC include
  		PRIVATE lib
-@@ -83,35 +94,45 @@ if(TERRAPHAST_USE_GMP)
+@@ -83,35 +95,50 @@ if(TERRAPHAST_USE_GMP)
  	find_package(GMP)
  	if(GMP_FOUND)
  		message(STATUS "GMP libraries found")
@@ -53,13 +54,18 @@ Description: Attempt to create shared library
  if(TERRAPHAST_BUILD_CLIB)
 -	add_library(terraces_c
 +	add_library(terraces_c_static
-+			c_lib/terraces.cpp
-+			c_include/terraces/terraces.h
-+	)
-+	add_library(terraces_c SHARED
  			c_lib/terraces.cpp
  			c_include/terraces/terraces.h
  	)
++	add_library(terraces_c SHARED
++			c_lib/terraces.cpp
++			c_include/terraces/terraces.h
++	)
++	set_target_properties(terraces_c PROPERTIES
++        		VERSION ${VERSION}
++		        SOVERSION ${SOVERSION}
++                        SKIP_BUILD_RPATH TRUE
++	)
 +	target_include_directories(terraces_c_static PUBLIC c_include)
  	target_include_directories(terraces_c PUBLIC c_include)
 +	target_link_libraries(terraces_c_static terraces_static)
@@ -83,7 +89,7 @@ Description: Attempt to create shared library
  		target_compile_definitions(terraces_c PRIVATE _GLIBCXX_DEBUG) # PRIVATE since no stdlib objects are used
  	endif()
  endif()
-@@ -216,12 +237,15 @@ else()
+@@ -216,12 +243,15 @@ else()
  	endif()
  endif()
  



View it on GitLab: https://salsa.debian.org/med-team/terraphast/-/compare/c4cb468df8e291747d72823366ed6cc75f9328e8...1db961c6cf3b142922fdb709c8b03c16d1d31a88

-- 
View it on GitLab: https://salsa.debian.org/med-team/terraphast/-/compare/c4cb468df8e291747d72823366ed6cc75f9328e8...1db961c6cf3b142922fdb709c8b03c16d1d31a88
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/20220121/ba2c64a1/attachment-0001.htm>