updates for 2.6.1

qgis · Nov 28, 2014 · a960187 · a960187
1 parent d99a3c1
commit a960187
Show file tree

Hide file tree

Showing 3 changed files with 212 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "6")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Brighton")
 SET(PROJECT_VERSION ${COMPLETE_VERSION})

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,211 @@
+Werner Macho <werner.macho@gmail.com>	2014-11-28
+
+    norwegian update
+
+    Signed-off-by: Werner Macho <werner.macho@gmail.com>
+
+Werner Macho <werner.macho@gmail.com>	2014-11-28
+
+    last complete string update
+
+    Signed-off-by: Werner Macho <werner.macho@gmail.com>
+
+Merge: 9d30db4 222a08a
+Werner Macho <werner.macho@gmail.com>	2014-11-28
+
+    Merge pull request #1704 from qgis-jp/ts2.6.1
+
+    update ja translation for 2.6.1 release
+
+Minoru Akagi <akaginch@gmail.com>	2014-11-28
+
+    update ja translation
+
+Nyall Dawson <nyall.dawson@gmail.com>	2014-11-28
+
+    Fix map unit scale for simple line width not restored (fix #11181)
+
+Nyall Dawson <nyall.dawson@gmail.com>	2014-11-28
+
+    Fix size scaling ignored for line symbology (fix #11751)
+
+Nyall Dawson <nyall.dawson@gmail.com>	2014-11-27
+
+    [composer] Fix refresh HTML item always using cached copy (fix #11747)
+
+Juergen E. Fischer <jef@norbit.de>	2014-11-24
+
+    support numerus forms in python strings and german translation update
+
+Tom Kralidis <tomkralidis@gmail.com>	2014-11-24
+
+    backport adjust pluralization
+
+    Backport https://github.com/geopython/MetaSearch/commit/83b88f67abb679501a238e4ab4ee344c3cdbf55d
+
+Nyall Dawson <nyall.dawson@gmail.com>	2014-11-24
+
+    Fix incorrect warning dialog appearing when creating new ramp
+
+    Previously a "not available" warning dialog would appear when
+    attempting to create a new color ramp using the categorised renderer.
+
+Nyall Dawson <nyall.dawson@gmail.com>	2014-11-24
+
+    Fix grammar
+
+Nyall Dawson <nyall.dawson@gmail.com>	2014-11-24
+
+    Fix potential crash in random color ramp
+
+    Badly choosen values (eg max < min) could cause a crash. Now, values
+    are sanitised prior to generating the ramp colors.
+
+Juergen E. Fischer <jef@norbit.de>	2014-11-22
+
+    getProjectSettings response: return 'maptip' instead of tooltip template as
+    displayField layer attribute
+
+Nyall Dawson <nyall.dawson@gmail.com>	2014-11-19
+
+    Fix incorrect cast to double in shapeburst fill header
+
+Werner Macho <werner.macho@gmail.com>	2014-11-04
+
+    remove redundant shortcut for Open and Open recent
+
+    Signed-off-by: Werner Macho <werner.macho@gmail.com>
+
+Nyall Dawson <nyall.dawson@gmail.com>	2014-11-18
+
+    [composer] Fix overview tooltips (fix #11655)
+
+Juergen E. Fischer <jef@norbit.de>	2014-11-12
+
+    fix PyQgsAppStartup test on windows
+
+Juergen E. Fischer <jef@norbit.de>	2014-11-11
+
+    fix german translations (fixes #11617)
+
+Sandro Mani <manisandro@gmail.com>	2014-11-13
+
+    Add casts to double to fix compilation on ARM
+
+Matthias Kuhn <matthias.kuhn@gmx.ch>	2014-11-14
+
+    Initialize some uninitialized variables
+
+Juergen E. Fischer <jef@norbit.de>	2014-11-08
+
+    fix PyQgsVectorLayer test
+
+Juergen E. Fischer <jef@norbit.de>	2014-11-11
+
+    vector file writer: scan shape file geometries instead of just assuming multi geometry types (followup 528c4cacb, refs #10584, fixes #11542, fixes #11597)
+
+Martin Dobias <wonder.sk@gmail.com>	2014-11-15
+
+    Add note about QgsMapCanvas::refresh() behavior
+
+rldhont <rldhont@gmail.com>	2014-11-07
+
+    [FIXED] #11572 Filter Legend By Map Content doesn't maintain point displacement legend
+
+    The fix from https://github.com/qgis/QGIS/pull/1673 has to be enhance to have
+     something more generic.
+
+    This fix add methods to QgsPointDisplacementRenderer:
+    * capabilities
+    * symbolForFeature
+    * originalSymbolForFeature
+    * symbolsForFeature
+    * originalSymbolsForFeature
+    * willRenderFeature
+
+Martin Dobias <wonder.sk@gmail.com>	2014-11-08
+
+    Revert "Doxygen: do not add "Definition at line N of XYZ.cpp" to each method"
+
+    This reverts commit 7ee05afd366cebf3c8f44354067c34223346f835.
+
+Martin Dobias <wonder.sk@gmail.com>	2014-11-04
+
+    Fix a crash in layer node after removal of layer from registry.
+
+    A crash may occur when using custom layer tree in composer legend and layer from that tree is removed from registry.
+    This would happen only in some code paths.
+
+rldhont <rldhont@gmail.com>	2014-11-05
+
+    [FIXED] #11572 ilter Legend By Map Content doesn't maintain point displacement legend
+
+    For point vector layer render with 'displacement point', when 'Filter
+     Legend By Map Content' is activated, the legend is not rendered even
+     if it has to be.
+
+    It's due to QgsPointDisplacementRenderer that embedded the real
+     renderer.
+
+    The solution proposed in this patch is to get the embedded renderer
+     for QgsPointDisplacementRenderer.
+
+Juergen E. Fischer <jef@norbit.de>	2014-11-02
+
+    browser: register editor widgets (fixes #11529)
+
+Juergen E. Fischer <jef@norbit.de>	2014-11-04
+
+    server: stop processing after 'no REQUEST' exception (fixes #11543)
+
+Juergen E. Fischer <jef@norbit.de>	2014-11-04
+
+    fix typo
+
+Juergen E. Fischer <jef@norbit.de>	2014-11-04
+
+    fix feature action from identify menu (fixes #11533)
+
+Juergen E. Fischer <jef@norbit.de>	2014-11-02
+
+    add QScintilla2 include directory to python bindings and oracle provider
+    (fixes #11528)
+
+Matthias Kuhn <matthias.kuhn@gmx.ch>	2014-11-05
+
+    Fix feature request with Fid Filter working on the edit buffer
+
+    The following snippet did not take attribut changes that have not been commited
+    into account.
+
+        layer.getFeatures( QgsFeatureRequest( fid ) ).next()
+
+    Fixes the VectorLayer test
+
+Tom Kralidis <tomkralidis@gmail.com>	2014-11-05
+
+    merge OWSLib 0.8.10 CSW fix
+
+    https://github.com/geopython/OWSLib/commit/4e5e24840372028be2858c5c6897818bf6059282
+
+Werner Macho <werner.macho@gmail.com>	2014-11-04
+
+    [TRANSUP] missing files from es and hi
+
+    Signed-off-by: Werner Macho <werner.macho@gmail.com>
+
+Juergen E. Fischer <jef@norbit.de>	2014-10-31
+
+    fix splash screen
+
+Juergen E. Fischer <jef@norbit.de>	2014-10-31
+
+    Release of 2.6 (Brighton)
+
+Juergen E. Fischer <jef@norbit.de>	2014-10-31
+
+    update changelog for 2.6 release
+
 Martin Dobias <wonder.sk@gmail.com>	2014-10-31
 
     Less verbose debug output in layer tree model

diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,8 @@
-qgis (2.6.0) UNRELEASED; urgency=medium
+qgis (2.6.1) unstable; urgency=medium
 
-  * Release of 2.6
+  * Release of 2.6.1
 
- -- Jürgen E. Fischer <jef@norbit.de>  Fri, 31 Oct 2014 13:00:09 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 28 Nov 2014 12:58:31 +0100
 
 qgis (2.5.0) unstable; urgency=medium