Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · eea6a2c1
--- a/debian/changelog
+++ b/debian/changelog
-qgis (3.4.14+dfsg-1~exp2) UNRELEASED; urgency=medium
+qgis (3.4.14+dfsg-1) unstable; urgency=medium

  * Drop Name field from upstream metadata.
+  * Update symbols for other architectures.
+  * Bump minimum GRASS build dependency version to 7.8.2.
+  * Don't quote placeholder in mailcap entries.
+  * Add patch to fix FTBFS with txt2tags 3.3.
+  * Move from experimental to unstable.

- -- Bas Couwenberg <sebastic@debian.org>  Mon, 09 Dec 2019 09:41:28 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 24 Dec 2019 20:39:26 +0100

 qgis (3.4.14+dfsg-1~exp1) experimental; urgency=medium


--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: bison,
               dh-python,
               flex,
               gdal-bin,
-               grass-dev (>= 7.8.1),
+               grass-dev (>= 7.8.2),
               libexpat1-dev,
               libfcgi-dev,
               libgdal-dev (>= 1.11),

--- a/debian/libqgis-analysis3.4.14.symbols
+++ b/debian/libqgis-analysis3.4.14.symbols
-# SymbolsHelper-Confirmed: 3.4.13 arm64 mips64el ppc64 ppc64el s390x x32
+# SymbolsHelper-Confirmed: 3.4.14 armel armhf i386
 libqgis_analysis.so.3.4.14 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
 _ZN10QByteArrayD1Ev@Base 3.4.5
@@ -469,7 +469,9 @@ libqgis_analysis.so.3.4.14 #PACKAGE# #MINVER#
 _ZN24CloughTocherInterpolator4initEdd@Base 2.0.1
 _ZN24CloughTocherInterpolator9calcPointEddR8QgsPoint@Base 3.4.5
 _ZN24CloughTocherInterpolatorC1EP16NormVecDecorator@Base 2.8.0
+ _ZN24CloughTocherInterpolatorC1Ev@Base 3.4.14
 _ZN24CloughTocherInterpolatorC2EP16NormVecDecorator@Base 2.8.0
+ _ZN24CloughTocherInterpolatorC2Ev@Base 3.4.14
 _ZN24CloughTocherInterpolatorD0Ev@Base 2.0.1
 _ZN24CloughTocherInterpolatorD1Ev@Base 2.0.1
 _ZN24CloughTocherInterpolatorD2Ev@Base 2.0.1
@@ -1098,6 +1100,7 @@ libqgis_analysis.so.3.4.14 #PACKAGE# #MINVER#
 (optional=templinst)_ZNSt10_HashtableIxSt4pairIKxiESaIS2_ENSt8__detail10_Select1stESt8equal_toIxESt4hashIxENS4_18_Mod_range_hashingENS4_20_Default_ranged_hashENS4_20_Prime_rehash_policyENS4_17_Hashtable_traitsILb0ELb0ELb1EEEED2Ev@Base 3.4.5
 (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x)_ZNSt10_HashtableIxxSaIxENSt8__detail9_IdentityESt8equal_toIxESt4hashIxENS1_18_Mod_range_hashingENS1_20_Default_ranged_hashENS1_20_Prime_rehash_policyENS1_17_Hashtable_traitsILb0ELb1ELb1EEEE21_M_insert_unique_nodeEjjPNS1_10_Hash_nodeIxLb0EEEj@Base 3.4.5
 (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x)_ZNSt10_HashtableIxxSaIxENSt8__detail9_IdentityESt8equal_toIxESt4hashIxENS1_18_Mod_range_hashingENS1_20_Default_ranged_hashENS1_20_Prime_rehash_policyENS1_17_Hashtable_traitsILb0ELb1ELb1EEEE21_M_insert_unique_nodeEmmPNS1_10_Hash_nodeIxLb0EEEm@Base 3.4.5
+ (optional=templinst)_ZNSt10_HashtableIxxSaIxENSt8__detail9_IdentityESt8equal_toIxESt4hashIxENS1_18_Mod_range_hashingENS1_20_Default_ranged_hashENS1_20_Prime_rehash_policyENS1_17_Hashtable_traitsILb0ELb1ELb1EEEE4findERKx@Base 3.4.14
 (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x)_ZNSt10_HashtableIxxSaIxENSt8__detail9_IdentityESt8equal_toIxESt4hashIxENS1_18_Mod_range_hashingENS1_20_Default_ranged_hashENS1_20_Prime_rehash_policyENS1_17_Hashtable_traitsILb0ELb1ELb1EEEE9_M_rehashEjRKj@Base 3.4.5
 (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x)_ZNSt10_HashtableIxxSaIxENSt8__detail9_IdentityESt8equal_toIxESt4hashIxENS1_18_Mod_range_hashingENS1_20_Default_ranged_hashENS1_20_Prime_rehash_policyENS1_17_Hashtable_traitsILb0ELb1ELb1EEEE9_M_rehashEmRKm@Base 3.4.5
 (optional=templinst)_ZNSt10_HashtableIxxSaIxENSt8__detail9_IdentityESt8equal_toIxESt4hashIxENS1_18_Mod_range_hashingENS1_20_Default_ranged_hashENS1_20_Prime_rehash_policyENS1_17_Hashtable_traitsILb0ELb1ELb1EEEED1Ev@Base 3.4.5

