cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to QuantumGIS 1.6.0.

Browse Source 
See http://blog.qgis.org/node/146 for details on this release.
This commit is contained in:
landry 2010-12-08 09:07:48 +00:00
parent 16f01d4a9d
commit 2d3c925c45
12 changed files with 324 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
geo/qgis/Makefile
View File

@ -1,19 +1,17 @@
# $OpenBSD: Makefile,v 1.17 2010/11/17 08:05:12 espie Exp $
# $OpenBSD: Makefile,v 1.18 2010/12/08 09:07:48 landry Exp $
COMMENT = desktop geographical information system
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
DISTNAME = qgis_1.5.0
PKGNAME = ${DISTNAME:L:S/_/-/}
REVISION = 1
DISTNAME = qgis-1.6.0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
SHARED_LIBS = qgis_core 3.0 \
qgis_gui 2.0 \
qgis_analysis 1.1 \
qgispython 1.0 # .1.3
SHARED_LIBS = qgis_core 4.0 \
qgis_gui 3.0 \
qgis_analysis 1.2 \
qgispython 1.1 # .1.3
HOMEPAGE = http://www.qgis.org/
@ -25,8 +23,7 @@ PERMIT_DISTFILES_FTP = Yes
MAINTAINER = Landry Breuil <gaston@gcu.info>
MASTER_SITES = http://download.osgeo.org/qgis/src/
WRKDIST = ${WRKDIR}/${DISTNAME:S/_/-/}
MASTER_SITES = ${HOMEPAGE}/downloads/
MODULES = devel/cmake \
devel/gettext \
@ -43,6 +40,8 @@ RUN_DEPENDS = x11/py-qt4 \
LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
devel/proj \
x11/qt4 \
x11/qwt \
www/fcgi \
geo/gdal \
geo/geos \
devel/gsl \
@ -51,7 +50,7 @@ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c expat fontconfig \
freetype glib-2.0 gthread-2.0 m png pthread gobject-2.0 util \
stdc++ z proj QtGui QtNetwork QtXml QtSql QtCore QtSvg QtWebKit\
gdal geos_c gsl gslcblas pq
gdal geos_c gsl gslcblas pq qwt fcgi
WANTLIB += ${MODPY_WANTLIB}
CONFIGURE_ENV+= VERBOSE=1

10
geo/qgis/distinfo
View File

@ -1,5 +1,5 @@
MD5 (qgis_1.5.0.tar.gz) = oZj7zY2W9e1ehagUy8jwMw==
RMD160 (qgis_1.5.0.tar.gz) = vTcWQHQMT21YnVu58md6DeRtSJU=
SHA1 (qgis_1.5.0.tar.gz) = 8XsaEXW9+tb4oAVHC/u3Dq6vgGo=
SHA256 (qgis_1.5.0.tar.gz) = +ZdI45SLl4lHA9yBwqProfJ5ZlHlgZV8wsYcm526tHA=
SIZE (qgis_1.5.0.tar.gz) = 17360308
MD5 (qgis-1.6.0.tar.bz2) = nqinhNlw9QCbDmJxggJI9g==
RMD160 (qgis-1.6.0.tar.bz2) = 6YrvG/UpDcf0Qz/B7GSK0TJzYEw=
SHA1 (qgis-1.6.0.tar.bz2) = gV59f0Zfh4w3hmsLw4NFu9dlQcw=
SHA256 (qgis-1.6.0.tar.bz2) = +Z5ur7TECd0VkbuZubuJ4xwxD47uw+G6NXNIpscPn24=
SIZE (qgis-1.6.0.tar.bz2) = 17479207

10
geo/qgis/patches/patch-CMakeLists_txt
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-CMakeLists_txt,v 1.4 2010/01/11 20:13:31 landry Exp $
--- CMakeLists.txt.orig Mon Dec 28 23:25:56 2009
+++ CMakeLists.txt Mon Jan 11 16:39:31 2010
@@ -414,7 +414,7 @@ ENDIF (ENABLE_TESTS)
$OpenBSD: patch-CMakeLists_txt,v 1.5 2010/12/08 09:07:48 landry Exp $
--- CMakeLists.txt.orig Sat Nov 13 19:29:21 2010
+++ CMakeLists.txt Mon Nov 29 17:31:37 2010
@@ -486,7 +486,7 @@ ENDIF (APPLE)
# install stuff
INSTALL (FILES AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS INSTALL CODING
@ -9,4 +9,4 @@ $OpenBSD: patch-CMakeLists_txt,v 1.4 2010/01/11 20:13:31 landry Exp $
+ DESTINATION ${QGIS_DATA_DIR}/../doc/qgis)
# manual page - makes sense only on unix systems
IF (UNIX)
IF (UNIX AND NOT APPLE)

