[med-svn] [hyphy] 01/03: Add hyphy-pt package, fix Python packaging

[Andreas Tille]

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

tille pushed a commit to branch master
in repository hyphy.

commit 7e1dd51b98743c925594370c1143b391762e5aa5
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jul 10 06:36:47 2015 +0200

    Add hyphy-pt package, fix Python packaging
---
 debian/control          | 27 ++++++++++++++++++++++++---
 debian/hyphy-pt.install |  1 +
 debian/rules            |  4 ++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index e86f4da..66b4954 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
+               dh-python,
                cmake,
                python-dev,
                python3-dev,
@@ -18,12 +19,12 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/hyphy.git
 Vcs-Git: git://anonscm.debian.org/debian-med/hyphy.git
 Homepage: http://hyphy.org/
 
-Package: hyphy
+Package: hyphygui
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          hyphy-common
-Description: Hypothesis testing using Phylogenies
+Description: Hypothesis testing using Phylogenies (GTK gui)
  HyPhy is an open-source software package for the analysis of genetic
  sequences using techniques in phylogenetics, molecular evolution, and
  machine learning. It features a complete graphical user interface (GUI)
@@ -33,6 +34,26 @@ Description: Hypothesis testing using Phylogenies
  library and called from other programming environments such as Python or
  R.  Continued development of HyPhy is currently supported in part by an
  NIGMS R01 award 1R01GM093939.
+ .
+ This package contains the GTK gui.
+
+Package: hyphy-pt
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         hyphy-common
+Description: Hypothesis testing using Phylogenies (pthreads version)
+ HyPhy is an open-source software package for the analysis of genetic
+ sequences using techniques in phylogenetics, molecular evolution, and
+ machine learning. It features a complete graphical user interface (GUI)
+ and a rich scripting language for limitless customization of analyses.
+ Additionally, HyPhy features support for parallel computing environments
+ (via message passing interface) and it can be compiled as a shared
+ library and called from other programming environments such as Python or
+ R.  Continued development of HyPhy is currently supported in part by an
+ NIGMS R01 award 1R01GM093939.
+ .
+ This package provides an executable using pthreads to do multiprocessing.
 
 Package: hyphy-mpi
 Architecture: any
@@ -50,7 +71,7 @@ Description: Hypothesis testing using Phylogenies (MPI version)
  R.  Continued development of HyPhy is currently supported in part by an
  NIGMS R01 award 1R01GM093939.
  .
- This package provides the MPI version.
+ This package provides an executable using MPI to do multiprocessing.
 
 Package: hyphy-common
 Architecture: all
diff --git a/debian/hyphy-pt.install b/debian/hyphy-pt.install
new file mode 100644
index 0000000..78ae728
--- /dev/null
+++ b/debian/hyphy-pt.install
@@ -0,0 +1 @@
+usr/bin/*mp
diff --git a/debian/rules b/debian/rules
index 46b79df..e383f89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	# no idea about the purpose of the dynamic library - executables are not simply linked against it
-	dh_auto_build -- HYPHYGTK MPI GTEST LIB
+	dh_auto_build -- HYPHYGTK MP2 MPI GTEST LIB
 	# create Python modules
 	cd src/lib ; \
 	for py in $(PYVERS) $(PY3VERS); do \
@@ -46,7 +46,7 @@ override_dh_auto_install:
 				      --install-layout deb; \
 	done
 	mkdir -p $(CURDIR)/debian/lib$(pkg)/usr/lib
-	find debian -name "*.so" -exec mv \{\} $(CURDIR)/debian/lib$(pkg)/usr/lib \;
+	find debian -name "lib*.so" -exec mv \{\} $(CURDIR)/debian/lib$(pkg)/usr/lib \;
 
 override_dh_install:
 	# smallcaps for executables

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