Andreas Tille pushed to branch master at Debian Med / terraphast
Commits:
9ab49559 by Andreas Tille at 2022-01-21T18:00:16+01:00
Use d-shlibs
- - - - -
c4cb468d by Andreas Tille at 2022-01-21T18:37:03+01:00
Adjust library package names to library names
- - - - -
6 changed files:
- debian/control
- + debian/libterraces-dev.install
- + debian/libterraces0.install
- − debian/libterraphast-dev.install
- debian/patches/dynamic_lib.patch
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Section: science
Priority: optional
Build-Depends: debhelper-compat (= 13),
cmake,
- dh-exec,
+ d-shlibs,
libgmp3-dev
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/med-team/terraphast
@@ -17,7 +17,8 @@ Package: terraphast
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
+ libterraces0 (= ${binary:Version})
Description: enumerate terraces in phylogenetic tree space
Terraphast takes a .nkw file in Newick format and a genes/sites file,
which denotes whether (1) or not (0) gene i is present in species j.
@@ -26,11 +27,27 @@ Description: enumerate terraces in phylogenetic tree space
edge is used as a new tree root, and the resulting supertree in
compressed newick format.
-Package: libterraphast-dev
+Package: libterraces0
Architecture: any
-Section: libdevel
+Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
+Description: enumerate terraces in phylogenetic tree space (shared lib)
+ Terraphast takes a .nkw file in Newick format and a genes/sites file,
+ which denotes whether (1) or not (0) gene i is present in species j.
+ .
+ Program output states some imput data properties, the species whose leaf
+ edge is used as a new tree root, and the resulting supertree in
+ compressed newick format.
+ .
+ This package contains the shared library.
+
+Package: libterraces-dev
+Architecture: any
+Section: libdevel
+Depends: libterraces0 (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
Description: enumerate terraces in phylogenetic tree space (development lib)
Terraphast takes a .nkw file in Newick format and a genes/sites file,
which denotes whether (1) or not (0) gene i is present in species j.
=====================================
debian/libterraces-dev.install
=====================================
@@ -0,0 +1,3 @@
+#!/usr/bin/dh-exec
+obj-*/*_c.a usr/lib/${DEB_HOST_MULTIARCH}/
+obj-*/*_c.so usr/lib/${DEB_HOST_MULTIARCH}/
=====================================
debian/libterraces0.install
=====================================
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+obj-*/*_c.so.* usr/lib/${DEB_HOST_MULTIARCH}/
=====================================
debian/libterraphast-dev.install deleted
=====================================
@@ -1,3 +0,0 @@
-#! /usr/bin/dh-exec
-obj-*/*.a usr/lib/${DEB_HOST_MULTIARCH}/
-include usr
=====================================
debian/patches/dynamic_lib.patch
=====================================
@@ -16,12 +16,17 @@ Description: Attempt to create shared library
lib/advanced.cpp
lib/bigint.cpp
lib/bipartitions.cpp
-@@ -74,6 +74,12 @@ add_library(terraces
+@@ -74,6 +74,17 @@ add_library(terraces
include/terraces/subtree_extraction.hpp
include/terraces/trees.hpp
)
+add_library(terraces_static ${terraces_sources})
+add_library(terraces SHARED ${terraces_sources})
++set_target_properties(terraces PROPERTIES
++ VERSION ${VERSION}
++ SOVERSION ${SOVERSION}
++)
++
+target_include_directories(terraces_static
+ PUBLIC include
+ PRIVATE lib
@@ -29,7 +34,7 @@ Description: Attempt to create shared library
target_include_directories(terraces
PUBLIC include
PRIVATE lib
-@@ -83,35 +89,45 @@ if(TERRAPHAST_USE_GMP)
+@@ -83,35 +94,45 @@ if(TERRAPHAST_USE_GMP)
find_package(GMP)
if(GMP_FOUND)
message(STATUS "GMP libraries found")
@@ -78,7 +83,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 +232,15 @@ else()
+@@ -216,12 +237,15 @@ else()
endif()
endif()
=====================================
debian/rules
=====================================
@@ -7,10 +7,30 @@ include /usr/share/dpkg/default.mk
# for hardening you might like to uncomment this:
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+#Set VERSION and SOVERSION
+VERSION=0.0
+SOVERSION=0
+
+BUILDDIR:=obj-$(DEB_HOST_GNU_TYPE)
+
%:
dh $@
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ -DVERSION="$(VERSION)" \
+ -DSOVERSION="$(SOVERSION)"
+
override_dh_install:
mkdir -p debian/$(DEB_SOURCE)/usr/bin
- mv obj-$$(dpkg-architecture -qDEB_TARGET_GNU_TYPE)/app
debian/$(DEB_SOURCE)/usr/bin/$(DEB_SOURCE)
+ mv $(BUILDDIR)/app debian/$(DEB_SOURCE)/usr/bin/$(DEB_SOURCE)
+ mv $(BUILDDIR)/libterraces_static.a $(BUILDDIR)/libterraces.a
+ mv $(BUILDDIR)/libterraces_c_static.a $(BUILDDIR)/libterraces_c.a
+ d-shlibmove --commit \
+ --multiarch \
+ --devunversioned \
+ --exclude-la \
+ --override s/libgmpxx4-dev/libgmpxx4ldbl/ \
+ --movedev include usr \
+ $(BUILDDIR)/libterraces.so
dh_install
View it on GitLab:
https://salsa.debian.org/med-team/terraphast/-/compare/bcfe69bf53fb6a0161bbdc221d0f0c4f1ad348a0...c4cb468df8e291747d72823366ed6cc75f9328e8
--
View it on GitLab:
https://salsa.debian.org/med-team/terraphast/-/compare/bcfe69bf53fb6a0161bbdc221d0f0c4f1ad348a0...c4cb468df8e291747d72823366ed6cc75f9328e8
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