28
geo/qgis/patches/patch-cmake_FindGDAL_cmake
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.1.1.1 2009/06/01 23:14:58 landry Exp $
--- cmake/FindGDAL.cmake.orig Sun May 31 10:52:56 2009
+++ cmake/FindGDAL.cmake Sun May 31 10:54:43 2009
@@ -118,11 +118,7 @@ ELSE(WIN32)
STRING(REGEX REPLACE "[-][l]" "" GDAL_LIB_NAME ${GDAL_LIB_NAME_WITH_PREFIX} )
ENDIF (GDAL_LIB_NAME_WITH_PREFIX)
$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.2 2010/12/08 09:07:48 landry Exp $
--- cmake/FindGDAL.cmake.orig Mon Nov 29 17:53:59 2010
+++ cmake/FindGDAL.cmake Mon Nov 29 17:54:19 2010
@@ -134,11 +134,7 @@ ELSE(WIN32)
STRING(REGEX REPLACE "[-][l]" "" GDAL_LIB_NAME ${GDAL_LIB_NAME_WITH_PREFIX} )
ENDIF (GDAL_LIB_NAME_WITH_PREFIX)
- IF (APPLE)
- SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL)
- ELSE (APPLE)
- SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
- ENDIF (APPLE)
+ FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATHS ${LOCALBASE}/lib)
- IF (APPLE)
- SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL)
- ELSE (APPLE)
- SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
- ENDIF (APPLE)
+ FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATHS ${LOCALBASE}/lib)
ELSE(GDAL_CONFIG)
MESSAGE("FindGDAL.cmake: gdal-config not found. Please set it manually. GDAL_CONFIG=${GDAL_CONFIG}")
ELSE(GDAL_CONFIG)
MESSAGE("FindGDAL.cmake: gdal-config not found. Please set it manually. GDAL_CONFIG=${GDAL_CONFIG}")

28
geo/qgis/patches/patch-cmake_FindGEOS_cmake
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.2 2009/09/06 11:19:17 landry Exp $
--- cmake/FindGEOS.cmake.orig Tue Apr 14 14:54:07 2009
+++ cmake/FindGEOS.cmake Thu Sep 3 20:17:54 2009
@@ -114,11 +114,7 @@ ELSE(WIN32)
ENDIF (GEOS_LIB_NAME_WITH_PREFIX)
#MESSAGE("DBG GEOS_LIB_NAME=${GEOS_LIB_NAME}")
$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.3 2010/12/08 09:07:48 landry Exp $
--- cmake/FindGEOS.cmake.orig Mon Nov 29 17:54:29 2010
+++ cmake/FindGEOS.cmake Mon Nov 29 17:54:44 2010
@@ -131,11 +131,7 @@ ELSE(WIN32)
ENDIF (GEOS_LIB_NAME_WITH_PREFIX)
#MESSAGE("DBG GEOS_LIB_NAME=${GEOS_LIB_NAME}")
- IF (APPLE)
- SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL)
- ELSE (APPLE)
- SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.so CACHE STRING INTERNAL)
- ENDIF (APPLE)
+ FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS ${LOCALBASE}/lib)
#MESSAGE("DBG GEOS_LIBRARY=${GEOS_LIBRARY}")
- IF (APPLE)
- SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL)
- ELSE (APPLE)
- SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.so CACHE STRING INTERNAL)
- ENDIF (APPLE)
+ FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS ${LOCALBASE}/lib)
#MESSAGE("DBG GEOS_LIBRARY=${GEOS_LIBRARY}")
ELSE(GEOS_CONFIG)
ELSE(GEOS_CONFIG)

8
geo/qgis/patches/patch-cmake_FindPostgres_cmake
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cmake_FindPostgres_cmake,v 1.2 2010/01/11 20:13:31 landry Exp $
--- cmake/FindPostgres.cmake.orig Sun Sep 13 12:49:37 2009
+++ cmake/FindPostgres.cmake Mon Jan 11 16:43:26 2010
@@ -50,11 +50,7 @@ ELSE(WIN32)
$OpenBSD: patch-cmake_FindPostgres_cmake,v 1.3 2010/12/08 09:07:48 landry Exp $
--- cmake/FindPostgres.cmake.orig Sat Oct 16 16:52:43 2010
+++ cmake/FindPostgres.cmake Mon Nov 29 17:31:37 2010
@@ -57,11 +57,7 @@ ELSE(WIN32)
EXEC_PROGRAM(${POSTGRES_CONFIG}
ARGS --libdir
OUTPUT_VARIABLE PG_TMP)

66
geo/qgis/patches/patch-python_core_conversions_sip
View File

