[silo-llnl] 04/21: Merge master changes

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit c53ad07bddd2a135e74c2d1a841b757363d1d132
Merge: cf02835 06a8941
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Sep 7 23:04:11 2015 +0100

    Merge master changes

 debian/changelog                     | 28 ++++++++++++++
 debian/control                       |  8 ++--
 debian/libsilo-dev.install           |  2 +
 debian/patches/qt5.patch             |  5 +++
 debian/patches/remove-mpiposix.patch | 40 ++++++++++++++++++++
 debian/patches/series                |  2 +-
 debian/patches/version-script.patch  | 71 ++++++++++++++++++++++++++----------
 debian/rules                         | 37 +++++++++++++------
 8 files changed, 159 insertions(+), 34 deletions(-)

diff --cc debian/rules
index 5394f12,8af2339..bafddb6
--- a/debian/rules
+++ b/debian/rules
@@@ -5,13 -5,13 +5,13 @@@ export DH_VERBOSE=
  
  # magic debhelper rule
  %:
 -	dh $@ --with python2,autoreconf
 +	dh $@ --with python2,python3,autoreconf
  
  include /usr/share/mpi-default-dev/debian_defaults
- #ARCH_DEFAULT_MPI_IMPL=lam
- MPI_INC=/usr/lib/$(ARCH_DEFAULT_MPI_IMPL)/include
+ MPI:=$(ARCH_DEFAULT_MPI_IMPL)
+ MPI_INC:=/usr/lib/$(MPI)/include
  
- ifeq ($(ARCH_DEFAULT_MPI_IMPL),lam)
+ ifeq ($(MPI),lam)
    CC:=mpicc.lam
    CXX:=mpic++.lam
  else
@@@ -19,16 -19,25 +19,29 @@@
    CC:=mpicc
  endif
  
 -DEFAULT_PYTHON=$(shell pyversions -d)
 -PYVERS= $(shell pyversions -s)
 +# QT version 4 or 5
 +QT:=qt5
 +QT_INCLUDES:=-I/usr/include/$(QT) -I/usr/include/$(QT)/QtGui -I/usr/include/$(QT)/QtCore -I/usr/include/$(QT)/QtWidgets
 +
- DEFAULT_PYTHON:=`pyversions -d`
 +PYVERS:= `pyversions -s`
 +PY3VERS:= `py3versions -s`
  DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+ LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
+ 
+ # QT version 4 or 5
+ QT:=5
+ QT_INC:=/usr/include/$(DEB_HOST_MULTIARCH)/$(QT)
  QT_BINDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/bin
- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+ QT_INCLUDES:=-I$(QT_INC) -I$(QT_INC)/QtGui -I$(QT_INC)/QtCore -I$(QT_INC)/QtWidgets
+ 
+ # Work with either old or new-style (co-installable)  HDF5 layouts
+ ifneq ($(wildcard $(LIBDIR)/hdf5/$(MPI)/libhdf5.so),)
+ HDF5_INC:=/usr/include/hdf5/$(MPI)
+ HDF5_LIB:=$(LIBDIR)/hdf5/$(MPI)
+ else
+ HDF5_INC:=/usr/include
+ HDF5_LIB:=/usr/lib
+ endif
  
  override_dh_autoreconf:
  	libtoolize -c -f

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git