Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Dec 2016 03:15:52 +0000 (UTC)
From:      Wen Heping <wen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429216 - in head/graphics/qgis: . files
Message-ID:  <201612230315.uBN3FqI7094928@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wen
Date: Fri Dec 23 03:15:52 2016
New Revision: 429216
URL: https://svnweb.freebsd.org/changeset/ports/429216

Log:
  - Update to 2.18.2(based on)
  - New dependency devel/qjson
  - New makefile target 'check', which runs the test suite
  - Use of external python functionality, if possible (via CMAKE_ARGS) [2]
  - Switch from PostGIS 2.1 to 2.2
  
  PR:		214238
  Submitted by:	rhurlin@gwdg.de(maintainer)

Modified:
  head/graphics/qgis/Makefile
  head/graphics/qgis/distinfo
  head/graphics/qgis/files/patch-debian_qgis.desktop
  head/graphics/qgis/files/patch-src_plugins_grass_CMakeLists.txt
  head/graphics/qgis/files/patch-src_plugins_grass_qtermwidget_kpty.cpp
  head/graphics/qgis/pkg-plist

Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile	Fri Dec 23 02:52:04 2016	(r429215)
+++ head/graphics/qgis/Makefile	Fri Dec 23 03:15:52 2016	(r429216)
@@ -3,8 +3,7 @@
 
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
-DISTVERSION=	2_14_3
-PORTREVISION=	2
+DISTVERSION=	2_18_2
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin@gwdg.de
@@ -20,6 +19,7 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2
 		libgsl.so:math/gsl \
 		libproj.so:graphics/proj \
 		libqca.so:devel/qca \
+		libqjson.so:devel/qjson \
 		libqscintilla2.so:devel/qscintilla2 \
 		libqwt.so:x11-toolkits/qwt5 \
 		libspatialindex.so:devel/spatialindex \
@@ -30,28 +30,42 @@ GH_PROJECT=	${PORTNAME:tu}
 
 USES=		bison cmake cpe desktop-file-utils execinfo fortran \
 		gmake python:2 sqlite
-USE_QT4=	corelib designer gui linguist_build moc_build network \
-		qmake_build rcc_build script sql svg testlib uic_build xml \
-		webkit
+USE_QT4=	corelib designer doc gui linguist_build moc_build \
+		network qmake_build rcc_build script sql svg testlib \
+		uic_build webkit xml
 
 USE_LDCONFIG=	yes
 ICON_SIZES=	8 16 22 24 32 36 42 48 64 72 80 96 128 192 256 512
 
 OPTIONS_DEFINE=		PYTHON POSTGIS GRASS SERVER
 OPTIONS_GROUP=		DEVELOPER
-OPTIONS_GROUP_DEVELOPER=	CUSTOMWIDGETS ASTYLE DEBUG
+OPTIONS_GROUP_DEVELOPER=	CUSTOMWIDGETS ASTYLE TESTS DEBUG
 OPTIONS_DEFAULT=	PYTHON POSTGIS
-OPTIONS_SUB=		yes
 NO_OPTIONS_SORT=	yes
+OPTIONS_SUB=		yes
 ASTYLE_DESC=		Enable AStyle for QGis
 CUSTOMWIDGETS_DESC=	Enable QT4/QGis Custom Widgets
 DEBUG_DESC=		Write Debugging Output to Console
 SERVER_DESC=		Enable QGIS server
+TESTS_DESC=		Run the test suite after build process
 
-CMAKE_ARGS+=	-DWITH_ORACLE:BOOL=FALSE
+CMAKE_ARGS+=	-DWITH_ORACLE:BOOL=FALSE \
+		-DWITH_GLOBE:BOOL=FALSE
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
+CMAKE_ARGS+=	-DSUPPRESS_SIP_WARNINGS=OFF -DSUPPRESS_QT_WARNINGS=OFF
+CMAKE_ARGS+=	-DWITH_INTERNAL_DATEUTIL=FALSE
+CMAKE_ARGS+=	-DWITH_INTERNAL_FUTURE=FALSE
+CMAKE_ARGS+=	-DWITH_INTERNAL_HTTPLIB2=FALSE
+CMAKE_ARGS+=	-DWITH_INTERNAL_JINJA2=FALSE
+CMAKE_ARGS+=	-DWITH_INTERNAL_MARKUPSAFE=FALSE
+CMAKE_ARGS+=	-DWITH_INTERNAL_NOSE2=FALSE
+CMAKE_ARGS+=	-DWITH_INTERNAL_PYGMENTS=FALSE
+CMAKE_ARGS+=	-DWITH_INTERNAL_PYTZ=FALSE
+CMAKE_ARGS+=	-DWITH_INTERNAL_REQUESTS=FALSE
+CMAKE_ARGS+=	-DWITH_INTERNAL_SIX=FALSE
+CMAKE_ARGS+=	-DWITH_INTERNAL_YAML=FALSE
 .endif
 
 ASTYLE_RUN_DEPENDS=	astyle:devel/astyle
@@ -67,18 +81,23 @@ DEBUG_CMAKE_OFF=	-DCMAKE_BUILD_TYPE=Rele
 GRASS_BUILD_DEPENDS=	grass64:databases/grass
 GRASS_RUN_DEPENDS=	grass64:databases/grass
 GRASS_CMAKE_ON=		-DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.6
-GRASS_CMAKE_OFF=	-DWITH_GRASS:BOOL=FALSE
 GRASS_FORCE_MAKE_JOBS=	NO
+GRASS_CMAKE_OFF=	-DWITH_GRASS:BOOL=FALSE
 
 POSTGIS_USES=		pgsql
-POSTGIS_LIB_DEPENDS=	liblwgeom.so:databases/postgis21
+POSTGIS_LIB_DEPENDS=	liblwgeom.so:databases/postgis22
 POSTGIS_CMAKE_ON=	-DWITH_POSTGRESQL:BOOL=TRUE
 POSTGIS_CMAKE_OFF=	-DWITH_POSTGRESQL:BOOL=FALSE
 
 PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future \
