[silo-llnl] 47/96: Need 4.8.1 or less QT

[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 2af24ca31135ced38ce269455b4dd0846dea65df
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jun 7 12:49:50 2012 +0100

    Need 4.8.1 or less QT
---
 debian/changelog                | 8 ++++++++
 debian/control                  | 5 +++--
 debian/patches/qt-version.patch | 4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f4ac99..506899b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+silo-llnl (4.8-12) unstable; urgency=low
+
+  * Add support for QT version 4.8.1; add build-depends on it.
+    Closes: #671614. 
+  * Standards-Version: 3.9.3; no changes required.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 07 Jun 2012 12:45:44 +0100
+
 silo-llnl (4.8-11) unstable; urgency=low
 
   * ld-as-needed patch not robust. Use new dh_autoreconf --as-needed
diff --git a/debian/control b/debian/control
index 628748a..e04f090 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@ Source: silo-llnl
 Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 8.1.3~), libreadline-dev, libhdf5-mpi-dev | libhdf5-dev, zlib1g-dev, libqt4-dev, gfortran, python-dev, chrpath, python-all-dev, mpi-default-dev, autoconf-archive, autoconf, automake, libtool, dh-autoreconf (>= 4~)
+Build-Depends: debhelper (>= 8.1.3~), libreadline-dev, libhdf5-mpi-dev | libhdf5-dev, zlib1g-dev, 
+  libqt4-dev (<= 4.8.2~), gfortran, python-dev, chrpath, python-all-dev, mpi-default-dev, autoconf-archive, autoconf, automake, libtool, dh-autoreconf (>= 4~)
 Build-Conflicts: qt3-dev-tools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage:  https://wci.llnl.gov/codes/silo
 
 Package: libsilo-dev
diff --git a/debian/patches/qt-version.patch b/debian/patches/qt-version.patch
index c7cab7b..e5d4363 100644
--- a/debian/patches/qt-version.patch
+++ b/debian/patches/qt-version.patch
@@ -1,6 +1,6 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Allow for Qt 4.7.2+
-Last-Updated: 2011-10-03
+Last-Updated: 2012-06-07
 Bug-Debian: #621781
 Forwarded: no
 
@@ -19,7 +19,7 @@ Index: silo-llnl-4.8/configure.ac
                  4.5.0 4.5.1 4.5.2 4.5.3 4.5.4 4.5.5 \
 -                4.6.0 4.6.1 4.6.2 4.6.3 4.6.4 4.6.5 ; do
 +                4.6.0 4.6.1 4.6.2 4.6.3 4.6.4 4.6.5 \
-+ 	        4.7.0 4.7.1 4.7.2 4.7.3 4.7.4 ; do
++ 	        4.7.0 4.7.1 4.7.2 4.7.3 4.7.4  4.8.1; do
         if test "$QtVersion2" == "$ver"; then
             QtVersion=$ver
             break

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