This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis.
commit 3e5c724a93c8ae6ecacc4a42e7d55fb33d5a3564 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Dec 21 02:48:18 2015 +0100 Refresh patches. --- debian/changelog | 1 + debian/patches/allows-to-typo.patch | 70 +++++++++++++++++------------------ debian/patches/occurrences-typo.patch | 10 ++--- 3 files changed, 41 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index ec43557..03cd1ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ qgis (2.8.5+dfsg-1) UNRELEASED; urgency=medium [ Bas Couwenberg ] * New upstream release. + * Refresh patches. -- Bas Couwenberg <sebas...@debian.org> Mon, 21 Dec 2015 02:46:06 +0100 diff --git a/debian/patches/allows-to-typo.patch b/debian/patches/allows-to-typo.patch index fb0e26f..df6543e 100644 --- a/debian/patches/allows-to-typo.patch +++ b/debian/patches/allows-to-typo.patch @@ -5,7 +5,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 --- a/ChangeLog +++ b/ChangeLog -@@ -20215,7 +20215,7 @@ Denis Rouzaud <denis.rouz...@gmail.com> +@@ -20272,7 +20272,7 @@ Denis Rouzaud <denis.rouz...@gmail.com> Salvatore Larosa <lrssv...@gmail.com> 2014-04-28 @@ -14,7 +14,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Nyall Dawson <nyall.daw...@gmail.com> 2014-04-28 -@@ -28675,7 +28675,7 @@ Matthias Kuhn <matthias.k...@gmx.ch> 201 +@@ -28732,7 +28732,7 @@ Matthias Kuhn <matthias.k...@gmx.ch> 201 AttributeForm: Create a dummy button box for intercepting ok clicks when the ok button is hidden and the accept was actually triggered @@ -23,7 +23,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 logic without changes. Fixes #8885 -@@ -29700,7 +29700,7 @@ Salvatore Larosa <lrssv...@gmail.com> 20 +@@ -29757,7 +29757,7 @@ Salvatore Larosa <lrssv...@gmail.com> 20 Salvatore Larosa <lrssv...@gmail.com> 2013-11-02 @@ -32,7 +32,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Salvatore Larosa <lrssv...@gmail.com> 2013-10-24 -@@ -29708,7 +29708,7 @@ Salvatore Larosa <lrssv...@gmail.com> 20 +@@ -29765,7 +29765,7 @@ Salvatore Larosa <lrssv...@gmail.com> 20 Salvatore Larosa <lrssv...@gmail.com> 2013-10-24 @@ -41,7 +41,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Radim Blazek <radim.bla...@gmail.com> 2013-11-02 -@@ -31591,7 +31591,7 @@ Tim Sutton <t...@linfiniti.com> 2013-09-1 +@@ -31648,7 +31648,7 @@ Tim Sutton <t...@linfiniti.com> 2013-09-1 Salvatore Larosa <lrssv...@gmail.com> 2013-09-20 @@ -50,7 +50,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 yellow-sky <nikuli...@gmail.com> 2013-09-20 -@@ -32052,7 +32052,7 @@ Stéphane Brunner <courriel@stephane-bru +@@ -32109,7 +32109,7 @@ Stéphane Brunner <courriel@stephane-bru Salvatore Larosa <lrssv...@gmail.com> 2013-09-14 @@ -59,7 +59,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Victor Olaya <vola...@gmail.com> 2013-09-11 -@@ -34577,7 +34577,7 @@ Alexander Bruy <alexander.b...@gmail.com +@@ -34634,7 +34634,7 @@ Alexander Bruy <alexander.b...@gmail.com Alexander Bruy <alexander.b...@gmail.com> 2013-08-06 @@ -68,7 +68,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Minoru Akagi <akagi...@gmail.com> 2013-07-18 -@@ -38378,7 +38378,7 @@ Juergen E. Fischer <j...@norbit.de> 2013- +@@ -38435,7 +38435,7 @@ Juergen E. Fischer <j...@norbit.de> 2013- more edit widget fixes: - handle editable state in drag&drop forms like in automatically generated forms @@ -77,7 +77,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Borys Jurgiel <i...@borysjurgiel.pl> 2013-06-05 -@@ -39599,10 +39599,10 @@ Salvatore Larosa <lrssv...@gmail.com> 20 +@@ -39656,10 +39656,10 @@ Salvatore Larosa <lrssv...@gmail.com> 20 Salvatore Larosa <lrssv...@gmail.com> 2013-05-20 @@ -90,7 +90,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 - fix for mousePressEvent into console Juergen E. Fischer <j...@norbit.de> 2013-05-20 -@@ -39847,7 +39847,7 @@ Radim Blazek <radim.bla...@gmail.com> 20 +@@ -39904,7 +39904,7 @@ Radim Blazek <radim.bla...@gmail.com> 20 Salvatore Larosa <lrssv...@gmail.com> 2013-05-15 @@ -99,7 +99,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 - fixes some translation string Marco Hugentobler <marco.hugentob...@sourcepole.ch> 2013-05-15 -@@ -41349,7 +41349,7 @@ D'Hont René-Luc <rldh...@gmail.com> 201 +@@ -41406,7 +41406,7 @@ D'Hont René-Luc <rldh...@gmail.com> 201 olivierdalang <olivier.dal...@gmail.com> 2013-04-24 @@ -108,7 +108,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Radim Blazek <radim.bla...@gmail.com> 2013-04-24 -@@ -41487,7 +41487,7 @@ Chris Crook <ccr...@linz.govt.nz> 2013-0 +@@ -41544,7 +41544,7 @@ Chris Crook <ccr...@linz.govt.nz> 2013-0 Salvatore Larosa <lrssv...@gmail.com> 2013-04-22 @@ -117,7 +117,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Salvatore Larosa <lrssv...@gmail.com> 2013-04-22 -@@ -41518,7 +41518,7 @@ Minoru Akagi <akagi...@gmail.com> 2013-0 +@@ -41575,7 +41575,7 @@ Minoru Akagi <akagi...@gmail.com> 2013-0 Salvatore Larosa <lrssv...@gmail.com> 2013-04-22 @@ -126,7 +126,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 nyalldawson <nyall.daw...@gmail.com> 2013-04-22 -@@ -41591,7 +41591,7 @@ Salvatore Larosa <lrssv...@gmail.com> 20 +@@ -41648,7 +41648,7 @@ Salvatore Larosa <lrssv...@gmail.com> 20 Salvatore Larosa <lrssv...@gmail.com> 2013-04-17 [pyqgis-console] added a python object browser for editor @@ -135,7 +135,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 - minor fixes and cleanup Salvatore Larosa <lrssv...@gmail.com> 2013-04-20 -@@ -41714,7 +41714,7 @@ Matthias Kuhn <matthias.k...@gmx.ch> 201 +@@ -41771,7 +41771,7 @@ Matthias Kuhn <matthias.k...@gmx.ch> 201 * QgsVectorLayerCache did sometimes cache features which did not contain all information which needs to be cached and therefore corrupting the cache and leading to incomplete cache hits. * Add a unit test for the cache problem * Fix QgsCacheIndexFeatureId @@ -144,7 +144,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 D'Hont René-Luc <rldh...@gmail.com> 2013-04-19 -@@ -42775,7 +42775,7 @@ Alexander Bruy <alexander.b...@gmail.com +@@ -42832,7 +42832,7 @@ Alexander Bruy <alexander.b...@gmail.com Alexander Bruy <alexander.b...@gmail.com> 2013-04-11 @@ -153,7 +153,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 4e5c660823) Alexander Bruy <alexander.b...@gmail.com> 2013-04-11 -@@ -44000,7 +44000,7 @@ Matthias Kuhn <matthias.k...@gmx.ch> 201 +@@ -44057,7 +44057,7 @@ Matthias Kuhn <matthias.k...@gmx.ch> 201 Matthias Kuhn <matthias.k...@gmx.ch> 2013-01-28 Add a select by expression dialog. @@ -162,7 +162,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 * Select (clear and select) * Add to selection * Remove from selection -@@ -46730,7 +46730,7 @@ Juergen E. Fischer <j...@norbit.de> 2013- +@@ -46787,7 +46787,7 @@ Juergen E. Fischer <j...@norbit.de> 2013- olivierdalang <olivier.dal...@gmail.com> 2013-01-29 [feature] added draw background checkbox in composer items @@ -171,7 +171,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Larry Shaffer <lar...@dakotacarto.com> 2013-01-26 -@@ -49127,7 +49127,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com +@@ -49184,7 +49184,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com Giuseppe Sucameli <brush.ty...@gmail.com> 2012-12-05 @@ -180,7 +180,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Alexander Bruy <alexander.b...@gmail.com> 2012-12-05 -@@ -49896,7 +49896,7 @@ Etienne Tourigny <etourigny....@gmail.co +@@ -49953,7 +49953,7 @@ Etienne Tourigny <etourigny....@gmail.co Etienne Tourigny <etourigny....@gmail.com> 2012-10-07 @@ -189,7 +189,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Etienne Tourigny <etourigny....@gmail.com> 2012-09-22 -@@ -52153,7 +52153,7 @@ Arunmozhi <arunthe...@gmail.com> 2012-10 +@@ -52210,7 +52210,7 @@ Arunmozhi <arunthe...@gmail.com> 2012-10 Giuseppe Sucameli <brush.ty...@gmail.com> 2012-10-07 python console: fix key events and text selection, @@ -198,7 +198,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 cleanup (remove unused functions and vars) Giuseppe Sucameli <brush.ty...@gmail.com> 2012-10-07 -@@ -54368,7 +54368,7 @@ Etienne Tourigny <etourigny....@gmail.co +@@ -54425,7 +54425,7 @@ Etienne Tourigny <etourigny....@gmail.co Etienne Tourigny <etourigny....@gmail.com> 2012-09-10 @@ -207,7 +207,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Larry Shaffer <lar...@dakotacarto.com> 2012-09-10 -@@ -56017,7 +56017,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- +@@ -56074,7 +56074,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- Juergen E. Fischer <j...@norbit.de> 2012-08-16 @@ -216,7 +216,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Larry Shaffer <lar...@dakotacarto.com> 2012-08-16 -@@ -61320,7 +61320,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- +@@ -61377,7 +61377,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- wmts fixes: - [FEATURE] add support for CRS:27 and CRS:83 in QgsCoordinateReferenceSystem - fix axis orientation for CRS:84 @@ -225,7 +225,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 - fix: only consider valid TileMatrixSetLimits Juergen E. Fischer <j...@norbit.de> 2012-05-16 -@@ -64375,7 +64375,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com +@@ -64432,7 +64432,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com Etienne Tourigny <etourigny....@gmail.com> 2012-03-08 @@ -234,7 +234,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Juergen E. Fischer <j...@norbit.de> 2012-03-09 -@@ -64519,7 +64519,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- +@@ -64576,7 +64576,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- Alexander Bruy <alexander.b...@gmail.com> 2012-03-06 @@ -243,7 +243,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 for individual features too Juergen E. Fischer <j...@norbit.de> 2012-03-06 -@@ -64748,7 +64748,7 @@ Marco Hugentobler <marco.hugentobler@sou +@@ -64805,7 +64805,7 @@ Marco Hugentobler <marco.hugentobler@sou Juergen E. Fischer <j...@norbit.de> 2012-02-23 @@ -252,7 +252,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Juergen E. Fischer <j...@norbit.de> 2012-02-23 -@@ -65102,7 +65102,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- +@@ -65159,7 +65159,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- Giuseppe Sucameli <brush.ty...@gmail.com> 2012-02-11 @@ -261,7 +261,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Juergen E. Fischer <j...@norbit.de> 2012-02-11 -@@ -66069,7 +66069,7 @@ Nathan Woodrow <woodrow.nat...@gmail.com +@@ -66126,7 +66126,7 @@ Nathan Woodrow <woodrow.nat...@gmail.com Juergen E. Fischer <j...@norbit.de> 2012-01-17 @@ -270,7 +270,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Juergen E. Fischer <j...@norbit.de> 2012-01-17 -@@ -67654,7 +67654,7 @@ Martin Dobias <wonder...@gmail.com> 2011 +@@ -67711,7 +67711,7 @@ Martin Dobias <wonder...@gmail.com> 2011 Juergen E. Fischer <j...@norbit.de> 2011-11-30 @@ -279,7 +279,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 force usage of the attribute table memory model. Apparently the memory model was completely disfunctional before. Fixes included, but it probably needs more testing. -@@ -69739,7 +69739,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com +@@ -69796,7 +69796,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com Giuseppe Sucameli <brush.ty...@gmail.com> 2011-08-18 @@ -288,7 +288,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Giuseppe Sucameli <brush.ty...@gmail.com> 2011-08-18 -@@ -69836,7 +69836,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com +@@ -69893,7 +69893,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com Giuseppe Sucameli <brush.ty...@gmail.com> 2011-08-18 @@ -297,7 +297,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Giuseppe Sucameli <brush.ty...@gmail.com> 2011-08-18 -@@ -96410,7 +96410,7 @@ macho <macho@c8812cc2-4d05-0410-92ff-de0 +@@ -96467,7 +96467,7 @@ macho <macho@c8812cc2-4d05-0410-92ff-de0 gcontreras <gcontreras@c8812cc2-4d05-0410-92ff-de0c093fc19c> 2009-08-21 @@ -306,7 +306,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 git-svn-id: http://svn.osgeo.org/qgis/trunk@11460 c8812cc2-4d05-0410-92ff-de0c093fc19c -@@ -105477,7 +105477,7 @@ telwertowski <telwertowski@c8812cc2-4d05 +@@ -105534,7 +105534,7 @@ telwertowski <telwertowski@c8812cc2-4d05 timlinux <timlinux@c8812cc2-4d05-0410-92ff-de0c093fc19c> 2008-08-30 @@ -315,7 +315,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 git-svn-id: http://svn.osgeo.org/qgis/trunk@9222 c8812cc2-4d05-0410-92ff-de0c093fc19c -@@ -122506,7 +122506,7 @@ g_j_m <g_j_m@c8812cc2-4d05-0410-92ff-de0 +@@ -122563,7 +122563,7 @@ g_j_m <g_j_m@c8812cc2-4d05-0410-92ff-de0 mhugent <mhugent@c8812cc2-4d05-0410-92ff-de0c093fc19c> 2006-08-18 diff --git a/debian/patches/occurrences-typo.patch b/debian/patches/occurrences-typo.patch index 5ef30b4..8df9f25 100644 --- a/debian/patches/occurrences-typo.patch +++ b/debian/patches/occurrences-typo.patch @@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebas...@debian.org> --- a/ChangeLog +++ b/ChangeLog -@@ -8762,7 +8762,7 @@ Werner Macho <werner.ma...@gmail.com> 20 +@@ -8819,7 +8819,7 @@ Werner Macho <werner.ma...@gmail.com> 20 Juergen E. Fischer <j...@norbit.de> 2014-10-26 @@ -12,7 +12,7 @@ Author: Bas Couwenberg <sebas...@debian.org> Robert Szczepanek <rob...@szczepanek.pl> 2014-10-25 -@@ -34230,7 +34230,7 @@ Denis Rouzaud <denis.rouz...@gmail.com> +@@ -34287,7 +34287,7 @@ Denis Rouzaud <denis.rouz...@gmail.com> Matthias Kuhn <matthias.k...@gmx.ch> 2013-08-13 @@ -21,7 +21,7 @@ Author: Bas Couwenberg <sebas...@debian.org> Removal of these deprecated calls is expected to improve stability Radim Blazek <radim.bla...@gmail.com> 2013-08-13 -@@ -107726,7 +107726,7 @@ jef <jef@c8812cc2-4d05-0410-92ff-de0c093 +@@ -107783,7 +107783,7 @@ jef <jef@c8812cc2-4d05-0410-92ff-de0c093 mhugent <mhugent@c8812cc2-4d05-0410-92ff-de0c093fc19c> 2008-06-23 @@ -30,7 +30,7 @@ Author: Bas Couwenberg <sebas...@debian.org> git-svn-id: http://svn.osgeo.org/qgis/trunk@8673 c8812cc2-4d05-0410-92ff-de0c093fc19c -@@ -117470,7 +117470,7 @@ wonder <wonder@c8812cc2-4d05-0410-92ff-d +@@ -117527,7 +117527,7 @@ wonder <wonder@c8812cc2-4d05-0410-92ff-d wonder <wonder@c8812cc2-4d05-0410-92ff-de0c093fc19c> 2007-02-28 @@ -39,7 +39,7 @@ Author: Bas Couwenberg <sebas...@debian.org> - moved #include "qgsconfig.h" from qgis.h to qgis.cpp so it doesn't spit many warnings when building bindings because of redefined PREFIX -@@ -123917,7 +123917,7 @@ mhugent <mhugent@c8812cc2-4d05-0410-92ff +@@ -123974,7 +123974,7 @@ mhugent <mhugent@c8812cc2-4d05-0410-92ff g_j_m <g_j_m@c8812cc2-4d05-0410-92ff-de0c093fc19c> 2006-06-11 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel