[qgis] 01/02: Merge tag 'debian/2.14.7+dfsg-2' into jessie-backports

Bas Couwenberg sebastic at debian.org
Wed Oct 5 10:09:29 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch jessie-backports
in repository qgis.

commit 36000a96c0b77e62284c266976a738d985141f82
Merge: 4e3c428 aa6bde7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Oct 5 09:41:45 2016 +0200

    Merge tag 'debian/2.14.7+dfsg-2' into jessie-backports
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/libqgis-core2.14.7.symbols
    	debian/libqgis-gui2.14.7.symbols
    	debian/libqgisgrass6-2.14.6.install
    	debian/libqgisgrass6-2.14.6.lintian-overrides
    	debian/libqgisgrass6-2.14.6.symbols
    	debian/libqgisgrass7-2.14.6.install
    	debian/libqgisgrass7-2.14.6.lintian-overrides
    	debian/libqgisgrass7-2.14.6.symbols
    	debian/libqgisgrass7-2.14.7.install
    	debian/libqgisgrass7-2.14.7.lintian-overrides
    	debian/libqgisgrass7-2.14.7.symbols
    	debian/rules

 CMakeLists.txt                                     |   2 +-
 ChangeLog                                          | 826 ++++++++++++++-------
 debian/changelog                                   |  37 +
 debian/control                                     |  50 +-
 debian/copyright                                   |  16 +
 debian/{ => icons}/qbrowser-icon128x128.png        | Bin
 debian/{ => icons}/qbrowser-icon16x16.png          | Bin
 debian/{ => icons}/qbrowser-icon192x192.png        | Bin
 debian/{ => icons}/qbrowser-icon22x22.png          | Bin
 debian/{ => icons}/qbrowser-icon24x24.png          | Bin
 debian/{ => icons}/qbrowser-icon256x256.png        | Bin
 debian/{ => icons}/qbrowser-icon32x32.png          | Bin
 debian/{ => icons}/qbrowser-icon36x36.png          | Bin
 debian/{ => icons}/qbrowser-icon42x42.png          | Bin
 debian/{ => icons}/qbrowser-icon48x48.png          | Bin
 debian/{ => icons}/qbrowser-icon512x512.png        | Bin
 debian/{ => icons}/qbrowser-icon64x64.png          | Bin
 debian/{ => icons}/qbrowser-icon72x72.png          | Bin
 debian/{ => icons}/qbrowser-icon80x80.png          | Bin
 debian/{ => icons}/qbrowser-icon8x8.png            | Bin
 debian/{ => icons}/qbrowser-icon96x96.png          | Bin
 debian/{ => icons}/qgis-icon128x128.png            | Bin
 debian/{ => icons}/qgis-icon16x16.png              | Bin
 debian/{ => icons}/qgis-icon192x192.png            | Bin
 debian/{ => icons}/qgis-icon22x22.png              | Bin
 debian/{ => icons}/qgis-icon24x24.png              | Bin
 debian/{ => icons}/qgis-icon256x256.png            | Bin
 debian/{ => icons}/qgis-icon32x32.png              | Bin
 debian/{ => icons}/qgis-icon36x36.png              | Bin
 debian/{ => icons}/qgis-icon42x42.png              | Bin
 debian/{ => icons}/qgis-icon48x48.png              | Bin
 debian/{ => icons}/qgis-icon512x512.png            | Bin
 debian/{ => icons}/qgis-icon64x64.png              | Bin
 debian/{ => icons}/qgis-icon72x72.png              | Bin
 debian/{ => icons}/qgis-icon80x80.png              | Bin
 debian/{ => icons}/qgis-icon8x8.png                | Bin
 debian/{ => icons}/qgis-icon96x96.png              | Bin
 debian/{ => icons}/qgis-mime-icon128x128.png       | Bin
 debian/{ => icons}/qgis-mime-icon16x16.png         | Bin
 debian/{ => icons}/qgis-mime-icon22x22.png         | Bin
 debian/{ => icons}/qgis-mime-icon24x24.png         | Bin
 debian/{ => icons}/qgis-mime-icon32x32.png         | Bin
 debian/{ => icons}/qgis-mime-icon36x36.png         | Bin
 debian/{ => icons}/qgis-mime-icon42x42.png         | Bin
 debian/{ => icons}/qgis-mime-icon48x48.png         | Bin
 debian/{ => icons}/qgis-mime-icon64x64.png         | Bin
 debian/{ => icons}/qgis-mime-icon72x72.png         | Bin
 debian/{ => icons}/qgis-mime-icon80x80.png         | Bin
 debian/{ => icons}/qgis-mime-icon8x8.png           | Bin
 debian/{ => icons}/qgis-mime-icon96x96.png         | Bin
 ...14.6.install => libqgis-analysis2.14.7.install} |   0
 ...14.6.symbols => libqgis-analysis2.14.7.symbols} |  10 +-
 ...app2.14.6.install => libqgis-app2.14.7.install} |   0
 ...app2.14.6.symbols => libqgis-app2.14.7.symbols} |  10 +-
 ...re2.14.6.install => libqgis-core2.14.7.install} |   0
 ...re2.14.6.symbols => libqgis-core2.14.7.symbols} |  93 +--
 ...gui2.14.6.install => libqgis-gui2.14.7.install} |   0
 ...gui2.14.6.symbols => libqgis-gui2.14.7.symbols} |  94 +--
 ...stall => libqgis-networkanalysis2.14.7.install} |   0
 ...mbols => libqgis-networkanalysis2.14.7.symbols} |   2 +-
 ...2.14.6.install => libqgis-server2.14.7.install} |   0
 ...2.14.6.symbols => libqgis-server2.14.7.symbols} |   2 +-
 ...2.14.6.install => libqgisgrass6-2.14.7.install} |   0
 ...ides => libqgisgrass6-2.14.7.lintian-overrides} |   2 +-
 ...2.14.6.symbols => libqgisgrass6-2.14.7.symbols} | 100 +--
 ...n2.14.6.install => libqgispython2.14.7.install} |   0
 ...n2.14.6.symbols => libqgispython2.14.7.symbols} |   2 +-
 debian/patches/columns-typo.patch                  | 508 +++++++++++++
 debian/patches/series                              |   1 +
 debian/python-qgis.install                         |   1 +
 debian/python-qgis.lintian-overrides               |   3 -
 debian/qgis-providers.lintian-overrides            |   3 -
 debian/qgis.lintian-overrides                      |   2 +-
 debian/{qgis.postinst => qgis.preinst}             |   4 +-
 debian/qgis.prerm                                  |  17 -
 debian/rules                                       |  11 +-
 debian/source/include-binaries                     |  90 +--
 python/CMakeLists.txt                              |  12 +
 python/QtWebKit/QtWebKitmod.sip                    |  63 ++
 python/QtWebKit/__init__.py                        |   0
 python/QtWebKit/qgraphicswebview.sip               | 150 ++++
 python/QtWebKit/qwebdatabase.sip                   |  46 ++
 python/QtWebKit/qwebelement.sip                    | 144 ++++
 python/QtWebKit/qwebframe.sip                      | 244 ++++++
 python/QtWebKit/qwebhistory.sip                    | 104 +++
 python/QtWebKit/qwebhistoryinterface.sip           |  40 +
 python/QtWebKit/qwebinspector.sip                  |  48 ++
 python/QtWebKit/qwebkitglobal.sip                  |  37 +
 python/QtWebKit/qwebkitversion.sip                 |  37 +
 python/QtWebKit/qwebpage.sip                       | 522 +++++++++++++
 python/QtWebKit/qwebpluginfactory.sip              |  88 +++
 python/QtWebKit/qwebsecurityorigin.sip             |  56 ++
 python/QtWebKit/qwebsettings.sip                   | 237 ++++++
 python/QtWebKit/qwebview.sip                       | 167 +++++
 python/core/geometry/qgsabstractgeometryv2.sip     |   6 +
 python/core/geometry/qgslinestringv2.sip           |   4 +
 python/core/geometry/qgsmultilinestringv2.sip      |   4 +
 python/core/geometry/qgsmultipolygonv2.sip         |   4 +
 python/core/geometry/qgspolygonv2.sip              |   4 +
 python/core/qgsstringutils.sip                     |  19 +
 python/core/qgsvectordataprovider.sip              |   4 +
 python/gui/qgsmessagebar.sip                       |   4 +-
 python/plugins/processing/algs/qgis/ConcaveHull.py |   4 +-
 .../plugins/processing/algs/qgis/Intersection.py   |   6 +-
 python/plugins/processing/algs/qgis/MeanCoords.py  |  11 +-
 .../algs/qgis/SinglePartsToMultiparts.py           |   4 +-
 python/plugins/processing/core/parameters.py       |   2 +-
 .../plugins/processing/gui/AlgorithmDialogBase.py  |   3 -
 .../processing/ui/DlgGetScriptsAndModels.ui        |   5 -
 src/analysis/vector/qgsgeometryanalyzer.cpp        |  59 +-
 src/analysis/vector/qgsgeometryanalyzer.h          |  10 +-
 src/app/main.cpp                                   |  94 ++-
 src/app/qgsidentifyresultsdialog.cpp               |   2 +
 src/app/qgssnappingdialog.cpp                      |   2 +-
 src/core/auth/qgsauthmanager.cpp                   |   8 +-
 src/core/geometry/qgsabstractgeometryv2.h          |   6 +
 src/core/geometry/qgsgeometry.cpp                  |   5 +
 src/core/geometry/qgslinestringv2.cpp              |   8 +
 src/core/geometry/qgslinestringv2.h                |   3 +
 src/core/geometry/qgsmultilinestringv2.cpp         |  11 +
 src/core/geometry/qgsmultilinestringv2.h           |   3 +
 src/core/geometry/qgsmultipolygonv2.cpp            |  10 +
 src/core/geometry/qgsmultipolygonv2.h              |   3 +
 src/core/geometry/qgspolygonv2.cpp                 |  12 +
 src/core/geometry/qgspolygonv2.h                   |   3 +
 src/core/qgsexpression.cpp                         |  14 +-
 src/core/qgslegendrenderer.cpp                     |  46 +-
 src/core/qgspallabeling.cpp                        |  71 +-
 src/core/qgspointlocator.cpp                       |   1 +
 src/core/qgspointlocator.h                         |   2 +-
 src/core/qgsstringutils.cpp                        |  50 ++
 src/core/qgsstringutils.h                          |  18 +
 src/core/qgsvectordataprovider.cpp                 | 109 ++-
 src/core/qgsvectordataprovider.h                   |   4 +
 src/core/qgsvectorlayer.cpp                        |   7 +-
 src/core/qgsvectorlayerfeatureiterator.cpp         | 287 ++++---
 src/core/qgsvectorlayerfeatureiterator.h           |  29 +-
 src/core/qgsvectorlayerlabelprovider.h             |   2 +
 src/core/symbology-ng/qgsvectorcolorrampv2.cpp     |   5 +-
 src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp  |   1 +
 .../qgsdelimitedtextfeatureiterator.cpp            |  10 +-
 .../delimitedtext/qgsdelimitedtextfile.cpp         |  10 +-
 src/providers/ogr/qgsogrconnpool.h                 |   3 +-
 src/providers/ogr/qgsogrfeatureiterator.cpp        |   7 +
 src/providers/ogr/qgsogrprovider.cpp               | 177 ++++-
 src/providers/ogr/qgsogrprovider.h                 |   8 +
 src/providers/postgres/qgspostgresdataitems.cpp    |   8 +-
 src/providers/postgres/qgspostgresprovider.cpp     |   7 +-
 .../spatialite/qgsspatialitesourceselect.cpp       |   4 +
 .../virtual/qgsvirtuallayerqueryparser.cpp         |   6 +-
 .../virtual/qgsvirtuallayersqlitemodule.cpp        |  19 +-
 tests/src/core/testqgsexpression.cpp               |   1 +
 tests/src/core/testqgslabelingenginev2.cpp         |  60 ++
 tests/src/core/testqgslegendrenderer.cpp           |  62 ++
 tests/src/python/test_provider_ogr_gpkg.py         | 164 ++++
 tests/src/python/test_provider_virtual.py          |  14 +
 tests/src/python/test_qgsfeatureiterator.py        |  88 ++-
 .../expected_legend_2_by_2.png                     | Bin 0 -> 4515 bytes
 .../expected_legend_2_by_2_mask.png                | Bin 0 -> 1198 bytes
 .../expected_legend_3_by_2.png                     | Bin 0 -> 5364 bytes
 .../expected_legend_3_by_2_mask.png                | Bin 0 -> 1491 bytes
 .../expected_legend_3_by_3.png                     | Bin 0 -> 5800 bytes
 .../expected_legend_3_by_3_mask.png                | Bin 0 -> 1526 bytes
 .../expected_legend_4_by_2.png                     | Bin 0 -> 5472 bytes
 .../expected_legend_4_by_2_mask.png                | Bin 0 -> 1676 bytes
 .../expected_legend_4_by_3.png                     | Bin 0 -> 6529 bytes
 .../expected_legend_4_by_3_mask.png                | Bin 0 -> 1855 bytes
 .../expected_legend_5_by_2.png                     | Bin 0 -> 6661 bytes
 .../expected_legend_5_by_2_mask.png                | Bin 0 -> 1964 bytes
 .../expected_legend_5_by_3.png                     | Bin 0 -> 6870 bytes
 .../expected_legend_5_by_3_mask.png                | Bin 0 -> 2045 bytes
 .../expected_legend_6_by_3.png                     | Bin 0 -> 7470 bytes
 .../expected_legend_6_by_3_mask.png                | Bin 0 -> 2226 bytes
 .../expected_legend_7_by_3.png                     | Bin 0 -> 8244 bytes
 .../expected_legend_7_by_3_mask.png                | Bin 0 -> 2539 bytes
 175 files changed, 4669 insertions(+), 829 deletions(-)

