- Update to 1.5.0

4 files changed, 214 insertions, 52 deletions

diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 39ee0699d6a3..5a8fce3a2c87 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qgis
-PORTVERSION=	1.4.0
-PORTREVISION=	5
+PORTVERSION=	1.5.0
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/qgis/src/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -72,7 +71,8 @@ BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sip>=4.8.2:${PORTSDIR}/devel/py-sip \
 		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.5.4:${PORTSDIR}/net/py-qt4-network \
 		${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.5.4:${PORTSDIR}/graphics/py-qt4-svg \
 		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:${PORTSDIR}/textproc/py-qt4-xml \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=4.5.4:${PORTSDIR}/devel/py-qt4-core
+		${PYTHON_PKGNAMEPREFIX}qt4-core>=4.5.4:${PORTSDIR}/devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.6.5:${PORTSDIR}/databases/py-sqlite3
 .endif
 
 MAN1=		qgis.1 qgis_help.1
diff --git a/graphics/qgis/distinfo b/graphics/qgis/distinfo
index b83ec8a299f9..81b9ab86a4d0 100644
--- a/graphics/qgis/distinfo
+++ b/graphics/qgis/distinfo
@@ -1,3 +1,3 @@
-MD5 (qgis_1.4.0.tar.gz) = 47710e7aa14c2a672c7f28457b0c956f
-SHA256 (qgis_1.4.0.tar.gz) = bbe07eedec4bda95cca994002941b91fd0e50d5cdee2bf79be0c4f7b930cc7da
-SIZE (qgis_1.4.0.tar.gz) = 17285943
+MD5 (qgis_1.5.0.tar.gz) = a198fbcd8d96f5ed5e85a814cbc8f033
+SHA256 (qgis_1.5.0.tar.gz) = f99748e3948b97894703dc81c2a3eba1f2796651e581957cc2c61c9b9dbab470
+SIZE (qgis_1.5.0.tar.gz) = 17360308
diff --git a/graphics/qgis/files/patch-cmake-Python.cmake b/graphics/qgis/files/patch-cmake-Python.cmake
deleted file mode 100644
index 068e7eb9410d..000000000000
--- a/graphics/qgis/files/patch-cmake-Python.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
---- cmake/Python.cmake.orig	2010-04-28 13:11:28.000000000 +0800
-+++ cmake/Python.cmake	2010-04-28 13:12:18.000000000 +0800
-@@ -150,6 +150,7 @@
-       # minimal version is 4.7 (to support universal builds)
-       SET (SIP_MIN_VERSION 040700)
-       TRY_RUN_PYTHON (RES "import sip\nprint '%x' % sip.SIP_VERSION" SIP_VERSION)
-+      SET (SIP_VERSION 041000)
-       IF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
-         SET (SIP_IS_GOOD TRUE)
-       ENDIF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist
index 0dfaff73cc9c..32a81260b20e 100644
--- a/graphics/qgis/pkg-plist
+++ b/graphics/qgis/pkg-plist
@@ -140,10 +140,10 @@
 %%DATADIR%%/resources/srs.db
 %%DATADIR%%/resources/qgis.db
 %%DATADIR%%/resources/qgis_help.db
+%%DATADIR%%/resources/spatialite.db
 %%DATADIR%%/resources/symbology-ng-style.xml
 %%DATADIR%%/resources/context_help/QgsBookmarks-pl_PL
 %%DATADIR%%/resources/context_help/QgsPluginInstallerDialog-en_US
-%%DATADIR%%/resources/context_help/QgsAttributeTable-pt_BR
 %%DATADIR%%/resources/context_help/QgsIdentifyResults-de_DE
 %%DATADIR%%/resources/context_help/QgsOptions-it_IT
 %%DATADIR%%/resources/context_help/QgsVectorLayerProperties-ru_RU
@@ -170,7 +170,6 @@
 %%DATADIR%%/resources/context_help/QgsDelimitedTextPluginGui-sv_SE
 %%DATADIR%%/resources/context_help/QgsNewHttpConnection-pt_BR
 %%DATADIR%%/resources/context_help/eVisDatabaseConnectionGui-de_DE
-%%DATADIR%%/resources/context_help/QgsGPSPlugin-pt_BR
 %%DATADIR%%/resources/context_help/QgsGPSPluginGui-de_DE
 %%DATADIR%%/resources/context_help/QgsWMSSourceSelect-en_US
 %%DATADIR%%/resources/context_help/QgsVectorLayerProperties-pt_BR
@@ -197,7 +196,6 @@
 %%DATADIR%%/resources/context_help/QgsVectorLayerProperties-de_DE
 %%DATADIR%%/resources/context_help/QgsNewConnection-ru_RU
 %%DATADIR%%/resources/context_help/QgsComposer-ru_RU
-%%DATADIR%%/resources/context_help/QgsDbSourceSelect-pt_BR
 %%DATADIR%%/resources/context_help/QgsNewVectorLayerDialog-fr_FR
 %%DATADIR%%/resources/context_help/QgsNewVectorLayerDialog-en_US
 %%DATADIR%%/resources/context_help/QgsNewConnection-sk_SK
@@ -246,7 +244,6 @@
 %%DATADIR%%/resources/context_help/QgsProjectProperties-sk_SK
 %%DATADIR%%/resources/context_help/QgsMeasureDialog-sk_SK
 %%DATADIR%%/resources/context_help/MapServerExport-en_US
-%%DATADIR%%/resources/context_help/QgsServerSourceSelect-pt_BR
 %%DATADIR%%/resources/context_help/QgsNewOgrConnection-it_IT
 %%DATADIR%%/resources/context_help/QgsProjectProperties-sv_SE
 %%DATADIR%%/resources/context_help/QgsCustomProjectionDialog-it_IT
@@ -262,14 +259,12 @@
 %%DATADIR%%/resources/context_help/QgsComposer-pt_BR
 %%DATADIR%%/resources/context_help/QgsIdentifyResults-es_ES
 %%DATADIR%%/resources/context_help/QgsIdentifyResults-ru_RU
-%%DATADIR%%/resources/context_help/QgsMeasure-pt_BR
 %%DATADIR%%/resources/context_help/QgsMeasureDialog-de_DE
 %%DATADIR%%/resources/context_help/QgsDelimitedTextPluginGui-sk_SK
 %%DATADIR%%/resources/context_help/QgsProjectProperties-es_ES
 %%DATADIR%%/resources/context_help/QgsPgSourceSelect-pl_PL
 %%DATADIR%%/resources/context_help/QgsPgSourceSelect-ru_RU
 %%DATADIR%%/resources/context_help/QgsMeasureDialog-en_US
-%%DATADIR%%/resources/context_help/QgsCreateNewVectorLayer-pt_BR
 %%DATADIR%%/resources/context_help/QgsWMSSourceSelect-ru_RU
 %%DATADIR%%/resources/context_help/QgsSpatiaLiteSourceSelect-de_DE
 %%DATADIR%%/resources/context_help/QgsVectorLayerProperties-sk_SK
@@ -294,8 +289,69 @@
 %%DATADIR%%/resources/context_help/QgsMeasureDialog-es_ES
 %%DATADIR%%/resources/context_help/QgsScaleBarPluginGui-pl_PL
 %%DATADIR%%/resources/context_help/QgsMeasureDialog-it_IT
+%%DATADIR%%/resources/context_help/QgsNewSpatialiteLayerDialog-ja_JP
+%%DATADIR%%/resources/context_help/QgsScaleBarPluginGui-ja_JP
+%%DATADIR%%/resources/context_help/QgsNorthArrowPluginGui-pt_BR
+%%DATADIR%%/resources/context_help/QgsNewVectorLayerDialog-pt_BR
+%%DATADIR%%/resources/context_help/eVisDatabaseConnectionGui-es_ES
+%%DATADIR%%/resources/context_help/QgsStyleV2ManagerDialog-ja_JP
+%%DATADIR%%/resources/context_help/QgsNewSpatialiteLayerDialog-pt_BR
+%%DATADIR%%/resources/context_help/QgsPgSourceSelect-it_IT
+%%DATADIR%%/resources/context_help/QgsVectorLayerProperties-ja_JP
+%%DATADIR%%/resources/context_help/QgsWMSSourceSelect-it_IT
+%%DATADIR%%/resources/context_help/QgsGPSPluginGui-ja_JP
+%%DATADIR%%/resources/context_help/QgsNewOgrConnection-ja_JP
+%%DATADIR%%/resources/context_help/QgsMeasureDialog-ja_JP
+%%DATADIR%%/resources/context_help/QgsScaleBarPluginGui-pt_BR
+%%DATADIR%%/resources/context_help/QgsComposer-ja_JP
+%%DATADIR%%/resources/context_help/QgsAttributeTableDialog-ja_JP
+%%DATADIR%%/resources/context_help/QgsPluginInstallerDialog-ja_JP
+%%DATADIR%%/resources/context_help/QgsCustomProjectionDialog-fr_FR
+%%DATADIR%%/resources/context_help/QgsSpatiaLiteSourceSelect-it_IT
+%%DATADIR%%/resources/context_help/QgsStyleV2ManagerDialog-pt_BR
+%%DATADIR%%/resources/context_help/QgsCustomProjectionDialog-ja_JP
+%%DATADIR%%/resources/context_help/QgsCopyrightLabelPluginGui-ja_JP
+%%DATADIR%%/resources/context_help/QgsGPSPluginGui-pt_BR
+%%DATADIR%%/resources/context_help/QgsMeasureDialog-pt_BR
+%%DATADIR%%/resources/context_help/eVisDatabaseConnectionGui-ja_JP
+%%DATADIR%%/resources/context_help/MapServerExport-es_ES
+%%DATADIR%%/resources/context_help/QgsProjectProperties-it_IT
+%%DATADIR%%/resources/context_help/QgsAttributeTableDialog-pt_BR
+%%DATADIR%%/resources/context_help/QgsPluginInstallerDialog-pt_BR
+%%DATADIR%%/resources/context_help/QgsNewConnection-ja_JP
+%%DATADIR%%/resources/context_help/QgsCustomProjectionDialog-pt_BR
+%%DATADIR%%/resources/context_help/QgsScaleBarPluginGui-it_IT
+%%DATADIR%%/resources/context_help/QgsPgSourceSelect-ja_JP
+%%DATADIR%%/resources/context_help/QgsWMSSourceSelect-ja_JP
+%%DATADIR%%/resources/context_help/eVisDatabaseConnectionGui-pt_BR
+%%DATADIR%%/resources/context_help/QgsOptions-ja_JP
+%%DATADIR%%/resources/context_help/QgsNewSpatialiteLayerDialog-de_DE
+%%DATADIR%%/resources/context_help/QgsDelimitedTextPluginGui-fr_FR
+%%DATADIR%%/resources/context_help/MapServerExport-fr_FR
+%%DATADIR%%/resources/context_help/QgsIdentifyResults-fr_FR
+%%DATADIR%%/resources/context_help/QgsStyleV2ManagerDialog-it_IT
+%%DATADIR%%/resources/context_help/QgsSpatiaLiteSourceSelect-ja_JP
+%%DATADIR%%/resources/context_help/QgsBookmarks-ja_JP
+%%DATADIR%%/resources/context_help/QgsDelimitedTextPluginGui-ja_JP
+%%DATADIR%%/resources/context_help/MapServerExport-ja_JP
+%%DATADIR%%/resources/context_help/QgsIdentifyResults-ja_JP
+%%DATADIR%%/resources/context_help/QgsOpenVectorLayerDialog-ja_JP
+%%DATADIR%%/resources/context_help/QgsVectorLayerProperties-it_IT
+%%DATADIR%%/resources/context_help/QgsPgSourceSelect-pt_BR
+%%DATADIR%%/resources/context_help/QgsWMSSourceSelect-pt_BR
+%%DATADIR%%/resources/context_help/QgsNewSpatialiteLayerDialog-en_US
+%%DATADIR%%/resources/context_help/QgsOptions-pt_BR
+%%DATADIR%%/resources/context_help/QgsPluginInstallerDialog-it_IT
+%%DATADIR%%/resources/context_help/QgsProjectProperties-ja_JP
+%%DATADIR%%/resources/context_help/QgsNewVectorLayerDialog-ja_JP
+%%DATADIR%%/resources/context_help/QgsNorthArrowPluginGui-ja_JP
+%%DATADIR%%/resources/context_help/QgsSpatiaLiteSourceSelect-pt_BR
+%%DATADIR%%/resources/context_help/MapServerExport-pt_BR
 %%DATADIR%%/i18n/qgis_pt_BR.qm
 %%DATADIR%%/i18n/qt_ru.qm
+%%DATADIR%%/i18n/qgis_bg.qm
+%%DATADIR%%/i18n/qgis_ca_ES.qm
+%%DATADIR%%/i18n/qgis_fi.qm
 %%DATADIR%%/i18n/qgis_lo.qm
 %%DATADIR%%/i18n/qgis_lv.qm
 %%DATADIR%%/i18n/qgis_it.qm
@@ -343,41 +399,42 @@
 bin/qgis
 bin/qgis_help
 lib/libqgis_core.so
-lib/libqgis_core.so.1.4.0
+lib/libqgis_core.so.1.5.0
 lib/libqgis_gui.so
-lib/libqgis_gui.so.1.4.0
+lib/libqgis_gui.so.1.5.0
 lib/libqgis_analysis.so
-lib/libqgis_analysis.so.1.4.0
-lib/qgis/libcopyrightlabelplugin.so
-lib/qgis/libdelimitedtextplugin.so
-lib/qgis/libdelimitedtextprovider.so
-lib/qgis/libgeorefplugin.so
-lib/qgis/liblabelingplugin.so
-lib/qgis/libgpsimporterplugin.so
-lib/qgis/libgpxprovider.so
-lib/qgis/libmemoryprovider.so
-lib/qgis/libnortharrowplugin.so
-lib/qgis/libogrprovider.so
-lib/qgis/libinterpolationplugin.so
-lib/qgis/libcoordinatecaptureplugin.so
-lib/qgis/libdxf2shpconverterplugin.so
-lib/qgis/libogrconverterplugin.so
+lib/libqgis_analysis.so.1.5.0
+lib/qgis/plugins/libmemoryprovider.so
+lib/qgis/plugins/libogrprovider.so
+lib/qgis/plugins/libwmsprovider.so
+lib/qgis/plugins/libdelimitedtextprovider.so
+lib/qgis/plugins/libosmprovider.so
+lib/qgis/plugins/libspatialiteprovider.so
+lib/qgis/plugins/libgpxprovider.so
+lib/qgis/plugins/libwfsprovider.so
+lib/qgis/plugins/libcopyrightlabelplugin.so
+lib/qgis/plugins/libdelimitedtextplugin.so
+lib/qgis/plugins/libinterpolationplugin.so
+lib/qgis/plugins/libnortharrowplugin.so
+lib/qgis/plugins/libscalebarplugin.so
+lib/qgis/plugins/liboracleplugin.so
+lib/qgis/plugins/librasterterrainplugin.so
+lib/qgis/plugins/libquickprintplugin.so
+lib/qgis/plugins/libcoordinatecaptureplugin.so
+lib/qgis/plugins/libdxf2shpconverterplugin.so
+lib/qgis/plugins/libogrconverterplugin.so
+lib/qgis/plugins/libdiagramoverlay.so
+lib/qgis/plugins/libevis.so
+lib/qgis/plugins/libdisplacementplugin.so
+lib/qgis/plugins/libspatialqueryplugin.so
+lib/qgis/plugins/libgpsimporterplugin.so
+lib/qgis/plugins/libwfsplugin.so
+lib/qgis/plugins/libgeorefplugin.so
 %%PGSQL%%lib/qgis/libpggeoprocessingplugin.so
 %%PGSQL%%lib/qgis/libpostgresprovider.so
-lib/qgis/libquickprintplugin.so
-lib/qgis/libscalebarplugin.so
 %%PGSQL%%lib/qgis/libspitplugin.so
-lib/qgis/libwfsplugin.so
-lib/qgis/libwfsprovider.so
-lib/qgis/libwmsprovider.so
-lib/qgis/libosmprovider.so
-lib/qgis/libspatialiteprovider.so
-lib/qgis/liboracleplugin.so
-lib/qgis/librasterterrainplugin.so
-lib/qgis/libdiagramoverlay.so
-lib/qgis/libevis.so
 %%QGIS_PYTHON%%lib/libqgispython.so
-%%QGIS_PYTHON%%lib/libqgispython.so.1.4.0
+%%QGIS_PYTHON%%lib/libqgispython.so.1.5.0
 include/qgis/qgis.h
 include/qgis/qgisgui.h
 include/qgis/qgisinterface.h
@@ -512,7 +569,45 @@ include/qgis/qgsvectorcolorbrewercolorrampv2dialog.h
 include/qgis/qgslegendinterface.h
 include/qgis/qgsludialog.h
 include/qgis/qgsprojectbadlayerguihandler.h
+include/qgis/qgscredentials.h
+include/qgis/qgspallabeling.h
+include/qgis/qgspluginlayer.h
+include/qgis/qgspluginlayerregistry.h
+include/qgis/qgscomposerlegenditem.h
+include/qgis/qgscategorizedsymbolrendererv2.h
+include/qgis/qgscolorbrewerpalette.h
+include/qgis/qgsfillsymbollayerv2.h
+include/qgis/qgsgraduatedsymbolrendererv2.h
+include/qgis/qgslinesymbollayerv2.h
+include/qgis/qgsmarkersymbollayerv2.h
+include/qgis/qgsrendererv2.h
+include/qgis/qgsrendererv2registry.h
+include/qgis/qgssinglesymbolrendererv2.h
+include/qgis/qgsstylev2.h
+include/qgis/qgssymbollayerv2.h
+include/qgis/qgssymbollayerv2registry.h
+include/qgis/qgssymbollayerv2utils.h
+include/qgis/qgssymbologyv2conversion.h
+include/qgis/qgssymbolv2.h
+include/qgis/qgsvectorcolorrampv2.h
+include/qgis/qgsnetworkaccessmanager.h
+include/qgis/qgscomposerattributetable.h
+include/qgis/qgsgpsconnection.h
+include/qgis/qgsgpsdetector.h
+include/qgis/qgsnmeaconnection.h
+include/qgis/qextserialport.h
+include/qgis/qextserialenumerator.h
+include/qgis/qgscredentialdialog.h
+include/qgis/ui_qgscredentialdialog.h
+include/qgis/qgsdashspacedialog.h
+include/qgis/qgsrulebasedrendererv2widget.h
+include/qgis/characterwidget.h
+include/qgis/qgspenstylecombobox.h
+include/qgis/qgsbrushstylecombobox.h
+include/qgis/qgsattributeeditor.h
+include/qgis/qgsformannotationitem.h
 @dirrm include/qgis
+@dirrm lib/qgis/plugins
 @dirrm lib/qgis
 @dirrm %%DATADIR%%/doc/images
 @dirrm %%DATADIR%%/doc
@@ -537,14 +632,18 @@ include/qgis/qgsprojectbadlayerguihandler.h
 @dirrm %%DATADIR%%/svg/transport
 @dirrm %%DATADIR%%/svg
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/__init__.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/qgis/__init__.pyc
+%%QGIS_PYTHON%%%%DATADIR%%/python/qgis/console.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/qgis/console.pyc
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/utils.py
-%%QGIS_PYTHON%%%%DATADIR%%/python/qgis/qgisconfig.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/qgis/utils.pyc
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/analysis.so
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/core.so
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/gui.so
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/plugin_installer/ui_qgsplugininstallerbase.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/plugin_installer/ui_qgsplugininstallerfetchingbase.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/plugin_installer/ui_qgsplugininstallerinstallingbase.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/plugin_installer/ui_qgsplugininstalleroldreposbase.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/plugin_installer/ui_qgsplugininstallerpluginerrorbase.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/plugin_installer/ui_qgsplugininstallerrepositorybase.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/plugin_installer/resources_rc.py
@@ -574,6 +673,7 @@ include/qgis/qgsprojectbadlayerguihandler.h
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/ui_frmAbout.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/resources_rc.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/tools/doGeoprocessing.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/tools/doMergeShapes.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/tools/doSumLines.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/tools/doIntersectLines.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/tools/doVectorSplit.py
@@ -595,6 +695,7 @@ include/qgis/qgsprojectbadlayerguihandler.h
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/tools/doReProject.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/tools/doSelectByLocation.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/tools/ui_frmAbout.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/tools/ui_frmMergeShapes.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/tools/ui_frmRandPoints.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/tools/ui_frmPointDistance.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/tools/ui_frmSumLines.py
@@ -638,6 +739,7 @@ include/qgis/qgsprojectbadlayerguihandler.h
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/sum_lines.png
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/define_projection.png
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/management.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/merge_shapes.png
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/sum_points.png
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/difference.png
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/matrix.png
@@ -733,6 +835,73 @@ include/qgis/qgsprojectbadlayerguihandler.h
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/osm/styles/small_scale.style
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/osm/styles/medium_scale.style
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/osm/styles/big_scale.style
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/GdalTools.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/__init__.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/resources_rc.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/__init__.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/dialogBase.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doWarp.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doSieve.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/optionsTable.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/GdalTools_utils.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doGrid.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doContour.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doBuildVRT.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doTranslate.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doMerge.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doPolygonize.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doSettings.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doOverview.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doRasterize.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/widgetPluginBase.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doAbout.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doProjection.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doRgbPct.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doPctRgb.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doNearBlack.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doInfo.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/widgetBatchBase.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doClipper.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/doProximity.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/dialogSRS.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetPolygonize.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetProximity.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetOverview.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetSieve.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetProjection.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetConvert.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_dialogBase.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_dialogAbout.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetContour.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetInfo.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetTranslate.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetMerge.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_optionsTable.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetRasterize.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetWarp.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_dialogSettings.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetNearBlack.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetGrid.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetBuildVRT.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/tools/ui_widgetClipper.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/translate.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/merge.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/polygonize.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/raster-paletted.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/projection-add.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/proximity.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/raster-overview.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/raster-rgb.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/rasterize.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/warp.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/about.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/vrt.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/sieve.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/nearblack.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/grid.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/raster-clip.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/raster-info.png
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/contour.png
 %%QGIS_PYTHON%%@dirrm %%DATADIR%%/python/plugins/mapserver_export
 %%QGIS_PYTHON%%@dirrm %%DATADIR%%/python/plugins/osm/map_tools
 %%QGIS_PYTHON%%@dirrm %%DATADIR%%/python/plugins/osm/styles
@@ -743,6 +912,9 @@ include/qgis/qgsprojectbadlayerguihandler.h
 %%QGIS_PYTHON%%@dirrm %%DATADIR%%/python/plugins/fTools/icons
 %%QGIS_PYTHON%%@dirrm %%DATADIR%%/python/plugins/fTools/tools
 %%QGIS_PYTHON%%@dirrm %%DATADIR%%/python/plugins/fTools
+%%QGIS_PYTHON%%@dirrm %%DATADIR%%/python/plugins/GdalTools/tools
+%%QGIS_PYTHON%%@dirrm %%DATADIR%%/python/plugins/GdalTools/icons
+%%QGIS_PYTHON%%@dirrm %%DATADIR%%/python/plugins/GdalTools
 %%QGIS_PYTHON%%@dirrm %%DATADIR%%/python/plugins
 %%QGIS_PYTHON%%@dirrm %%DATADIR%%/python/qgis
 %%QGIS_PYTHON%%@dirrm %%DATADIR%%/python