[Git][debian-gis-team/qgis][master] 3 commits: Update packaging for GRASS 7.6.0.
Bas Couwenberg
gitlab at salsa.debian.org
Mon Jan 21 09:16:04 GMT 2019
Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits:
2e3ab634 by Bas Couwenberg at 2019-01-19T12:24:59Z
Update packaging for GRASS 7.6.0.
- - - - -
de8f33ed by Bas Couwenberg at 2019-01-21T06:37:03Z
Update symbols for other architectures.
- - - - -
e2dad31c by Bas Couwenberg at 2019-01-21T06:37:42Z
Set distribution to unstable.
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/libqgis-app2.18.28.symbols
- debian/libqgis-core2.18.28.symbols
- debian/libqgis-server2.18.28.symbols
- + debian/patches/grass76.patch
- debian/patches/series
- debian/qgis.sh
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+qgis (2.18.28+dfsg-1) unstable; urgency=medium
+
+ * Update packaging for GRASS 7.6.0.
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 21 Jan 2019 07:37:16 +0100
+
qgis (2.18.28+dfsg-1~exp1) experimental; urgency=medium
[ Jürgen E. Fischer ]
=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Build-Depends: bison,
dh-python,
flex,
gdal-bin,
- grass-dev (>= 7.4.4),
+ grass-dev (>= 7.6.0),
libexpat1-dev,
libfcgi-dev,
libgdal-dev (>= 1.10.1-0~),
@@ -221,7 +221,7 @@ Description: QGIS - shared server library
Package: libqgis-dev
Architecture: any
Section: libdevel
-Depends: grass-dev (>= 7.4.0),
+Depends: grass-dev (>= 7.6.0),
libexpat1-dev,
libgdal-dev (>= 1.10.1-0~),
libgeos-dev (>= 3.0.0),
@@ -271,7 +271,7 @@ Architecture: any
Depends: qgis (= ${binary:Version}),
qgis-plugin-grass-common (= ${source:Version}),
qgis-provider-grass (= ${binary:Version}),
- grass-core (>= 7.4.0),
+ grass-core (>= 7.6.0),
${grass:Depends},
${shlibs:Depends},
${misc:Depends}
=====================================
debian/libqgis-app2.18.28.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 2.18.26 hurd-i386
+# SymbolsHelper-Confirmed: 2.18.28 riscv64
libqgis_app.so.2.18.28 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
(optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !x32)_Z10qDeleteAllI5QListIPN13QFormInternal11DomPropertyEEEvRKT_ at Base 2.14.18
@@ -2159,7 +2159,6 @@ libqgis_app.so.2.18.28 #PACKAGE# #MINVER#
_ZN20QgsVisibilityPresetsD0Ev at Base 2.18.17
_ZN20QgsVisibilityPresetsD1Ev at Base 2.18.17
_ZN20QgsVisibilityPresetsD2Ev at Base 2.18.17
- (optional=templinst|arch=!amd64 !hurd-i386 !i386 !m68k !x32)_ZN21QScopedPointerDeleterI16QUiLoaderPrivateE7cleanupEPS0_ at Base 2.18.22
_ZN21QgsDecorationScaleBar11projectReadEv at Base 2.14.0
_ZN21QgsDecorationScaleBar11qt_metacallEN11QMetaObject4CallEiPPv at Base 2.14.0
_ZN21QgsDecorationScaleBar11qt_metacastEPKc at Base 2.14.0
=====================================
debian/libqgis-core2.18.28.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 2.18.27 amd64 armel armhf hurd-i386 i386 mips powerpc
+# SymbolsHelper-Confirmed: 2.18.28 arm64 ppc64el riscv64 s390x
libqgis_core.so.2.18.28 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
GEOPROJ4 at Base 2.0.1
@@ -14,7 +14,7 @@ libqgis_core.so.2.18.28 #PACKAGE# #MINVER#
(subst)_Z9qgsCalloc{size_t}{size_t}@Base 2.14.0
(subst)_Z9qgsMalloc{size_t}@Base 2.14.0
_ZN10QgsClipper14clippedLineWKBER14QgsConstWkbPtrRK12QgsRectangleR9QPolygonF at Base 2.18.17
- (arch=amd64)_ZN10QgsClipper15clipLineSegmentEddddRdS0_S0_S0_ at Base 2.18.27
+ _ZN10QgsClipper15clipLineSegmentEddddRdS0_S0_S0_ at Base 2.18.28
_ZN10QgsClipper21connectSeparatedLinesEddddRK12QgsRectangleR9QPolygonF at Base 2.0.1
(arch=mips mipsel)_ZN10QgsClipper21trimPolygonToBoundaryERK9QPolygonFRS0_RK12QgsRectangleNS_8BoundaryEd at Base 2.18.23
_ZN10QgsClipper5MAX_XE at Base 2.0.1
@@ -865,8 +865,8 @@ libqgis_core.so.2.18.28 #PACKAGE# #MINVER#
_ZN13QgsBlurEffectD0Ev at Base 2.14.0
_ZN13QgsBlurEffectD1Ev at Base 2.14.0
_ZN13QgsBlurEffectD2Ev at Base 2.14.0
- (arch=alpha armel mips mips64el mipsel)_ZN13QgsExpression11HelpExampleC1ERK7QStringS3_S3_ at Base 2.18.17
- (arch=alpha armel mips mips64el mipsel)_ZN13QgsExpression11HelpExampleC2ERK7QStringS3_S3_ at Base 2.18.17
+ (arch=alpha armel mips mips64el mipsel riscv64)_ZN13QgsExpression11HelpExampleC1ERK7QStringS3_S3_ at Base 2.18.28
+ (arch=alpha armel mips mips64el mipsel riscv64)_ZN13QgsExpression11HelpExampleC2ERK7QStringS3_S3_ at Base 2.18.28
_ZN13QgsExpression11HelpExampleD1Ev at Base 2.18.17
_ZN13QgsExpression11HelpExampleD2Ev at Base 2.18.17
_ZN13QgsExpression11HelpVariantC1ERK7QStringS3_RK5QListINS_7HelpArgEEbRKS4_INS_11HelpExampleEES3_ at Base 2.18.17
@@ -1269,7 +1269,7 @@ libqgis_core.so.2.18.28 #PACKAGE# #MINVER#
_ZN14QgsAuthManager18smAuthServersTableE at Base 2.14.0
_ZN14QgsAuthManager18storeCertAuthorityERK15QSslCertificate at Base 2.14.0
_ZN14QgsAuthManager18updateNetworkReplyEP13QNetworkReplyRK7QStringS4_ at Base 2.14.0
- (arch=!amd64 !hurd-i386 !i386 !m68k !x32)_ZN14QgsAuthManager19clearMasterPasswordEv at Base 2.18.17
+ (arch=!amd64 !hurd-i386 !i386 !m68k !riscv64 !x32)_ZN14QgsAuthManager19clearMasterPasswordEv at Base 2.18.17
_ZN14QgsAuthManager19existsCertAuthorityERK15QSslCertificate at Base 2.14.0
_ZN14QgsAuthManager19getUntrustedCaCertsE5QListI15QSslCertificateE at Base 2.14.0
_ZN14QgsAuthManager19insertCaCertInCacheEN16QgsAuthCertUtils12CaCertSourceERK5QListI15QSslCertificateE at Base 2.14.0
@@ -3786,8 +3786,8 @@ libqgis_core.so.2.18.28 #PACKAGE# #MINVER#
_ZN17QgsSimplifyMethod25setForceLocalOptimizationEb at Base 2.2.0
_ZN17QgsSimplifyMethodC1Ev at Base 2.2.0
_ZN17QgsSimplifyMethodC2Ev at Base 2.2.0
- (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !x32)_ZN17QgsVectorJoinInfoC1ERKS_ at Base 2.18.22
- (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !x32)_ZN17QgsVectorJoinInfoC2ERKS_ at Base 2.18.22
+ (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !riscv64 !x32)_ZN17QgsVectorJoinInfoC1ERKS_ at Base 2.18.22
+ (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !riscv64 !x32)_ZN17QgsVectorJoinInfoC2ERKS_ at Base 2.18.22
_ZN17QgsVectorJoinInfoD1Ev at Base 2.18.17
_ZN17QgsVectorJoinInfoD2Ev at Base 2.18.17
_ZN18QgsColorRampShader16setColorRampTypeENS_14ColorRamp_TYPEE at Base 2.0.1
@@ -4608,8 +4608,8 @@ libqgis_core.so.2.18.28 #PACKAGE# #MINVER#
_ZN19QgsVectorFileWriter10addFeatureER10QgsFeatureP20QgsFeatureRendererV2N4QGis8UnitTypeE at Base 2.0.1
_ZN19QgsVectorFileWriter10stopRenderEP14QgsVectorLayer at Base 2.14.0
_ZN19QgsVectorFileWriter11startRenderEP14QgsVectorLayer at Base 2.14.0
- (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !powerpc !ppc64 !ppc64el !riscv64 !x32)_ZN19QgsVectorFileWriter12HiddenOptionC1ERK7QString at Base 2.18.22
- (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !powerpc !ppc64 !ppc64el !riscv64 !x32)_ZN19QgsVectorFileWriter12HiddenOptionC2ERK7QString at Base 2.18.22
+ (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !powerpc !ppc64 !ppc64el !x32)_ZN19QgsVectorFileWriter12HiddenOptionC1ERK7QString at Base 2.18.28
+ (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !powerpc !ppc64 !ppc64el !x32)_ZN19QgsVectorFileWriter12HiddenOptionC2ERK7QString at Base 2.18.28
_ZN19QgsVectorFileWriter12HiddenOptionD0Ev at Base 2.18.17
_ZN19QgsVectorFileWriter12HiddenOptionD1Ev at Base 2.18.17
_ZN19QgsVectorFileWriter12HiddenOptionD2Ev at Base 2.18.17
@@ -10620,7 +10620,7 @@ libqgis_core.so.2.18.28 #PACKAGE# #MINVER#
(optional=templinst)_ZNSt6vectorIN8QgsLabel10labelpointESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_ at Base 2.14.18
(optional=templinst)_ZNSt6vectorISt4pairIidESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_ at Base 2.14.18
(optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc x32)_ZNSt6vectorIiSaIiEE17_M_default_appendEj at Base 2.18.22
- (optional=templinst|arch=amd64 arm64 ppc64 ppc64el s390x)_ZNSt6vectorIiSaIiEE17_M_default_appendEm at Base 2.18.22
+ (optional=templinst)_ZNSt6vectorIiSaIiEE17_M_default_appendEm at Base 2.18.22
(optional=templinst)_ZSt4swapI18QgsRendererRangeV2ENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleIS5_ESt18is_move_assignableIS5_EEE5valueEvE4typeERS5_SF_ at Base 2.14.18
(optional=templinst|arch=alpha arm64 armel armhf mips mips64el mipsel powerpc s390x)_ZSt4swapI21QgsRendererCategoryV2ENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleIS5_ESt18is_move_assignableIS5_EEE5valueEvE4typeERS5_SF_ at Base 2.14.18
_ZTI10QgsCurveV2 at Base 2.14.0
=====================================
debian/libqgis-server2.18.28.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 2.18.28 amd64
+# SymbolsHelper-Confirmed: 2.18.28 amd64 arm64 armel mips riscv64
libqgis_server.so.2.18.28 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
_ZN14QgsConfigCache11qt_metacallEN11QMetaObject4CallEiPPv at Base 2.8.0
@@ -88,7 +88,9 @@ libqgis_server.so.2.18.28 #PACKAGE# #MINVER#
_ZN22QgsAccessControlFilterD1Ev at Base 2.14.0
_ZN22QgsAccessControlFilterD2Ev at Base 2.14.0
_ZN22QgsMapServiceExceptionC1ERK7QStringS2_ at Base 2.8.0
+ (arch=!amd64)_ZN22QgsMapServiceExceptionC1ERKS_ at Base 2.18.28
_ZN22QgsMapServiceExceptionC2ERK7QStringS2_ at Base 2.8.0
+ (arch=!amd64)_ZN22QgsMapServiceExceptionC2ERKS_ at Base 2.18.28
_ZN22QgsMapServiceExceptionD1Ev at Base 2.18.17
_ZN22QgsMapServiceExceptionD2Ev at Base 2.18.17
_ZN22QgsServerProjectParser24sublayersOfEmbeddedGroupERK7QStringS2_R4QSetIS0_E at Base 2.8.0
=====================================
debian/patches/grass76.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Add support for GRASS 7.6.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/python/plugins/processing/algs/grass7/Grass7Utils.py
++++ b/python/plugins/processing/algs/grass7/Grass7Utils.py
+@@ -84,7 +84,7 @@ class Grass7Utils:
+ if Grass7Utils.grassPath() is None:
+ return None
+
+- for command in ["grass74", "grass72", "grass71", "grass70", "grass"]:
++ for command in ["grass76", "grass74", "grass72", "grass71", "grass70", "grass"]:
+ proc = subprocess.Popen(
+ ["{} -v".format(command)],
+ shell=True,
=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ exclude-elvensword-resources.patch
occurred-typo.patch
number-typo.patch
columns-typo.patch
+grass76.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/grass74/lib
+ LD_LIBRARY_PATH=/usr/lib/grass76/lib
else
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass74/lib
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass76/lib
fi
fi
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/666283bb9f791c9a9f7e91018ed8ad192864f2e5...e2dad31c8e90cfbab48b48f0a2185891907dd665
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/666283bb9f791c9a9f7e91018ed8ad192864f2e5...e2dad31c8e90cfbab48b48f0a2185891907dd665
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/20190121/7166c429/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list