[Git][debian-gis-team/qgis][experimental] 6 commits: Update build dependency for libqscintilla2-dev. (closes: #886194)

Sebastiaan Couwenberg gitlab at salsa.debian.org
Wed Jan 3 10:03:38 UTC 2018


Sebastiaan Couwenberg pushed to branch experimental at Debian GIS Project / qgis


Commits:
edbb1bce by Bas Couwenberg at 2018-01-03T08:10:48+01:00
Update build dependency for libqscintilla2-dev. (closes: #886194)

- - - - -
6a870c6f by Bas Couwenberg at 2018-01-03T08:14:09+01:00
Update build dependency for libqscintilla2-dev. (closes: #886194)

- - - - -
718f5b41 by Bas Couwenberg at 2018-01-03T08:20:22+01:00
Update symbols for other architectures.

- - - - -
27ea1358 by Bas Couwenberg at 2018-01-03T09:30:28+01:00
Bump Standards-Version to 4.1.3, no changes.

- - - - -
fba92181 by Bas Couwenberg at 2018-01-03T09:30:29+01:00
Set distribution to unstable.

- - - - -
b2e3577d by Bas Couwenberg at 2018-01-03T11:03:02+01:00
Merge branch 'master' into experimental

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/libqgis-analysis2.14.21.symbols
- debian/libqgis-app2.14.21.symbols
- debian/libqgis-core2.14.21.symbols
- debian/libqgisgrass7-2.14.21.symbols


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,18 @@
-qgis (2.14.21+dfsg-2) UNRELEASED; urgency=medium
+qgis (2.14.21+dfsg-3) UNRELEASED; urgency=medium
 
   * Update packaging for GRASS 7.4.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 10 Dec 2017 16:30:08 +0100
 
+qgis (2.14.21+dfsg-2) unstable; urgency=medium
+
+  * Update build dependency for libqscintilla2-dev.
+    (closes: #886194)
+  * Update symbols for other architectures.
+  * Bump Standards-Version to 4.1.3, no changes.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 03 Jan 2018 08:20:24 +0100
+
 qgis (2.14.21+dfsg-1) unstable; urgency=medium
 
   * Update symbols for amd64 & other architectures.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: bison,
                libqt4-sql-sqlite,
                libqca2-dev,
                libqca2-plugin-ossl,
-               libqscintilla2-dev,
+               libqscintilla2-qt4-dev,
 #               libqtwebkit-dev,
                libqwt-dev,
                libspatialite-dev,
@@ -65,7 +65,7 @@ Build-Depends: bison,
                pkg-kde-tools
 Build-Conflicts: libqgis-dev,
                  qgis-dev
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/qgis.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/qgis.git -b experimental
 Homepage: https://qgis.org/


=====================================
debian/libqgis-analysis2.14.21.symbols
=====================================
--- a/debian/libqgis-analysis2.14.21.symbols
+++ b/debian/libqgis-analysis2.14.21.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 2.14.21 kfreebsd-amd64 mipsel
+# SymbolsHelper-Confirmed: 2.14.21 alpha hppa kfreebsd-amd64 mips64el mipsel
 libqgis_analysis.so.2.14.21 #PACKAGE# #MINVER#
  _ZN12TriDecorator10calcNormalEddP8Vector3D at Base 2.0.1
  _ZN12TriDecorator11getTriangleEddP7Point3DPiS1_S2_S1_S2_ at Base 2.0.1
@@ -494,10 +494,10 @@ libqgis_analysis.so.2.14.21 #PACKAGE# #MINVER#
  _ZNK8Vector3D9getLengthEv at Base 2.0.1
  _ZNK8Vector3DeqERKS_ at Base 2.14.0
  _ZNK8Vector3DneERKS_ at Base 2.14.0
- (optional=templinst|arch=amd64 arm64 armel armhf kfreebsd-amd64 m68k ppc64el sparc64)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE12_M_erase_auxESt23_Rb_tree_const_iteratorIS2_E at Base 2.14.18
+ (optional=templinst|arch=amd64 arm64 armel armhf hppa kfreebsd-amd64 m68k mips64el ppc64el sparc64)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE12_M_erase_auxESt23_Rb_tree_const_iteratorIS2_E at Base 2.14.18
  (optional=templinst)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE15_M_insert_equalIS0_IdiEEESt17_Rb_tree_iteratorIS2_EOT_ at Base 2.8.0
  (optional=templinst|arch=armel armhf m68k)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE4findERS1_ at Base 2.8.3
- (optional=templinst|arch=mips mipsel powerpc ppc64 s390x)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE5eraseB5cxx11ESt17_Rb_tree_iteratorIS2_E at Base 2.14.19
+ (optional=templinst|arch=alpha mips mipsel powerpc ppc64 s390x)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE5eraseB5cxx11ESt17_Rb_tree_iteratorIS2_E at Base 2.14.19
  (optional=templinst)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E at Base 2.0.1
  (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKidESt10_Select1stIS2_ESt4lessIiESaIS2_EE16_M_insert_uniqueIS0_IidEEES0_ISt17_Rb_tree_iteratorIS2_EbEOT_ at Base 2.8.0
  (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKidESt10_Select1stIS2_ESt4lessIiESaIS2_EE5eraseERS1_ at Base 2.0.1


=====================================
debian/libqgis-app2.14.21.symbols
=====================================
--- a/debian/libqgis-app2.14.21.symbols
+++ b/debian/libqgis-app2.14.21.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 2.14.21 kfreebsd-amd64 kfreebsd-i386
+# SymbolsHelper-Confirmed: 2.14.21 alpha arm64 armel armhf hppa kfreebsd-amd64 kfreebsd-i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x
 libqgis_app.so.2.14.21 #PACKAGE# #MINVER#
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_Z10qDeleteAllI5QListIPN13QFormInternal11DomPropertyEEEvRKT_ at Base 2.14.18
  (optional=templinst)_Z13qvariant_castI26QUiTranslatableStringValueET_RK8QVariant at Base 2.14.0
@@ -3143,7 +3143,7 @@ libqgis_app.so.2.14.21 #PACKAGE# #MINVER#
  (optional=templinst)_ZN5QListI5QPairIS0_IN2Qt12ItemDataRoleES2_E7QStringEE6appendERKS5_ at Base 2.14.0
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZN5QListI5QPairIS0_IN2Qt12ItemDataRoleES2_E7QStringEED1Ev at Base 2.14.18
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZN5QListI5QPairIS0_IN2Qt12ItemDataRoleES2_E7QStringEED2Ev at Base 2.14.18
- (optional=templinst)_ZN5QListI7QStringE4freeEPN9QListData4DataE at Base 2.14.18
+ (optional=templinst|arch=kfreebsd-amd64 kfreebsd-i386)_ZN5QListI7QStringE4freeEPN9QListData4DataE at Base 2.14.18
  (optional=templinst)_ZN5QListI7QStringEC1ERKS1_ at Base 2.14.0
  (optional=templinst)_ZN5QListI7QStringEC2ERKS1_ at Base 2.14.0
  (optional=templinst)_ZN5QListIP30QDesignerCustomWidgetInterfaceE13detach_helperEi at Base 2.14.0


=====================================
debian/libqgis-core2.14.21.symbols
=====================================
--- a/debian/libqgis-core2.14.21.symbols
+++ b/debian/libqgis-core2.14.21.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 2.14.21 amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x
+# SymbolsHelper-Confirmed: 2.14.21 alpha amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x
 libqgis_core.so.2.14.21 #PACKAGE# #MINVER#
  GEOPROJ4 at Base 2.0.1
  GEOWKT at Base 2.0.1
@@ -7382,7 +7382,7 @@ libqgis_core.so.2.14.21 #PACKAGE# #MINVER#
  _ZNK14QgsConstWkbPtr11verifyBoundEi at Base 2.14.0
  (optional=templinst)_ZNK14QgsConstWkbPtr4readIdEEvRT_ at Base 2.14.0
  (optional=templinst)_ZNK14QgsConstWkbPtr4readIiEEvRT_ at Base 2.14.0
- (optional=templinst|arch=armel mips mips64el mipsel)_ZNK14QgsConstWkbPtr4readIjEEvRT_ at Base 2.14.18
+ (optional=templinst|arch=alpha armel mips mips64el mipsel)_ZNK14QgsConstWkbPtr4readIjEEvRT_ at Base 2.14.18
  _ZNK14QgsContextHelp10metaObjectEv at Base 2.0.1
  _ZNK14QgsDataDefined12toXmlElementER12QDomDocumentRK7QString at Base 2.8.0
  _ZNK14QgsDataDefined13useExpressionEv at Base 2.14.0
@@ -9056,7 +9056,7 @@ libqgis_core.so.2.14.21 #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=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_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=armel armhf mips mips64el mipsel)_ZSt4swapI21QgsRendererCategoryV2ENSt9enable_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 armel armhf mips mips64el mipsel)_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
  _ZTI10QgsDiagram at Base 2.0.1
  _ZTI10QgsFeature at Base 2.14.0


=====================================
debian/libqgisgrass7-2.14.21.symbols
=====================================
--- a/debian/libqgisgrass7-2.14.21.symbols
+++ b/debian/libqgisgrass7-2.14.21.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 2.14.19 armel armhf sparc64
+# SymbolsHelper-Confirmed: 2.14.21 alpha
 libqgisgrass7.so.2.14.21 #PACKAGE# #MINVER#
  Vect_delete_line_function_pointer at Base 2.14.0
  Vect_rewrite_line_function_pointer at Base 2.14.0
@@ -441,7 +441,7 @@ libqgisgrass7.so.2.14.21 #PACKAGE# #MINVER#
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !x32)_ZN4QMapIi7QStringE6insertERKiRKS0_ at Base 2.14.0
  (optional=templinst)_ZN4QMapIi7QStringED1Ev at Base 2.14.0
  (optional=templinst)_ZN4QMapIi7QStringED2Ev at Base 2.14.0
- (optional=templinst|arch=armel armhf mips mips64el mipsel)_ZN4QMapIi8QVariantE11node_createEP8QMapDataPPNS2_4NodeERKiRKS0_ at Base 2.14.18
+ (optional=templinst|arch=alpha armel armhf mips mips64el mipsel)_ZN4QMapIi8QVariantE11node_createEP8QMapDataPPNS2_4NodeERKiRKS0_ at Base 2.14.18
  (optional=templinst)_ZN4QMapIi8QVariantE13detach_helperEv at Base 2.0.1
  (optional=templinst)_ZN4QMapIi8QVariantED1Ev at Base 2.14.0
  (optional=templinst)_ZN4QMapIi8QVariantED2Ev at Base 2.14.0
@@ -462,7 +462,7 @@ libqgisgrass7.so.2.14.21 #PACKAGE# #MINVER#
  (optional=templinst)_ZN5QHashIi7QStringE13duplicateNodeEPN9QHashData4NodeEPv at Base 2.0.1
  (optional=templinst)_ZN5QHashIiP21QgsAbstractGeometryV2E11deleteNode2EPN9QHashData4NodeE at Base 2.14.0
  (optional=templinst)_ZN5QHashIiP21QgsAbstractGeometryV2E13duplicateNodeEPN9QHashData4NodeEPv at Base 2.14.0
- (optional=templinst|arch=armel armhf mips mips64el mipsel)_ZN5QHashIiP21QgsAbstractGeometryV2E6insertERKiRKS1_ at Base 2.14.0
+ (optional=templinst|arch=alpha armel armhf mips mips64el mipsel)_ZN5QHashIiP21QgsAbstractGeometryV2E6insertERKiRKS1_ at Base 2.14.0
  (optional=templinst)_ZN5QHashIiiE11deleteNode2EPN9QHashData4NodeE at Base 2.14.0
  (optional=templinst)_ZN5QHashIiiE13detach_helperEv at Base 2.14.0
  (optional=templinst)_ZN5QHashIiiE13duplicateNodeEPN9QHashData4NodeEPv at Base 2.14.0



View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/0a6d591bced43ef028c5676681c55a2a2ef1ae09...b2e3577da319c06152cd1d5cea4c51701cc01687

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/0a6d591bced43ef028c5676681c55a2a2ef1ae09...b2e3577da319c06152cd1d5cea4c51701cc01687
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180103/dc894f44/attachment-0001.html>


More information about the Pkg-grass-devel mailing list