Author: frankie Date: 2007-05-21 10:16:39 +0000 (Mon, 21 May 2007) New Revision: 849
Modified: packages/qgis/trunk/debian/changelog packages/qgis/trunk/debian/patches/gcc43-fixes.dpatch Log: New fixes for gcc 4.3 Modified: packages/qgis/trunk/debian/changelog =================================================================== --- packages/qgis/trunk/debian/changelog 2007-05-20 22:11:45 UTC (rev 848) +++ packages/qgis/trunk/debian/changelog 2007-05-21 10:16:39 UTC (rev 849) @@ -4,8 +4,10 @@ * Enabled python scripts support and changed build-dep and suggests as consequence. * Enabled WFS support. * Long description revised. + * Patch gcc43-fixes updated. Thanks again Martin Michlmayr. + (closes: #417522) - -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Sat, 19 May 2007 10:41:27 +0200 + -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Mon, 21 May 2007 12:15:38 +0200 qgis (0.8.0-3) unstable; urgency=low Modified: packages/qgis/trunk/debian/patches/gcc43-fixes.dpatch =================================================================== --- packages/qgis/trunk/debian/patches/gcc43-fixes.dpatch 2007-05-20 22:11:45 UTC (rev 848) +++ packages/qgis/trunk/debian/patches/gcc43-fixes.dpatch 2007-05-21 10:16:39 UTC (rev 849) @@ -5,20 +5,55 @@ ## DP: No description. @DPATCH@ -diff -urNad qgis~/src/composer/qgscomposition.cpp qgis/src/composer/qgscomposition.cpp ---- qgis~/src/composer/qgscomposition.cpp 2006-12-08 05:26:10.000000000 +0100 -+++ qgis/src/composer/qgscomposition.cpp 2007-04-30 20:29:23.000000000 +0200 -@@ -30,6 +30,7 @@ +diff -urNad qgis-0.8.0~/src/composer/qgscomposition.cpp qgis-0.8.0/src/composer/qgscomposition.cpp +--- qgis-0.8.0~/src/composer/qgscomposition.cpp 2006-12-08 05:26:10.000000000 +0100 ++++ qgis-0.8.0/src/composer/qgscomposition.cpp 2007-05-21 12:10:14.000000000 +0200 +@@ -30,7 +30,9 @@ #include <QMatrix> #include <QMessageBox> +#include <cstdlib> #include <iostream> ++#include <typeinfo> QgsCompositionPaper::QgsCompositionPaper ( QString name, int w, int h, bool c) -diff -urNad qgis~/src/providers/grass/qgsgrass.cpp qgis/src/providers/grass/qgsgrass.cpp ---- qgis~/src/providers/grass/qgsgrass.cpp 2006-12-24 22:56:43.000000000 +0100 -+++ qgis/src/providers/grass/qgsgrass.cpp 2007-04-30 20:29:57.000000000 +0200 + :mName(name), mWidth(w), mHeight(h), mCustom(c) +diff -urNad qgis-0.8.0~/src/core/qgslogger.h qgis-0.8.0/src/core/qgslogger.h +--- qgis-0.8.0~/src/core/qgslogger.h 2006-04-07 18:26:45.000000000 +0200 ++++ qgis-0.8.0/src/core/qgslogger.h 2007-05-21 12:09:35.000000000 +0200 +@@ -18,6 +18,7 @@ + #ifndef QGSLOGGER_H + #define QGSLOGGER_H + ++#include <cstdlib> + #include <iostream> + #include <sstream> + #include <QString> +diff -urNad qgis-0.8.0~/src/plugins/grass/qgsgrassmapcalc.cpp qgis-0.8.0/src/plugins/grass/qgsgrassmapcalc.cpp +--- qgis-0.8.0~/src/plugins/grass/qgsgrassmapcalc.cpp 2006-11-04 20:41:11.000000000 +0100 ++++ qgis-0.8.0/src/plugins/grass/qgsgrassmapcalc.cpp 2007-05-21 12:11:11.000000000 +0200 +@@ -13,6 +13,7 @@ + * * + *************************************************************************/ + #include <iostream> ++#include <typeinfo> + + #include <qapplication.h> + #include <qstringlist.h> +diff -urNad qgis-0.8.0~/src/plugins/grass/qgsgrassmodule.cpp qgis-0.8.0/src/plugins/grass/qgsgrassmodule.cpp +--- qgis-0.8.0~/src/plugins/grass/qgsgrassmodule.cpp 2006-12-20 02:47:44.000000000 +0100 ++++ qgis-0.8.0/src/plugins/grass/qgsgrassmodule.cpp 2007-05-21 12:11:35.000000000 +0200 +@@ -14,6 +14,7 @@ + * * + ***************************************************************************/ + #include <iostream> ++#include <typeinfo> + + #include <qapplication.h> + #include <qdir.h> +diff -urNad qgis-0.8.0~/src/providers/grass/qgsgrass.cpp qgis-0.8.0/src/providers/grass/qgsgrass.cpp +--- qgis-0.8.0~/src/providers/grass/qgsgrass.cpp 2006-12-24 22:56:43.000000000 +0100 ++++ qgis-0.8.0/src/providers/grass/qgsgrass.cpp 2007-05-21 12:08:56.000000000 +0200 @@ -15,6 +15,7 @@ ***************************************************************************/ /* $Id: qgsgrass.cpp 6290 2006-12-20 04:51:35Z telwertowski $ */ @@ -27,9 +62,9 @@ #include <iostream> #include "qstring.h" -diff -urNad qgis~/src/providers/postgres/qgspostgisbox2d.cpp qgis/src/providers/postgres/qgspostgisbox2d.cpp ---- qgis~/src/providers/postgres/qgspostgisbox2d.cpp 2006-03-03 21:38:20.000000000 +0100 -+++ qgis/src/providers/postgres/qgspostgisbox2d.cpp 2007-04-30 20:30:26.000000000 +0200 +diff -urNad qgis-0.8.0~/src/providers/postgres/qgspostgisbox2d.cpp qgis-0.8.0/src/providers/postgres/qgspostgisbox2d.cpp +--- qgis-0.8.0~/src/providers/postgres/qgspostgisbox2d.cpp 2006-03-03 21:38:20.000000000 +0100 ++++ qgis-0.8.0/src/providers/postgres/qgspostgisbox2d.cpp 2007-05-21 12:08:56.000000000 +0200 @@ -17,6 +17,7 @@ ***************************************************************************/ /* $Id: qgspostgisbox2d.cpp 4501 2006-01-08 01:17:57Z timlinux $ */ @@ -38,9 +73,9 @@ #include <fstream> #include <qstring.h> -diff -urNad qgis~/src/providers/postgres/qgspostgisbox3d.cpp qgis/src/providers/postgres/qgspostgisbox3d.cpp ---- qgis~/src/providers/postgres/qgspostgisbox3d.cpp 2006-03-03 21:38:20.000000000 +0100 -+++ qgis/src/providers/postgres/qgspostgisbox3d.cpp 2007-04-30 20:31:01.000000000 +0200 +diff -urNad qgis-0.8.0~/src/providers/postgres/qgspostgisbox3d.cpp qgis-0.8.0/src/providers/postgres/qgspostgisbox3d.cpp +--- qgis-0.8.0~/src/providers/postgres/qgspostgisbox3d.cpp 2006-03-03 21:38:20.000000000 +0100 ++++ qgis-0.8.0/src/providers/postgres/qgspostgisbox3d.cpp 2007-05-21 12:08:56.000000000 +0200 @@ -17,6 +17,7 @@ ***************************************************************************/ /* $Id: qgspostgisbox3d.cpp 4501 2006-01-08 01:17:57Z timlinux $ */ @@ -49,9 +84,9 @@ #include <fstream> #include <qstring.h> -diff -urNad qgis~/src/providers/postgres/qgspostgresextentthread.cpp qgis/src/providers/postgres/qgspostgresextentthread.cpp ---- qgis~/src/providers/postgres/qgspostgresextentthread.cpp 2006-03-03 21:38:20.000000000 +0100 -+++ qgis/src/providers/postgres/qgspostgresextentthread.cpp 2007-04-30 20:32:38.000000000 +0200 +diff -urNad qgis-0.8.0~/src/providers/postgres/qgspostgresextentthread.cpp qgis-0.8.0/src/providers/postgres/qgspostgresextentthread.cpp +--- qgis-0.8.0~/src/providers/postgres/qgspostgresextentthread.cpp 2006-03-03 21:38:20.000000000 +0100 ++++ qgis-0.8.0/src/providers/postgres/qgspostgresextentthread.cpp 2007-05-21 12:08:56.000000000 +0200 @@ -17,6 +17,7 @@ ***************************************************************************/ /* $Id: qgspostgresextentthread.cpp 4501 2006-01-08 01:17:57Z timlinux $ */ _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
