[med-svn] [libpll] 05/05: Adapt build to current upstream development branch

Andreas Tille tille at debian.org
Mon Mar 20 21:22:51 UTC 2017


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository libpll.

commit 028901c070bf94d4fe25ee976f507bf771d1795c
Author: Andreas Tille <tille at debian.org>
Date:   Mon Mar 20 22:21:09 2017 +0100

    Adapt build to current upstream development branch
---
 debian/control | 92 ++++++++--------------------------------------------------
 debian/rules   | 18 +++++-------
 2 files changed, 19 insertions(+), 91 deletions(-)

diff --git a/debian/control b/debian/control
index f9f5470..d3e7f98 100644
--- a/debian/control
+++ b/debian/control
@@ -4,18 +4,20 @@ Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 10),
-               d-shlibs
+               d-shlibs,
+               bison,
+               flex
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libpll.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/libpll.git
 Homepage: http://www.libpll.org/
 
-Package: libpll-avx1
+Package: libpll0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Phylogenetic Likelihood Library (AVX version)
- PLL is a highly optimized, parallized software library to ease the
+Description: Phylogenetic Likelihood Library
+ PLL is a highly optimized, parallelized software library to ease the
  development of new software tools dealing with phylogenetic inference.
  .
  Among the functions included in PLL are parsing multiple sequence
@@ -26,80 +28,14 @@ Description: Phylogenetic Likelihood Library (AVX version)
  the GTR nucleotide substitution model for DNA data and a number of
  models for aminoacid data.
  .
- It comes in three flavours — single-thread, POSIX Threads, and MPI.
- Each version is optimized for the Streaming SIMD Extensions 3 (SSE3) and
- Advanced Vector Extensions (AVX).
+ This package contains the dynamic library.
 
-Package: libpll-sse3-1
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Phylogenetic Likelihood Library (SSE3 version)
- PLL is a highly optimized, parallized software library to ease the
- development of new software tools dealing with phylogenetic inference.
- .
- Among the functions included in PLL are parsing multiple sequence
- alignments (MSA) from PHYLIP and FASTA files, reading Newick trees,
- performing topological moves such as SPR and NNI, model optimization,
- likelihood evaluation and partitioned analysis by assigning different
- substitution models to each partition of the MSA. PLL fully implements
- the GTR nucleotide substitution model for DNA data and a number of
- models for aminoacid data.
- .
- It comes in three flavours — single-thread, POSIX Threads, and MPI.
- Each version is optimized for the Streaming SIMD Extensions 3 (SSE3) and
- Advanced Vector Extensions (AVX).
-
-Package: libpll-headers
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Phylogenetic Likelihood Library (header files)
- PLL is a highly optimized, parallized software library to ease the
- development of new software tools dealing with phylogenetic inference.
- .
- Among the functions included in PLL are parsing multiple sequence
- alignments (MSA) from PHYLIP and FASTA files, reading Newick trees,
- performing topological moves such as SPR and NNI, model optimization,
- likelihood evaluation and partitioned analysis by assigning different
- substitution models to each partition of the MSA. PLL fully implements
- the GTR nucleotide substitution model for DNA data and a number of
- models for aminoacid data.
- .
- It comes in three flavours — single-thread, POSIX Threads, and MPI.
- Each version is optimized for the Streaming SIMD Extensions 3 (SSE3) and
- Advanced Vector Extensions (AVX).
- .
- This package contains the static library of the AVX version.
-
-Package: libpll-avx-dev
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpll-headers, libpll-avx1 (= ${binary:Version})
-Description: Phylogenetic Likelihood Library (AVX version development files)
- PLL is a highly optimized, parallized software library to ease the
- development of new software tools dealing with phylogenetic inference.
- .
- Among the functions included in PLL are parsing multiple sequence
- alignments (MSA) from PHYLIP and FASTA files, reading Newick trees,
- performing topological moves such as SPR and NNI, model optimization,
- likelihood evaluation and partitioned analysis by assigning different
- substitution models to each partition of the MSA. PLL fully implements
- the GTR nucleotide substitution model for DNA data and a number of
- models for aminoacid data.
- .
- It comes in three flavours — single-thread, POSIX Threads, and MPI.
- Each version is optimized for the Streaming SIMD Extensions 3 (SSE3) and
- Advanced Vector Extensions (AVX).
- .
- This package contains the static library of the AVX version.
-
-Package: libpll-sse3-dev
+Package: libpll-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpll-headers, libpll-sse3-1 (= ${binary:Version})
-Description: Phylogenetic Likelihood Library (SSE3 version development files)
- PLL is a highly optimized, parallized software library to ease the
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpll0 (= ${binary:Version})
+Description: Phylogenetic Likelihood Library (development)
+ PLL is a highly optimized, parallelized software library to ease the
  development of new software tools dealing with phylogenetic inference.
  .
  Among the functions included in PLL are parsing multiple sequence
@@ -110,8 +46,4 @@ Description: Phylogenetic Likelihood Library (SSE3 version development files)
  the GTR nucleotide substitution model for DNA data and a number of
  models for aminoacid data.
  .
- It comes in three flavours — single-thread, POSIX Threads, and MPI.
- Each version is optimized for the Streaming SIMD Extensions 3 (SSE3) and
- Advanced Vector Extensions (AVX).
- .
- This package contains the static library of the SSE3 version.
+ This package contains the static library and the header file.
diff --git a/debian/rules b/debian/rules
index 7e7c768..ffc729d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,24 +2,20 @@
 
 # DH_VERBOSE := 1
 
-BUILDTYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@
 
-#override_dh_auto_configure:
-#	dh_auto_configure -- --enable-generic
+override_dh_auto_configure:
+	./autogen.sh
+	dh_auto_configure
 
 override_dh_install:
 	dh_install
-	for lib in avx sse3 ; do \
-	    d-shlibmove --commit \
+	d-shlibmove --commit \
 		    --multiarch \
 		    --devunversioned \
 		    --exclude-la \
-		    --movedev debian/tmp/usr/lib/$(BUILDTYPE)/libpll-$${lib}-pthreads.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/lib/$(BUILDTYPE)/libpll-$${lib}-mpi.a usr/lib/$(BUILDTYPE) \
-		    debian/tmp/usr/lib/*/libpll-$${lib}.so ; \
-	    mv debian/tmp/usr/lib/$(BUILDTYPE)/libpll-$${lib}-*.so debian/libpll-$${lib}-dev/usr/lib/$(BUILDTYPE) ; \
-	    mv debian/tmp/usr/lib/$(BUILDTYPE)/libpll-$${lib}-*.so.* debian/libpll-$${lib}*1/usr/lib/$(BUILDTYPE) ; \
-	done
+		    --movedev debian/tmp/usr/include/* usr/include \
+		    debian/tmp/usr/lib/*/*.so

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libpll.git



More information about the debian-med-commit mailing list