[silo-llnl] 11/21: Merge 4.10.2-5 onto experimental/py3

[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 4aeaf95b206c1f3a3b7a0b096c7c261bddc0ef34
Merge: f5ec7ce 3aaf469
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jul 19 08:59:36 2016 +0100

    Merge 4.10.2-5 onto experimental/py3

 debian/changelog                    |  29 +++++++
 debian/control                      |   4 +-
 debian/libsilo-bin.install          |   9 ++-
 debian/patches/qt5.patch            | 155 +++++++++++++++++++++++++++++++++++-
 debian/patches/series               |   1 +
 debian/patches/version-number.patch |  12 +++
 debian/rules                        |  21 +++--
 7 files changed, 216 insertions(+), 15 deletions(-)

diff --cc debian/control
index df5358f,880aa81..b959038
--- a/debian/control
+++ b/debian/control
@@@ -4,10 -4,9 +4,10 @@@ Priority: optiona
  Maintainer: Alastair McKinstry <mckinstry at debian.org>
  Build-Depends: debhelper (>= 9), libreadline-dev, libhdf5-mpi-dev | libhdf5-dev, 
    zlib1g-dev, 
 -  gfortran, chrpath, python-all-dev, mpi-default-dev, autoconf-archive, autoconf, automake, libtool, 
 +  python-all-dev, python3-all-dev, 
 +  gfortran, chrpath, mpi-default-dev, autoconf-archive, autoconf, automake, libtool, 
    dh-autoreconf (>= 4~),
-   qtbase5-dev
+   qtbase5-dev, qt5-default
  Build-Conflicts: qt3-dev-tools, qt4-dev-tools
  X-Python-Version: >= 2.6
  X-Python3-Version: >= 3.2
diff --cc debian/rules
index bafddb6,4d04ede..51f7458
--- a/debian/rules
+++ b/debian/rules
@@@ -19,12 -19,7 +19,13 @@@ els
    CC:=mpicc
  endif
  
 -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
 +
 +PYVERS:= `pyversions -s`
 +PY3VERS:= `py3versions -s`
  DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
  LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
  

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