@ -1,66 +0,0 @@
$OpenBSD: patch-python_core_conversions_sip,v 1.1 2010/09/07 10:23:31 sthen Exp $
workaround build problem with sip >= 4.11
--- python/core/conversions.sip.orig Tue Sep 7 00:14:55 2010
+++ python/core/conversions.sip Tue Sep 7 00:17:23 2010
@@ -265,59 +265,6 @@ template <TYPE>
-%MappedType QSet<int>
-{
-%TypeHeaderCode
-#include <QSet>
-#if (SIP_VERSION >= 0x040900)
-#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
-#endif
-%End
-
-%ConvertFromTypeCode
- // Create the list.
- PyObject *l;
-
- if ((l = PyList_New(sipCpp->size())) == NULL)
- return NULL;
-
- // Set the list elements.
- QSet<int>::iterator it = sipCpp->begin();
- for (int i = 0; it != sipCpp->end(); ++it, ++i)
- {
- PyObject *tobj;
-
- if ((tobj = PyInt_FromLong(*it)) == NULL)
- {
- Py_DECREF(l);
- return NULL;
- }
- PyList_SET_ITEM(l, i, tobj);
- }
-
- return l;
-%End
-
-%ConvertToTypeCode
- // Check the type if that is all that is required.
- if (sipIsErr == NULL)
- return PyList_Check(sipPy);
-
- QSet<int> *qset = new QSet<int>;
-
- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
- {
- qset->insert(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
- }
-
- *sipCppPtr = qset;
- return sipGetState(sipTransferObj);
-%End
-
-};
-
-
template <TYPE>
%MappedType QSet<TYPE>
{

8
geo/qgis/patches/patch-src_app_attributetable_qgsattributetabledelegate_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_app_attributetable_qgsattributetabledelegate_cpp,v 1.2 2010/01/11 20:13:31 landry Exp $
$OpenBSD: patch-src_app_attributetable_qgsattributetabledelegate_cpp,v 1.3 2010/12/08 09:07:48 landry Exp $
Unroll some c++ too violent for g++3.3.
--- src/app/attributetable/qgsattributetabledelegate.cpp.orig Sun Dec 20 19:13:22 2009
+++ src/app/attributetable/qgsattributetabledelegate.cpp Mon Jan 11 16:39:31 2010
@@ -111,7 +111,9 @@ void QgsAttributeTableDelegate::paint( QPainter * pain
--- src/app/attributetable/qgsattributetabledelegate.cpp.orig Mon Apr 5 19:19:07 2010
+++ src/app/attributetable/qgsattributetabledelegate.cpp Mon Nov 29 17:31:38 2010
@@ -112,7 +112,9 @@ void QgsAttributeTableDelegate::paint( QPainter * pain
if ( option.state & QStyle::State_HasFocus )
{
QRect r = option.rect.adjusted( 1, 1, -1, -1 );

8
geo/qgis/patches/patch-src_core_CMakeLists_txt
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.3 2010/05/11 06:41:30 dcoppa Exp $
--- src/core/CMakeLists.txt.orig Mon May 10 11:32:02 2010
+++ src/core/CMakeLists.txt Mon May 10 11:35:23 2010
@@ -289,9 +289,9 @@ ENDIF (WIN32)
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.4 2010/12/08 09:07:48 landry Exp $
--- src/core/CMakeLists.txt.orig Thu Oct 28 01:58:43 2010
+++ src/core/CMakeLists.txt Mon Nov 29 17:31:38 2010
@@ -345,9 +345,9 @@ ENDIF(APPLE)
TARGET_LINK_LIBRARIES(qgis_core
${QT_QTMAIN_LIBRARY}
${QT_QTXML_LIBRARY}

12
geo/qgis/patches/patch-src_mapserver_CMakeLists_txt Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_mapserver_CMakeLists_txt,v 1.1 2010/12/08 09:07:48 landry Exp $
install sld & xml in share/qgis
--- src/mapserver/CMakeLists.txt.orig Tue Nov 30 13:15:24 2010
+++ src/mapserver/CMakeLists.txt Tue Nov 30 13:16:24 2010
@@ -121,6 +121,6 @@ INSTALL(TARGETS
INSTALL(FILES
admin.sld
wms_metadata.xml
- DESTINATION ${QGIS_CGIBIN_DIR}
+ DESTINATION ${QGIS_DATA_DIR}
)

3
geo/qgis/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.6 2010/08/30 11:02:48 landry Exp $
@comment $OpenBSD: PFRAG.shared,v 1.7 2010/12/08 09:07:48 landry Exp $
@lib lib/libqgis_analysis.so.${LIBqgis_analysis_VERSION}
@lib lib/libqgis_core.so.${LIBqgis_core_VERSION}
@lib lib/libqgis_gui.so.${LIBqgis_gui_VERSION}
@ -19,6 +19,7 @@ lib/qgis/plugins/libgpxprovider.so
lib/qgis/plugins/libinterpolationplugin.so
lib/qgis/plugins/libmemoryprovider.so
lib/qgis/plugins/libnortharrowplugin.so
lib/qgis/plugins/libofflineeditingplugin.so
lib/qgis/plugins/libogrconverterplugin.so
lib/qgis/plugins/libogrprovider.so
lib/qgis/plugins/liboracleplugin.so

263
geo/qgis/pkg/PLIST
View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.6 2010/08/30 11:02:48 landry Exp $
@comment $OpenBSD: PLIST,v 1.7 2010/12/08 09:07:48 landry Exp $
%%SHARED%%
@bin bin/qgis
@bin bin/qgis_help
@bin bin/qgis_mapserv.fcgi
include/qgis/
include/qgis/characterwidget.h
include/qgis/qextserialenumerator.h
@ -21,6 +22,7 @@ include/qgis/qgsclipper.h
include/qgis/qgscliptominmaxenhancement.h
include/qgis/qgscolorbrewerpalette.h
include/qgis/qgscolorbutton.h
include/qgis/qgscolorrampcombobox.h
include/qgis/qgscolorrampshader.h
include/qgis/qgscomposerattributetable.h
include/qgis/qgscomposeritem.h
@ -62,6 +64,7 @@ include/qgis/qgsgenericprojectionselector.h
include/qgis/qgsgeometry.h
include/qgis/qgsgeometryanalyzer.h
include/qgis/qgsgpsconnection.h
include/qgis/qgsgpsdconnection.h
include/qgis/qgsgpsdetector.h
include/qgis/qgsgraduatedsymbolrenderer.h
include/qgis/qgsgraduatedsymbolrendererv2.h
@ -78,6 +81,7 @@ include/qgis/qgslinearminmaxenhancement.h
include/qgis/qgslinearminmaxenhancementwithclip.h
include/qgis/qgslinesymbollayerv2.h
include/qgis/qgslogger.h
include/qgis/qgslonglongvalidator.h
include/qgis/qgsludialog.h
include/qgis/qgsmapcanvas.h
include/qgis/qgsmapcanvasitem.h
@ -132,6 +136,7 @@ include/qgis/qgsrendererplugin.h
include/qgis/qgsrendererv2.h
include/qgis/qgsrendererv2propertiesdialog.h
include/qgis/qgsrendererv2registry.h
include/qgis/qgsrendererv2widget.h
include/qgis/qgsrubberband.h
include/qgis/qgsrulebasedrendererv2widget.h
include/qgis/qgsrunprocess.h
@ -176,6 +181,7 @@ include/qgis/ui_qgsmessageviewer.h
include/qgis/ui_qgsprojectionselectorbase.h
@man man/man1/qgis.1
@man man/man1/qgis_help.1
share/applications/
share/applications/qgis.desktop
share/doc/qgis/
share/doc/qgis/AUTHORS
@ -188,6 +194,8 @@ share/doc/qgis/TRANSLATORS
share/pixmaps/
share/pixmaps/qgis-icon.png
share/qgis/
share/qgis/admin.sld
share/qgis/wms_metadata.xml
share/qgis/doc/
share/qgis/doc/favicon.ico
share/qgis/doc/images/
@ -219,9 +227,11 @@ share/qgis/i18n/qgis_mn.qm
share/qgis/i18n/qgis_nl.qm
share/qgis/i18n/qgis_pl_PL.qm
share/qgis/i18n/qgis_pt_BR.qm
share/qgis/i18n/qgis_pt_PT.qm
share/qgis/i18n/qgis_ro.qm
share/qgis/i18n/qgis_ru.qm
share/qgis/i18n/qgis_sk.qm
share/qgis/i18n/qgis_sl_SI.qm
share/qgis/i18n/qgis_sq_AL.qm
share/qgis/i18n/qgis_sv.qm
share/qgis/i18n/qgis_th.qm
@ -231,19 +241,6 @@ share/qgis/i18n/qgis_vi.qm
share/qgis/i18n/qgis_xh.qm
share/qgis/i18n/qgis_zh_CN.qm
share/qgis/i18n/qgis_zh_TW.qm
share/qgis/i18n/qt_ar.qm
share/qgis/i18n/qt_de.qm
share/qgis/i18n/qt_es.qm
share/qgis/i18n/qt_fr.qm
share/qgis/i18n/qt_ja_jp.qm
share/qgis/i18n/qt_pl.qm
share/qgis/i18n/qt_pt.qm
share/qgis/i18n/qt_ru.qm
share/qgis/i18n/qt_sk.qm
share/qgis/i18n/qt_sv.qm
share/qgis/i18n/qt_uk.qm
share/qgis/i18n/qt_zh_CN.qm
share/qgis/i18n/qt_zh_TW.qm
share/qgis/images/
share/qgis/images/icons/
share/qgis/images/icons/qgis-icon-16x16.png
@ -552,6 +549,7 @@ share/qgis/resources/context_help/MapServerExport-pl_PL
share/qgis/resources/context_help/MapServerExport-pt_BR
share/qgis/resources/context_help/QgsAttributeTableDialog-de_DE
share/qgis/resources/context_help/QgsAttributeTableDialog-en_US
share/qgis/resources/context_help/QgsAttributeTableDialog-es_ES
share/qgis/resources/context_help/QgsAttributeTableDialog-fr_FR
share/qgis/resources/context_help/QgsAttributeTableDialog-it_IT
share/qgis/resources/context_help/QgsAttributeTableDialog-ja_JP
@ -572,6 +570,7 @@ share/qgis/resources/context_help/QgsBookmarks-sk_SK
share/qgis/resources/context_help/QgsBookmarks-sv_SE
share/qgis/resources/context_help/QgsComposer-de_DE
share/qgis/resources/context_help/QgsComposer-en_US
share/qgis/resources/context_help/QgsComposer-es_ES
share/qgis/resources/context_help/QgsComposer-fr_FR
share/qgis/resources/context_help/QgsComposer-it_IT
share/qgis/resources/context_help/QgsComposer-ja_JP
@ -581,6 +580,7 @@ share/qgis/resources/context_help/QgsComposer-ru_RU
share/qgis/resources/context_help/QgsComposer-sk_SK
share/qgis/resources/context_help/QgsCopyrightLabelPluginGui-de_DE
share/qgis/resources/context_help/QgsCopyrightLabelPluginGui-en_US
share/qgis/resources/context_help/QgsCopyrightLabelPluginGui-es_ES
share/qgis/resources/context_help/QgsCopyrightLabelPluginGui-fr_FR
share/qgis/resources/context_help/QgsCopyrightLabelPluginGui-it_IT
share/qgis/resources/context_help/QgsCopyrightLabelPluginGui-ja_JP
@ -591,12 +591,14 @@ share/qgis/resources/context_help/QgsCopyrightLabelPluginGui-sk_SK
share/qgis/resources/context_help/QgsCopyrightLabelPluginGui-sv_SE
share/qgis/resources/context_help/QgsCustomProjectionDialog-de_DE
share/qgis/resources/context_help/QgsCustomProjectionDialog-en_US
share/qgis/resources/context_help/QgsCustomProjectionDialog-es_ES
share/qgis/resources/context_help/QgsCustomProjectionDialog-fr_FR
share/qgis/resources/context_help/QgsCustomProjectionDialog-it_IT
share/qgis/resources/context_help/QgsCustomProjectionDialog-ja_JP
share/qgis/resources/context_help/QgsCustomProjectionDialog-pt_BR
share/qgis/resources/context_help/QgsDelimitedTextPluginGui-de_DE
share/qgis/resources/context_help/QgsDelimitedTextPluginGui-en_US
share/qgis/resources/context_help/QgsDelimitedTextPluginGui-es_ES
share/qgis/resources/context_help/QgsDelimitedTextPluginGui-fr_FR
share/qgis/resources/context_help/QgsDelimitedTextPluginGui-it_IT
share/qgis/resources/context_help/QgsDelimitedTextPluginGui-ja_JP
@ -733,10 +735,13 @@ share/qgis/resources/context_help/QgsVectorLayerProperties-pl_PL
share/qgis/resources/context_help/QgsVectorLayerProperties-pt_BR
share/qgis/resources/context_help/QgsVectorLayerProperties-ru_RU
share/qgis/resources/context_help/QgsVectorLayerProperties-sk_SK
share/qgis/resources/context_help/QgsVectorLayerSaveAsDialog-de_DE
share/qgis/resources/context_help/QgsVectorLayerSaveAsDialog-en_US
share/qgis/resources/context_help/QgsWMSSourceSelect-de_DE
share/qgis/resources/context_help/QgsWMSSourceSelect-en_US
share/qgis/resources/context_help/QgsWMSSourceSelect-it_IT
share/qgis/resources/context_help/QgsWMSSourceSelect-ja_JP
share/qgis/resources/context_help/QgsWMSSourceSelect-pl_PL
share/qgis/resources/context_help/QgsWMSSourceSelect-pt_BR
share/qgis/resources/context_help/QgsWMSSourceSelect-ru_RU
share/qgis/resources/context_help/QgsWMSSourceSelect-sk_SK
@ -753,6 +758,38 @@ share/qgis/resources/spatialite.db
share/qgis/resources/srs.db
share/qgis/resources/symbology-ng-style.xml
share/qgis/svg/
share/qgis/svg/accommodation/
share/qgis/svg/accommodation/accommodation_alpinehut.svg
share/qgis/svg/accommodation/accommodation_bed_and_breakfast.svg
share/qgis/svg/accommodation/accommodation_camping.svg
share/qgis/svg/accommodation/accommodation_caravan_park.svg
share/qgis/svg/accommodation/accommodation_hotel.svg
share/qgis/svg/accommodation/accommodation_hotel2.svg
share/qgis/svg/accommodation/accommodation_shelter.svg
share/qgis/svg/accommodation/accommodation_shelter2.svg
share/qgis/svg/accommodation/accommodation_youth_hostel.svg
share/qgis/svg/amenity/
share/qgis/svg/amenity/amenity_bench.svg
share/qgis/svg/amenity/amenity_court.svg
share/qgis/svg/amenity/amenity_firestation.svg
share/qgis/svg/amenity/amenity_firestation2.svg
share/qgis/svg/amenity/amenity_firestation3.svg
share/qgis/svg/amenity/amenity_fountain.svg
share/qgis/svg/amenity/amenity_information.svg
share/qgis/svg/amenity/amenity_library.svg
share/qgis/svg/amenity/amenity_police.svg
share/qgis/svg/amenity/amenity_police2.svg
share/qgis/svg/amenity/amenity_post_box.svg
share/qgis/svg/amenity/amenity_post_office.svg
share/qgis/svg/amenity/amenity_prison.svg
share/qgis/svg/amenity/amenity_recycling.svg
share/qgis/svg/amenity/amenity_survey_point.svg
share/qgis/svg/amenity/amenity_telephone.svg
share/qgis/svg/amenity/amenity_toilets.svg
share/qgis/svg/amenity/amenity_toilets_disabled.svg
share/qgis/svg/amenity/amenity_toilets_men.svg
share/qgis/svg/amenity/amenity_toilets_women.svg
share/qgis/svg/amenity/amenity_waste_bin.svg
share/qgis/svg/biology/
share/qgis/svg/biology/Coniferous.svg
share/qgis/svg/biology/Deciduous.svg
@ -769,6 +806,14 @@ share/qgis/svg/entertainment/amenity=fast_food.svg
share/qgis/svg/entertainment/amenity=pub.svg
share/qgis/svg/entertainment/amenity=restaurant.svg
share/qgis/svg/entertainment/amenity=theatre.svg
share/qgis/svg/food/
share/qgis/svg/food/food_bar.svg
share/qgis/svg/food/food_cafe.svg
share/qgis/svg/food/food_drinkingtap.svg
share/qgis/svg/food/food_fastfood.svg
share/qgis/svg/food/food_fastfood2.svg
share/qgis/svg/food/food_pub.svg
share/qgis/svg/food/food_restaurant.svg
share/qgis/svg/geometric/
share/qgis/svg/geometric/Square1.svg
share/qgis/svg/geometric/Square2.svg
@ -811,6 +856,16 @@ share/qgis/svg/gpsicons/teepee.svg
share/qgis/svg/gpsicons/tree.svg
share/qgis/svg/gpsicons/walker.svg
share/qgis/svg/gpsicons/waypoint.svg
share/qgis/svg/health/
share/qgis/svg/health/health_dentist.svg
share/qgis/svg/health/health_doctors.svg
share/qgis/svg/health/health_hospital.svg
share/qgis/svg/health/health_hospital_emergency.svg
share/qgis/svg/health/health_hospital_emergency2.svg
share/qgis/svg/health/health_opticians.svg
share/qgis/svg/health/health_pharmacy.svg
share/qgis/svg/health/health_pharmacy_dispencing.svg
share/qgis/svg/health/health_veterinary.svg
share/qgis/svg/icon/
share/qgis/svg/icon/cameraangle.svg
share/qgis/svg/icon/golfcourse.svg
@ -825,6 +880,12 @@ share/qgis/svg/landmark/religion=muslim.svg
share/qgis/svg/landmark/religion=pastafarian.svg
share/qgis/svg/landmark/religion=sikh.svg
share/qgis/svg/landmark/tourism=museum.svg
share/qgis/svg/money/
share/qgis/svg/money/money_atm.svg
share/qgis/svg/money/money_atm2.svg
share/qgis/svg/money/money_bank.svg
share/qgis/svg/money/money_bank2.svg
share/qgis/svg/money/money_currency_exchange.svg
share/qgis/svg/north_arrows/
share/qgis/svg/north_arrows/NorthArrow1.svg
share/qgis/svg/north_arrows/NorthArrow10.svg
@ -839,6 +900,11 @@ share/qgis/svg/north_arrows/NorthArrow3.svg
share/qgis/svg/north_arrows/NorthArrow4.svg
share/qgis/svg/north_arrows/NorthArrow5.svg
share/qgis/svg/north_arrows/NorthArrow6.svg
share/qgis/svg/north_arrows/NorthArrow_blackgreenblack.svg
share/qgis/svg/north_arrows/NorthArrow_blackwhiteblack.svg
share/qgis/svg/north_arrows/NorthArrow_blackyellowblack.svg
share/qgis/svg/north_arrows/NorthArrow_bluegreenblue.svg
share/qgis/svg/north_arrows/NorthArrow_source.svg
share/qgis/svg/north_arrows/default.svg
share/qgis/svg/north_arrows/north-arrow_10_with_map_layers.svg
share/qgis/svg/north_arrows/north-arrow_11_simple_corner.svg
@ -857,6 +923,27 @@ share/qgis/svg/north_arrows/north-arrow_6_unfilled_big_arrow_symmetric.svg
share/qgis/svg/north_arrows/north-arrow_7_big_circle_with_small_arrow_unfilled_n.svg
share/qgis/svg/north_arrows/north-arrow_8_checkered.svg
share/qgis/svg/north_arrows/north-arrow_9_half_arrow_unfilled.svg
share/qgis/svg/religion/
share/qgis/svg/religion/place_of_worship.svg
share/qgis/svg/religion/place_of_worship_bahai.svg
share/qgis/svg/religion/place_of_worship_bahai3.svg
share/qgis/svg/religion/place_of_worship_buddhist.svg
share/qgis/svg/religion/place_of_worship_buddhist3.svg
share/qgis/svg/religion/place_of_worship_christian.svg
share/qgis/svg/religion/place_of_worship_christian3.svg
share/qgis/svg/religion/place_of_worship_hindu.svg
share/qgis/svg/religion/place_of_worship_hindu3.svg
share/qgis/svg/religion/place_of_worship_islamic.svg
share/qgis/svg/religion/place_of_worship_islamic3.svg
share/qgis/svg/religion/place_of_worship_jain.svg
share/qgis/svg/religion/place_of_worship_jain3.svg
share/qgis/svg/religion/place_of_worship_jewish.svg
share/qgis/svg/religion/place_of_worship_jewish3.svg
share/qgis/svg/religion/place_of_worship_shinto.svg
share/qgis/svg/religion/place_of_worship_shinto3.svg
share/qgis/svg/religion/place_of_worship_sikh.svg
share/qgis/svg/religion/place_of_worship_sikh3.svg
share/qgis/svg/religion/place_of_worship_unknown3.svg
share/qgis/svg/services/
share/qgis/svg/services/amenity=atm.svg
share/qgis/svg/services/amenity=pharmacy,dispensing=yes.svg
@ -867,9 +954,65 @@ share/qgis/svg/services/amenity=telephone.svg
share/qgis/svg/services/shop=convenience.svg
share/qgis/svg/services/shop=supermarket.svg
share/qgis/svg/services/tourism=hotel.svg
share/qgis/svg/shopping/
share/qgis/svg/shopping/shopping_alcohol.svg
share/qgis/svg/shopping/shopping_bakery.svg
share/qgis/svg/shopping/shopping_bicycle.svg
share/qgis/svg/shopping/shopping_book.svg
share/qgis/svg/shopping/shopping_butcher.svg
share/qgis/svg/shopping/shopping_car.svg
share/qgis/svg/shopping/shopping_car_repair.svg
share/qgis/svg/shopping/shopping_clothes.svg
share/qgis/svg/shopping/shopping_confectionery.svg
share/qgis/svg/shopping/shopping_convenience.svg
share/qgis/svg/shopping/shopping_diy.svg
share/qgis/svg/shopping/shopping_estateagent.svg
share/qgis/svg/shopping/shopping_estateagent2.svg
share/qgis/svg/shopping/shopping_estateagent3.svg
share/qgis/svg/shopping/shopping_fish.svg
share/qgis/svg/shopping/shopping_garden_centre.svg
share/qgis/svg/shopping/shopping_gift.svg
share/qgis/svg/shopping/shopping_greengrocer.svg
share/qgis/svg/shopping/shopping_hairdresser.svg
share/qgis/svg/shopping/shopping_hifi.svg
share/qgis/svg/shopping/shopping_jewelry.svg
share/qgis/svg/shopping/shopping_laundrette.svg
share/qgis/svg/shopping/shopping_mobile_phone.svg
share/qgis/svg/shopping/shopping_motorcycle.svg
share/qgis/svg/shopping/shopping_music.svg
share/qgis/svg/shopping/shopping_pet.svg
share/qgis/svg/shopping/shopping_pet2.svg
share/qgis/svg/shopping/shopping_photo.svg
share/qgis/svg/shopping/shopping_supermarket.svg
share/qgis/svg/shopping/shopping_tackle.svg
share/qgis/svg/shopping/shopping_video_rental.svg
share/qgis/svg/sport/
share/qgis/svg/sport/backpacker_ganson.svg
share/qgis/svg/sport/golf_flag_in_hole_on_gr_01.svg
share/qgis/svg/sport/sport_archery.svg
share/qgis/svg/sport/sport_baseball.svg
share/qgis/svg/sport/sport_cricket.svg
share/qgis/svg/sport/sport_diving.svg
share/qgis/svg/sport/sport_golf.svg
share/qgis/svg/sport/sport_gym.svg
share/qgis/svg/sport/sport_gymnasium.svg
share/qgis/svg/sport/sport_gymnasium2.svg
share/qgis/svg/sport/sport_hillclimbing.svg
share/qgis/svg/sport/sport_horse_racing.svg
share/qgis/svg/sport/sport_iceskating.svg
share/qgis/svg/sport/sport_jetski.svg
share/qgis/svg/sport/sport_leisure_centre.svg
share/qgis/svg/sport/sport_motorracing.svg
share/qgis/svg/sport/sport_playground.svg
share/qgis/svg/sport/sport_sailing.svg
share/qgis/svg/sport/sport_skiing_crosscountry.svg
share/qgis/svg/sport/sport_skiing_downhill.svg
share/qgis/svg/sport/sport_snooker.svg
share/qgis/svg/sport/sport_soccer.svg
share/qgis/svg/sport/sport_swimming_indoor.svg
share/qgis/svg/sport/sport_swimming_outdoor.svg
share/qgis/svg/sport/sport_tennis.svg
share/qgis/svg/sport/sport_windsurfing.svg
share/qgis/svg/symbol/
share/qgis/svg/symbol/Cross1.svg
share/qgis/svg/symbol/Cross2.svg
@ -879,12 +1022,104 @@ share/qgis/svg/symbol/Cross6.svg
share/qgis/svg/symbol/Star1.svg
share/qgis/svg/symbol/Star2.svg
share/qgis/svg/symbol/Star3.svg
share/qgis/svg/symbol/blank.svg
share/qgis/svg/symbol/blank_font.svg
share/qgis/svg/symbol/education_nursery.svg
share/qgis/svg/symbol/education_school.svg
share/qgis/svg/symbol/education_university.svg
share/qgis/svg/symbol/fountain.svg
share/qgis/svg/symbol/landuse_coniferous.svg
share/qgis/svg/symbol/landuse_coniferous_and_deciduous.svg
share/qgis/svg/symbol/landuse_deciduous.svg
share/qgis/svg/symbol/landuse_grass.svg
share/qgis/svg/symbol/landuse_hills.svg
share/qgis/svg/symbol/landuse_quary.svg
share/qgis/svg/symbol/landuse_scrub.svg
share/qgis/svg/symbol/landuse_swamp.svg
share/qgis/svg/symbol/poi_boundary_administrative.svg
share/qgis/svg/symbol/poi_cave.svg
share/qgis/svg/symbol/poi_embassy.svg
share/qgis/svg/symbol/poi_embassy2.svg
share/qgis/svg/symbol/poi_military_bunker.svg
share/qgis/svg/symbol/poi_mine.svg
share/qgis/svg/symbol/poi_mine_abandoned.svg
share/qgis/svg/symbol/poi_peak.svg
share/qgis/svg/symbol/poi_place_city.svg
share/qgis/svg/symbol/poi_place_town.svg
share/qgis/svg/symbol/poi_place_village.svg
share/qgis/svg/symbol/poi_point_of_interest.svg
share/qgis/svg/symbol/poi_tower_communications.svg
share/qgis/svg/symbol/poi_tower_power.svg
share/qgis/svg/symbol/poi_tower_water.svg
share/qgis/svg/symbol/water_tower.svg
share/qgis/svg/tourist/
share/qgis/svg/tourist/tourist_archaeological.svg
share/qgis/svg/tourist/tourist_archaeological2.svg
share/qgis/svg/tourist/tourist_art_gallery.svg
share/qgis/svg/tourist/tourist_art_gallery2.svg
share/qgis/svg/tourist/tourist_battlefield.svg
share/qgis/svg/tourist/tourist_beach.svg
share/qgis/svg/tourist/tourist_casino.svg
share/qgis/svg/tourist/tourist_castle.svg
share/qgis/svg/tourist/tourist_cinema.svg
share/qgis/svg/tourist/tourist_cinema2.svg
share/qgis/svg/tourist/tourist_fountain.svg
share/qgis/svg/tourist/tourist_memorial.svg
share/qgis/svg/tourist/tourist_monument.svg
share/qgis/svg/tourist/tourist_museum.svg
share/qgis/svg/tourist/tourist_picnic.svg
share/qgis/svg/tourist/tourist_ruin.svg
share/qgis/svg/tourist/tourist_steam_train.svg
share/qgis/svg/tourist/tourist_theatre.svg
share/qgis/svg/tourist/tourist_view_point.svg
share/qgis/svg/tourist/tourist_waterwheel.svg
share/qgis/svg/tourist/tourist_windmill.svg
share/qgis/svg/tourist/tourist_wreck.svg
share/qgis/svg/tourist/tourist_zoo.svg
share/qgis/svg/tourist/tourisum_fountain.svg
share/qgis/svg/transport/
share/qgis/svg/transport/amenity=airport.svg
share/qgis/svg/transport/amenity=ferry_terminal.svg
share/qgis/svg/transport/amenity=parking.svg
share/qgis/svg/transport/amenity=taxi.svg
share/qgis/svg/transport/barrier_bollard.svg
share/qgis/svg/transport/barrier_enterance.svg
share/qgis/svg/transport/barrier_gate.svg
share/qgis/svg/transport/barrier_lift_gate.svg
share/qgis/svg/transport/barrier_stile.svg
share/qgis/svg/transport/barrier_toll_booth.svg
share/qgis/svg/transport/highway=bus_stop.svg
share/qgis/svg/transport/railway=station.svg
share/qgis/svg/transport/transport_aerodrome.svg
share/qgis/svg/transport/transport_aerodrome2.svg
share/qgis/svg/transport/transport_airport.svg
share/qgis/svg/transport/transport_airport2.svg
share/qgis/svg/transport/transport_bus_station.svg
share/qgis/svg/transport/transport_bus_stop.svg
share/qgis/svg/transport/transport_bus_stop2.svg
share/qgis/svg/transport/transport_car_share.svg
share/qgis/svg/transport/transport_ford.svg
share/qgis/svg/transport/transport_fuel.svg
share/qgis/svg/transport/transport_fuel_lpg.svg
share/qgis/svg/transport/transport_lighthouse.svg
share/qgis/svg/transport/transport_marina.svg
share/qgis/svg/transport/transport_parking.svg
share/qgis/svg/transport/transport_parking_bicycle.svg
share/qgis/svg/transport/transport_parking_car.svg
share/qgis/svg/transport/transport_parking_car_paid.svg
share/qgis/svg/transport/transport_parking_disabled.svg
share/qgis/svg/transport/transport_parking_private.svg
share/qgis/svg/transport/transport_parking_private2.svg
share/qgis/svg/transport/transport_parking_private3.svg
share/qgis/svg/transport/transport_port.svg
share/qgis/svg/transport/transport_rental_bicycle.svg
share/qgis/svg/transport/transport_rental_car.svg
share/qgis/svg/transport/transport_roundabout_anticlockwise.svg
share/qgis/svg/transport/transport_roundabout_clockwise.svg
share/qgis/svg/transport/transport_taxi_rank.svg
share/qgis/svg/transport/transport_traffic_lights.svg
share/qgis/svg/transport/transport_train_station.svg
share/qgis/svg/transport/transport_train_station2.svg
share/qgis/svg/transport/transport_tram_stop.svg
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database