[silo-llnl] 44/96: Update patch now configure generated

[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 896944252fcda57b628f8daa80982a6482ca2578
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Oct 3 12:07:27 2011 +0100

    Update patch now configure generated
---
 debian/changelog                |  1 +
 debian/patches/qt-version.patch | 16 +---------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8a5d10..a243110 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ silo-llnl (4.8-10) unstable; urgency=low
     Closes: #642782. 
   * Two fixes to fprintf() needed to compile with -Werror=format-security
   * Disable sh4-build patch as not needed now we do 'autoreconf'. 
+    Ditto, update qt-version.patch
 
  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 03 Oct 2011 11:26:00 +0100
 
diff --git a/debian/patches/qt-version.patch b/debian/patches/qt-version.patch
index 9d25573..c7cab7b 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-07-04
+Last-Updated: 2011-10-03
 Bug-Debian: #621781
 Forwarded: no
 
@@ -23,17 +23,3 @@ Index: silo-llnl-4.8/configure.ac
         if test "$QtVersion2" == "$ver"; then
             QtVersion=$ver
             break
-Index: silo-llnl-4.8/configure
-===================================================================
---- silo-llnl-4.8.orig/configure	2011-04-11 00:23:22.000000000 +0100
-+++ silo-llnl-4.8/configure	2011-04-11 00:23:36.000000000 +0100
-@@ -27014,7 +27014,8 @@
-     ## Check for supported versions of Qt.
-     for ver in  4.4.0 4.4.1 4.4.2 4.4.3 4.4.4 4.4.5 \
-                 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
-        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