[qgis] 04/07: Refresh patches.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis. commit 805216b18a4701d4ff4fe178f94dbb93cd539486 Author: Bas Couwenberg Date: Fri Jan 13 13:17:49 2017 +0100 Refresh patches. --- debian/changelog | 1 + debian/patches/columns-typo.patch | 2 +- debian/patches/number-typo.patch | 2 +- debian/patches/occurred-typo.patch | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c994490..09dff38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ qgis (2.14.11+dfsg-1) UNRELEASED; urgency=medium [ Bas Couwenberg ] * New upstream release. + * Refresh patches. -- Bas Couwenberg Fri, 13 Jan 2017 13:13:26 +0100 diff --git a/debian/patches/columns-typo.patch b/debian/patches/columns-typo.patch index cef2629..fba0e6b 100644 --- a/debian/patches/columns-typo.patch +++ b/debian/patches/columns-typo.patch @@ -70,7 +70,7 @@ Forwarded: not-neededCell size X and Y
--- a/i18n/qgis_de.ts +++ b/i18n/qgis_de.ts -@@ -89386,7 +89386,7 @@ clustering of points. +@@ -89643,7 +89643,7 @@ clustering of points.Rows and Columns
Used to change the dimensions of the output raster file. These values are also linked to the Cell size X and Cell size Y values. diff --git a/debian/patches/number-typo.patch b/debian/patches/number-typo.patch index 2d741a3..7c817b5 100644 --- a/debian/patches/number-typo.patch +++ b/debian/patches/number-typo.patch @@ -70,7 +70,7 @@ Forwarded: https://github.com/qgis/QGIS/pull/2946 are interpreted. --- a/i18n/qgis_de.ts +++ b/i18n/qgis_de.ts -@@ -90355,7 +90355,7 @@ Each attribute also has a data type, one +@@ -90611,7 +90611,7 @@ Each attribute also has a data type, one or real number. The data type is inferred from the content of the fields - if every non blank value is a valid integer then the type is integer, otherwise if it is a valid long long diff --git a/debian/patches/occurred-typo.patch b/debian/patches/occurred-typo.patch index 266fc82..0be5408 100644 --- a/debian/patches/occurred-typo.patch +++ b/debian/patches/occurred-typo.patch @@ -89,7 +89,7 @@ Forwarded: not-needed --- a/i18n/qgis_de.ts +++ b/i18n/qgis_de.ts -@@ -25802,11 +25802,11 @@ Fehler: %3 +@@ -25863,11 +25863,11 @@ Fehler: %3 Proxy-Authentifikation erforderlich -- 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
[qgis] 04/07: Refresh patches.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis. commit 19cd72ce01e221253cdec2feecbcf913ed50ff0b Author: Bas Couwenberg Date: Tue Jan 19 07:02:53 2016 +0100 Refresh patches. --- debian/changelog | 1 + debian/patches/allows-to-typo.patch | 70 +-- debian/patches/occurred-typo.patch| 8 ++-- debian/patches/occurrences-typo.patch | 10 ++--- 4 files changed, 45 insertions(+), 44 deletions(-) diff --git a/debian/changelog b/debian/changelog index 95985ed..5fbb919 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ qgis (2.8.6+dfsg-1~exp1) UNRELEASED; urgency=medium * Add dependency on openscenegraph-plugin-osgearth to qgis-plugin-globe. QGIS crashes when using the Globe plugin if this package is not installed. (closes: #808817) + * Refresh patches. -- Bas Couwenberg Tue, 19 Jan 2016 06:56:08 +0100 diff --git a/debian/patches/allows-to-typo.patch b/debian/patches/allows-to-typo.patch index df6543e..843d3ad 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 -@@ -20272,7 +20272,7 @@ Denis Rouzaud +@@ -20309,7 +20309,7 @@ Denis Rouzaud Salvatore Larosa 2014-04-28 @@ -14,7 +14,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Nyall Dawson 2014-04-28 -@@ -28732,7 +28732,7 @@ Matthias Kuhn201 +@@ -28769,7 +28769,7 @@ Matthias Kuhn201 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 -@@ -29757,7 +29757,7 @@ Salvatore Larosa 20 +@@ -29794,7 +29794,7 @@ Salvatore Larosa 20 Salvatore Larosa 2013-11-02 @@ -32,7 +32,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Salvatore Larosa 2013-10-24 -@@ -29765,7 +29765,7 @@ Salvatore Larosa 20 +@@ -29802,7 +29802,7 @@ Salvatore Larosa 20 Salvatore Larosa 2013-10-24 @@ -41,7 +41,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Radim Blazek 2013-11-02 -@@ -31648,7 +31648,7 @@ Tim Sutton 2013-09-1 +@@ -31685,7 +31685,7 @@ Tim Sutton 2013-09-1 Salvatore Larosa 2013-09-20 @@ -50,7 +50,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 yellow-sky 2013-09-20 -@@ -32109,7 +32109,7 @@ Stéphane Brunner 2013-09-14 @@ -59,7 +59,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Victor Olaya 2013-09-11 -@@ -34634,7 +34634,7 @@ Alexander Bruy 2013-08-06 @@ -68,7 +68,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Minoru Akagi 2013-07-18 -@@ -38435,7 +38435,7 @@ Juergen E. Fischer 2013- +@@ -38472,7 +38472,7 @@ Juergen E. Fischer 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 2013-06-05 -@@ -39656,10 +39656,10 @@ Salvatore Larosa 20 +@@ -39693,10 +39693,10 @@ Salvatore Larosa 20 Salvatore Larosa 2013-05-20 @@ -90,7 +90,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 - fix for mousePressEvent into console Juergen E. Fischer2013-05-20 -@@ -39904,7 +39904,7 @@ Radim Blazek 20 +@@ -39941,7 +39941,7 @@ Radim Blazek 20 Salvatore Larosa 2013-05-15 @@ -99,7 +99,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 - fixes some translation string Marco Hugentobler2013-05-15 -@@ -41406,7 +41406,7 @@ D'Hont René-Luc 201 +@@ -41443,7 +41443,7 @@ D'Hont René-Luc 201 olivierdalang 2013-04-24 @@ -108,7 +108,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Radim Blazek 2013-04-24 -@@ -41544,7 +41544,7 @@ Chris Crook 2013-0 +@@ -41581,7 +41581,7 @@ Chris Crook 2013-0 Salvatore Larosa 2013-04-22 @@ -117,7 +117,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Salvatore Larosa 2013-04-22 -@@ -41575,7 +41575,7 @@ Minoru Akagi 2013-0 +@@ -41612,7 +41612,7 @@ Minoru Akagi 2013-0 Salvatore Larosa 2013-04-22 @@ -126,7 +126,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 nyalldawson 2013-04-22 -
