Attachment #188295 for bug #223887

View | Details | Raw Unified | Return to bug 223887
Collapse All | Expand All





PORTNAME=	qgis
DISTVERSIONPREFIX=	final-
DISTVERSION=	2_18_14
PORTREVISION=	1
CATEGORIES=	graphics geography

MAINTAINER=	rhurlin@gwdg.de


GRASS_BUILD_DEPENDS=	grass72:databases/grass7
GRASS_RUN_DEPENDS=	grass72:databases/grass7
GRASS_CMAKE_ON=		-DWITH_GRASS7:BOOL=TRUE -DGRASS_PREFIX7=${LOCALBASE}/grass-7.2.2
GRASS_FORCE_MAKE_JOBS=	NO
GRASS_CMAKE_OFF=	-DWITH_GRASS7:BOOL=FALSE


			${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \
			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \
			${PYTHON_PKGNAMEPREFIX}wxPython-common>=3.0.2.0:x11-toolkits/py-wxPython-common \
			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler \
			${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil \

			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \
			${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \
			${PYTHON_PKGNAMEPREFIX}wxPython-common>=3.0.2.0:x11-toolkits/py-wxPython-common \
			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
PYTHON_CMAKE_ON=	-DWITH_BINDINGS:BOOL=TRUE
PYTHON_CMAKE_OFF=	-DWITH_BINDINGS:BOOL=FALSE

	${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}-icon${SZ}x${SZ}.png \
		${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png
.endfor
	${RM} /tmp/srs.db

check:
	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)

Lines 1-3 Link Here

(-)qgis/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1503130352	1	TIMESTAMP = 1511094312
2	SHA256 (qgis-QGIS-final-2_18_12_GH0.tar.gz) = 154920b5c79f587589f04b9da6f52ddbb8b6acace61f665aa79f6681d5fb5346	2	SHA256 (qgis-QGIS-final-2_18_14_GH0.tar.gz) = f8912cddca6673b54fcbea8b418d877b51d7229ebd4caec07bdb5fbfda6851e4
3	SIZE (qgis-QGIS-final-2_18_12_GH0.tar.gz) = 99289641	3	SIZE (qgis-QGIS-final-2_18_14_GH0.tar.gz) = 99324977




--- debian/qgis.desktop.orig	2017-10-27 12:00:21 UTC
+++ debian/qgis.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]

 GenericName=Geographic Information System
 GenericName[ar]=ÙØ¸Ø§Ù Ø§ÙÙØ¹ÙÙÙØ§Øª Ø§ÙØ¬ØºØ±Ø§ÙÙ
 GenericName[az]=CoÄrafi informasiya sistemi
@@ -47,9 +49,9 @@ GenericName[th]=à¸£à¸°à¸à¸à¸ªà¸²à¸£à¸ªà¸à¹à¸à¸¨à¸
 GenericName[tr]=CoÄrafi bilgi sistemi
 GenericName[uk]=ÐÐµÐ¾ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÐ¹Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð°
 GenericName[uz]=Geografik axborot tizimi
-Icon=qgis
-TryExec=/usr/bin/qgis
-Exec=/usr/bin/qgis %F
+Icon=qgis-icon
+TryExec=/usr/local/bin/qgis
+Exec=/usr/local/bin/qgis %F
 Terminal=false
 StartupNotify=false
 Categories=Qt;Education;Science;Geography;

Line 0 Link Here

(-)qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py (+11 lines)
	1	--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2017-10-27 12:00:21 UTC
	2	+++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
	3	@@ -73,7 +73,7 @@ class SagaAlgorithmProvider(AlgorithmProvider):
	4	self.tr('Problem with SAGA installation: SAGA was not found or is not correctly installed'))
	5	return
	6
	7	- if not version.startswith('2.3.'):
	8	+ if version < '2.3.':
	9	ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
	10	self.tr('Problem with SAGA installation: unsupported SAGA version found.'))
	11	return