+			${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2 \
+			${PYTHON_PKGNAMEPREFIX}Jinja>=1.2:devel/py-Jinja \
+			${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib \
 			${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \
 			${PYTHON_PKGNAMEPREFIX}pip>=8.0.2:devel/py-pip \
+			${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \
+			${PYTHON_PKGNAMEPREFIX}pytz>=2016.6.1,1:devel/py-pytz \
 			${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:devel/py-qt4-core \
 			${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:x11-toolkits/py-qt4-gui \
 			${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:net/py-qt4-network \
@@ -86,17 +105,23 @@ PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPR
 			${PYTHON_PKGNAMEPREFIX}qt4-sql>=4.11.3:databases/py-qt4-sql \
 			${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:graphics/py-qt4-svg \
 			${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:textproc/py-qt4-xml \
+			${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
 			${PYTHON_PKGNAMEPREFIX}sip>=4.14.6:devel/py-sip \
+			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
 			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:databases/py-sqlite3 \
 			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
 PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future \
 			${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:graphics/py-gdal \
+			${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2 \
+			${PYTHON_PKGNAMEPREFIX}Jinja>=1.2:devel/py-Jinja \
+			${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib \
 			${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \
-			${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1,1:math/py-numpy \
+			${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2,1:math/py-numpy \
 			${PYTHON_PKGNAMEPREFIX}pip>=8.0.2:devel/py-pip \
 			${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:databases/py-psycopg2 \
 			${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \
+			${PYTHON_PKGNAMEPREFIX}pytz>=2016.6.1,1:devel/py-pytz \
 			${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:devel/py-qt4-core \
 			${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:x11-toolkits/py-qt4-gui \
 			${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:net/py-qt4-network \
@@ -105,7 +130,11 @@ PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREF
 			${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:graphics/py-qt4-svg \
 			${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.11.1:www/py-qt4-webkit \
 			${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:textproc/py-qt4-xml \
+			${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
+			${PYTHON_PKGNAMEPREFIX}sip>=4.14.6:devel/py-sip \
+			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
 			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:databases/py-sqlite3 \
+			${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \
 			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
 PYTHON_CMAKE_ON=	-DWITH_BINDINGS:BOOL=TRUE
 PYTHON_CMAKE_OFF=	-DWITH_BINDINGS:BOOL=FALSE
@@ -114,6 +143,9 @@ SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_ON=	-DWITH_SERVER:BOOL=TRUE
 SERVER_CMAKE_OFF=	-DWITH_SERVER:BOOL=FALSE
 
+TESTS_CMAKE_ON=		-DENABLE_TESTS=TRUE
+TESTS_CMAKE_OFF=	-DENABLE_TESTS=FALSE
+
 INSTALLS_ICONS=		yes
 
 .include <bsd.port.options.mk>
@@ -134,15 +166,8 @@ pre-patch:
 # [Ugly workaround!] Because of GitHub #76aa035 from 2015-05-23
 # 'Hide shared library symbols by default on GCC and Clang',
 # some layer properties are not visible on FreeBSD > 9.x
-	@${REINPLACE_CMD} -e 's|SET(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")|#SET(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")|g' \
-		${WRKSRC}/src/analysis/CMakeLists.txt \
-		${WRKSRC}/src/app/CMakeLists.txt \
-		${WRKSRC}/src/core/CMakeLists.txt \
-		${WRKSRC}/src/customwidgets/CMakeLists.txt \
-		${WRKSRC}/src/gui/CMakeLists.txt \
-		${WRKSRC}/src/plugins/CMakeLists.txt \
-		${WRKSRC}/src/python/CMakeLists.txt \
-		${WRKSRC}/src/server/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|SET(CMAKE_CXX_VISIBILITY_PRESET hidden)|#SET(CMAKE_CXX_VISIBILITY_PRESET hidden)|' \
+		${WRKSRC}/CMakeLists.txt
 .endif
 
 post-patch:
@@ -162,6 +187,8 @@ post-patch:
 		${WRKSRC}/src/plugins/grass/scripts/qgis.v.upgrade.py \
 		${WRKSRC}/src/plugins/grass/scripts/r.external.all.py \
 		${WRKSRC}/src/plugins/grass/scripts/db.connect-login.pg.py
+	@${REINPLACE_CMD} -e 's|markupsafe ||g' \
+		${WRKSRC}/python/ext-libs/CMakeLists.txt
 
 post-install:
 	${RM} ${STAGEDIR}${DATADIR}/python/pygments/util.py.bak
@@ -178,4 +205,7 @@ post-install:
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png
 .endfor
 
+check:
+	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)
+
 .include <bsd.port.mk>

Modified: head/graphics/qgis/distinfo
==============================================================================
--- head/graphics/qgis/distinfo	Fri Dec 23 02:52:04 2016	(r429215)
+++ head/graphics/qgis/distinfo	Fri Dec 23 03:15:52 2016	(r429216)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464843777
-SHA256 (qgis-QGIS-final-2_14_3_GH0.tar.gz) = 5423fff2b0ed0572eb01700b7a5b8ba4e06f7d59392ec0a9e1b3dbeb7fe44608
-SIZE (qgis-QGIS-final-2_14_3_GH0.tar.gz) = 87864988
+TIMESTAMP = 1482452795
+SHA256 (qgis-QGIS-final-2_18_2_GH0.tar.gz) = d61c0b28bc9aa84b36bbe8b25cb4432b5f8d31836431976d5bc8d43d4808647b
+SIZE (qgis-QGIS-final-2_18_2_GH0.tar.gz) = 98127033

Modified: head/graphics/qgis/files/patch-debian_qgis.desktop
==============================================================================
--- head/graphics/qgis/files/patch-debian_qgis.desktop	Fri Dec 23 02:52:04 2016	(r429215)
+++ head/graphics/qgis/files/patch-debian_qgis.desktop	Fri Dec 23 03:15:52 2016	(r429216)
@@ -1,4 +1,4 @@
---- debian/qgis.desktop.orig	2016-02-26 12:23:48 UTC
+--- debian/qgis.desktop.orig	2016-10-21 12:14:02 UTC
 +++ debian/qgis.desktop
 @@ -1,7 +1,9 @@
  [Desktop Entry]

Modified: head/graphics/qgis/files/patch-src_plugins_grass_CMakeLists.txt
==============================================================================
--- head/graphics/qgis/files/patch-src_plugins_grass_CMakeLists.txt	Fri Dec 23 02:52:04 2016	(r429215)
+++ head/graphics/qgis/files/patch-src_plugins_grass_CMakeLists.txt	Fri Dec 23 03:15:52 2016	(r429216)
@@ -1,6 +1,6 @@
---- src/plugins/grass/CMakeLists.txt.orig	2015-10-23 12:10:38 UTC
+--- src/plugins/grass/CMakeLists.txt.orig	2016-10-21 12:14:02 UTC
 +++ src/plugins/grass/CMakeLists.txt
-@@ -195,6 +195,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSIO
+@@ -202,6 +202,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSIO
        qgis_app
        qgis_gui
        ${OPENPTY_LIBRARY}

Modified: head/graphics/qgis/files/patch-src_plugins_grass_qtermwidget_kpty.cpp
==============================================================================
--- head/graphics/qgis/files/patch-src_plugins_grass_qtermwidget_kpty.cpp	Fri Dec 23 02:52:04 2016	(r429215)
+++ head/graphics/qgis/files/patch-src_plugins_grass_qtermwidget_kpty.cpp	Fri Dec 23 03:15:52 2016	(r429216)
@@ -1,10 +1,11 @@
---- src/plugins/grass/qtermwidget/kpty.cpp.orig	2015-10-23 12:10:38 UTC
+--- src/plugins/grass/qtermwidget/kpty.cpp.orig	2016-10-21 12:14:02 UTC
 +++ src/plugins/grass/qtermwidget/kpty.cpp
-@@ -30,6 +30,7 @@
+@@ -28,6 +28,8 @@
+ 
+ 
  #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#define HAVE_UTEMPTER
++#define HAVE_UTMPX
  #define HAVE_LOGIN
  #define HAVE_LIBUTIL_H
-+#define HAVE_UTEMPTER
  #endif
- 
- #ifdef __sgi

Modified: head/graphics/qgis/pkg-plist
==============================================================================
--- head/graphics/qgis/pkg-plist	Fri Dec 23 02:52:04 2016	(r429215)
+++ head/graphics/qgis/pkg-plist	Fri Dec 23 03:15:52 2016	(r429216)
@@ -1,9 +1,9 @@
 %%SERVER%%bin/admin.sld
 bin/qbrowser
 bin/qgis
-bin/qgis_bench
+%%TESTS%%bin/qgis_bench
 %%SERVER%%bin/qgis_mapserv.fcgi
-%%DEBUG%%bin/qgis_wcstest
+%%TESTS%%%%DEBUG%%bin/qgis_wcstest
 %%SERVER%%bin/schemaExtension.xsd
 %%SERVER%%bin/wms_metadata.xml
 include/qgis/Bezier3D.h
@@ -31,14 +31,19 @@ include/qgis/qgisplugin.h
 include/qgis/qgs25drenderer.h
 include/qgis/qgs25drendererwidget.h
 include/qgis/qgsabstractgeometryv2.h
+include/qgis/qgsaction.h
+include/qgis/qgsactionmanager.h
 include/qgis/qgsactionmenu.h
 include/qgis/qgsaddremoveitemcommand.h
 include/qgis/qgsaddremovemultiframecommand.h
 include/qgis/qgsadvanceddigitizingdockwidget.h
+include/qgis/qgsaggregatecalculator.h
 include/qgis/qgsalignraster.h
+include/qgis/qgsannotation.h
 include/qgis/qgsannotationitem.h
 include/qgis/qgsapplication.h
 include/qgis/qgsarcproperter.h
+include/qgis/qgsarrowsymbollayerwidget.h
 include/qgis/qgsaspectfilter.h
 include/qgis/qgsatlascomposition.h
 include/qgis/qgsattributeaction.h
@@ -46,8 +51,10 @@ include/qgis/qgsattributedialog.h
 include/qgis/qgsattributeeditor.h
 include/qgis/qgsattributeeditorcontext.h
 include/qgis/qgsattributeform.h
+include/qgis/qgsattributeformeditorwidget.h
 include/qgis/qgsattributeforminterface.h
 include/qgis/qgsattributeformlegacyinterface.h
+include/qgis/qgsattributetableconfig.h
 include/qgis/qgsattributetabledelegate.h
 include/qgis/qgsattributetablefiltermodel.h
 include/qgis/qgsattributetablemodel.h
@@ -80,6 +87,7 @@ include/qgis/qgsauthsslconfigwidget.h
 include/qgis/qgsauthsslerrorsdialog.h
 include/qgis/qgsauthsslimportdialog.h
 include/qgis/qgsauthtrustedcasdialog.h
+include/qgis/qgsbearingutils.h
 include/qgis/qgsbilinearrasterresampler.h
 include/qgis/qgsblendmodecombobox.h
 include/qgis/qgsblureffect.h
@@ -95,8 +103,10 @@ include/qgis/qgscategorizedsymbolrendere
 include/qgis/qgscategorizedsymbolrendererv2widget.h
 include/qgis/qgscharacterselectdialog.h
 include/qgis/qgscheckboxconfigdlg.h
+include/qgis/qgscheckboxsearchwidgetwrapper.h
 include/qgis/qgscheckboxwidgetfactory.h
 include/qgis/qgscheckboxwidgetwrapper.h
+include/qgis/qgscircularstringv2.h
 include/qgis/qgsclassificationwidgetwrapper.h
 include/qgis/qgsclassificationwidgetwrapperfactory.h
 include/qgis/qgsclipper.h
@@ -133,6 +143,7 @@ include/qgis/qgscomposereffect.h
 include/qgis/qgscomposerframe.h
 include/qgis/qgscomposerhtml.h
 include/qgis/qgscomposeritem.h
+include/qgis/qgscomposeritemcombobox.h
 include/qgis/qgscomposeritemcommand.h
 include/qgis/qgscomposeritemgroup.h
 include/qgis/qgscomposerlabel.h
@@ -147,8 +158,11 @@ include/qgis/qgscomposermodel.h
 include/qgis/qgscomposermousehandles.h
 include/qgis/qgscomposermultiframe.h
 include/qgis/qgscomposermultiframecommand.h
+include/qgis/qgscomposernodesitem.h
 include/qgis/qgscomposerobject.h
 include/qgis/qgscomposerpicture.h
+include/qgis/qgscomposerpolygon.h
+include/qgis/qgscomposerpolyline.h
 include/qgis/qgscomposerruler.h
 include/qgis/qgscomposerscalebar.h
 include/qgis/qgscomposershape.h
@@ -158,13 +172,17 @@ include/qgis/qgscomposertablev2.h
 include/qgis/qgscomposertexttable.h
 include/qgis/qgscomposerview.h
 include/qgis/qgscomposition.h
+include/qgis/qgscompoundcolorwidget.h
+include/qgis/qgscompoundcurvev2.h
 include/qgis/qgsconditionalstyle.h
 include/qgis/qgsconfig.h
+include/qgis/qgsconfigureshortcutsdialog.h
 include/qgis/qgsconnectionpool.h
 include/qgis/qgscontexthelp.h
 include/qgis/qgscontrastenhancement.h
 include/qgis/qgscontrastenhancementfunction.h
 include/qgis/qgscoordinatereferencesystem.h
+include/qgis/qgscoordinatereferencesystem_p.h
 include/qgis/qgscoordinatetransform.h
 include/qgis/qgscoordinateutils.h
 include/qgis/qgscptcityarchive.h
@@ -175,6 +193,8 @@ include/qgis/qgscrscache.h
 include/qgis/qgscsexception.h
 include/qgis/qgscubicrasterresampler.h
 include/qgis/qgscursors.h
+include/qgis/qgscurvepolygonv2.h
+include/qgis/qgscurvev2.h
 include/qgis/qgscustomlayerorderwidget.h
 include/qgis/qgsdartmeasurement.h
 include/qgis/qgsdashspacedialog.h
@@ -193,6 +213,8 @@ include/qgis/qgsdatetimeeditconfig.h
 include/qgis/qgsdatetimeeditfactory.h
 %%CUSTOMWIDGETS%%include/qgis/qgsdatetimeeditplugin.h
 include/qgis/qgsdatetimeeditwrapper.h
+include/qgis/qgsdatetimesearchwidgetwrapper.h
+include/qgis/qgsdatetimestatisticalsummary.h
 include/qgis/qgsdatumtransformdialog.h
 include/qgis/qgsdatumtransformstore.h
 include/qgis/qgsdbfilterproxymodel.h
@@ -207,6 +229,8 @@ include/qgis/qgsdial.h
 include/qgis/qgsdialog.h
 include/qgis/qgsdistancearcproperter.h
 include/qgis/qgsdistancearea.h
+include/qgis/qgsdockwidget.h
+%%CUSTOMWIDGETS%%include/qgis/qgsdockwidgetplugin.h
 include/qgis/qgsdoubleboxscalebarstyle.h
 include/qgis/qgsdoublespinbox.h
 %%CUSTOMWIDGETS%%include/qgis/qgsdoublespinboxplugin.h
@@ -236,6 +260,7 @@ include/qgis/qgsexpressionbuilderwidget.
 include/qgis/qgsexpressioncontext.h
 include/qgis/qgsexpressionfieldbuffer.h
 include/qgis/qgsexpressionhighlighter.h
+include/qgis/qgsexpressionlineedit.h
 include/qgis/qgsexpressionselectiondialog.h
 include/qgis/qgsextentgroupbox.h
 %%CUSTOMWIDGETS%%include/qgis/qgsextentgroupboxplugin.h
@@ -256,6 +281,7 @@ include/qgis/qgsfeaturerequest.h
 include/qgis/qgsfeatureselectiondlg.h
 include/qgis/qgsfeatureselectionmodel.h
 include/qgis/qgsfeaturestore.h
+include/qgis/qgsfeedback.h
 include/qgis/qgsfield.h
 include/qgis/qgsfield_p.h
 include/qgis/qgsfieldcombobox.h
@@ -266,6 +292,7 @@ include/qgis/qgsfieldexpressionwidget.h
 include/qgis/qgsfieldmodel.h
 include/qgis/qgsfieldproxymodel.h
 include/qgis/qgsfieldvalidator.h
+include/qgis/qgsfiledownloader.h
 include/qgis/qgsfiledropedit.h
 include/qgis/qgsfilenamewidgetfactory.h
 include/qgis/qgsfilenamewidgetwrapper.h
@@ -274,6 +301,7 @@ include/qgis/qgsfilewidget.h
 include/qgis/qgsfillsymbollayerv2.h
 include/qgis/qgsfilterlineedit.h
 %%CUSTOMWIDGETS%%include/qgis/qgsfilterlineeditplugin.h
+include/qgis/qgsfocuswatcher.h
 include/qgis/qgsfontutils.h
 include/qgis/qgsformannotationitem.h
 include/qgis/qgsgenericfeatureselectionmanager.h
@@ -281,14 +309,21 @@ include/qgis/qgsgenericprojectionselecto
 include/qgis/qgsgeometry.h
 include/qgis/qgsgeometryanalyzer.h
 include/qgis/qgsgeometrycache.h
+include/qgis/qgsgeometrycollectionv2.h
+include/qgis/qgsgeometryeditutils.h
+include/qgis/qgsgeometryengine.h
+include/qgis/qgsgeometryfactory.h
 include/qgis/qgsgeometrygeneratorsymbollayerv2.h
+include/qgis/qgsgeometryutils.h
 include/qgis/qgsgeometryvalidator.h
+include/qgis/qgsgeos.h
 include/qgis/qgsgloweffect.h
 include/qgis/qgsgml.h
 include/qgis/qgsgmlschema.h
 include/qgis/qgsgpsconnection.h
 include/qgis/qgsgpsdconnection.h
 include/qgis/qgsgpsdetector.h
+include/qgis/qgsgradientstopeditor.h
 include/qgis/qgsgraduatedhistogramwidget.h
 include/qgis/qgsgraduatedsymbolrendererv2.h
 include/qgis/qgsgraduatedsymbolrendererv2widget.h
@@ -298,6 +333,7 @@ include/qgis/qgsgraphbuilder.h
 include/qgis/qgsgraphbuilderintr.h
 include/qgis/qgsgraphdirector.h
 include/qgis/qgsgridfilewriter.h
+include/qgis/qgsgroupungroupitemscommand.h
 include/qgis/qgsgroupwmsdatadialog.h
 include/qgis/qgsheatmaprenderer.h
 include/qgis/qgsheatmaprendererwidget.h
@@ -305,6 +341,8 @@ include/qgis/qgshiddenwidgetfactory.h
 include/qgis/qgshiddenwidgetwrapper.h
 include/qgis/qgshighlight.h
 include/qgis/qgshillshadefilter.h
+include/qgis/qgshillshaderenderer.h
+include/qgis/qgshillshaderendererwidget.h
 include/qgis/qgshistogram.h
 include/qgis/qgshistogramdiagram.h
 include/qgis/qgshistogramwidget.h
@@ -318,8 +356,10 @@ include/qgis/qgsimageoperation.h
 include/qgis/qgsindexedfeature.h
 include/qgis/qgsinternalgeometryengine.h
 include/qgis/qgsinterpolator.h
+include/qgis/qgsinterval.h
 include/qgis/qgsinvertedpolygonrenderer.h
 include/qgis/qgsinvertedpolygonrendererwidget.h
+include/qgis/qgsjsonutils.h
 include/qgis/qgslabel.h
 include/qgis/qgslabelattributes.h
 include/qgis/qgslabelfeature.h
@@ -328,6 +368,9 @@ include/qgis/qgslabelsearchtree.h
 include/qgis/qgslayerdefinition.h
 include/qgis/qgslayerpropertieswidget.h
 include/qgis/qgslayertree.h
+include/qgis/qgslayertreeembeddedconfigwidget.h
+include/qgis/qgslayertreeembeddedwidgetregistry.h
+include/qgis/qgslayertreeembeddedwidgetsimpl.h
 include/qgis/qgslayertreegroup.h
 include/qgis/qgslayertreelayer.h
 include/qgis/qgslayertreemapcanvasbridge.h
@@ -347,6 +390,7 @@ include/qgis/qgslegendsettings.h
 include/qgis/qgslegendsymbolitemv2.h
 include/qgis/qgslinearminmaxenhancement.h
 include/qgis/qgslinearminmaxenhancementwithclip.h
+include/qgis/qgslinestringv2.h
 include/qgis/qgslinesymbollayerv2.h
 include/qgis/qgslinevectorlayerdirector.h
 include/qgis/qgslocalec.h
@@ -365,12 +409,15 @@ include/qgis/qgsmaplayer.h
 include/qgis/qgsmaplayeractionregistry.h
 include/qgis/qgsmaplayercombobox.h
 %%CUSTOMWIDGETS%%include/qgis/qgsmaplayercomboboxplugin.h
+include/qgis/qgsmaplayerconfigwidget.h
+include/qgis/qgsmaplayerconfigwidgetfactory.h
 include/qgis/qgsmaplayerlegend.h
 include/qgis/qgsmaplayermodel.h
 include/qgis/qgsmaplayerproxymodel.h
 include/qgis/qgsmaplayerregistry.h
 include/qgis/qgsmaplayerrenderer.h
 include/qgis/qgsmaplayerstylemanager.h
+include/qgis/qgsmaplayerstylemanagerwidget.h
 include/qgis/qgsmapmouseevent.h
 include/qgis/qgsmapoverviewcanvas.h
 include/qgis/qgsmaprenderer.h
@@ -403,24 +450,36 @@ include/qgis/qgsmessageviewer.h
 include/qgis/qgsmimedatautils.h
 include/qgis/qgsmultibandcolorrenderer.h
 include/qgis/qgsmultibandcolorrendererwidget.h
+include/qgis/qgsmulticurvev2.h
+include/qgis/qgsmultiedittoolbutton.h
+include/qgis/qgsmultilinestringv2.h
+include/qgis/qgsmultipointv2.h
+include/qgis/qgsmultipolygonv2.h
 include/qgis/qgsmultirenderchecker.h
+include/qgis/qgsmultisurfacev2.h
 include/qgis/qgsnetworkaccessmanager.h
 include/qgis/qgsnetworkcontentfetcher.h
 include/qgis/qgsnetworkdiskcache.h
 include/qgis/qgsnetworkreplyparser.h
+include/qgis/qgsnewgeopackagelayerdialog.h
 include/qgis/qgsnewhttpconnection.h
 include/qgis/qgsnewmemorylayerdialog.h
 include/qgis/qgsnewnamedialog.h
 include/qgis/qgsnewvectorlayerdialog.h
 include/qgis/qgsninecellfilter.h
 include/qgis/qgsnmeaconnection.h
+include/qgis/qgsnullsymbolrenderer.h
+include/qgis/qgsnullsymbolrendererwidget.h
 include/qgis/qgsnumericscalebarstyle.h
 include/qgis/qgsnumericsortlistviewitem.h
 include/qgis/qgsobjectcustomproperties.h
 include/qgis/qgsofflineediting.h
 include/qgis/qgsogcutils.h
+include/qgis/qgsoptional.h
+include/qgis/qgsoptionalexpression.h
 include/qgis/qgsoptionsdialogbase.h
 include/qgis/qgsorderbydialog.h
+include/qgis/qgsorganizetablecolumnsdialog.h
 include/qgis/qgsosmbase.h
 include/qgis/qgsosmdatabase.h
 include/qgis/qgsosmdownload.h
@@ -436,6 +495,8 @@ include/qgis/qgspaintenginehack.h
 include/qgis/qgspalettedrasterrenderer.h
 include/qgis/qgspalettedrendererwidget.h
 include/qgis/qgspallabeling.h
+include/qgis/qgspanelwidget.h
+include/qgis/qgspanelwidgetstack.h
 include/qgis/qgspaperitem.h
 include/qgis/qgspenstylecombobox.h
 include/qgis/qgsphotoconfigdlg.h
@@ -451,6 +512,7 @@ include/qgis/qgspointdisplacementrendere
 include/qgis/qgspointdisplacementrendererwidget.h
 include/qgis/qgspointlocator.h
 include/qgis/qgspointv2.h
+include/qgis/qgspolygonv2.h
 include/qgis/qgsprevieweffect.h
 include/qgis/qgsproject.h
 include/qgis/qgsprojectbadlayerguihandler.h
@@ -502,6 +564,7 @@ include/qgis/qgsrasterresampler.h
 include/qgis/qgsrastershader.h
 include/qgis/qgsrastershaderfunction.h
 include/qgis/qgsrastertransparency.h
+include/qgis/qgsrastertransparencywidget.h
 include/qgis/qgsrasterviewport.h
 include/qgis/qgsrectangle.h
 include/qgis/qgsrelation.h
@@ -510,6 +573,7 @@ include/qgis/qgsrelationeditorwidget.h
 include/qgis/qgsrelationmanager.h
 include/qgis/qgsrelationreferenceconfigdlg.h
 include/qgis/qgsrelationreferencefactory.h
+include/qgis/qgsrelationreferencesearchwidgetwrapper.h
 include/qgis/qgsrelationreferencewidget.h
 %%CUSTOMWIDGETS%%include/qgis/qgsrelationreferencewidgetplugin.h
 include/qgis/qgsrelationreferencewidgetwrapper.h
@@ -517,6 +581,7 @@ include/qgis/qgsrelationwidgetwrapper.h
 include/qgis/qgsrelief.h
 include/qgis/qgsrenderchecker.h
 include/qgis/qgsrendercontext.h
+include/qgis/qgsrendererrasterpropertieswidget.h
 include/qgis/qgsrendererv2.h
 include/qgis/qgsrendererv2propertiesdialog.h
 include/qgis/qgsrendererv2registry.h
@@ -526,6 +591,7 @@ include/qgis/qgsruggednessfilter.h
 include/qgis/qgsrulebasedrendererv2.h
 include/qgis/qgsrulebasedrendererv2widget.h
 include/qgis/qgsrunprocess.h
+include/qgis/qgsruntimeprofiler.h
 include/qgis/qgsscalebarstyle.h
 include/qgis/qgsscalecalculator.h
 include/qgis/qgsscalecombobox.h
@@ -537,8 +603,10 @@ include/qgis/qgsscalevisibilitydialog.h
 include/qgis/qgsscalewidget.h
 %%CUSTOMWIDGETS%%include/qgis/qgsscalewidgetplugin.h
 include/qgis/qgssearchquerybuilder.h
+include/qgis/qgssearchwidgettoolbutton.h
 include/qgis/qgssearchwidgetwrapper.h
 include/qgis/qgsshadoweffect.h
+include/qgis/qgsshortcutsmanager.h
 include/qgis/qgssimplifymethod.h
 include/qgis/qgssinglebandcolordatarenderer.h
 include/qgis/qgssinglebandgrayrenderer.h
@@ -554,17 +622,21 @@ include/qgis/qgsslopefilter.h
 include/qgis/qgssmartgroupeditordialog.h
 include/qgis/qgssnapper.h
 include/qgis/qgssnappingutils.h
+include/qgis/qgssourceselectdialog.h
 include/qgis/qgsspatialindex.h
 include/qgis/qgsspinbox.h
 %%CUSTOMWIDGETS%%include/qgis/qgsspinboxplugin.h
+include/qgis/qgssqlcomposerdialog.h
 include/qgis/qgssqlexpressioncompiler.h
 include/qgis/qgsstatisticalsummary.h
+include/qgis/qgsstringstatisticalsummary.h
 include/qgis/qgsstringutils.h
 include/qgis/qgsstylev2.h
 include/qgis/qgsstylev2exportimportdialog.h
 include/qgis/qgsstylev2groupselectiondialog.h
 include/qgis/qgsstylev2managerdialog.h
 include/qgis/qgssublayersdialog.h
+include/qgis/qgssurfacev2.h
 include/qgis/qgssvgannotationitem.h
 include/qgis/qgssvgcache.h
 include/qgis/qgssvgselectorwidget.h
@@ -577,9 +649,13 @@ include/qgis/qgssymbologyv2conversion.h
 include/qgis/qgssymbolslistwidget.h
 include/qgis/qgssymbolv2.h
 include/qgis/qgssymbolv2selectordialog.h
+include/qgis/qgstablewidgetitem.h
+include/qgis/qgstabwidget.h
+include/qgis/qgstestutils.h
 include/qgis/qgstextannotationitem.h
 include/qgis/qgstextdiagram.h
 include/qgis/qgstexteditconfigdlg.h
+include/qgis/qgstexteditsearchwidgetwrapper.h
 include/qgis/qgstexteditwidgetfactory.h
 include/qgis/qgstexteditwrapper.h
 include/qgis/qgstextlabelfeature.h
@@ -588,6 +664,7 @@ include/qgis/qgstininterpolator.h
 include/qgis/qgstolerance.h
 include/qgis/qgstotalcurvaturefilter.h
 include/qgis/qgstracer.h
+include/qgis/qgstrackedvectorlayertools.h
 include/qgis/qgstransaction.h
 include/qgis/qgstransactiongroup.h
 include/qgis/qgstransformeffect.h
@@ -641,6 +718,7 @@ include/qgis/qgswebviewwidgetfactory.h
 include/qgis/qgswebviewwidgetwrapper.h
 include/qgis/qgswidgetwrapper.h
 include/qgis/qgswkbptr.h
+include/qgis/qgswkbsimplifierptr.h
 include/qgis/qgswkbtypes.h
 include/qgis/qgsxmlutils.h
 include/qgis/qgszonalstatistics.h
@@ -655,23 +733,24 @@ include/qgis/ui_qgsmessageviewer.h
 include/qgis/ui_qgsowssourceselectbase.h
 include/qgis/ui_qgsprojectionselectorbase.h
 include/qgis/ui_qgsquerybuilderbase.h
+include/qgis/ui_qgssqlcomposerdialogbase.h
 include/qgis/ui_qgssublayersdialogbase.h
 lib/libqgis_analysis.so
-lib/libqgis_analysis.so.2.14.3
+lib/libqgis_analysis.so.2.18.2
 lib/libqgis_app.so
-lib/libqgis_app.so.2.14.3
+lib/libqgis_app.so.2.18.2
 lib/libqgis_core.so
-lib/libqgis_core.so.2.14.3
+lib/libqgis_core.so.2.18.2
 lib/libqgis_gui.so
-lib/libqgis_gui.so.2.14.3
+lib/libqgis_gui.so.2.18.2
 lib/libqgis_networkanalysis.so
-lib/libqgis_networkanalysis.so.2.14.3
+lib/libqgis_networkanalysis.so.2.18.2
 %%SERVER%%lib/libqgis_server.so
-%%SERVER%%lib/libqgis_server.so.2.14.3
+%%SERVER%%lib/libqgis_server.so.2.18.2
 %%GRASS%%lib/libqgisgrass6.so
-%%GRASS%%lib/libqgisgrass6.so.2.14.3
+%%GRASS%%lib/libqgisgrass6.so.2.18.2
 %%PYTHON%%lib/libqgispython.so
-%%PYTHON%%lib/libqgispython.so.2.14.3
+%%PYTHON%%lib/libqgispython.so.2.18.2
 %%PYTHON%%%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py
 lib/qgis/crssync
 %%GRASS%%lib/qgis/grass/bin/qgis.g.browser6
@@ -679,8 +758,11 @@ lib/qgis/crssync
 %%GRASS%%lib/qgis/grass/modules/qgis.g.info6
 %%GRASS%%lib/qgis/grass/modules/qgis.r.in6
 %%GRASS%%lib/qgis/grass/modules/qgis.v.in6
+lib/qgis/plugins/libarcgisfeatureserverprovider.so
+lib/qgis/plugins/libarcgismapserverprovider.so
 lib/qgis/plugins/libbasicauthmethod.so
 lib/qgis/plugins/libcoordinatecaptureplugin.so
+lib/qgis/plugins/libdb2provider.so
 lib/qgis/plugins/libdelimitedtextprovider.so
 lib/qgis/plugins/libdxf2shpconverterplugin.so
 lib/qgis/plugins/libevis.so
@@ -717,7 +799,7 @@ lib/qgis/plugins/libwmsprovider.so
 lib/qgis/plugins/libzonalstatisticsplugin.so
 lib/qgis/qgis_help
 %%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so
-%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.14.3
+%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.18.0
 man/man1/qbrowser.1.gz
 man/man1/qgis.1.gz
 share/applications/qgis.desktop
@@ -749,10 +831,46 @@ share/icons/hicolor/96x96/apps/qgis.png
 %%DATADIR%%/doc/contributors.json
 %%DATADIR%%/doc/developersmap.html
 %%DATADIR%%/doc/favicon.ico
+%%DATADIR%%/doc/images/projects/thumbnails/035ade9287e0bae1ddf62a00a52519f028a18e7f.png.100x50_q85.jpg
+%%DATADIR%%/doc/images/projects/thumbnails/0baa83c55c7c6194627e87ca81c9dffd4eee9ad1.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/0d5fea827c8bfc486877065e21d3e28f89788e78.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/0d8ae6aad78ca052492dff96434ddb54d5401262.png.50x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/0e2f6fb1efc89d41120cddf90509374642d400b4.png.50x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/0eb2c265017956fb6b15cb9a098f8d27928152e8.jpg.100x50_q85.jpg
+%%DATADIR%%/doc/images/projects/thumbnails/1607f4bc4a24d0e6aabe5e8e424b93b40b83be3a.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/1789f70f1058ee18570638070439a8082b91dca8.png.100x50_q85.jpg
+%%DATADIR%%/doc/images/projects/thumbnails/207dd8769c4926452e07e39d88716ec518ff5f3a.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/25ce8c01cf28046bac3866b5649d269138d257a4.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/35602d87c0858381e9a95a481808b27249f0f592.jpg.200x100_q85.jpg
+%%DATADIR%%/doc/images/projects/thumbnails/44113fc21a8e2cd84d93459d0f00b3a64850095c.png.100x50_q85.jpg
+%%DATADIR%%/doc/images/projects/thumbnails/44e7274c2c76c57d1e2338ddb55a7fb7e764b765.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/46d3e22cccef65fc941eaf0d080fcabbe29d3aff.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/5a65a575314f063d065ef84840e734e411c770f2.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/63b4e423e3ae2888b441002777aee43514e3e271.png.200x100_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/69255208cf440914eb947bf6dce5cee1c78455ba.jpg.100x50_q85.jpg
+%%DATADIR%%/doc/images/projects/thumbnails/69f8dd7f727158ebeb6bcbdce6fef4cb313ad9f9.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/6e9c4de359ddbda8ed0b144478e7fa001e22ba63.jpg.100x50_q85.jpg
+%%DATADIR%%/doc/images/projects/thumbnails/775de328b2774c112cc73fb5aaaee9696220649b.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/7ab30679cc486ecb9981c8c02a6d6ba1fb6ca2c7.png.100x50_q85.jpg
+%%DATADIR%%/doc/images/projects/thumbnails/879213e1d9dd7d4e4adb87abf81c96c26c25cd36.png.100x50_q85.jpg
+%%DATADIR%%/doc/images/projects/thumbnails/8d0653a46046e8d43a28d4ea3466633f15d17636.png.100x50_q85.jpg
+%%DATADIR%%/doc/images/projects/thumbnails/945e5e1463ca738057fd9bae0a427519ccbfef0d.png.300x150_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/95966a3500fe4f686b531f05fcf85f59ed0dcb93.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/9d30ee055aaea7ef42b807b1b4fcd22566eef69d.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/a784c121da037ea4fdb57c0de6ce4573af6d8c6c.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/af9b8c3a4363482f12c7b2dff14659fd9ff6240c.png.100x50_q85.jpg
+%%DATADIR%%/doc/images/projects/thumbnails/b3196a2b5781e788e6adac40ecf6964eddc4d38e.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/bba9a55eb7e288e622e7bf40ee85326c28cf09f3.jpg.100x50_q85.jpg
+%%DATADIR%%/doc/images/projects/thumbnails/c8dbccba699fc2f34ef61b034f7b86adfd96f4c4.png.100x50_q85.jpg
+%%DATADIR%%/doc/images/projects/thumbnails/d31441980fc90fb15735df8509527e6a1badce72.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/d5fd4af2929840586da0bd45110758c5b0a786ff.png.50x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/e24951be1e5ff2d6fd591f9760871e38a684bed0.png.100x50_q85.png
+%%DATADIR%%/doc/images/projects/thumbnails/f6379f3083e612fd47917e1f948d795b6951dde9.png.200x100_q85.png
 %%DATADIR%%/doc/images/qgis-icon-60x60.png
 %%DATADIR%%/doc/index.html
 %%DATADIR%%/doc/news
 %%DATADIR%%/doc/news.html
+%%DATADIR%%/doc/release-sponsors.html
 %%DATADIR%%/doc/style.css
 %%GRASS%%%%DATADIR%%/grass/locations.gml
 %%GRASS%%%%DATADIR%%/grass/modules/db-connect.1.svg
@@ -1825,7 +1943,6 @@ share/icons/hicolor/96x96/apps/qgis.png
 %%DATADIR%%/i18n/qgis_ru.qm
 %%DATADIR%%/i18n/qgis_sk.qm
 %%DATADIR%%/i18n/qgis_sl.qm
-%%DATADIR%%/i18n/qgis_sr@latin.qm
 %%DATADIR%%/i18n/qgis_sv.qm
 %%DATADIR%%/i18n/qgis_tr.qm
 %%DATADIR%%/i18n/qgis_vi.qm
@@ -1850,171 +1967,11 @@ share/icons/hicolor/96x96/apps/qgis.png
 %%PYTHON%%%%DATADIR%%/python/console/ui_console_compile_apis.py
 %%PYTHON%%%%DATADIR%%/python/console/ui_console_history_dlg.py
 %%PYTHON%%%%DATADIR%%/python/console/ui_console_settings.py
-%%PYTHON%%%%DATADIR%%/python/dateutil/__init__.py
-%%PYTHON%%%%DATADIR%%/python/dateutil/easter.py
-%%PYTHON%%%%DATADIR%%/python/dateutil/parser.py
-%%PYTHON%%%%DATADIR%%/python/dateutil/relativedelta.py
-%%PYTHON%%%%DATADIR%%/python/dateutil/rrule.py
-%%PYTHON%%%%DATADIR%%/python/dateutil/tz.py
-%%PYTHON%%%%DATADIR%%/python/dateutil/tzwin.py
-%%PYTHON%%%%DATADIR%%/python/dateutil/zoneinfo/__init__.py
-%%PYTHON%%%%DATADIR%%/python/dateutil/zoneinfo/zoneinfo--latest.tar.gz
-%%PYTHON%%%%DATADIR%%/python/httplib2/CMakeLists.txt
-%%PYTHON%%%%DATADIR%%/python/httplib2/__init__.py
-%%PYTHON%%%%DATADIR%%/python/httplib2/iri2uri.py
-%%PYTHON%%%%DATADIR%%/python/httplib2/socks.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/__init__.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/_compat.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/_stringdefs.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/bccache.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/compiler.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/constants.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/debug.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/defaults.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/environment.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/exceptions.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/ext.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/filters.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/lexer.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/loaders.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/meta.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/nodes.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/optimizer.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/parser.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/runtime.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/sandbox.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/tests.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/__init__.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/api.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/bytecode_cache.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/core_tags.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/debug.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/doctests.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/ext.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/filters.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/imports.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/inheritance.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/lexnparse.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/loader.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/regression.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/res/__init__.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/res/templates/broken.html
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/res/templates/foo/test.html
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/res/templates/syntaxerror.html
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/res/templates/test.html
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/security.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/tests.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/testsuite/utils.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/utils.py
-%%PYTHON%%%%DATADIR%%/python/jinja2/visitor.py
-%%PYTHON%%%%DATADIR%%/python/markupsafe/__init__.py
-%%PYTHON%%%%DATADIR%%/python/markupsafe/_compat.py
-%%PYTHON%%%%DATADIR%%/python/markupsafe/_constants.py
-%%PYTHON%%%%DATADIR%%/python/markupsafe/_native.py
-%%PYTHON%%%%DATADIR%%/python/markupsafe/_speedups.c
-%%PYTHON%%%%DATADIR%%/python/markupsafe/_speedups.so
-%%PYTHON%%%%DATADIR%%/python/markupsafe/tests.py
-%%PYTHON%%%%DATADIR%%/python/nose2/__init__.py
-%%PYTHON%%%%DATADIR%%/python/nose2/__main__.py
-%%PYTHON%%%%DATADIR%%/python/nose2/backports/__init__.py
-%%PYTHON%%%%DATADIR%%/python/nose2/backports/ordereddict.py
-%%PYTHON%%%%DATADIR%%/python/nose2/collector.py
-%%PYTHON%%%%DATADIR%%/python/nose2/compat.py
-%%PYTHON%%%%DATADIR%%/python/nose2/config.py
-%%PYTHON%%%%DATADIR%%/python/nose2/events.py
-%%PYTHON%%%%DATADIR%%/python/nose2/exceptions.py
-%%PYTHON%%%%DATADIR%%/python/nose2/loader.py
-%%PYTHON%%%%DATADIR%%/python/nose2/main.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/__init__.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/attrib.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/buffer.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/collect.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/coverage.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/debugger.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/doctests.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/dundertest.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/failfast.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/junitxml.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/layers.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/loader/__init__.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/loader/discovery.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/loader/eggdiscovery.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/loader/functions.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/loader/generators.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/loader/loadtests.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/loader/parameters.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/loader/testcases.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/loader/testclasses.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/logcapture.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/mp.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/outcomes.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/printhooks.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/prof.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/result.py
-%%PYTHON%%%%DATADIR%%/python/nose2/plugins/testid.py
-%%PYTHON%%%%DATADIR%%/python/nose2/result.py
-%%PYTHON%%%%DATADIR%%/python/nose2/runner.py
-%%PYTHON%%%%DATADIR%%/python/nose2/session.py
-%%PYTHON%%%%DATADIR%%/python/nose2/sphinxext.py
-%%PYTHON%%%%DATADIR%%/python/nose2/suite.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/__init__.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/_common.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/__init__.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_attrib_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_collect_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_coverage.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_decorators.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_discovery_loader.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_dundertest_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_eggdiscovery_loader.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_junitxml_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_layers_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_loading.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_loadtests_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_logcapture_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_main.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_mp_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_printhooks_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_session.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_such_dsl.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/functional/test_util.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/__init__.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_attrib_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_buffer_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_collect_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_collector.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_config.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_debugger_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_decorators.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_doctest_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_dundertest_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_failfast.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_functions_loader.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_generators_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_junitxml.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_layers_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_loader.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_logcapture_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_mp_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_outcomes_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_params_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_plugin_api.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_printhooks_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_prof_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_result.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_session.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_testcase_loader.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_testclass_loader.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tests/unit/test_testid_plugin.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tools/__init__.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tools/decorators.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tools/params.py
-%%PYTHON%%%%DATADIR%%/python/nose2/tools/such.py
-%%PYTHON%%%%DATADIR%%/python/nose2/util.py
 %%PYTHON%%%%DATADIR%%/python/owslib/__init__.py
 %%PYTHON%%%%DATADIR%%/python/owslib/coverage/__init__.py
 %%PYTHON%%%%DATADIR%%/python/owslib/coverage/wcs100.py
 %%PYTHON%%%%DATADIR%%/python/owslib/coverage/wcs110.py
+%%PYTHON%%%%DATADIR%%/python/owslib/coverage/wcs111.py
 %%PYTHON%%%%DATADIR%%/python/owslib/coverage/wcsBase.py
 %%PYTHON%%%%DATADIR%%/python/owslib/coverage/wcsdecoder.py
 %%PYTHON%%%%DATADIR%%/python/owslib/crs.py
@@ -2022,11 +1979,13 @@ share/icons/hicolor/96x96/apps/qgis.png
 %%PYTHON%%%%DATADIR%%/python/owslib/dif.py
 %%PYTHON%%%%DATADIR%%/python/owslib/etree.py
 %%PYTHON%%%%DATADIR%%/python/owslib/feature/__init__.py
+%%PYTHON%%%%DATADIR%%/python/owslib/feature/schema.py
 %%PYTHON%%%%DATADIR%%/python/owslib/feature/wfs100.py
 %%PYTHON%%%%DATADIR%%/python/owslib/feature/wfs110.py
 %%PYTHON%%%%DATADIR%%/python/owslib/feature/wfs200.py
 %%PYTHON%%%%DATADIR%%/python/owslib/fes.py
 %%PYTHON%%%%DATADIR%%/python/owslib/fgdc.py
+%%PYTHON%%%%DATADIR%%/python/owslib/gm03.py
 %%PYTHON%%%%DATADIR%%/python/owslib/interfaces.py
 %%PYTHON%%%%DATADIR%%/python/owslib/iso.py
 %%PYTHON%%%%DATADIR%%/python/owslib/namespaces.py
@@ -2148,7 +2107,6 @@ share/icons/hicolor/96x96/apps/qgis.png
 %%PYTHON%%%%DATADIR%%/python/plugins/MetaSearch/dialogs/recorddialog.py
 %%PYTHON%%%%DATADIR%%/python/plugins/MetaSearch/dialogs/xmldialog.py
 %%PYTHON%%%%DATADIR%%/python/plugins/MetaSearch/images/MetaSearch.png
-%%PYTHON%%%%DATADIR%%/python/plugins/MetaSearch/images/help.png
 %%PYTHON%%%%DATADIR%%/python/plugins/MetaSearch/link_types.py
 %%PYTHON%%%%DATADIR%%/python/plugins/MetaSearch/metadata.txt
 %%PYTHON%%%%DATADIR%%/python/plugins/MetaSearch/plugin.py
@@ -2199,6 +2157,14 @@ share/icons/hicolor/96x96/apps/qgis.png
 %%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/ui_DlgVersioning.py
 %%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/resources_rc.py
 %%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py
+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/__init__.py
+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/connector.py
+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/data_model.py
+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/icons/gpkg_icon.png
+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/info_model.py
+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/plugin.py
+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/resources_rc.py
+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/sql_dictionary.py
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/__init__.py
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/connector.py
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/data_model.py
@@ -2224,6 +2190,7 @@ share/icons/hicolor/96x96/apps/qgis.png
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/dlg_field_properties.py
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/dlg_import_vector.py
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/dlg_query_builder.py
+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/dlg_sql_layer_window.py
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/dlg_sql_window.py
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/dlg_table_properties.py
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/icons/about.png
@@ -2270,109 +2237,9 @@ share/icons/hicolor/96x96/apps/qgis.png
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/ui/ui_DlgFieldProperties.py
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/ui/ui_DlgImportVector.py
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/ui/ui_DlgQueryBuilder.py
+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/ui/ui_DlgSqlLayerWindow.py
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/ui/ui_DlgSqlWindow.py
 %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/ui/ui_DlgTableProperties.py
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/__init__.py
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/fTools.py
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/analysis.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/basic_statistics.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/buffer.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/centroids.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/check_geometry.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/clip.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/convex_hull.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/define_projection.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/delaunay.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/difference.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/dissolve.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/eliminate.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/export_geometry.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/export_projection.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/extract_nodes.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/ftools_logo.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/ftoolslogo2.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/geometry.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/geoprocessing.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/help.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/intersect.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/intersections.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/join_attributes.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/join_location.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/layer_extent.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/management.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/matrix.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/mean.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/merge_shapes.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/multi_to_single.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/neighbour.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/random_points.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/random_selection.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/regular_points.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/sampling.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/select_location.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/simplify.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/single_to_multi.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/split_layer.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/sub_selection.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/sum_lines.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/sum_points.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/sym_difference.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/to_lines.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/union.png
-%%PYTHON%%%%DATADIR%%/python/plugins/fTools/icons/default/unique.png

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612230315.uBN3FqI7094928>