--- a/debian/libqgis-app3.4.14.symbols
+++ b/debian/libqgis-app3.4.14.symbols
-# SymbolsHelper-Confirmed: 3.4.13 i386 x32
+# SymbolsHelper-Confirmed: 3.4.14 arm64 armel armhf ppc64 ppc64el s390x
 libqgis_app.so.3.4.14 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
 _ZN10QgsOptions10addSVGPathEv@Base 3.4.5
@@ -929,6 +929,7 @@ libqgis_app.so.3.4.14 #PACKAGE# #MINVER#
 _ZN17QgsSnappingWidgetD0Ev@Base 3.4.5
 _ZN17QgsSnappingWidgetD1Ev@Base 3.4.5
 _ZN17QgsSnappingWidgetD2Ev@Base 3.4.5
+ _ZN18QStandardItemModel9appendRowEP13QStandardItem@Base 3.4.14
 _ZN18QStyleOptionButtonD1Ev@Base 3.4.5
 _ZN18QStyleOptionButtonD2Ev@Base 3.4.5
 _ZN18QgsColorRampShaderD0Ev@Base 3.4.5
@@ -4250,6 +4251,7 @@ libqgis_app.so.3.4.14 #PACKAGE# #MINVER#
 (optional=templinst)_ZNSt8functionIFviRK7QStringEEC2ERKS4_@Base 3.4.5
 (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x)_ZSt17__rotate_adaptiveIPP20QgsLayoutTableColumnS2_iET_S3_S3_S3_T1_S4_T0_S4_@Base 3.4.5
 (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x)_ZSt17__rotate_adaptiveIPP20QgsLayoutTableColumnS2_lET_S3_S3_S3_T1_S4_T0_S4_@Base 3.4.5
+ (optional=templinst|arch=armel armhf)_ZSt4swapIN8QVariant7PrivateEENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleIS6_ESt18is_move_assignableIS6_EEE5valueEvE4typeERS6_SG_@Base 3.4.14
 _ZTI10QgsOptions@Base 2.14.0
 _ZTI11QgsProperty@Base 3.4.5
 _ZTI12QgsBookmarks@Base 2.14.0

--- a/debian/libqgis-core3.4.14.symbols
+++ b/debian/libqgis-core3.4.14.symbols
-# SymbolsHelper-Confirmed: 3.4.14 amd64
+# SymbolsHelper-Confirmed: 3.4.14 amd64 armel armhf i386 x32
 libqgis_core.so.3.4.14 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
 GEOPROJ4@Base 2.0.1
@@ -14282,7 +14282,7 @@ libqgis_core.so.3.4.14 #PACKAGE# #MINVER#
 (optional=templinst)_ZNSt6vectorISt10unique_ptrI13QgsLineStringSt14default_deleteIS1_EESaIS4_EE12emplace_backIJPS1_EEEvDpOT_@Base 3.4.5
 (optional=templinst)_ZNSt6vectorISt10unique_ptrI13QgsLineStringSt14default_deleteIS1_EESaIS4_EE17_M_realloc_insertIJPS1_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 3.4.5
 (optional=templinst|arch=armel armhf i386 x32)_ZNSt6vectorISt10unique_ptrI14QgsRasterBlockSt14default_deleteIS1_EESaIS4_EE17_M_default_appendEj@Base 3.4.13
- (optional=templinst)_ZNSt6vectorISt10unique_ptrI14QgsRasterBlockSt14default_deleteIS1_EESaIS4_EE17_M_default_appendEm@Base 3.4.13
+ (optional=templinst|arch=amd64)_ZNSt6vectorISt10unique_ptrI14QgsRasterBlockSt14default_deleteIS1_EESaIS4_EE17_M_default_appendEm@Base 3.4.13
 (optional=templinst)_ZNSt6vectorISt10unique_ptrI14QgsRasterBlockSt14default_deleteIS1_EESaIS4_EED1Ev@Base 3.4.13
 (optional=templinst)_ZNSt6vectorISt10unique_ptrI14QgsRasterBlockSt14default_deleteIS1_EESaIS4_EED2Ev@Base 3.4.13
 (optional=templinst)_ZNSt6vectorISt10unique_ptrI16QgsLabelPositionSt14default_deleteIS1_EESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 3.4.9