--- python/plugins/processing/algs/saga/SagaUtils.py.orig	2017-10-27 12:00:21 UTC
+++ python/plugins/processing/algs/saga/SagaUtils.py
@@ -26,6 +26,7 @@ __copyright__ = '(C) 2012, Victor Olaya'
 __revision__ = '$Format:%H$'
 
 import os
+import platform
 import stat
 import subprocess
 import time
@@ -57,7 +58,7 @@ def sagaBatchJobFilename():
 
 def findSagaFolder():
     folder = None
-    if isMac():
+    if isMac() or platform.system() == 'FreeBSD':
         testfolder = os.path.join(QgsApplication.prefixPath(), 'bin')
         if os.path.exists(os.path.join(testfolder, 'saga_cmd')):
             folder = testfolder
@@ -82,7 +83,7 @@ def findSagaFolder():
 
 
 def sagaPath():
-    if not isWindows() and not isMac():
+    if not isWindows() and not isMac() and not platform.system() == 'FreeBSD':
         return ''
 
     folder = findSagaFolder()
@@ -101,7 +102,7 @@ def createSagaBatchJobFileFromSagaCommands(commands):
         fout.write('set SAGA_MLB=' + sagaPath() + os.sep +
                    'modules' + '\n')
         fout.write('PATH=%PATH%;%SAGA%;%SAGA_MLB%\n')
-    elif isMac():
+    elif isMac()  or platform.system() == 'FreeBSD':
         fout.write('export SAGA_MLB=' + sagaPath() +
                    '/../lib/saga\n')
         fout.write('export PATH=' + sagaPath() + ':$PATH\n')
@@ -130,7 +131,7 @@ def getSagaInstalledVersion(runSaga=False):
 
     if isWindows():
         commands = [os.path.join(sagaPath(), "saga_cmd.exe"), "-v"]
-    elif isMac():
+    elif isMac() or platform.system() == 'FreeBSD':
         commands = [os.path.join(sagaPath(), "saga_cmd -v")]
     else:
         # for Linux use just one string instead of separated parameters as the list
@@ -146,7 +147,7 @@ def getSagaInstalledVersion(runSaga=False):
             stderr=subprocess.STDOUT,
             universal_newlines=True,
         ).stdout
-        if isMac():  # This trick avoids having an uninterrupted system call exception if SAGA is not installed
+        if isMac() or platform.system() == 'FreeBSD':  # This trick avoids having an uninterrupted system call exception if SAGA is not installed
             time.sleep(1)
         try:
             lines = proc.readlines()

Lines 1-6 Link Here

(-)qgis/files/patch-src_plugins_grass_CMakeLists.txt (-2 / +2 lines)
1	--- src/plugins/grass/CMakeLists.txt.orig 2016-10-21 12:14:02 UTC	1	--- src/plugins/grass/CMakeLists.txt.orig 2017-10-27 12:00:21 UTC
2	+++ src/plugins/grass/CMakeLists.txt	2	+++ src/plugins/grass/CMakeLists.txt
3	@@ -202,6 +202,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSIO	3	@@ -202,6 +202,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSION)
4	qgis_app	4	qgis_app
5	qgis_gui	5	qgis_gui
6	${OPENPTY_LIBRARY}	6	${OPENPTY_LIBRARY}




include/qgis/ui_qgssqlcomposerdialogbase.h
include/qgis/ui_qgssublayersdialogbase.h
lib/libqgis_analysis.so
lib/libqgis_analysis.so.2.18.14
lib/libqgis_app.so
lib/libqgis_app.so.2.18.14
lib/libqgis_core.so
lib/libqgis_core.so.2.18.14
lib/libqgis_gui.so
lib/libqgis_gui.so.2.18.14
lib/libqgis_networkanalysis.so
lib/libqgis_networkanalysis.so.2.18.14
%%SERVER%%lib/libqgis_server.so
%%SERVER%%lib/libqgis_server.so.2.18.14
%%GRASS%%lib/libqgisgrass7.so
%%GRASS%%lib/libqgisgrass7.so.2.18.14
%%PYTHON%%lib/libqgispython.so
%%PYTHON%%lib/libqgispython.so.2.18.14
%%PYTHON%%%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py
lib/qgis/crssync
%%GRASS%%lib/qgis/grass/bin/qgis.g.browser7

