[qgis] 04/07: Drop wms-provider-dependencies.patch, applied upstream. Refresh remaining patches.

Fri Mar 23 16:05:26 UTC 2018

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qgis.

commit d612ac0c4d32d0a03d72fcd1783bb47c507f6fac
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 23 14:29:44 2018 +0100

    Drop wms-provider-dependencies.patch, applied upstream. Refresh remaining patches.
---
 debian/changelog                               |  2 ++
 debian/patches/columns-typo.patch              |  4 ++--
 debian/patches/number-typo.patch               |  4 ++--
 debian/patches/occurred-typo.patch             |  4 ++--
 debian/patches/series                          |  1 -
 debian/patches/wms-provider-dependencies.patch | 20 --------------------
 6 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 306dc03..22fd023 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qgis (2.18.18+dfsg-1) UNRELEASED; urgency=medium
 
   [ Bas Couwenberg ]
   * New upstream release.
+  * Drop wms-provider-dependencies.patch, applied upstream.
+    Refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 23 Mar 2018 14:23:02 +0100
 
diff --git a/debian/patches/columns-typo.patch b/debian/patches/columns-typo.patch
index 623eeaa..be59ab0 100644
--- a/debian/patches/columns-typo.patch
+++ b/debian/patches/columns-typo.patch
@@ -231,7 +231,7 @@ Forwarded: not-needed
  <h4>Cell size X and Y</h4>
 --- a/i18n/qgis_it.ts
 +++ b/i18n/qgis_it.ts
-@@ -90759,7 +90759,7 @@ clustering of points.</p>
+@@ -91202,7 +91202,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. 
@@ -319,7 +319,7 @@ Forwarded: not-needed
  <h4>Cell size X and Y</h4>
 --- a/i18n/qgis_pl.ts
 +++ b/i18n/qgis_pl.ts
-@@ -90829,7 +90829,7 @@ clustering of points.</p>
+@@ -90841,7 +90841,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. 
diff --git a/debian/patches/number-typo.patch b/debian/patches/number-typo.patch
index 698e0d6..9a7b474 100644
--- a/debian/patches/number-typo.patch
+++ b/debian/patches/number-typo.patch
@@ -249,7 +249,7 @@ Forwarded: https://github.com/qgis/QGIS/pull/2946
  are interpreted.
 --- a/i18n/qgis_it.ts
 +++ b/i18n/qgis_it.ts
-@@ -93256,7 +93256,7 @@ Each attribute also has a data type, one
+@@ -94335,7 +94335,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
@@ -337,7 +337,7 @@ Forwarded: https://github.com/qgis/QGIS/pull/2946
  are interpreted.
 --- a/i18n/qgis_pl.ts
 +++ b/i18n/qgis_pl.ts
-@@ -92754,7 +92754,7 @@ Each attribute also has a data type, one
+@@ -92766,7 +92766,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 4119434..d1ad806 100644
--- a/debian/patches/occurred-typo.patch
+++ b/debian/patches/occurred-typo.patch
@@ -289,7 +289,7 @@ Forwarded: not-needed
      <message>
 --- a/i18n/qgis_it.ts
 +++ b/i18n/qgis_it.ts
-@@ -25271,11 +25271,11 @@ Errori: %3
+@@ -25267,11 +25267,11 @@ Errori: %3
          <translation>Richiesta autenticazione proxy</translation>
      </message>
      <message numerus="yes">
@@ -421,7 +421,7 @@ Forwarded: not-needed
      <message>
 --- a/i18n/qgis_pl.ts
 +++ b/i18n/qgis_pl.ts
-@@ -25282,11 +25282,11 @@ Błędy: %3
+@@ -25286,11 +25286,11 @@ Błędy: %3
          <translation>Wymagane uwierzytelnienie proxy</translation>
      </message>
      <message numerus="yes">
diff --git a/debian/patches/series b/debian/patches/series
index 0623a06..b0b3fa0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ exclude-elvensword-resources.patch
 occurred-typo.patch
 number-typo.patch
 columns-typo.patch
-wms-provider-dependencies.patch
diff --git a/debian/patches/wms-provider-dependencies.patch b/debian/patches/wms-provider-dependencies.patch
deleted file mode 100644
index dd3e121..0000000
--- a/debian/patches/wms-provider-dependencies.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Add dependency on qgis_gui target to fix parallel build.
- In file included from /<<BUILDDIR>>/qgis-2.18.17+dfsg/src/providers/wms/qgswmssourceselect.cpp:26:0:
- /<<BUILDDIR>>/qgis-2.18.17+dfsg/src/providers/wms/../../gui/qgsgenericprojectionselector.h:20:10: fatal error: ui_qgsgenericprojectionselectorbase.h: No such file or directory
-  #include <ui_qgsgenericprojectionselectorbase.h>
-           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/qgis/QGIS/pull/6471
-Applied-Upstream: https://github.com/qgis/QGIS/commit/9a3ecc28346c95fc423cc75a7a83ad4aa459cf4f
-
---- a/src/providers/wms/CMakeLists.txt
-+++ b/src/providers/wms/CMakeLists.txt
-@@ -46,6 +46,8 @@ INCLUDE_DIRECTORIES(SYSTEM
- ADD_LIBRARY(wmsprovider_a STATIC ${WMS_SRCS} ${WMS_MOC_SRCS})
- ADD_LIBRARY(wmsprovider MODULE ${WMS_SRCS} ${WMS_MOC_SRCS})
- 
-+ADD_DEPENDENCIES(wmsprovider qgis_gui)
-+
- TARGET_LINK_LIBRARIES(wmsprovider
-   qgis_core
-   qgis_gui

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git