--- a/debian/libqgis-gui3.4.14.symbols
+++ b/debian/libqgis-gui3.4.14.symbols
-# SymbolsHelper-Confirmed: 3.4.13 amd64 ppc64el x32
+# SymbolsHelper-Confirmed: 3.4.14 armel armhf i386
 libqgis_gui.so.3.4.14 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
 _Z17createDatabaseURIRK7QStringS1_S1_S_S1_S_S_b@Base 3.4.5
@@ -10131,6 +10131,7 @@ libqgis_gui.so.3.4.14 #PACKAGE# #MINVER#
 (optional=templinst)_ZNSt6vectorIN22QgsAttributeTableModel9SortCacheESaIS1_EED1Ev@Base 3.4.5
 (optional=templinst)_ZNSt6vectorIN22QgsAttributeTableModel9SortCacheESaIS1_EED2Ev@Base 3.4.5
 (optional=templinst|subst)_ZNSt6vectorIiSaIiEE17_M_default_appendE{size_t}@Base 2.14.0
+ (optional=templinst)_ZSt4swapIN8QVariant7PrivateEENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleIS6_ESt18is_move_assignableIS6_EEE5valueEvE4typeERS6_SG_@Base 3.4.14
 _ZTI10QgsMapTool@Base 2.0.1
 _ZTI10QgsSpinBox@Base 2.6.0
 _ZTI11QgsAppStyle@Base 3.4.5

--- a/debian/libqgisgrass7-3.4.14.symbols
+++ b/debian/libqgisgrass7-3.4.14.symbols
-# SymbolsHelper-Confirmed: 3.4.14 amd64
+# SymbolsHelper-Confirmed: 3.4.14 amd64 armel armhf i386 ppc64 ppc64el s390x
 libqgisgrass7.so.3.4.14 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
 _ZN10QByteArray6detachEv@Base 3.4.5
@@ -408,7 +408,7 @@ libqgisgrass7.so.3.4.14 #PACKAGE# #MINVER#
 _ZN34QgsGrassUndoCommandChangeAttributeD1Ev@Base 2.14.0
 _ZN34QgsGrassUndoCommandChangeAttributeD2Ev@Base 2.14.0
 (optional=templinst)_ZN7QObject7connectIM14QgsVectorLayerFvvEM16QgsGrassProviderFvvEEEN11QMetaObject10ConnectionEPKN9QtPrivate15FunctionPointerIT_E6ObjectESB_PKNSA_IT0_E6ObjectESG_N2Qt14ConnectionTypeE@Base 3.4.5
- _ZN7QString10fromLatin1EPKci@Base 3.4.13
+ (arch=!ppc64 !ppc64el !s390x)_ZN7QString10fromLatin1EPKci@Base 3.4.14
 _ZN7QStringC1EPKc@Base 3.4.5
 _ZN7QStringC2EPKc@Base 3.4.5
 _ZN7QStringD1Ev@Base 3.4.5
@@ -678,6 +678,7 @@ libqgisgrass7.so.3.4.14 #PACKAGE# #MINVER#
 _ZNK23QgsGrassFeatureIterator10metaObjectEv@Base 2.14.0
 _ZNK26QgsAbstractFeatureIterator7isValidEv@Base 3.4.5
 _ZNK8QgsGrass10metaObjectEv@Base 2.14.0
+ (optional=templinst|arch=armel armhf i386)_ZSt4swapIN8QVariant7PrivateEENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleIS6_ESt18is_move_assignableIS6_EEE5valueEvE4typeERS6_SG_@Base 3.4.14
 _ZTI12QgsGrassCopy@Base 2.14.0
 _ZTI14QgsGrassImport@Base 2.14.0
 _ZTI14QgsGrassVector@Base 2.14.0

--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ python-env.patch
 developersmap-use-debian-package.patch
 exclude-elvensword-resources.patch
 grass78.patch