lib/qgis/plugins/libzonalstatisticsplugin.so
lib/qgis/qgis_help
%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so
%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.18.14
man/man1/qbrowser.1.gz
man/man1/qgis.1.gz
share/applications/qgis.desktop

%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/i.vi.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/i.zc.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/m.cogo.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/nviz.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.aspect.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.basins.fill.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.blend.combine.txt

%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/ext/v_what_rast_points.py
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/ext/v_what_vect.py
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/grass7.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/nviz7.py
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/__init__.py
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/qgis.yaml
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/saga.yaml

%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExportGeometryInfo.py
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtentFromLayer.py
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByAttribute.py
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByExpression.py
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByLocation.py
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractNodes.py
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/FieldPyculator.py

%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiffusiveHillslopeEvolution(FTCS).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DirectionalAverage.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DirectionalStatisticsforSingleGrid.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Distance(ViGrA).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DistanceMatrix.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiurnalAnisotropicHeating.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiversityOfCategories.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DownslopeDistanceGradient.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EarthsOrbitalParameters.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EdgeContamination.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EdgeDetection(ViGrA).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EffectiveAirFlowHeights.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EnhancedVegetationIndex.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EnumerateTableField.txt

%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowAccumulation(Top-Down).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowPathLength.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowWidthandSpecificCatchmentArea.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierFilter(ViGrA).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransform(RealViGrA).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransform(ViGrA).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransformInverse(ViGrA).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransformation(OpenCV).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Fragmentation(Alternative).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Fragmentation(Standard).txt

%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/ModifiedQuadraticShepard.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MonthlyGlobalbyLatitude.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter(OpenCV).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter(ViGrA).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphometricFeatures.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphometricProtectionIndex.txt

%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RadiusofVariance(Grid).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomField.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomForestClassification(OpenCV).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomForestPresencePrediction(ViGrA).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomTerrain.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomTerrainGeneration.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RankFilter.txt

%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Slope,Aspect,Curvature.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SlopeLength.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SlopeLimitedFlowAccumulation.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Smoothing(ViGrA).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoGrid.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoLines.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoPoints.txt

%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WarpingShapes.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WaterRetentionCapacity.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedBasins.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedSegmentation(ViGrA).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedSegmentation.txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WindEffect(WindwardLeewardIndex).txt
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WindExpositionIndex.txt

Return to bug 223887

Lines 3-10 Link Here

