[qgis] 02/04: Merge tag 'upstream/2.6.1'
Bas Couwenberg
sebastic at xs4all.nl
Wed Dec 3 14:27:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository qgis.
commit 080e6fab1f7ec6cc55c02936313ed6a1791149f4
Merge: 115dcce 1d1ecb0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Dec 3 13:03:10 2014 +0100
Merge tag 'upstream/2.6.1'
Upstream version 2.6.1
CMakeLists.txt | 2 +-
ChangeLog | 208 +
cmake_templates/Doxyfile.in | 2 +-
debian/changelog | 8 +-
doc/TRANSLATORS | 75 +-
doc/api_break.dox | 4 +
i18n/CMakeLists.txt | 2 +-
i18n/qgis_af.ts | 99 +-
i18n/qgis_ar.ts | 101 +-
i18n/qgis_bg.ts | 99 +-
i18n/qgis_bn.ts | 99 +-
i18n/qgis_bs.ts | 98 +-
i18n/qgis_ca.ts | 96 +-
i18n/qgis_cs.ts | 94 +-
i18n/qgis_da.ts | 95 +-
i18n/qgis_de.ts | 430 +-
i18n/qgis_el.ts | 97 +-
i18n/qgis_en.ts | 99 +-
i18n/qgis_es.ts | 77047 +++++-------
i18n/qgis_et.ts | 99 +-
i18n/qgis_eu.ts | 93 +-
i18n/qgis_fa.ts | 98 +-
i18n/qgis_fi.ts | 114249 +++++++++---------
i18n/qgis_fr.ts | 93 +-
i18n/qgis_gl.ts | 93 +-
i18n/qgis_he.ts | 99 +-
i18n/qgis_hi.ts | 25097 ++--
i18n/qgis_hr.ts | 100 +-
i18n/qgis_hu.ts | 92 +-
i18n/qgis_id.ts | 92 +-
i18n/qgis_is.ts | 97 +-
i18n/qgis_it.ts | 93 +-
i18n/qgis_ja.ts | 92 +-
i18n/qgis_ka.ts | 99 +-
i18n/qgis_km.ts | 93 +-
i18n/qgis_ko.ts | 92 +-
i18n/qgis_lo.ts | 99 +-
i18n/qgis_lt.ts | 96 +-
i18n/qgis_lv.ts | 94 +-
i18n/qgis_ml.ts | 99 +-
i18n/qgis_mn.ts | 99 +-
i18n/qgis_mr.ts | 99 +-
i18n/qgis_nb.ts | 111 +-
i18n/qgis_nl.ts | 93 +-
i18n/qgis_pl.ts | 94 +-
i18n/qgis_pt_BR.ts | 93 +-
i18n/qgis_pt_PT.ts | 93 +-
i18n/qgis_ro.ts | 94 +-
i18n/qgis_ru.ts | 94 +-
i18n/qgis_sk.ts | 98 +-
i18n/qgis_sl.ts | 97 +-
i18n/qgis_sq.ts | 99 +-
i18n/qgis_sr_Cyrl.ts | 100 +-
i18n/qgis_sr_Latn.ts | 100 +-
i18n/qgis_sv.ts | 99 +-
i18n/qgis_sw.ts | 99 +-
i18n/qgis_ta.ts | 99 +-
i18n/qgis_te.ts | 99 +-
i18n/qgis_th.ts | 98 +-
i18n/qgis_tl.ts | 100 +-
i18n/qgis_tr.ts | 96 +-
i18n/qgis_uk.ts | 100 +-
i18n/qgis_vi.ts | 98 +-
i18n/qgis_xh.ts | 98 +-
i18n/qgis_zh_CN.ts | 96 +-
i18n/qgis_zh_TW.ts | 94 +-
python/CMakeLists.txt | 1 +
python/core/composer/qgscomposerhtml.sip | 4 +-
python/core/qgsgeometry.sip | 2 +-
python/core/symbology-ng/qgsfillsymbollayerv2.sip | 8 +-
python/ext-libs/owslib/csw.py | 9 +-
python/gui/symbology-ng/qgscolorrampcombobox.sip | 6 +
python/plugins/MetaSearch/dialogs/maindialog.py | 7 +-
scripts/ts2cpp.pl | 5 +
src/app/qgisapp.cpp | 2 +-
src/browser/CMakeLists.txt | 2 +
src/browser/main.cpp | 36 +
src/core/composer/qgscomposerhtml.cpp | 18 +-
src/core/composer/qgscomposerhtml.h | 4 +-
src/core/layertree/qgslayertreelayer.cpp | 5 +-
src/core/layertree/qgslayertreemodellegendnode.cpp | 10 +-
src/core/qgsgeometry.h | 2 +-
src/core/qgslegendrenderer.cpp | 2 +-
src/core/qgsmaphittest.cpp | 1 +
src/core/qgsvectorfilewriter.cpp | 15 +-
src/core/qgsvectorlayer.cpp | 3 +
src/core/qgsvectorlayerfeatureiterator.cpp | 4 +-
src/core/symbology-ng/qgsfillsymbollayerv2.h | 8 +-
src/core/symbology-ng/qgslinesymbollayerv2.cpp | 26 +-
src/core/symbology-ng/qgslinesymbollayerv2.h | 1 +
.../symbology-ng/qgspointdisplacementrenderer.cpp | 98 +-
.../symbology-ng/qgspointdisplacementrenderer.h | 20 +-
src/core/symbology-ng/qgsvectorcolorrampv2.cpp | 14 +-
src/gui/qgsidentifymenu.cpp | 2 +-
.../qgscategorizedsymbolrendererv2widget.cpp | 2 +-
src/gui/symbology-ng/qgscolorrampcombobox.cpp | 6 +
src/gui/symbology-ng/qgscolorrampcombobox.h | 6 +
src/mapserver/qgsserverprojectparser.cpp | 5 +-
src/mapserver/qgswmsserver.cpp | 2 +
src/providers/oracle/CMakeLists.txt | 1 +
src/ui/qgisapp.ui | 4 +-
src/ui/qgscomposermapwidgetbase.ui | 8 +-
tests/src/python/test_qgsappstartup.py | 6 +-
103 files changed, 103177 insertions(+), 119632 deletions(-)
diff --cc debian/changelog
index d950648,6a68561..fcbf336
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,8 +1,39 @@@
- qgis (2.6.0-1~exp2) UNRELEASED; urgency=medium
-qgis (2.6.1) unstable; urgency=medium
++qgis (2.6.1-1~exp1) UNRELEASED; urgency=medium
++ [ Jürgen E. Fischer ]
+ * Release of 2.6.1
+
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 28 Nov 2014 12:58:31 +0100
++ [ Bas Couwenberg ]
+ * Add upstream metadata.
+
- -- Bas Couwenberg <sebastic at xs4all.nl> Fri, 28 Nov 2014 20:57:44 +0100
++ -- Bas Couwenberg <sebastic at xs4all.nl> Wed, 03 Dec 2014 13:02:31 +0100
+
+qgis (2.6.0-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.6
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Drop patches included upstream, refresh remaining patches.
+ * Bump Standards-Version to 3.9.6, no changes.
+ * Also install scalable icons.
+ * Group libqgis* packages in control file.
+ * Build depend only on python-sip-dev, remove alternatives.
+ * Update copyright file, changes:
+ - Remove unused Files paragraph for the python plugin_installer
+ - Fix qwtpolar-1.0 typo
+ - Remove unused License paragraph for Apache-2.0
+ - Add License paragraph for Zlib
+ * Update allows-to-typo.patch.
+ * Update symbols for amd64.
+ * Install only qgis and pyspatialite in python-qgis, widget-plugins
+ are installed in python-qgis-common.
+ * Sync control & control.in, changes:
+ - control Update package descriptions
+ - control.in Reorder Breaks/Replaces, reorder packages.
+
+ -- Bas Couwenberg <sebastic at xs4all.nl> Sun, 02 Nov 2014 20:07:03 +0100
qgis (2.5.0) unstable; urgency=medium
--
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