[qgis] 01/03: Merge tag 'debian/2.14.11+dfsg-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Wed Jan 25 09:22:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository qgis.
commit 3d289a0e39a731f7ae9528213d453d2de4ac1bd6
Merge: c0fc069 6194906
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Jan 25 07:41:52 2017 +0100
Merge tag 'debian/2.14.11+dfsg-1' into jessie-backports
Conflicts:
debian/changelog
debian/control
debian/libqgisgrass6-2.14.10.install
debian/libqgisgrass6-2.14.10.lintian-overrides
debian/libqgisgrass6-2.14.10.symbols
debian/libqgisgrass7-2.14.10.install
debian/libqgisgrass7-2.14.10.lintian-overrides
debian/libqgisgrass7-2.14.10.symbols
debian/libqgisgrass7-2.14.11.install
debian/libqgisgrass7-2.14.11.lintian-overrides
debian/libqgisgrass7-2.14.11.symbols
debian/qgis.sh
CMakeLists.txt | 2 +-
ChangeLog | 4574 ++++----
debian/changelog | 36 +
debian/control | 51 +-
....10.install => libqgis-analysis2.14.11.install} | 0
....10.symbols => libqgis-analysis2.14.11.symbols} | 6 +-
...p2.14.10.install => libqgis-app2.14.11.install} | 0
...p2.14.10.symbols => libqgis-app2.14.11.symbols} | 178 +-
...2.14.10.install => libqgis-core2.14.11.install} | 0
...2.14.10.symbols => libqgis-core2.14.11.symbols} | 42 +-
...i2.14.10.install => libqgis-gui2.14.11.install} | 0
...i2.14.10.symbols => libqgis-gui2.14.11.symbols} | 103 +-
...tall => libqgis-networkanalysis2.14.11.install} | 0
...bols => libqgis-networkanalysis2.14.11.symbols} | 2 +-
...14.10.install => libqgis-server2.14.11.install} | 0
...14.10.symbols => libqgis-server2.14.11.symbols} | 2 +-
...14.10.install => libqgisgrass6-2.14.11.install} | 0
...des => libqgisgrass6-2.14.11.lintian-overrides} | 2 +-
...14.10.symbols => libqgisgrass6-2.14.11.symbols} | 2 +-
....14.10.install => libqgispython2.14.11.install} | 0
....14.10.symbols => libqgispython2.14.11.symbols} | 2 +-
debian/patches/columns-typo.patch | 2 +-
debian/patches/number-typo.patch | 2 +-
debian/patches/occurred-typo.patch | 2 +-
doc/TRANSLATORS | 78 +-
i18n/qgis_de.ts | 11714 ++++++++++---------
ms-windows/osgeo4w/package-nightly.cmd | 10 +-
ms-windows/osgeo4w/package.cmd | 10 +-
python/PyQt/CMakeLists.txt | 1 +
python/core/geometry/qgscurvev2.sip | 3 +-
.../plugins/processing/algs/gdal/GdalAlgorithm.py | 19 +-
.../algs/gdal/GdalOgrAlgorithmProvider.py | 13 +
python/plugins/processing/algs/gdal/GdalUtils.py | 22 +
.../processing/algs/grass/GrassAlgorithm.py | 9 +-
.../algs/grass/GrassAlgorithmProvider.py | 6 +
python/plugins/processing/algs/grass/GrassUtils.py | 25 +
.../processing/algs/grass7/Grass7Algorithm.py | 34 +-
.../algs/grass7/Grass7AlgorithmProvider.py | 6 +
.../plugins/processing/algs/grass7/Grass7Utils.py | 25 +
python/plugins/processing/core/GeoAlgorithm.py | 2 +-
python/plugins/processing/core/ProcessingConfig.py | 6 +
.../plugins/processing/gui/GetScriptsAndModels.py | 32 +-
src/app/qgisapp.cpp | 7 +-
src/core/geometry/qgscurvepolygonv2.cpp | 4 +-
src/core/geometry/qgscurvev2.h | 3 +-
src/core/geometry/qgslinestringv2.cpp | 3 -
src/core/qgsapplication.cpp | 2 +-
src/core/qgsexpression.cpp | 4 +
src/server/qgsserver.cpp | 12 +-
src/server/qgsserverprojectparser.cpp | 21 +
src/server/qgswmsserver.cpp | 28 +-
tests/src/core/testqgsgeometry.cpp | 33 +-
52 files changed, 9160 insertions(+), 7980 deletions(-)
diff --cc debian/changelog
index 452b64a,1e38b67..d88db12
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,30 +1,36 @@@
+ qgis (2.14.11+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 14 Jan 2017 09:39:46 +0100
+
+ qgis (2.14.11+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.11
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Refresh patches.
+ * Update symbols for amd64.
+ * Add ${python:Depends} to python-qgis-common dependencies.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 13 Jan 2017 14:19:43 +0100
+
+ qgis (2.14.10+dfsg-2) unstable; urgency=medium
+
+ * Bump minimum GRASS version to 7.2.0.
+ * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 28 Dec 2016 20:01:31 +0100
+
+qgis (2.14.10+dfsg-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 29 Dec 2016 07:27:04 +0100
+
qgis (2.14.10+dfsg-1) unstable; urgency=medium
* Update symbols for other architectures.
@@@ -49,11 -64,12 +76,20 @@@ qgis (2.14.9+dfsg-1~exp1) experimental
-- Bas Couwenberg <sebastic at debian.org> Fri, 25 Nov 2016 15:37:03 +0100
++<<<<<<< HEAD
+qgis (2.14.8+dfsg-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 05 Nov 2016 09:38:35 +0100
++=======
+ qgis (2.14.8+dfsg-2~exp1) experimental; urgency=medium
+
+ * Update symbols for other architectures.
+ * Update dependencies & paths for GRASS 7.2.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 28 Oct 2016 16:49:30 +0200
++>>>>>>> debian/2.14.11+dfsg-1
qgis (2.14.8+dfsg-1) unstable; urgency=medium
diff --cc debian/control
index 6d009e9,bcbba4a..ce7fece
--- 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.10
-Package: libqgisgrass7-2.14.11
++Package: libqgisgrass6-2.14.11
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.10 (= ${binary:Version}),
- libqgis-core2.14.10 (= ${binary:Version}),
- libqgis-gui2.14.10 (= ${binary:Version}),
- libqgis-analysis2.14.10 (= ${binary:Version}),
- libqgis-networkanalysis2.14.10 (= ${binary:Version}),
- libqgis-server2.14.10 (= ${binary:Version}),
- libqgisgrass6-2.14.10 (= ${binary:Version}),
- libqgispython2.14.10 (= ${binary:Version}),
+ libqgis-app2.14.11 (= ${binary:Version}),
+ libqgis-core2.14.11 (= ${binary:Version}),
+ libqgis-gui2.14.11 (= ${binary:Version}),
+ libqgis-analysis2.14.11 (= ${binary:Version}),
+ libqgis-networkanalysis2.14.11 (= ${binary:Version}),
+ libqgis-server2.14.11 (= ${binary:Version}),
- libqgisgrass7-2.14.11 (= ${binary:Version}),
++ libqgisgrass6-2.14.11 (= ${binary:Version}),
+ libqgispython2.14.11 (= ${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.10 (= ${binary:Version}),
- libqgis-core2.14.10 (= ${binary:Version}),
- libqgis-gui2.14.10 (= ${binary:Version}),
- libqgis-analysis2.14.10 (= ${binary:Version}),
- libqgis-networkanalysis2.14.10 (= ${binary:Version}),
- libqgis-server2.14.10 (= ${binary:Version}),
- libqgisgrass6-2.14.10 (= ${binary:Version}),
- libqgispython2.14.10 (= ${binary:Version}),
+ Depends: libqgis-app2.14.11 (= ${binary:Version}),
+ libqgis-core2.14.11 (= ${binary:Version}),
+ libqgis-gui2.14.11 (= ${binary:Version}),
+ libqgis-analysis2.14.11 (= ${binary:Version}),
+ libqgis-networkanalysis2.14.11 (= ${binary:Version}),
+ libqgis-server2.14.11 (= ${binary:Version}),
- libqgisgrass7-2.14.11 (= ${binary:Version}),
++ libqgisgrass6-2.14.11 (= ${binary:Version}),
+ libqgispython2.14.11 (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
Description: QGIS - debugging symbols
diff --cc debian/libqgis-analysis2.14.11.symbols
index 112ba8d,71f8023..cf3f4b5
--- a/debian/libqgis-analysis2.14.11.symbols
+++ b/debian/libqgis-analysis2.14.11.symbols
@@@ -497,13 -494,11 +497,13 @@@ libqgis_analysis.so.2.14.11 #PACKAGE# #
_ZNK8Vector3D9getLengthEv at Base 2.0.1
_ZNK8Vector3DeqERKS_ at Base 2.14.0
_ZNK8Vector3DneERKS_ at Base 2.14.0
- (optional=templinst|arch=amd64)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE12_M_erase_auxESt23_Rb_tree_const_iteratorIS2_E at Base 2.14.10
+ (optional=templinst|arch=amd64 arm64 armel armhf hppa mips64el ppc64el)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE12_M_erase_auxESt23_Rb_tree_const_iteratorIS2_E at Base 2.14.10
(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.11.symbols
index 68b7418,f608631..42f2202
--- a/debian/libqgis-app2.14.11.symbols
+++ b/debian/libqgis-app2.14.11.symbols
@@@ -3163,9 -3114,8 +3163,9 @@@ libqgis_app.so.2.14.11 #PACKAGE# #MINVE
(optional=templinst)_ZN5QHashIPKN13QFormInternal20QAbstractFormBuilderEPNS0_17QFormBuilderExtraEE13detach_helperEv at Base 2.14.0
(optional=templinst)_ZN5QHashIPKN13QFormInternal20QAbstractFormBuilderEPNS0_17QFormBuilderExtraEE13duplicateNodeEPN9QHashData4NodeEPv at Base 2.14.0
(optional=templinst)_ZN5QListI10QByteArrayE18detach_helper_growEii at Base 2.14.0
- (optional=templinst|arch=amd64)_ZN5QListI10QByteArrayE4freeEPN9QListData4DataE at Base 2.14.10
+ (optional=templinst|arch=amd64 i386)_ZN5QListI10QByteArrayE4freeEPN9QListData4DataE at Base 2.14.10
(optional=templinst)_ZN5QListI10QByteArrayE6appendERKS0_ at Base 2.14.0
+ (optional=templinst)_ZN5QListI10QByteArrayE7reserveEi at Base 2.14.4
(optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE13detach_helperEi at Base 2.14.0
(optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE18detach_helper_growEii at Base 2.14.0
(optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE6appendERKS0_ at Base 2.14.0
@@@ -3219,9 -3170,10 +3219,9 @@@
(optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEE6appendERKS2_ at Base 2.14.0
(optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEEC1ERKS3_ at Base 2.14.0
(optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEEC2ERKS3_ at Base 2.14.0
- (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEED1Ev at Base 2.14.10
- (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEED2Ev at Base 2.14.10
+ (optional=templinst|arch=!amd64)_ZN5QListIPN13QFormInternal11DomPropertyEED1Ev at Base 2.14.11
+ (optional=templinst|arch=!amd64)_ZN5QListIPN13QFormInternal11DomPropertyEED2Ev at Base 2.14.11
(optional=templinst|arch=alpha armel armhf mips mips64el mipsel s390x)_ZN5QListIPN13QFormInternal11DomPropertyEEaSERKS3_ at Base 2.14.0
- (optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE13detach_helperEi at Base 2.14.0
(optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE18detach_helper_growEii at Base 2.14.0
(optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE5clearEv at Base 2.14.0
(optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE6appendERKS2_ at Base 2.14.0
diff --cc debian/libqgis-gui2.14.11.symbols
index 8515016,7c811f8..1c43d14
--- a/debian/libqgis-gui2.14.11.symbols
+++ b/debian/libqgis-gui2.14.11.symbols
@@@ -6544,9 -6096,8 +6523,9 @@@ libqgis_gui.so.2.14.11 #PACKAGE# #MINVE
(optional=templinst)_ZN5QHashIPKN13QFormInternal20QAbstractFormBuilderEPNS0_17QFormBuilderExtraEE13detach_helperEv at Base 2.0.1
(optional=templinst)_ZN5QHashIPKN13QFormInternal20QAbstractFormBuilderEPNS0_17QFormBuilderExtraEE13duplicateNodeEPN9QHashData4NodeEPv at Base 2.0.1
(optional=templinst)_ZN5QListI10QByteArrayE18detach_helper_growEii at Base 2.0.1
- (optional=templinst|arch=amd64)_ZN5QListI10QByteArrayE4freeEPN9QListData4DataE at Base 2.8.3
+ (optional=templinst|arch=amd64 i386)_ZN5QListI10QByteArrayE4freeEPN9QListData4DataE at Base 2.8.3
(optional=templinst)_ZN5QListI10QByteArrayE6appendERKS0_ at Base 2.0.1
+ (optional=templinst)_ZN5QListI10QByteArrayE7reserveEi at Base 2.14.4
(optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE13detach_helperEi at Base 2.0.1
(optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE18detach_helper_growEii at Base 2.0.1
(optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE6appendERKS0_ at Base 2.0.1
@@@ -6602,9 -6140,8 +6567,7 @@@
(optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEE6appendERKS2_ at Base 2.0.1
(optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEEC1ERKS3_ at Base 2.0.1
(optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEEC2ERKS3_ at Base 2.0.1
- (optional=templinst|arch=!amd64)_ZN5QListIPN13QFormInternal11DomPropertyEED1Ev at Base 2.14.10
- (optional=templinst|arch=!amd64)_ZN5QListIPN13QFormInternal11DomPropertyEED2Ev at Base 2.14.10
(optional=templinst|arch=alpha armel armhf mips mips64el mipsel s390x)_ZN5QListIPN13QFormInternal11DomPropertyEEaSERKS3_ at Base 2.8.3
- (optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE13detach_helperEi at Base 2.8.3
(optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE18detach_helper_growEii at Base 2.0.1
(optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE5clearEv at Base 2.0.1
(optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE6appendERKS2_ at Base 2.0.1
diff --cc debian/libqgisgrass6-2.14.11.lintian-overrides
index b7082ee,d3c98ff..ed18463
--- a/debian/libqgisgrass6-2.14.11.lintian-overrides
+++ b/debian/libqgisgrass6-2.14.11.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.10: hardening-no-fortify-functions *
-libqgisgrass7-2.14.11: hardening-no-fortify-functions *
++libqgisgrass6-2.14.11: hardening-no-fortify-functions *
diff --cc debian/libqgisgrass6-2.14.11.symbols
index e027f0e,4d69997..03c7968
--- a/debian/libqgisgrass6-2.14.11.symbols
+++ b/debian/libqgisgrass6-2.14.11.symbols
@@@ -1,5 -1,5 +1,5 @@@
# SymbolsHelper-Confirmed: 2.14.7 arm64 hppa kfreebsd-amd64 kfreebsd-i386 ppc64el
- libqgisgrass6.so.2.14.10 #PACKAGE# #MINVER#
-libqgisgrass7.so.2.14.11 #PACKAGE# #MINVER#
++libqgisgrass6.so.2.14.11 #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.11.symbols
index c2f236e,09e6bbd..2586345
--- a/debian/libqgispython2.14.11.symbols
+++ b/debian/libqgispython2.14.11.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.10 #PACKAGE# #MINVER#
+ libqgispython.so.2.14.11 #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