[qgis] 05/07: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Fri Oct 21 19:20:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit 6b0f03b62e7040b26546a2ea0d7f0e7c3afd2c4f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Oct 21 19:15:47 2016 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/columns-typo.patch | 57 +-------------------------------------
debian/patches/number-typo.patch | 24 +---------------
debian/patches/occurred-typo.patch | 2 +-
4 files changed, 4 insertions(+), 80 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4fc4548..38c8107 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qgis (2.14.8+dfsg-1) UNRELEASED; urgency=medium
* Update copyright file, changes:
- Update copyright years for Marco Bernasocchi
- Add Andrea Aime to copyright holders
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Fri, 21 Oct 2016 18:57:22 +0200
diff --git a/debian/patches/columns-typo.patch b/debian/patches/columns-typo.patch
index dc1c6cf..cef2629 100644
--- a/debian/patches/columns-typo.patch
+++ b/debian/patches/columns-typo.patch
@@ -70,7 +70,7 @@ Forwarded: not-needed
<h4>Cell size X and Y</h4>
--- a/i18n/qgis_de.ts
+++ b/i18n/qgis_de.ts
-@@ -88991,7 +88991,7 @@ clustering of points.</p>
+@@ -89386,7 +89386,7 @@ clustering of points.</p>
<h4>Rows and Columns</h4>
<p>Used to change the dimensions of the output raster file. These values are also linked to the <b>Cell size X</b> and <b>Cell size Y</b> values.
@@ -451,58 +451,3 @@ Forwarded: not-needed
are also linked, so doubling the number of rows will automatically double the number of columns and the cell sizes will also be halved. The geographical area of the output raster will remain the same!</p>
<h4>Cell size X and Y</h4>
---- a/resources/context_help/HeatmapGui
-+++ b/resources/context_help/HeatmapGui
-@@ -26,7 +26,7 @@ clustering of points.</p>
-
- <h4>Rows and Columns</h4>
- <p>Used to change the dimensions of the output raster file. These values are also linked to the <b>Cell size X</b> and <b>Cell size Y</b> values.
--Increasing the number of rows or colums will decrease the cell size and increase the file size of the output file. The values in Rows and Columns
-+Increasing the number of rows or columns will decrease the cell size and increase the file size of the output file. The values in Rows and Columns
- are also linked, so doubling the number of rows will automatically double the number of columns and the cell sizes will also be halved. The geographical area of the output raster will remain the same!</p>
-
- <h4>Cell size X and Y</h4>
---- a/src/app/gps/qwtpolar-0.1/qwt_polar_plot.cpp
-+++ b/src/app/gps/qwtpolar-0.1/qwt_polar_plot.cpp
-@@ -186,7 +186,7 @@ const QwtTextLabel *QwtPolarPlot::titleL
-
- \param legend Legend
- \param pos The legend's position. For top/left position the number
-- of colums will be limited to 1, otherwise it will be set to
-+ of columns will be limited to 1, otherwise it will be set to
- unlimited.
-
- \param ratio Ratio between legend and the bounding rect
---- a/src/app/gps/qwtpolar-1.0/qwt_polar_plot.cpp
-+++ b/src/app/gps/qwtpolar-1.0/qwt_polar_plot.cpp
-@@ -167,7 +167,7 @@ const QwtTextLabel *QwtPolarPlot::titleL
-
- \param legend Legend
- \param pos The legend's position. For top/left position the number
-- of colums will be limited to 1, otherwise it will be set to
-+ of columns will be limited to 1, otherwise it will be set to
- unlimited.
-
- \param ratio Ratio between legend and the bounding rect
---- a/src/app/gps/qwtpolar-1.1.1/qwt_polar_plot.cpp
-+++ b/src/app/gps/qwtpolar-1.1.1/qwt_polar_plot.cpp
-@@ -171,7 +171,7 @@ const QwtTextLabel *QwtPolarPlot::titleL
-
- \param legend Legend
- \param pos The legend's position. For top/left position the number
-- of colums will be limited to 1, otherwise it will be set to
-+ of columns will be limited to 1, otherwise it will be set to
- unlimited.
-
- \param ratio Ratio between legend and the bounding rect
---- a/src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h
-+++ b/src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h
-@@ -697,7 +697,7 @@ struct DXFLIB_EXPORT DL_InsertData {
- double sz;
- /*! Rotation angle in degrees. */
- double angle;
-- /*! Number of colums if we insert an array of the block or 1. */
-+ /*! Number of columns if we insert an array of the block or 1. */
- int cols;
- /*! Number of rows if we insert an array of the block or 1. */
- int rows;
diff --git a/debian/patches/number-typo.patch b/debian/patches/number-typo.patch
index e7757f1..2d741a3 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
-@@ -89960,7 +89960,7 @@ Each attribute also has a data type, one
+@@ -90355,7 +90355,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
@@ -460,25 +460,3 @@ Forwarded: https://github.com/qgis/QGIS/pull/2946
number then the type is real, otherwise the type is string. Note that this is
based on the content of the fields - quoting fields does not change the way they
are interpreted.
---- a/resources/context_help/QgsDelimitedTextSourceSelect
-+++ b/resources/context_help/QgsDelimitedTextSourceSelect
-@@ -221,7 +221,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
--nubmer then the type is longlong, otherwise if it is a valid real
-+number then the type is longlong, otherwise if it is a valid real
- number then the type is real, otherwise the type is string. Note that this is
- based on the content of the fields - quoting fields does not change the way they
- are interpreted.
---- a/src/providers/wcs/qgswcsprovider.cpp
-+++ b/src/providers/wcs/qgswcsprovider.cpp
-@@ -185,7 +185,7 @@ QgsWcsProvider::QgsWcsProvider( QString
- return;
- }
-
-- // Get small piece of coverage to find GDAL data type and nubmer of bands
-+ // Get small piece of coverage to find GDAL data type and number of bands
- int bandNo = 0; // All bands
- int width;
- int height;
diff --git a/debian/patches/occurred-typo.patch b/debian/patches/occurred-typo.patch
index 4cb8d00..266fc82 100644
--- a/debian/patches/occurred-typo.patch
+++ b/debian/patches/occurred-typo.patch
@@ -89,7 +89,7 @@ Forwarded: not-needed
<message>
--- a/i18n/qgis_de.ts
+++ b/i18n/qgis_de.ts
-@@ -25684,11 +25684,11 @@ Fehler: %3
+@@ -25802,11 +25802,11 @@ Fehler: %3
<translation>Proxy-Authentifikation erforderlich</translation>
</message>
<message numerus="yes">
--
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