[DebianGIS-dev] r959 - packages/qgis/branches/0.8.0/debian/patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2007-07-04 11:31:52 +0000 (Wed, 04 Jul 2007)
New Revision: 959

Modified:
   packages/qgis/branches/0.8.0/debian/patches/qt43.dpatch
Log:
Fixing qt43.dpatch


Modified: packages/qgis/branches/0.8.0/debian/patches/qt43.dpatch
===================================================================
--- packages/qgis/branches/0.8.0/debian/patches/qt43.dpatch	2007-07-04 11:06:41 UTC (rev 958)
+++ packages/qgis/branches/0.8.0/debian/patches/qt43.dpatch	2007-07-04 11:31:52 UTC (rev 959)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad qgis-0.8.0~/acinclude.m4 qgis-0.8.0/acinclude.m4
---- qgis-0.8.0~/acinclude.m4	2007-07-04 13:05:01.000000000 +0200
-+++ qgis-0.8.0/acinclude.m4	2007-07-04 13:05:02.000000000 +0200
+--- qgis-0.8.0~/acinclude.m4	2007-07-04 13:31:00.000000000 +0200
++++ qgis-0.8.0/acinclude.m4	2007-07-04 13:31:01.000000000 +0200
 @@ -183,7 +183,7 @@
  AC_MSG_CHECKING([Qt version in $QTVERTEST])
  QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTVERTEST/qglobal.h | perl -p -e 's/\D//g'`
@@ -17,3 +17,15 @@
      QT_MAJOR="${QT_VER:0:1}"
      QT_MINOR="${QT_VER:1:1}"
      case "${host}" in
+diff -urNad qgis-0.8.0~/configure qgis-0.8.0/configure
+--- qgis-0.8.0~/configure	2007-07-04 10:37:25.000000000 +0200
++++ qgis-0.8.0/configure	2007-07-04 13:31:26.000000000 +0200
+@@ -19862,7 +19862,7 @@
+ echo $ECHO_N "checking Qt version in $QTVERTEST... $ECHO_C" >&6
+ QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTVERTEST/qglobal.h | perl -p -e 's/\D//g'`
+ case "${QT_VER}" in
+-  42*)
++  42*|43*)
+     QT_MAJOR="${QT_VER:0:1}"
+     QT_MINOR="${QT_VER:1:1}"
+     case "${host}" in