[med-svn] r8816 - in trunk/packages/mrbayes/trunk/debian: . patches

[Timothy Booth]

Author: tbooth-guest
Date: 2011-12-07 17:43:14 +0000 (Wed, 07 Dec 2011)
New Revision: 8816

Modified:
   trunk/packages/mrbayes/trunk/debian/changelog
   trunk/packages/mrbayes/trunk/debian/control
   trunk/packages/mrbayes/trunk/debian/mb-mpi
   trunk/packages/mrbayes/trunk/debian/patches/series
   trunk/packages/mrbayes/trunk/debian/rules
Log:
My first crack at building new MrBayes.  Note there is a new build system so
several changes to rules, otherwise should build much like before.


Modified: trunk/packages/mrbayes/trunk/debian/changelog
===================================================================
--- trunk/packages/mrbayes/trunk/debian/changelog	2011-12-07 17:37:02 UTC (rev 8815)
+++ trunk/packages/mrbayes/trunk/debian/changelog	2011-12-07 17:43:14 UTC (rev 8816)
@@ -1,3 +1,12 @@
+mrbayes (3.2.0-1) lucid; urgency=low
+
+  * Rebuild of new 3.2.0 release.  Pjotr mentioned having a package for
+    the pre-release but I can't find that work in SVN.
+  * Current build is without Beagle - this needs packaging - nothing
+    to do with existing libbeagle-dev package.
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Tue, 06 Dec 2011 16:57:45 +0000
+
 mrbayes (3.1.2-3) UNRELEASED; urgency=low
 
   * Added -dbg package.

Modified: trunk/packages/mrbayes/trunk/debian/control
===================================================================
--- trunk/packages/mrbayes/trunk/debian/control	2011-12-07 17:37:02 UTC (rev 8815)
+++ trunk/packages/mrbayes/trunk/debian/control	2011-12-07 17:43:14 UTC (rev 8816)
@@ -44,6 +44,8 @@
 
 Package: mrbayes-dbg
 Architecture: any
+Priority: extra
+Section: debug
 Depends: ${misc:Depends}, mrbayes (= ${binary:Version}) | mrbayes-mpi (= ${binary:Version})
 Conflicts:  mrbayes (<< ${binary:Version}), mrbayes (>> ${binary:Version}), mrbayes-mpi (<< ${binary:Version}), mrbayes-mpi (>> ${binary:Version})
 Description: debug sysmbols for mrbayes

Modified: trunk/packages/mrbayes/trunk/debian/mb-mpi
===================================================================
--- trunk/packages/mrbayes/trunk/debian/mb-mpi	2011-12-07 17:37:02 UTC (rev 8815)
+++ trunk/packages/mrbayes/trunk/debian/mb-mpi	2011-12-07 17:43:14 UTC (rev 8816)
@@ -1,3 +1,3 @@
 #!/bin/sh
 # PATH="/usr/lib/mrbayes-mpi:$PATH"
-orterun /usr/lib/mrbayes-mpi/mb-mpi $@
+orterun /usr/lib/mrbayes-mpi/mb-mpi "$@"

Modified: trunk/packages/mrbayes/trunk/debian/patches/series
===================================================================
--- trunk/packages/mrbayes/trunk/debian/patches/series	2011-12-07 17:37:02 UTC (rev 8815)
+++ trunk/packages/mrbayes/trunk/debian/patches/series	2011-12-07 17:43:14 UTC (rev 8816)
@@ -1 +0,0 @@
-no_ncurses.patch

Modified: trunk/packages/mrbayes/trunk/debian/rules
===================================================================
--- trunk/packages/mrbayes/trunk/debian/rules	2011-12-07 17:37:02 UTC (rev 8815)
+++ trunk/packages/mrbayes/trunk/debian/rules	2011-12-07 17:43:14 UTC (rev 8816)
@@ -7,22 +7,25 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@
+	dh $@ --sourcedirectory=src
 
+override_dh_auto_configure:
+	#Configure for MPI at first
+	dh_auto_configure -- --with-beagle=no --enable-mpi=yes --enable-debug=yes
+
 override_dh_auto_clean:
-	$(MAKE) clean
+	( cd src ; $(MAKE) -f Makefile.in distclean )
 	rm -f mb mb-mpi
 
 override_dh_auto_build:
-	# build mb-mpi
-	MPI=yes LIBS="-Wl,--as-needed" $(MAKE)
-	mv mb mb-mpi
+	# build mb-mpi (from initial config)
+	LIBS="-Wl,--as-needed" dh_auto_build
+	mv src/mb ./mb-mpi
+	# Now - build mb
+	( cd src ; make clean )
+	dh_auto_configure -- --with-beagle=no --enable-mpi=no --enable-debug=yes
+	LIBS="-Wl,--as-needed" dh_auto_build
+	mv src/mb .
 
-        # build mb
-	# $(MAKE) clean # <-- seems to delete mb-mpi somehow, so rm *.o files manually
-	rm -f *.o
-	MPI=no LIBS="-Wl,--as-needed" $(MAKE)
-
-
 override_dh_strip:
 	dh_strip --dbg-package=mrbayes-dbg