[med-svn] [phyml] 01/03: Also provide version without beagle library since it causes trouble on machines without according graphics hardware

[Andreas Tille]

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

tille pushed a commit to branch master
in repository phyml.

commit 10de40058082dd047f08a3622897ef486e47ca66
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jan 31 11:01:56 2017 +0100

    Also provide version without beagle library since it causes trouble on machines without according graphics hardware
---
 debian/changelog |  7 +++++++
 debian/rules     | 15 ++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2930517..86d3027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+phyml (3:3.2.0+dfsg-6) UNRELEASED; urgency=medium
+
+  * Also provide version without beagle library since it causes trouble
+    on machines without according graphics hardware
+
+ -- Andreas Tille <tille at debian.org>  Tue, 31 Jan 2017 11:00:10 +0100
+
 phyml (3:3.2.0+dfsg-5) unstable; urgency=medium
 
   * Fix wrapper to correctly use mpirun
diff --git a/debian/rules b/debian/rules
index 875ad17..e7bd3be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,24 +15,29 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	# According to README you need different configure options to get different executables
 	# Here we hack in a full build process for phyml executable
+	# The hack includes saving the documentation from beeing cleaned up
+	mv doc/phyml-manual.pdf .
+	dh_auto_configure
+	dh_auto_build -- LDFLAGS="$(LDFLAGS)"
+	# move phyml binary to temporary dir inside debian/
+	mkdir -p $(CURDIR)/debian/bin
+	mv src/phyml $(CURDIR)/debian/bin/phyml
+	$(MAKE) distclean
 	dh_auto_configure -- --enable-beagle
 	dh_auto_build -- LDFLAGS="$(LDFLAGS)"
 	# move phyml binary to temporary dir inside debian/
 	mkdir -p $(CURDIR)/debian/bin
-	mv src/phyml-beagle $(CURDIR)/debian/bin/phyml
-	mv doc/phyml-manual.pdf .
+	mv src/phyml-beagle $(CURDIR)/debian/bin/phyml-beagle
 	$(MAKE) distclean
-	mv phyml-manual.pdf doc
 	dh_auto_configure -- --enable-mpi
 	dh_auto_build -- LDFLAGS="$(LDFLAGS)"
 	# move phyml binary to temporary dir inside debian/
 	# mkdir -p $(CURDIR)/debian/bin
 	mv src/phyml-mpi $(CURDIR)/debian/bin/phyml-mpi
-	mv doc/phyml-manual.pdf .
 	$(MAKE) distclean
-	mv phyml-manual.pdf doc
 	dh_auto_configure -- --enable-phytime
 	dh_auto_build -- LDFLAGS="$(LDFLAGS)" CPPFLAGS="-DPHYREX $(CPPFLAGS)"
+	mv phyml-manual.pdf doc
 
 override_dh_auto_install:
 	dh_auto_install

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