+txt2tags-3.3.patch
--- a/debian/patches/txt2tags-3.3.patch
+++ b/debian/patches/txt2tags-3.3.patch
+Description: Drop options removed from txt2tags.
+ See: https://github.com/txt2tags/txt2tags/blob/v3/CHANGELOG.md#version-33-2019-11-04
+Author: Bas Couwenberg <sebastic@debian.org>
+
+--- a/doc/INSTALL.t2t
+++ b/doc/INSTALL.t2t
+@@ -4,7 +4,7 @@ Building QGIS from source - step by step
+ 
+ %! target       : html
+ %! style        : style.css
+-%! Options      : --toc --toc-level 2 --enum-title --css-sugar --css-inside
+%! Options      : --toc --toc-level 2 --enum-title
+ %! preproc      : TUT_URL   https://qgis.org
+ %! PostProc(html): '(?i)(<pre>)' '<div class="code">\1'
+ %! PostProc(html): '(?i)(</pre>)' '\1</div>'
+--- a/doc/news.t2t
+++ b/doc/news.t2t
+@@ -4,7 +4,7 @@ Change history for the QGIS Project
+ 
+ %! target       : html
+ %! style        : style.css
+-%! Options      : --toc --toc-level 1 --enum-title --css-sugar --css-inside
+%! Options      : --toc --toc-level 1 --enum-title
+ %! preproc      : TUT_URL   https://qgis.org
+ %! PostProc(html): '(?i)(<pre>)' '<div class="code">\1'
+ %! PostProc(html): '(?i)(</pre>)' '\1</div>'
--- a/debian/qgis.mime
+++ b/debian/qgis.mime
-image/tif; qgis '%s'; description="TIFF Image"; test=test -n "$DISPLAY"; nametemplate=%s.tif; priority=2
-image/jpg; qgis '%s'; description="JPEG Image"; test=test -n "$DISPLAY"; nametemplate=%s.jpg; priority=2
-image/jp2; qgis '%s'; description="JPEG 2000 Image"; test=test -n "$DISPLAY"; nametemplate=%s.jp2; priority=2
-application/x-raster-aig; qgis '%s'; description="AIG raster data"; test=test -n "$DISPLAY"; nametemplate=%s.aig; priority=2
-application/x-raster-ecw; qgis '%s'; description="ECW raster data"; test=test -n "$DISPLAY"; nametemplate=%s.ecw; priority=2
-application/x-raster-mrsid; qgis '%s'; description="MrSID raster data"; test=test -n "$DISPLAY"; nametemplate=%s.sid; priority=2
-application/x-raster-mif; qgis '%s'; description="MapInfo file"; test=test -n "$DISPLAY"; nametemplate=%s.mif; priority=2
-application/x-esri-shape; qgis '%s'; description="ESRI shape file"; test=test -n "$DISPLAY"; nametemplate=%s.shp; priority=2
-application/x-qgis-project; qgis '%s'; description="QGIS Project"; test=test -n "$DISPLAY"; nametemplate=%s.qgs
-application/x-qgis-layer-settings; qgis '%s'; description="QGIS Layer Settings"; test=test -n "$DISPLAY"; nametemplate=%s.qml
-application/x-qgis-layer-definition; qgis '%s'; description="QGIS Layer Definition"; test=test -n "$DISPLAY"; nametemplate=%s.qlr
-application/x-qgis-composer-template; qgis '%s'; description="QGIS Composer Template"; test=test -n "$DISPLAY"; nametemplate=%s.qpt
+image/tif; qgis %s; description="TIFF Image"; test=test -n "$DISPLAY"; nametemplate=%s.tif; priority=2
+image/jpg; qgis %s; description="JPEG Image"; test=test -n "$DISPLAY"; nametemplate=%s.jpg; priority=2
+image/jp2; qgis %s; description="JPEG 2000 Image"; test=test -n "$DISPLAY"; nametemplate=%s.jp2; priority=2
+application/x-raster-aig; qgis %s; description="AIG raster data"; test=test -n "$DISPLAY"; nametemplate=%s.aig; priority=2
+application/x-raster-ecw; qgis %s; description="ECW raster data"; test=test -n "$DISPLAY"; nametemplate=%s.ecw; priority=2
+application/x-raster-mrsid; qgis %s; description="MrSID raster data"; test=test -n "$DISPLAY"; nametemplate=%s.sid; priority=2
+application/x-raster-mif; qgis %s; description="MapInfo file"; test=test -n "$DISPLAY"; nametemplate=%s.mif; priority=2
+application/x-esri-shape; qgis %s; description="ESRI shape file"; test=test -n "$DISPLAY"; nametemplate=%s.shp; priority=2
+application/x-qgis-project; qgis %s; description="QGIS Project"; test=test -n "$DISPLAY"; nametemplate=%s.qgs
+application/x-qgis-layer-settings; qgis %s; description="QGIS Layer Settings"; test=test -n "$DISPLAY"; nametemplate=%s.qml
+application/x-qgis-layer-definition; qgis %s; description="QGIS Layer Definition"; test=test -n "$DISPLAY"; nametemplate=%s.qlr
+application/x-qgis-composer-template; qgis %s; description="QGIS Composer Template"; test=test -n "$DISPLAY"; nametemplate=%s.qpt