diff --cc debian/changelog
index 31d4cbc,f2c60df..eb4f94e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,40 +1,46 @@@
+ qgis (2.14.7+dfsg-2) unstable; urgency=medium
+ 
+   * Move icons to subdirectory.
+   * Update symbols for other architectures.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 29 Sep 2016 14:52:59 +0200
+ 
+ qgis (2.14.7+dfsg-1) unstable; urgency=medium
+ 
+   * Update symbols for other architectures.
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 28 Sep 2016 08:10:58 +0200
+ 
+ qgis (2.14.7+dfsg-1~exp1) experimental; urgency=medium
+ 
+   [ Jürgen E. Fischer ]
+   * Release of 2.14.7
+ 
+   [ Bas Couwenberg ]
+   * New upstream release.
+   * Update copyright file, changes:
+     - Add license & copyright for QtWebKit files.
+   * Install PyQt4 files in python-qgis package.
+   * Re-enable QtWebKit support using embedded copy.
+   * Update symbols for amd64.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 25 Sep 2016 09:34:21 +0200
+ 
+ qgis (2.14.6+dfsg-4) unstable; urgency=medium
+ 
+   * Add patch to fix 'columns' typo.
+   * Remove obsolete diversions in qgis.preinst again, but don't rename.
+     (closes: #836993)
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 18 Sep 2016 01:01:47 +0200
+ 
 +qgis (2.14.6+dfsg-3~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 17 Sep 2016 07:32:35 +0200
 +
  qgis (2.14.6+dfsg-3) unstable; urgency=medium
  
    * Remove obsolete diversions in postinst & prerm.
diff --cc debian/control
index 8b1315f,510a728..d519649
--- a/debian/control
+++ b/debian/control
@@@ -162,7 -163,7 +162,7 @@@ Description: QGIS - shared network anal
   .
   This package contains the shared network analysis library.
  
- Package: libqgisgrass6-2.14.6
 -Package: libqgisgrass7-2.14.7
++Package: libqgisgrass6-2.14.7
  Architecture: any
  Section: libs
  Depends: ${shlibs:Depends},
@@@ -221,17 -222,17 +221,17 @@@ Depends: grass-dev
           libexpat1-dev,
           libgdal-dev (>= 1.10.1-0~),
           libgeos-dev (>= 3.0.0),
 -         libgsl-dev,
 +         libgsl0-dev,
           libpq-dev,
           libproj-dev,
-          libqgis-app2.14.6 (= ${binary:Version}),
-          libqgis-core2.14.6 (= ${binary:Version}),
-          libqgis-gui2.14.6 (= ${binary:Version}),
-          libqgis-analysis2.14.6 (= ${binary:Version}),
-          libqgis-networkanalysis2.14.6 (= ${binary:Version}),
-          libqgis-server2.14.6 (= ${binary:Version}),
-          libqgisgrass6-2.14.6 (= ${binary:Version}),
-          libqgispython2.14.6 (= ${binary:Version}),
+          libqgis-app2.14.7 (= ${binary:Version}),
+          libqgis-core2.14.7 (= ${binary:Version}),
+          libqgis-gui2.14.7 (= ${binary:Version}),
+          libqgis-analysis2.14.7 (= ${binary:Version}),
+          libqgis-networkanalysis2.14.7 (= ${binary:Version}),
+          libqgis-server2.14.7 (= ${binary:Version}),
 -         libqgisgrass7-2.14.7 (= ${binary:Version}),
++         libqgisgrass6-2.14.7 (= ${binary:Version}),
+          libqgispython2.14.7 (= ${binary:Version}),
           libqt4-dev (>= 4.7.0),
           libsqlite3-dev,
           python-qt4 (>= 4.1.0),
@@@ -253,14 -254,14 +253,14 @@@ Package: qgis-db
  Architecture: any
  Section: debug
  Priority: extra
- Depends: libqgis-app2.14.6 (= ${binary:Version}),
-          libqgis-core2.14.6 (= ${binary:Version}),
-          libqgis-gui2.14.6 (= ${binary:Version}),
-          libqgis-analysis2.14.6 (= ${binary:Version}),
-          libqgis-networkanalysis2.14.6 (= ${binary:Version}),
-          libqgis-server2.14.6 (= ${binary:Version}),
-          libqgisgrass6-2.14.6 (= ${binary:Version}),
-          libqgispython2.14.6 (= ${binary:Version}),
+ Depends: libqgis-app2.14.7 (= ${binary:Version}),
+          libqgis-core2.14.7 (= ${binary:Version}),
+          libqgis-gui2.14.7 (= ${binary:Version}),
+          libqgis-analysis2.14.7 (= ${binary:Version}),
+          libqgis-networkanalysis2.14.7 (= ${binary:Version}),
+          libqgis-server2.14.7 (= ${binary:Version}),
 -         libqgisgrass7-2.14.7 (= ${binary:Version}),
++         libqgisgrass6-2.14.7 (= ${binary:Version}),
+          libqgispython2.14.7 (= ${binary:Version}),
           ${misc:Depends}
  Suggests: gdb
  Description: QGIS - debugging symbols
diff --cc debian/libqgis-analysis2.14.7.symbols
index e7efece,474bd09..c16c725
--- a/debian/libqgis-analysis2.14.7.symbols
+++ b/debian/libqgis-analysis2.14.7.symbols
@@@ -497,13 -494,11 +497,13 @@@ libqgis_analysis.so.2.14.7 #PACKAGE# #M
   _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 hppa mips64el ppc64el sparc64)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE12_M_erase_auxESt23_Rb_tree_const_iteratorIS2_E at Base 2.14.1
+  (optional=templinst|arch=amd64 kfreebsd-amd64)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE12_M_erase_auxESt23_Rb_tree_const_iteratorIS2_E at Base 2.14.1
   (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)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE4findERS1_ at Base 2.8.3
 + (optional=templinst)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE4findERS1_ at Base 2.8.3
 + (optional=templinst|arch=i386)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE5eraseB5cxx11ESt17_Rb_tree_iteratorIS2_E at Base 2.14.4
   (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_EE4findERS1_ at Base 2.14.4
   (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKidESt10_Select1stIS2_ESt4lessIiESaIS2_EE5eraseERS1_ at Base 2.0.1
   (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKidESt10_Select1stIS2_ESt4lessIiESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E at Base 2.0.1
   _ZTI12TriDecorator at Base 2.0.1
diff --cc debian/libqgis-app2.14.7.symbols
index f30eba2,d36b154..9e04a70
--- a/debian/libqgis-app2.14.7.symbols
+++ b/debian/libqgis-app2.14.7.symbols
@@@ -1,22 -1,9 +1,22 @@@
- # SymbolsHelper-Confirmed: 2.14.6 amd64 mips
- libqgis_app.so.2.14.6 #PACKAGE# #MINVER#
+ # SymbolsHelper-Confirmed: 2.14.7 amd64 armhf mips
+ libqgis_app.so.2.14.7 #PACKAGE# #MINVER#
   (optional=templinst|arch=!amd64 !i386)_Z10qDeleteAllI5QListIPN13QFormInternal11DomPropertyEEEvRKT_ at Base 2.14.0
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal10DomIncludeEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal11DomResourceEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal12DomColorRoleEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal13DomConnectionEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal13DomLayoutItemEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal14DomButtonGroupEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal15DomCustomWidgetEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal15DomGradientStopEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal15DomPropertyDataEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal17DomConnectionHintEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal30DomStringPropertySpecificationEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal8DomColorEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal8DomImageEE14const_iteratorEEvT_S6_ at Base 2.14.4
   (optional=templinst)_Z13qvariant_castI26QUiTranslatableStringValueET_RK8QVariant at Base 2.14.0
 - (optional=templinst|arch=!amd64 !i386)_Z13qvariant_castI5QIconET_RK8QVariant at Base 2.14.0
 - (optional=templinst|arch=!amd64 !i386)_Z13qvariant_castI5QListIP7QWidgetEET_RK8QVariant at Base 2.14.0
 + (optional=templinst)_Z13qvariant_castI5QIconET_RK8QVariant at Base 2.14.0
 + (optional=templinst)_Z13qvariant_castI5QListIP7QWidgetEET_RK8QVariant at Base 2.14.0
   (optional=templinst|arch=alpha armel armhf mips mips64el mipsel s390x)_Z13qvariant_castI7QStringET_RK8QVariant at Base 2.14.0
   (optional=templinst)_Z21qMetaTypeDeleteHelperI26QUiTranslatableStringValueEvPT_ at Base 2.14.0
   (optional=templinst)_Z21qMetaTypeDeleteHelperI5QListIP7QWidgetEEvPT_ at Base 2.14.0
@@@ -3200,14 -3138,13 +3200,13 @@@
   (optional=templinst)_ZN5QListI5QPairIS0_IN2Qt12ItemDataRoleES2_E7QStringEE13detach_helperEi at Base 2.14.0
   (optional=templinst)_ZN5QListI5QPairIS0_IN2Qt12ItemDataRoleES2_E7QStringEE18detach_helper_growEii at Base 2.14.0
   (optional=templinst)_ZN5QListI5QPairIS0_IN2Qt12ItemDataRoleES2_E7QStringEE6appendERKS5_ at Base 2.14.0
 - (optional=templinst|arch=!amd64 !i386)_ZN5QListI5QPairIS0_IN2Qt12ItemDataRoleES2_E7QStringEED1Ev at Base 2.14.0
 - (optional=templinst|arch=!amd64 !i386)_ZN5QListI5QPairIS0_IN2Qt12ItemDataRoleES2_E7QStringEED2Ev at Base 2.14.0
 + (optional=templinst)_ZN5QListI5QPairIS0_IN2Qt12ItemDataRoleES2_E7QStringEED1Ev at Base 2.14.0
 + (optional=templinst)_ZN5QListI5QPairIS0_IN2Qt12ItemDataRoleES2_E7QStringEED2Ev at Base 2.14.0
   (optional=templinst)_ZN5QListI7QStringEC1ERKS1_ at Base 2.14.0
   (optional=templinst)_ZN5QListI7QStringEC2ERKS1_ at Base 2.14.0
-  (optional=templinst)_ZN5QListI7QStringEaSERKS1_ at Base 2.14.6
   (optional=templinst)_ZN5QListIP30QDesignerCustomWidgetInterfaceE13detach_helperEi at Base 2.14.0
   (optional=templinst)_ZN5QListIP30QDesignerCustomWidgetInterfaceE18detach_helper_growEii at Base 2.14.0
-  (optional=templinst|arch=alpha armel armhf hppa mips mips64el mipsel sparc64)_ZN5QListIP30QDesignerCustomWidgetInterfaceE6appendERKS1_ at Base 2.14.0
+  (optional=templinst|arch=alpha armel hppa mips mips64el mipsel sparc64)_ZN5QListIP30QDesignerCustomWidgetInterfaceE6appendERKS1_ at Base 2.14.0
   (optional=templinst|arch=!amd64 !i386)_ZN5QListIP30QDesignerCustomWidgetInterfaceED1Ev at Base 2.14.0
   (optional=templinst|arch=!amd64 !i386)_ZN5QListIP30QDesignerCustomWidgetInterfaceED2Ev at Base 2.14.0
   (optional=templinst)_ZN5QListIP7QObjectE18detach_helper_growEii at Base 2.14.0
diff --cc debian/libqgis-core2.14.7.symbols
index f7ee4d8,dab75d9..ebc6dad
--- a/debian/libqgis-core2.14.7.symbols
+++ b/debian/libqgis-core2.14.7.symbols
@@@ -11,9 -11,8 +11,9 @@@ libqgis_core.so.2.14.7 #PACKAGE# #MINVE
   _Z7qgsFreePv at Base 2.0.1
   (subst)_Z9qgsCalloc{size_t}{size_t}@Base 2.14.0
   (subst)_Z9qgsMalloc{size_t}@Base 2.14.0
 + (arch=amd64)_ZN10QgsClipper11trimPolygonER9QPolygonFRK12QgsRectangle at Base 2.14.4
   _ZN10QgsClipper14clippedLineWKBE14QgsConstWkbPtrRK12QgsRectangleR9QPolygonF at Base 2.14.0
-  (arch=alpha amd64 arm64 hppa mips64el ppc64 ppc64el s390x sparc64)_ZN10QgsClipper15clipLineSegmentEddddRdS0_S0_S0_ at Base 2.14.4
+  (arch=alpha amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZN10QgsClipper15clipLineSegmentEddddRdS0_S0_S0_ at Base 2.14.7
   _ZN10QgsClipper21connectSeparatedLinesEddddRK12QgsRectangleR9QPolygonF at Base 2.0.1
   _ZN10QgsClipper5MAX_XE at Base 2.0.1
   _ZN10QgsClipper5MAX_YE at Base 2.0.1
@@@ -9995,10 -9715,8 +9987,9 @@@
   _ZTV10QgsZipItem at Base 2.0.1
   _ZTV11QgsDataItem at Base 2.0.1
   _ZTV11QgsMapLayer at Base 2.0.1
 + (arch=amd64 i386)_ZTV11QgsProperty at Base 2.14.4
   _ZTV11QgsSvgCache at Base 2.0.1
   _ZTV11QgsSymbolV2 at Base 2.0.1
-  (arch=!amd64)_ZTV12QWebSettings at Base 2.14.4
   _ZTV12QgsErrorItem at Base 2.0.1
   _ZTV12QgsException at Base 2.0.1
   _ZTV12QgsGmlSchema at Base 2.0.1
diff --cc debian/libqgis-gui2.14.7.symbols
index 5c5338d,086fe43..d046a87
--- a/debian/libqgis-gui2.14.7.symbols
+++ b/debian/libqgis-gui2.14.7.symbols
@@@ -1,22 -1,9 +1,22 @@@
- # SymbolsHelper-Confirmed: 2.14.6 amd64
- libqgis_gui.so.2.14.6 #PACKAGE# #MINVER#
+ # SymbolsHelper-Confirmed: 2.14.7 amd64 armel armhf hppa mips mips64el mipsel
+ libqgis_gui.so.2.14.7 #PACKAGE# #MINVER#
   (optional=templinst|arch=!amd64 !i386)_Z10qDeleteAllI5QListIPN13QFormInternal11DomPropertyEEEvRKT_ at Base 2.8.3
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal10DomIncludeEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal11DomResourceEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal12DomColorRoleEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal13DomConnectionEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal13DomLayoutItemEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal14DomButtonGroupEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal15DomCustomWidgetEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal15DomGradientStopEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal15DomPropertyDataEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal17DomConnectionHintEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal30DomStringPropertySpecificationEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal8DomColorEE14const_iteratorEEvT_S6_ at Base 2.14.4
 + (optional=templinst)_Z10qDeleteAllIN5QListIPN13QFormInternal8DomImageEE14const_iteratorEEvT_S6_ at Base 2.14.4
   (optional=templinst)_Z13qvariant_castI26QUiTranslatableStringValueET_RK8QVariant at Base 2.0.1
 - (optional=templinst|arch=!amd64 !i386)_Z13qvariant_castI5QIconET_RK8QVariant at Base 2.0.1
 - (optional=templinst|arch=!amd64 !i386)_Z13qvariant_castI5QListIP7QWidgetEET_RK8QVariant at Base 2.0.1
 + (optional=templinst)_Z13qvariant_castI5QIconET_RK8QVariant at Base 2.0.1
 + (optional=templinst)_Z13qvariant_castI5QListIP7QWidgetEET_RK8QVariant at Base 2.0.1
   (optional=templinst|arch=alpha armel armhf mips mips64el mipsel s390x)_Z13qvariant_castI7QStringET_RK8QVariant at Base 2.2.0
   (optional=templinst)_Z21qMetaTypeDeleteHelperI26QUiTranslatableStringValueEvPT_ at Base 2.0.1
   (optional=templinst)_Z21qMetaTypeDeleteHelperI5QListIP7QWidgetEEvPT_ at Base 2.0.1
diff --cc debian/libqgisgrass6-2.14.7.lintian-overrides
index 0bbf58d,8cff5d2..a148c46
--- a/debian/libqgisgrass6-2.14.7.lintian-overrides
+++ b/debian/libqgisgrass6-2.14.7.lintian-overrides
@@@ -1,4 -1,4 +1,4 @@@
  # Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
  #  Fortify Source functions: no, only unprotected functions found!
- libqgisgrass6-2.14.6: hardening-no-fortify-functions *
 -libqgisgrass7-2.14.7: hardening-no-fortify-functions *
++libqgisgrass6-2.14.7: hardening-no-fortify-functions *
  
diff --cc debian/libqgisgrass6-2.14.7.symbols
index 18240d5,c5bb1ad..380abfc
--- a/debian/libqgisgrass6-2.14.7.symbols
+++ b/debian/libqgisgrass6-2.14.7.symbols
@@@ -1,5 -1,5 +1,5 @@@
- # SymbolsHelper-Confirmed: 2.14.6 amd64 arm64 armel mips mipsel ppc64el
- libqgisgrass6.so.2.14.6 #PACKAGE# #MINVER#
+ # SymbolsHelper-Confirmed: 2.14.7 arm64 hppa kfreebsd-amd64 kfreebsd-i386 ppc64el
 -libqgisgrass7.so.2.14.7 #PACKAGE# #MINVER#
++libqgisgrass6.so.2.14.7 #PACKAGE# #MINVER#
   Vect_delete_line_function_pointer at Base 2.14.0
   Vect_rewrite_line_function_pointer at Base 2.14.0
   _Z23qStringComparisonHelperRK7QStringPKc at Base 2.8.4
diff --cc debian/libqgispython2.14.7.symbols
index 1499b92,586e34a..df6fedc
--- a/debian/libqgispython2.14.7.symbols
+++ b/debian/libqgispython2.14.7.symbols
@@@ -1,6 -1,5 +1,6 @@@
  # SymbolsHelper-Confirmed: 2.14.0 amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64el s390x
- libqgispython.so.2.14.6 #PACKAGE# #MINVER#
+ libqgispython.so.2.14.7 #PACKAGE# #MINVER#
   _ZTI14QgsPythonUtils at Base 2.0.1
   _ZTS14QgsPythonUtils at Base 2.0.1
 + _ZTV14QgsPythonUtils at Base 2.14.4
   instance at Base 2.0.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git



More information about the Pkg-grass-devel mailing list