(-)qgis/Makefile (-3 / +5 lines)
3		3
4	PORTNAME= qgis	4	PORTNAME= qgis
5	DISTVERSIONPREFIX= final-	5	DISTVERSIONPREFIX= final-
6	DISTVERSION= 2_18_12	6	DISTVERSION= 2_18_14
7	PORTREVISION= 1
8	CATEGORIES= graphics geography	7	CATEGORIES= graphics geography
9		8
10	MAINTAINER= rhurlin@gwdg.de	9	MAINTAINER= rhurlin@gwdg.de
Lines 80-86 Link Here
80		79
81	GRASS_BUILD_DEPENDS= grass72:databases/grass7	80	GRASS_BUILD_DEPENDS= grass72:databases/grass7
82	GRASS_RUN_DEPENDS= grass72:databases/grass7	81	GRASS_RUN_DEPENDS= grass72:databases/grass7
83	GRASS_CMAKE_ON= -DWITH_GRASS7:BOOL=TRUE -DGRASS_PREFIX7=${LOCALBASE}/grass-7.2.1	82	GRASS_CMAKE_ON= -DWITH_GRASS7:BOOL=TRUE -DGRASS_PREFIX7=${LOCALBASE}/grass-7.2.2
84	GRASS_FORCE_MAKE_JOBS= NO	83	GRASS_FORCE_MAKE_JOBS= NO
85	GRASS_CMAKE_OFF= -DWITH_GRASS7:BOOL=FALSE	84	GRASS_CMAKE_OFF= -DWITH_GRASS7:BOOL=FALSE
86		85
Lines 107-112 Link Here
107	${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \	106	${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \
108	${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \	107	${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
109	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \	108	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \
		109	${PYTHON_PKGNAMEPREFIX}wxPython-common>=3.0.2.0:x11-toolkits/py-wxPython-common \
110	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml	110	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
111	PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler \	111	PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler \
112	${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil \	112	${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil \
Lines 130-135 Link Here
130	${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \	130	${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
131	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \	131	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \
132	${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \	132	${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \
		133	${PYTHON_PKGNAMEPREFIX}wxPython-common>=3.0.2.0:x11-toolkits/py-wxPython-common \
133	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml	134	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
134	PYTHON_CMAKE_ON= -DWITH_BINDINGS:BOOL=TRUE	135	PYTHON_CMAKE_ON= -DWITH_BINDINGS:BOOL=TRUE
135	PYTHON_CMAKE_OFF= -DWITH_BINDINGS:BOOL=FALSE	136	PYTHON_CMAKE_OFF= -DWITH_BINDINGS:BOOL=FALSE
Lines 184-189 Link Here
184	${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}-icon${SZ}x${SZ}.png \	185	${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}-icon${SZ}x${SZ}.png \
185	${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png	186	${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png
186	.endfor	187	.endfor
		188	${RM} /tmp/srs.db
187		189
188	check:	190	check:
189	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)	191	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)

Lines 1-4 Link Here

(-)qgis/files/patch-debian_qgis.desktop (-1 / +14 lines)
1	--- debian/qgis.desktop.orig 2016-10-21 12:14:02 UTC	1	--- debian/qgis.desktop.orig 2017-10-27 12:00:21 UTC
2	+++ debian/qgis.desktop	2	+++ debian/qgis.desktop
3	@@ -1,7 +1,9 @@	3	@@ -1,7 +1,9 @@
4	[Desktop Entry]	4	[Desktop Entry]
Lines 10-12 Link Here
10	GenericName=Geographic Information System	10	GenericName=Geographic Information System
11	GenericName[ar]=ÙØ¸Ø§Ù Ø§ÙÙØ¹ÙÙÙØ§Øª Ø§ÙØ¬ØºØ±Ø§ÙÙ	11	GenericName[ar]=ÙØ¸Ø§Ù Ø§ÙÙØ¹ÙÙÙØ§Øª Ø§ÙØ¬ØºØ±Ø§ÙÙ
12	GenericName[az]=CoÄrafi informasiya sistemi	12	GenericName[az]=CoÄrafi informasiya sistemi
		13	@@ -47,9 +49,9 @@ GenericName[th]=à¸£à¸°à¸à¸à¸ªà¸²à¸£à¸ªà¸à¹à¸à¸¨à¸
		14	GenericName[tr]=CoÄrafi bilgi sistemi
		15	GenericName[uk]=ÐÐµÐ¾ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÐ¹Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð°
		16	GenericName[uz]=Geografik axborot tizimi
		17	-Icon=qgis
		18	-TryExec=/usr/bin/qgis
		19	-Exec=/usr/bin/qgis %F
		20	+Icon=qgis-icon
		21	+TryExec=/usr/local/bin/qgis
		22	+Exec=/usr/local/bin/qgis %F
		23	Terminal=false
		24	StartupNotify=false
		25	Categories=Qt;Education;Science;Geography;

Lines 758-778 Link Here

(-)qgis/pkg-plist (-21 / +10 lines)
758	include/qgis/ui_qgssqlcomposerdialogbase.h	758	include/qgis/ui_qgssqlcomposerdialogbase.h
759	include/qgis/ui_qgssublayersdialogbase.h	759	include/qgis/ui_qgssublayersdialogbase.h
760	lib/libqgis_analysis.so	760	lib/libqgis_analysis.so
761	lib/libqgis_analysis.so.2.18.12	761	lib/libqgis_analysis.so.2.18.14
762	lib/libqgis_app.so	762	lib/libqgis_app.so
763	lib/libqgis_app.so.2.18.12	763	lib/libqgis_app.so.2.18.14
764	lib/libqgis_core.so	764	lib/libqgis_core.so
765	lib/libqgis_core.so.2.18.12	765	lib/libqgis_core.so.2.18.14
766	lib/libqgis_gui.so	766	lib/libqgis_gui.so
767	lib/libqgis_gui.so.2.18.12	767	lib/libqgis_gui.so.2.18.14
768	lib/libqgis_networkanalysis.so	768	lib/libqgis_networkanalysis.so
769	lib/libqgis_networkanalysis.so.2.18.12	769	lib/libqgis_networkanalysis.so.2.18.14
770	%%SERVER%%lib/libqgis_server.so	770	%%SERVER%%lib/libqgis_server.so
771	%%SERVER%%lib/libqgis_server.so.2.18.12	771	%%SERVER%%lib/libqgis_server.so.2.18.14
772	%%GRASS%%lib/libqgisgrass7.so	772	%%GRASS%%lib/libqgisgrass7.so
773	%%GRASS%%lib/libqgisgrass7.so.2.18.12	773	%%GRASS%%lib/libqgisgrass7.so.2.18.14
774	%%PYTHON%%lib/libqgispython.so	774	%%PYTHON%%lib/libqgispython.so
775	%%PYTHON%%lib/libqgispython.so.2.18.12	775	%%PYTHON%%lib/libqgispython.so.2.18.14
776	%%PYTHON%%%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py	776	%%PYTHON%%%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py
777	lib/qgis/crssync	777	lib/qgis/crssync
778	%%GRASS%%lib/qgis/grass/bin/qgis.g.browser7	778	%%GRASS%%lib/qgis/grass/bin/qgis.g.browser7
Lines 821-827 Link Here
821	lib/qgis/plugins/libzonalstatisticsplugin.so	821	lib/qgis/plugins/libzonalstatisticsplugin.so
822	lib/qgis/qgis_help	822	lib/qgis/qgis_help
823	%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so	823	%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so
824	%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.18.12	824	%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.18.14
825	man/man1/qbrowser.1.gz	825	man/man1/qbrowser.1.gz
826	man/man1/qgis.1.gz	826	man/man1/qgis.1.gz
827	share/applications/qgis.desktop	827	share/applications/qgis.desktop
Lines 2541-2547 Link Here
2541	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/i.vi.txt	2541	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/i.vi.txt
2542	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/i.zc.txt	2542	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/i.zc.txt
2543	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/m.cogo.txt	2543	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/m.cogo.txt
2544	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/nviz.txt
2545	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.aspect.txt	2544	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.aspect.txt
2546	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.basins.fill.txt	2545	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.basins.fill.txt
2547	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.blend.combine.txt	2546	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.blend.combine.txt
Lines 2928-2934 Link Here
2928	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/ext/v_what_rast_points.py	2927	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/ext/v_what_rast_points.py
2929	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/ext/v_what_vect.py	2928	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/ext/v_what_vect.py
2930	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/grass7.txt	2929	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/grass7.txt
2931	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/nviz7.py
2932	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/__init__.py	2930	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/__init__.py
2933	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/qgis.yaml	2931	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/qgis.yaml
2934	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/saga.yaml	2932	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/saga.yaml
Lines 4211-4216 Link Here
4211	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExportGeometryInfo.py	4209	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExportGeometryInfo.py
4212	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtentFromLayer.py	4210	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtentFromLayer.py
4213	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByAttribute.py	4211	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByAttribute.py
		4212	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByExpression.py
4214	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByLocation.py	4213	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByLocation.py
4215	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractNodes.py	4214	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractNodes.py
4216	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/FieldPyculator.py	4215	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/FieldPyculator.py
Lines 4405-4418 Link Here
4405	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiffusiveHillslopeEvolution(FTCS).txt	4404	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiffusiveHillslopeEvolution(FTCS).txt
4406	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DirectionalAverage.txt	4405	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DirectionalAverage.txt
4407	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DirectionalStatisticsforSingleGrid.txt	4406	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DirectionalStatisticsforSingleGrid.txt
4408	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Distance(ViGrA).txt
4409	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DistanceMatrix.txt	4407	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DistanceMatrix.txt
4410	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiurnalAnisotropicHeating.txt	4408	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiurnalAnisotropicHeating.txt
4411	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiversityOfCategories.txt	4409	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiversityOfCategories.txt
4412	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DownslopeDistanceGradient.txt	4410	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DownslopeDistanceGradient.txt
4413	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EarthsOrbitalParameters.txt	4411	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EarthsOrbitalParameters.txt
4414	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EdgeContamination.txt	4412	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EdgeContamination.txt
4415	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EdgeDetection(ViGrA).txt
4416	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EffectiveAirFlowHeights.txt	4413	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EffectiveAirFlowHeights.txt
4417	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EnhancedVegetationIndex.txt	4414	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EnhancedVegetationIndex.txt
4418	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EnumerateTableField.txt	4415	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EnumerateTableField.txt
Lines 4436-4445 Link Here
4436	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowAccumulation(Top-Down).txt	4433	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowAccumulation(Top-Down).txt
4437	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowPathLength.txt	4434	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowPathLength.txt
4438	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowWidthandSpecificCatchmentArea.txt	4435	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowWidthandSpecificCatchmentArea.txt
4439	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierFilter(ViGrA).txt
4440	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransform(RealViGrA).txt
4441	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransform(ViGrA).txt
4442	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransformInverse(ViGrA).txt
4443	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransformation(OpenCV).txt	4436	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransformation(OpenCV).txt
4444	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Fragmentation(Alternative).txt	4437	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Fragmentation(Alternative).txt
4445	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Fragmentation(Standard).txt	4438	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Fragmentation(Standard).txt
Lines 4529-4535 Link Here
4529	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/ModifiedQuadraticShepard.txt	4522	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/ModifiedQuadraticShepard.txt
4530	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MonthlyGlobalbyLatitude.txt	4523	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MonthlyGlobalbyLatitude.txt
4531	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter(OpenCV).txt	4524	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter(OpenCV).txt
4532	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter(ViGrA).txt
4533	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter.txt	4525	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter.txt
4534	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphometricFeatures.txt	4526	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphometricFeatures.txt
4535	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphometricProtectionIndex.txt	4527	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphometricProtectionIndex.txt
Lines 4590-4596 Link Here
4590	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RadiusofVariance(Grid).txt	4582	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RadiusofVariance(Grid).txt
4591	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomField.txt	4583	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomField.txt
4592	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomForestClassification(OpenCV).txt	4584	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomForestClassification(OpenCV).txt
4593	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomForestPresencePrediction(ViGrA).txt
4594	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomTerrain.txt	4585	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomTerrain.txt
4595	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomTerrainGeneration.txt	4586	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomTerrainGeneration.txt
4596	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RankFilter.txt	4587	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RankFilter.txt
Lines 4631-4637 Link Here
4631	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Slope,Aspect,Curvature.txt	4622	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Slope,Aspect,Curvature.txt
4632	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SlopeLength.txt	4623	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SlopeLength.txt
4633	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SlopeLimitedFlowAccumulation.txt	4624	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SlopeLimitedFlowAccumulation.txt
4634	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Smoothing(ViGrA).txt
4635	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoGrid.txt	4625	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoGrid.txt
4636	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoLines.txt	4626	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoLines.txt
4637	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoPoints.txt	4627	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoPoints.txt
Lines 4692-4698 Link Here
4692	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WarpingShapes.txt	4682	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WarpingShapes.txt
4693	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WaterRetentionCapacity.txt	4683	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WaterRetentionCapacity.txt
4694	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedBasins.txt	4684	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedBasins.txt
4695	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedSegmentation(ViGrA).txt
4696	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedSegmentation.txt	4685	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedSegmentation.txt
4697	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WindEffect(WindwardLeewardIndex).txt	4686	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WindEffect(WindwardLeewardIndex).txt
4698	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WindExpositionIndex.txt	4687	%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WindExpositionIndex.txt