[med-svn] [biosquid] 03/05: Add pvm-dev as dependency

[Gert Wollny]

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

gewo pushed a commit to branch master
in repository biosquid.

commit df986830a35736d9f1d2a317de816406d3195ffd
Author: Gert Wollny <gewo at debian.org>
Date:   Mon Apr 3 19:16:34 2017 +0000

    Add pvm-dev as dependency
---
 Testsuite/Makefile.in         |  2 +-
 configure.ac                  |  2 --
 debian/control                |  5 +++--
 debian/patches/automake.patch | 21 +++++++++++++++++----
 debian/rules                  |  3 ++-
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Testsuite/Makefile.in b/Testsuite/Makefile.in
index 773627b..6bcfadd 100644
--- a/Testsuite/Makefile.in
+++ b/Testsuite/Makefile.in
@@ -14,7 +14,7 @@
 SHELL  = /bin/sh
 CC     = @CC@
 DEFS   = @DEFS@
-LIBS   = -lsquid @LIBS@ -lm
+LIBS   = -lsquid @PVMLIBS@ @LIBS@ -lm
 
 TESTPROGS = iospeed rndspeed
 
diff --git a/configure.ac b/configure.ac
index 48ea01e..be53488 100644
--- a/configure.ac
+++ b/configure.ac
@@ -290,8 +290,6 @@ AC_SUBST(PVMLIBDIR)
 AC_SUBST(PVMINCDIR)
 AC_SUBST(PVMLIBS)
 
-
-
 # Write out Makefiles, and squid.h also has some output variable substitution.
 AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(Testsuite/Makefile)
diff --git a/debian/control b/debian/control
index 8a34606..344692e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,10 @@ Uploaders: Nelson A. de Oliveira <naoliv at debian.org>,
            Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9.20160403),
                autoconf,
-               autotools-dev
+               autotools-dev,
+	       pvm-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/biosquid.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/biosquid.git
diff --git a/debian/patches/automake.patch b/debian/patches/automake.patch
index 1ef883b..a7b1c90 100644
--- a/debian/patches/automake.patch
+++ b/debian/patches/automake.patch
@@ -4,7 +4,7 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
 
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,154 @@
+@@ -0,0 +1,155 @@
 +lib_LTLIBRARIES  = libbiosquid.la
 +
 +libbiosquiddir=$(includedir)/biosquid
@@ -61,6 +61,7 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
 +	wuss.c
 +
 +libbiosquid_la_LDFLAGS = -version-info @LIB_VERSION@
++libbiosquid_la_LDADD = @PVMLIBS@
 +
 +libbiosquid_la_CPPFLAGS = $(INCLUDES)
 +
@@ -343,7 +344,7 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
  
  
  
-@@ -282,20 +277,20 @@
+@@ -282,21 +277,19 @@
   	 PVMLIBDIR="-L${PVM_ROOT}/lib/${PVM_ARCH}"
  	 PVMINCDIR="-I${PVM_ROOT}/include"
  	 PVMLIBS="-lpvm3"
@@ -361,9 +362,21 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
  AC_SUBST(PVMINCDIR)
  AC_SUBST(PVMLIBS)
  
- 
+-
 -# Write out squidconf.h header
 -AC_CONFIG_HEADER(squidconf.h)
- 
+-
  # Write out Makefiles, and squid.h also has some output variable substitution.
  AC_CONFIG_FILES(Makefile)
+ AC_CONFIG_FILES(Testsuite/Makefile)
+--- a/Testsuite/Makefile.in
++++ b/Testsuite/Makefile.in
+@@ -14,7 +14,7 @@
+ SHELL  = /bin/sh
+ CC     = @CC@
+ DEFS   = @DEFS@
+-LIBS   = -lsquid @LIBS@ -lm
++LIBS   = -lsquid @PVMLIBS@ @LIBS@ -lm
+ 
+ TESTPROGS = iospeed rndspeed
+ 
diff --git a/debian/rules b/debian/rules
index 1cd377b..f64959a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,8 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	# autoreconf && true
 	autoconf
-	dh_auto_configure --  --enable-lfs
+	dh_auto_configure --  --enable-lfs --enable-pvm
+
 
 override_dh_auto_install:
 	dh_auto_install -- prefix=$(CURDIR)/debian/tmp/usr

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