[qgis] 02/06: Merge tag 'upstream/2.8.1'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Feb 27 00:30:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit d50ac13eaae3cb519a986030df5ee9468897edc4
Merge: 6736648 343e303
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Feb 27 01:00:07 2015 +0100
Merge tag 'upstream/2.8.1'
Upstream version 2.8.1
Conflicts:
debian/changelog
debian/control
debian/copyright
debian/rules
CMakeLists.txt | 2 +-
ChangeLog | 191 +++++++++++++++++
INSTALL | 9 +-
NEWS | 60 ++----
cmake/FindPyQt.py | 24 ++-
debian/changelog | 6 +
debian/control.in | 16 +-
debian/copyright | 2 +-
debian/rules | 3 +-
doc/CODING.html | 2 +-
doc/CODING.t2t | 2 +-
doc/INSTALL.html | 12 +-
doc/TRANSLATORS | 8 +-
doc/developersmap.html | 1 +
doc/linux.t2t | 3 +-
doc/news.html | 62 +++---
doc/news.t2t | 9 +-
i18n/qgis_de.ts | 20 +-
i18n/qgis_en.ts | 4 +
images/developers/essen-2012.jpg | Bin 60213 -> 0 bytes
images/developers/essen-2014.jpg | Bin 0 -> 106306 bytes
images/flags/sr at latin.png | Bin 423 -> 0 bytes
images/flags/zh.png | Bin 0 -> 472 bytes
images/images.qrc | 4 +-
python/analysis/raster/qgsrastercalcnode.sip | 3 +-
python/core/qgis.sip | 2 +
python/core/qgsgeometry.sip | 2 +-
python/gui/qgsattributedialog.sip | 11 +-
.../MetaSearch/dialogs/newconnectiondialog.py | 5 +
.../MetaSearch/resources/connections-default.xml | 2 +-
.../processing/algs/qgis/SelectByLocation.py | 4 +-
scripts/release.pl | 225 +++++++++++++--------
scripts/tsstat.pl | 117 ++++++-----
src/analysis/raster/qgsrastercalcnode.cpp | 8 +-
src/analysis/raster/qgsrastercalcnode.h | 3 +-
src/analysis/raster/qgsrastercalculator.cpp | 11 +-
.../composer/qgscomposerattributetablewidget.cpp | 35 +---
src/app/composer/qgscomposerlabelwidget.cpp | 7 +-
src/app/composer/qgscomposerlegendwidget.cpp | 33 +--
src/app/composer/qgscomposermapwidget.cpp | 12 +-
src/app/composer/qgscomposerscalebarwidget.cpp | 8 +-
src/app/composer/qgscomposertablewidget.cpp | 17 +-
src/app/gps/qgsgpsinformationwidget.cpp | 48 ++---
src/app/gps/qgsgpsinformationwidget.h | 2 +
src/app/qgisapp.cpp | 1 +
src/app/qgsbookmarks.cpp | 36 ++--
src/app/qgsdecorationgriddialog.cpp | 10 +-
src/app/qgsdiagramproperties.cpp | 5 +-
src/app/qgsfeatureaction.cpp | 6 +-
src/app/qgslabeldialog.cpp | 9 +-
src/app/qgslabelinggui.cpp | 6 -
src/app/qgsmeasuredialog.cpp | 17 +-
src/app/qgsrastercalcdialog.cpp | 13 +-
src/core/qgis.cpp | 12 ++
src/core/qgis.h | 2 +
src/core/qgsdistancearea.cpp | 3 +-
src/core/qgsgeometry.cpp | 2 +-
src/core/qgsgeometry.h | 2 +-
src/core/qgssnappingutils.cpp | 3 +-
src/core/qgsvectorlayer.cpp | 4 +-
src/gui/qgisgui.cpp | 17 +-
src/gui/qgisgui.h | 10 +
src/gui/qgsattributeform.cpp | 2 +-
src/gui/qgsmaptoolzoom.cpp | 3 +-
.../qgspointdisplacementrendererwidget.cpp | 10 +-
src/providers/oracle/qgsoracleprovider.cpp | 5 +-
src/providers/wms/qgswmsprovider.cpp | 13 +-
67 files changed, 722 insertions(+), 464 deletions(-)
diff --cc debian/changelog
index d4a8bb1,38ca2bb..33bacd4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,16 +1,41 @@@
+ qgis (2.8.1) UNRELEASED; urgency=medium
+
+ * Release of 2.8.1
+
+ -- Jürgen E. Fischer <jef at norbit.de> Thu, 26 Feb 2015 10:12:00 +0100
+
-qgis (2.8.0) unstable; urgency=medium
+qgis (2.8.0-1~exp1) experimental; urgency=medium
+ [ Jürgen E. Fischer ]
* Release of 2.8
- -- Jürgen E. Fischer <jef at norbit.de> Thu, 26 Feb 2015 10:12:00 +0100
-
-qgis (2.7.0) unstable; urgency=medium
+ [ Bas Couwenberg ]
+ * Update Vcs-Browser URL to use cgit instead of gitweb.
+ * Update my email to use @debian.org address.
+ * Drop patches included upstream, refresh remaining patches.
+ * Update copyright file, changes:
+ - Add additional copyright holders to general files section
+ - Add copyright years to general files section
+ - Order copyright holder by year
+ - Group files sections
+ - Sort groups files sections alphanumerically
+ - Document copyright holders & licenses for external modules
+ - Add license specifications for: Apache-2.0, BSD-2-Clause,
+ dxflib-Commercial-License, GPL-2, LGPL-2.1+, QT-Commericial,
+ LGPL-2.1 with Digia Qt LGPL Exception 1.1 & GPL-3.
+ * Remove extra license file for MetaSearch plugin.
+ * Add symbols file for libqgis-server2.8.0.
+ * Update symbols for amd64.
+ * Drop obsolete WITH_INTERNAL_SPATIALITE option.
+ * Install libqgis_server.so in libqgis-dev.
+ * Install schemaExtension.xsd in qgis-server.
+ * Install contributors.json & developersmap.html in qgis-common.
+ * Use Debian packages for Leaflet & jQuery in developersmap.html.
+ * Add dependency on libqgis-server to libqgis-dev.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 25 Feb 2015 18:54:10 +0100
+
+qgis (2.7.0) UNRELEASED; urgency=medium
* New development version 2.7 after branch of 2.6
* run tests in en_US.UTF-8 locale
diff --cc debian/copyright
index d1b671d,7e87ebf..121971d
--- a/debian/copyright
+++ b/debian/copyright
@@@ -91,7 -91,7 +91,6 @@@ Copyright: Carl Ander
2014, Michael Douchin
2014, Niccolo' Marchi <sciurusurbanus at hotmail.it>
2014, Radoslaw Guzinski <rmgu at dhi-gras.com>
- 2014, Tom Kralidis <tomkralidis at gmail.com>
- 2015, Tom Kralidis <tomkralidis at gmail.com>
2004-2006, 2009-2015, Radim Blazek <blazek at itc.it>
2005-2015, Martin Dobias <wonder.sk at gmail.com>
2012-2015, Victor Olaya <volayaf at gmail.com>
@@@ -101,6 -101,6 +100,7 @@@
2014-2015, Arnaud Morvan <arnaud.morvan at camptocamp.com>
2014-2015, Sandro Mani <manisandro at gmail.com>
2014-2015, Sandro Santilli <strk at keybit.net>
++ 2014-2015, Tom Kralidis <tomkralidis at gmail.com>
2015, Michael Kirk <michael.john.kirk at gmail.com>
License: GPL-2+
diff --cc debian/rules
index d64b399,038b456..ae98958
--- a/debian/rules
+++ b/debian/rules
@@@ -45,10 -42,10 +45,9 @@@ QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(
GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
CMAKE_OPTS := \
- -DBUILDNAME=$(DEB_BUILD_NAME) \
-DCMAKE_VERBOSE_MAKEFILE=1 \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DGRASS_PREFIX=/usr/lib/grass64 \
+ -DGRASS_PREFIX=/usr/lib/$(GRASS) \
-DBINDINGS_GLOBAL_INSTALL=TRUE \
-DPEDANTIC=TRUE \
-DWITH_QSPATIALITE=TRUE \
--
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