[Git][debian-gis-team/qgis][master] 3 commits: Update packaging for GRASS 7.8.0.
Bas Couwenberg
gitlab at salsa.debian.org
Sat Sep 7 11:54:41 BST 2019
Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits:
ad75e62c by Bas Couwenberg at 2019-09-07T07:28:18Z
Update packaging for GRASS 7.8.0.
- - - - -
f00f865d by Bas Couwenberg at 2019-09-07T08:08:12Z
Update symbols for other architectures.
- - - - -
7da12bde by Bas Couwenberg at 2019-09-07T08:08:27Z
Set distribution to unstable.
- - - - -
10 changed files:
- debian/changelog
- debian/control
- debian/libqgis-analysis3.4.11.symbols
- debian/libqgis-app3.4.11.symbols
- debian/libqgis-core3.4.11.symbols
- debian/libqgis-gui3.4.11.symbols
- debian/libqgis-server3.4.11.symbols
- + debian/patches/grass78.patch
- debian/patches/series
- debian/qgis.sh
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+qgis (3.4.11+dfsg-2) unstable; urgency=medium
+
+ * Update packaging for GRASS 7.8.0.
+ * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 07 Sep 2019 10:08:14 +0200
+
qgis (3.4.11+dfsg-1) unstable; urgency=medium
* Add Breaks/Replaces to fix upgrade from 2.18.18.
=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends: bison,
dh-python,
flex,
gdal-bin,
- grass-dev (>= 7.6.1),
+ grass-dev (>= 7.8.0),
libexpat1-dev,
libfcgi-dev,
libgdal-dev (>= 1.11),
@@ -244,7 +244,7 @@ Description: QGIS custom widgets for Qt Designer
Package: libqgis-dev
Architecture: any
Section: libdevel
-Depends: grass-dev (>= 7.6.0),
+Depends: grass-dev (>= 7.8.0),
libexpat1-dev,
libgdal-dev (>= 1.11),
libgeos-dev (>= 3.0.0),
@@ -301,7 +301,7 @@ Architecture: any
Depends: qgis (= ${binary:Version}),
qgis-plugin-grass-common (= ${source:Version}),
qgis-provider-grass (= ${binary:Version}),
- grass-core (>= 7.6.0),
+ grass-core (>= 7.8.0),
${grass:Depends},
${shlibs:Depends},
${misc:Depends}
=====================================
debian/libqgis-analysis3.4.11.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 3.4.11 i386 powerpc ppc64
+# SymbolsHelper-Confirmed: 3.4.11 armel armhf i386 m68k powerpc ppc64
libqgis_analysis.so.3.4.11 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
_ZN10QByteArrayD1Ev at Base 3.4.5
@@ -16,7 +16,7 @@ libqgis_analysis.so.3.4.11 #PACKAGE# #MINVER#
_ZN12QgsExceptionD0Ev at Base 3.4.5
_ZN12QgsExceptionD1Ev at Base 3.4.5
_ZN12QgsExceptionD2Ev at Base 3.4.5
- (arch=i386 mips mipsel powerpc)_ZN12QgsRectangle17combineExtentWithERKS_ at Base 3.4.11
+ (arch=armel armhf i386 m68k mips mipsel powerpc)_ZN12QgsRectangle17combineExtentWithERKS_ at Base 3.4.11
_ZN12QtConcurrent16ThreadEngineBase14threadFunctionEv at Base 3.4.5
_ZN12QtConcurrent16ThreadEngineBase17shouldStartThreadEv at Base 3.4.5
_ZN12QtConcurrent16ThreadEngineBase20shouldThrottleThreadEv at Base 3.4.5
=====================================
debian/libqgis-app3.4.11.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 3.4.11 amd64 arm64 i386 powerpc ppc64 ppc64el
+# SymbolsHelper-Confirmed: 3.4.11 amd64 arm64 armel i386 powerpc ppc64 ppc64el
libqgis_app.so.3.4.11 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
_ZN10QgsOptions10addSVGPathEv at Base 3.4.5
@@ -4140,10 +4140,6 @@ libqgis_app.so.3.4.11 #PACKAGE# #MINVER#
(optional=templinst)_ZNKSt5ctypeIcE8do_widenEc at Base 2.18.17
(optional=templinst)_ZNSt10unique_ptrI20QgsExpressionContextSt14default_deleteIS0_EED1Ev at Base 3.4.5
(optional=templinst)_ZNSt10unique_ptrI20QgsExpressionContextSt14default_deleteIS0_EED2Ev at Base 3.4.5
- (optional=templinst|arch=armel)_ZNSt12__shared_ptrI21QgsGeometryCheckErrorLN9__gnu_cxx12_Lock_policyE1EEC1ERKS3_ at Base 3.4.5
- (optional=templinst|arch=armel)_ZNSt12__shared_ptrI21QgsGeometryCheckErrorLN9__gnu_cxx12_Lock_policyE1EEC2ERKS3_ at Base 3.4.5
- (optional=templinst|arch=armel)_ZNSt12__shared_ptrI27QgsSingleGeometryCheckErrorLN9__gnu_cxx12_Lock_policyE1EEC1ERKS3_ at Base 3.4.5
- (optional=templinst|arch=armel)_ZNSt12__shared_ptrI27QgsSingleGeometryCheckErrorLN9__gnu_cxx12_Lock_policyE1EEC2ERKS3_ at Base 3.4.5
(optional=templinst)_ZNSt14_Function_base13_Base_managerIPFP17QgsFormAnnotationvEE10_M_managerERSt9_Any_dataRKS6_St18_Manager_operation at Base 3.4.5
(optional=templinst)_ZNSt14_Function_base13_Base_managerIPFP18QgsLayoutItem3DMapP9QgsLayoutEE10_M_managerERSt9_Any_dataRKS8_St18_Manager_operation at Base 3.4.5
(optional=templinst|arch=armel)_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE1EEC1I23QgsGeometryCheckContextSt14default_deleteIS4_EEEOSt10unique_ptrIT_T0_E at Base 3.4.5
=====================================
debian/libqgis-core3.4.11.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 3.4.11 amd64 i386 powerpc ppc64 ppc64el
+# SymbolsHelper-Confirmed: 3.4.11 amd64 arm64 armel armhf i386 m68k mips64el mipsel powerpc ppc64 ppc64el
libqgis_core.so.3.4.11 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
GEOPROJ4 at Base 2.0.1
@@ -2593,9 +2593,9 @@ libqgis_core.so.3.4.11 #PACKAGE# #MINVER#
_ZN15QgsPointLocator23onAttributeValueChangedExiRK8QVariant at Base 3.4.5
_ZN15QgsPointLocator4initEi at Base 2.8.0
(arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x)_ZN15QgsPointLocator5MatchC1ENS_4TypeEP14QgsVectorLayerxdRK10QgsPointXYiPS4_ at Base 3.4.5
- (arch=!arm64 !mips64el)_ZN15QgsPointLocator5MatchC1EOS0_ at Base 3.4.6
+ (arch=!arm64 !m68k !mips64el !mipsel)_ZN15QgsPointLocator5MatchC1EOS0_ at Base 3.4.6
(arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x)_ZN15QgsPointLocator5MatchC2ENS_4TypeEP14QgsVectorLayerxdRK10QgsPointXYiPS4_ at Base 3.4.5
- (arch=!arm64 !mips64el)_ZN15QgsPointLocator5MatchC2EOS0_ at Base 3.4.6
+ (arch=!arm64 !m68k !mips64el !mipsel)_ZN15QgsPointLocator5MatchC2EOS0_ at Base 3.4.6
_ZN15QgsPointLocator9setExtentEPK12QgsRectangle at Base 2.14.0
_ZN15QgsPointLocatorC1EP14QgsVectorLayerRK28QgsCoordinateReferenceSystemRK29QgsCoordinateTransformContextPK12QgsRectangle at Base 3.4.5
_ZN15QgsPointLocatorC2EP14QgsVectorLayerRK28QgsCoordinateReferenceSystemRK29QgsCoordinateTransformContextPK12QgsRectangle at Base 3.4.5
@@ -3672,7 +3672,7 @@ libqgis_core.so.3.4.11 #PACKAGE# #MINVER#
_ZN17QgsImageOperation23ShadeFromArrayOperationclERjii at Base 2.8.0
_ZN17QgsImageOperation23nonTransparentImageRectERK6QImage5QSizeb at Base 2.14.0
_ZN17QgsImageOperation24adjustBrightnessContrastER6QImageid at Base 2.8.0
- (optional=templinst|arch=!alpha !arm64 !armel !armhf !hppa !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !s390x)_ZN17QgsImageOperation26runBlockOperationInThreadsINS_21GaussianBlurOperationEEEvR6QImageRT_NS_22LineOperationDirectionE at Base 2.8.1
+ (optional=templinst|arch=!alpha !arm64 !armel !armhf !hppa !powerpc !powerpcspe !ppc64 !ppc64el !s390x)_ZN17QgsImageOperation26runBlockOperationInThreadsINS_21GaussianBlurOperationEEEvR6QImageRT_NS_22LineOperationDirectionE at Base 2.8.1
(optional=templinst)_ZN17QgsImageOperation26runBlockOperationInThreadsINS_30ProcessBlockUsingLineOperationINS_17FlipLineOperationEEEEEvR6QImageRT_NS_22LineOperationDirectionE at Base 2.8.0
(optional=templinst)_ZN17QgsImageOperation26runBlockOperationInThreadsINS_30ProcessBlockUsingLineOperationINS_22StackBlurLineOperationEEEEEvR6QImageRT_NS_22LineOperationDirectionE at Base 2.8.0
_ZN17QgsImageOperation27HueSaturationPixelOperationclERjii at Base 2.8.0
@@ -9547,8 +9547,8 @@ libqgis_core.so.3.4.11 #PACKAGE# #MINVER#
_ZN6QgsGmlD1Ev at Base 2.0.1
_ZN6QgsGmlD2Ev at Base 2.0.1
(optional=templinst)_ZN7QObject7connectIM14QgsVectorLayerFvvEM17QgsLayerTreeModelFvvEEEN11QMetaObject10ConnectionEPKN9QtPrivate15FunctionPointerIT_E6ObjectESB_PKNSA_IT0_E6ObjectESG_N2Qt14ConnectionTypeE at Base 3.4.5
- (optional=templinst|arch=amd64)_ZN7QObject7connectIM16QgsLayerTreeNodeFvPS1_iiEM17QgsLayerTreeModelFvS2_iiEEEN11QMetaObject10ConnectionEPKN9QtPrivate15FunctionPointerIT_E6ObjectESC_PKNSB_IT0_E6ObjectESH_N2Qt14ConnectionTypeE at Base 3.4.5
- (optional=templinst|arch=!i386 !powerpc)_ZN7QObject7connectIM17QgsLayerTreeLayerFvvEM17QgsLayerTreeModelFvvEEEN11QMetaObject10ConnectionEPKN9QtPrivate15FunctionPointerIT_E6ObjectESB_PKNSA_IT0_E6ObjectESG_N2Qt14ConnectionTypeE at Base 3.4.5
+ (optional=templinst|arch=amd64 arm64)_ZN7QObject7connectIM16QgsLayerTreeNodeFvPS1_iiEM17QgsLayerTreeModelFvS2_iiEEEN11QMetaObject10ConnectionEPKN9QtPrivate15FunctionPointerIT_E6ObjectESC_PKNSB_IT0_E6ObjectESH_N2Qt14ConnectionTypeE at Base 3.4.5
+ (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN7QObject7connectIM17QgsLayerTreeLayerFvvEM17QgsLayerTreeModelFvvEEEN11QMetaObject10ConnectionEPKN9QtPrivate15FunctionPointerIT_E6ObjectESB_PKNSA_IT0_E6ObjectESG_N2Qt14ConnectionTypeE at Base 3.4.5
_ZN7QString10fromLatin1ERK10QByteArray at Base 3.4.5
_ZN7QString7prependEPKc at Base 3.4.5
_ZN7QString8fromUtf8EPKci at Base 3.4.5
=====================================
debian/libqgis-gui3.4.11.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 3.4.11 amd64 arm64 i386 powerpc ppc64 ppc64el
+# SymbolsHelper-Confirmed: 3.4.11 amd64 arm64 armel armhf i386 m68k mipsel powerpc ppc64 ppc64el
libqgis_gui.so.3.4.11 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
_Z17createDatabaseURIRK7QStringS1_S1_S_S1_S_S_b at Base 3.4.5
@@ -174,7 +174,7 @@ libqgis_gui.so.3.4.11 #PACKAGE# #MINVER#
_ZN11QgsPropertyD1Ev at Base 3.4.5
_ZN11QgsPropertyD2Ev at Base 3.4.5
(optional=templinst)_ZN11QgsSettings9enumValueIN12QgsUnitTypes10LayoutUnitEEET_RK7QStringRKS3_NS_7SectionE at Base 3.4.11
- (optional=templinst|arch=powerpc)_ZN11QgsSettings9enumValueIN18QgsMapToolIdentify12IdentifyModeEEET_RK7QStringRKS3_NS_7SectionE at Base 3.4.11
+ (optional=templinst|arch=mipsel powerpc)_ZN11QgsSettings9enumValueIN18QgsMapToolIdentify12IdentifyModeEEET_RK7QStringRKS3_NS_7SectionE at Base 3.4.11
(optional=templinst)_ZN11QgsSettings9enumValueIN6QgsGui18ProjectCrsBehaviorEEET_RK7QStringRKS3_NS_7SectionE at Base 3.4.11
_ZN11QgsWkbTypes11isMultiTypeENS_4TypeE at Base 3.4.5
_ZN11QgsWkbTypes12geometryTypeENS_4TypeE at Base 3.4.5
@@ -1206,7 +1206,7 @@ libqgis_gui.so.3.4.11 #PACKAGE# #MINVER#
_ZN15QgsVertexMarkerD0Ev at Base 2.18.17
_ZN15QgsVertexMarkerD1Ev at Base 2.18.17
_ZN15QgsVertexMarkerD2Ev at Base 2.18.17
- _ZN16QTableWidgetItem10setToolTipERK7QString at Base 3.4.5
+ (arch=!mipsel)_ZN16QTableWidgetItem10setToolTipERK7QString at Base 3.4.11
_ZN16QTableWidgetItem7setTextERK7QString at Base 3.4.5
_ZN16QgsAttributeForm10WidgetInfoD1Ev at Base 3.4.5
_ZN16QgsAttributeForm10WidgetInfoD2Ev at Base 3.4.5
@@ -8789,7 +8789,7 @@ libqgis_gui.so.3.4.11 #PACKAGE# #MINVER#
_ZNK14QgsVScrollArea10metaObjectEv at Base 3.4.5
_ZNK15CharacterWidget10metaObjectEv at Base 2.0.1
_ZNK15CharacterWidget8sizeHintEv at Base 2.0.1
- (arch=i386 powerpc)_ZNK15QTreeWidgetItem10foregroundEi at Base 3.4.11
+ (arch=armel armhf i386 m68k mipsel powerpc)_ZNK15QTreeWidgetItem10foregroundEi at Base 3.4.11
_ZNK15QgsAuthCertInfo10metaObjectEv at Base 2.14.0
_ZNK15QgsDateTimeEdit10metaObjectEv at Base 2.6.0
_ZNK15QgsDateTimeEdit8dateTimeEv at Base 2.6.0
@@ -8807,7 +8807,7 @@ libqgis_gui.so.3.4.11 #PACKAGE# #MINVER#
_ZNK15QgsSymbolButton8sizeHintEv at Base 3.4.5
_ZNK15QgsSymbolButton9mapCanvasEv at Base 3.4.5
_ZNK15QgsVertexMarker12boundingRectEv at Base 2.0.1
- (arch=i386 powerpc)_ZNK16QTableWidgetItem4textEv at Base 3.4.11
+ (arch=armel armhf i386 m68k mipsel powerpc)_ZNK16QTableWidgetItem4textEv at Base 3.4.11
_ZNK16QgsAttributeForm10metaObjectEv at Base 2.4.0
_ZNK16QgsAttributeForm15aggregateFilterEv at Base 3.4.5
_ZNK16QgsAttributeForm15fieldIsEditableERK14QgsVectorLayerix at Base 3.4.5
@@ -10046,7 +10046,7 @@ libqgis_gui.so.3.4.11 #PACKAGE# #MINVER#
_ZNK44QgsProcessingParameterWidgetFactoryInterface29modelerExpressionFormatStringEv at Base 3.4.5
(optional=templinst|arch=powerpcspe)_ZNK5QListIP7QObjectE7indexOfERKS1_i at Base 2.14.15
_ZNK6QgsGui10metaObjectEv at Base 3.4.9
- (arch=!i386 !powerpc !ppc64 !s390x)_ZNK7QPointF7toPointEv at Base 3.4.6
+ (arch=!armel !armhf !i386 !mipsel !powerpc !ppc64 !s390x)_ZNK7QPointF7toPointEv at Base 3.4.6
_ZNK7QgsDial10metaObjectEv at Base 2.4.0
_ZNK7QgsDial12variantValueEv at Base 2.8.3
_ZNK9QgsDialog10metaObjectEv at Base 2.0.1
=====================================
debian/libqgis-server3.4.11.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 3.4.11 amd64 i386 powerpc ppc64
+# SymbolsHelper-Confirmed: 3.4.11 amd64 arm64 i386 m68k mips64el powerpc ppc64 ppc64el
libqgis_server.so.3.4.11 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
_ZN10QByteArrayD1Ev at Base 3.4.5
@@ -455,11 +455,11 @@ libqgis_server.so.3.4.11 #PACKAGE# #MINVER#
(optional=templinst|arch=armel)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE10_M_releaseEv at Base 3.4.5
(optional=templinst|arch=!armel)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv at Base 3.4.5
(optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE24_M_get_insert_unique_posERS2_ at Base 3.4.5
- (optional=templinst|arch=amd64)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS3_ERS2_ at Base 3.4.6
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS3_ERS2_ at Base 3.4.6
(optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE8_M_eraseEPSt13_Rb_tree_nodeIS3_E at Base 3.4.5
(optional=templinst)_ZNSt8_Rb_treeIN18QgsServerParameter4NameESt4pairIKS1_S0_ESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE22_M_emplace_hint_uniqueIJS2_IS1_S0_EEEESt17_Rb_tree_iteratorIS4_ESt23_Rb_tree_const_iteratorIS4_EDpOT_ at Base 3.4.5
(optional=templinst)_ZNSt8_Rb_treeIN18QgsServerParameter4NameESt4pairIKS1_S0_ESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE24_M_get_insert_unique_posERS3_ at Base 3.4.5
- (optional=templinst|arch=amd64)_ZNSt8_Rb_treeIN18QgsServerParameter4NameESt4pairIKS1_S0_ESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS3_ at Base 3.4.6
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el)_ZNSt8_Rb_treeIN18QgsServerParameter4NameESt4pairIKS1_S0_ESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS3_ at Base 3.4.6
(optional=templinst)_ZNSt8_Rb_treeIN18QgsServerParameter4NameESt4pairIKS1_S0_ESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE8_M_eraseEPSt13_Rb_tree_nodeIS4_E at Base 3.4.5
_ZTI10QgsService at Base 3.4.5
_ZTI12QgsException at Base 3.4.5
=====================================
debian/patches/grass78.patch
=====================================
@@ -0,0 +1,62 @@
+Description: Add support for GRASS 7.8.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/cmake/FindGRASS.cmake
++++ b/cmake/FindGRASS.cmake
+@@ -160,14 +160,14 @@ ENDIF (WIN32)
+ IF (UNIX)
+ IF (GRASS_FIND_VERSION EQUAL 7)
+ IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+- FOREACH (VERSION_MINOR 0 1 2 3 4 5 6)
+- FOREACH (VERSION_BUILD 0 1 2 3 4 5 6)
++ FOREACH (VERSION_MINOR 0 1 2 3 4 5 6 8)
++ FOREACH (VERSION_BUILD 0 1 2 3 4 5 6 8)
+ LIST (APPEND GRASS_PATHS /usr/local/grass-${GRASS_FIND_VERSION}.${VERSION_MINOR}.${VERSION_BUILD})
+ ENDFOREACH (VERSION_BUILD)
+ ENDFOREACH(VERSION_MINOR)
+ ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ FOREACH (PATH /usr/lib64 /usr/lib)
+- FOREACH (VERSION grass76, grass74, grass72, grass70)
++ FOREACH (VERSION grass78, grass76, grass74, grass72, grass70)
+ LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}")
+ ENDFOREACH (VERSION)
+ ENDFOREACH (PATH)
+@@ -178,6 +178,7 @@ ENDIF (UNIX)
+ IF (APPLE)
+ IF (GRASS_FIND_VERSION EQUAL 7)
+ LIST(APPEND GRASS_PATHS
++ /Applications/GRASS-7.8.app/Contents/MacOS
+ /Applications/GRASS-7.6.app/Contents/MacOS
+ /Applications/GRASS-7.4.app/Contents/MacOS
+ /Applications/GRASS-7.2.app/Contents/MacOS
+--- a/python/plugins/processing/algs/grass7/Grass7Utils.py
++++ b/python/plugins/processing/algs/grass7/Grass7Utils.py
+@@ -165,8 +165,8 @@ class Grass7Utils:
+ ]
+ else:
+ cmdList = [
+- "grass76", "grass74", "grass72", "grass70", "grass",
+- "grass76.sh", "grass74.sh", "grass72.sh", "grass70.sh", "grass.sh"
++ "grass78", "grass76", "grass74", "grass72", "grass70", "grass",
++ "grass78.sh", "grass76.sh", "grass74.sh", "grass72.sh", "grass70.sh", "grass.sh"
+ ]
+
+ # For MS-Windows there is a difference between GRASS Path and GRASS binary
+@@ -230,7 +230,7 @@ class Grass7Utils:
+ elif isMac():
+ # For MacOSX, we scan some well-known directories
+ # Start with QGIS bundle
+- for version in ['', '7', '76', '74', '72', '70']:
++ for version in ['', '7', '78', '76', '74', '72', '70']:
+ testfolder = os.path.join(str(QgsApplication.prefixPath()),
+ 'grass{}'.format(version))
+ if os.path.isdir(testfolder):
+@@ -565,7 +565,7 @@ class Grass7Utils:
+ return 'https://grass.osgeo.org/grass{}/manuals/'.format(version)
+ else:
+ # GRASS not available!
+- return 'https://grass.osgeo.org/grass76/manuals/'
++ return 'https://grass.osgeo.org/grass78/manuals/'
+
+ @staticmethod
+ def getSupportedOutputRasterExtensions():
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
python-env.patch
developersmap-use-debian-package.patch
exclude-elvensword-resources.patch
+grass78.patch
=====================================
debian/qgis.sh
=====================================
@@ -2,9 +2,9 @@
if dpkg -s qgis-plugin-grass >/dev/null 2>&1; then
if [ "$LD_LIBRARY_PATH" = "" ]; then
- LD_LIBRARY_PATH=/usr/lib/grass76/lib
+ LD_LIBRARY_PATH=/usr/lib/grass78/lib
else
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass76/lib
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass78/lib
fi
fi
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/cd8c6be397c1bbd6fd61804c8f75e5ade460439f...7da12bde8ec22bf8a8ffaba54b5d72ec5267313b
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/cd8c6be397c1bbd6fd61804c8f75e5ade460439f...7da12bde8ec22bf8a8ffaba54b5d72ec5267313b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190907/70d5e7db/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list