Author: frankie Date: 2007-07-04 11:06:41 +0000 (Wed, 04 Jul 2007) New Revision: 958
Added: packages/qgis/branches/0.8.0/debian/patches/qt43.dpatch Modified: packages/qgis/branches/0.8.0/debian/changelog packages/qgis/branches/0.8.0/debian/control packages/qgis/branches/0.8.0/debian/patches/00list Log: Fixing #431031 Modified: packages/qgis/branches/0.8.0/debian/changelog =================================================================== --- packages/qgis/branches/0.8.0/debian/changelog 2007-07-04 08:34:36 UTC (rev 957) +++ packages/qgis/branches/0.8.0/debian/changelog 2007-07-04 11:06:41 UTC (rev 958) @@ -1,3 +1,15 @@ +qgis (0.8.0-6) unstable; urgency=low + + * Removed postgresql-dev build-dep, obsoleted after etch release. + (closes: #429984) + * Removed libmysqlclient14 build-dep, obsoleted after etch release. + * Added patch qt43.dpatch to work with Qt 4.3. + (closes: #431031) + * Added libtool build-dep. + * Moved to versioned automake build-dep. + + -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Wed, 04 Jul 2007 10:47:31 +0200 + qgis (0.8.0-5) unstable; urgency=low * Added python-dev build-dep. Modified: packages/qgis/branches/0.8.0/debian/control =================================================================== --- packages/qgis/branches/0.8.0/debian/control 2007-07-04 08:34:36 UTC (rev 957) +++ packages/qgis/branches/0.8.0/debian/control 2007-07-04 11:06:41 UTC (rev 958) @@ -3,9 +3,9 @@ Priority: extra Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.0), libgdal1-dev, libqt4-dev, libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), dpatch, - grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libmysqlclient15-dev | libmysqlclient14-dev, - flex, bison, python-dev, autoconf, automake +Build-Depends: debhelper (>= 5.0.0), libgdal1-dev, libqt4-dev, libpq-dev, libgeos-dev (>= 2.0.1-1), dpatch, + grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libmysqlclient15-dev, + flex, bison, python-dev, autoconf, automake1.9, libtool Standards-Version: 3.7.2 Package: qgis Modified: packages/qgis/branches/0.8.0/debian/patches/00list =================================================================== --- packages/qgis/branches/0.8.0/debian/patches/00list 2007-07-04 08:34:36 UTC (rev 957) +++ packages/qgis/branches/0.8.0/debian/patches/00list 2007-07-04 11:06:41 UTC (rev 958) @@ -2,3 +2,4 @@ gridmaker_bin gcc43-fixes ax_python +qt43 Added: packages/qgis/branches/0.8.0/debian/patches/qt43.dpatch =================================================================== --- packages/qgis/branches/0.8.0/debian/patches/qt43.dpatch (rev 0) +++ packages/qgis/branches/0.8.0/debian/patches/qt43.dpatch 2007-07-04 11:06:41 UTC (rev 958) @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## qt43.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + [EMAIL PROTECTED]@ +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 +@@ -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'` + case "${QT_VER}" in +- 42*) ++ 42*|43*) + QT_MAJOR="${QT_VER:0:1}" + QT_MINOR="${QT_VER:1:1}" + case "${host}" in Property changes on: packages/qgis/branches/0.8.0/debian/patches/qt43.dpatch ___________________________________________________________________ Name: svn:executable + * _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel