[qgis] 04/07: Drop remove-sip-workaround.patch, applied upstream.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository qgis.

commit 89de95e879e9774545574e3f9f19098d9fc66a43
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 15 23:06:24 2017 +0200

    Drop remove-sip-workaround.patch, applied upstream.
---
 debian/changelog                           |  1 +
 debian/patches/remove-sip-workaround.patch | 16 ----------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b283e8..02f1e6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qgis (2.14.19+dfsg-1) UNRELEASED; urgency=medium
 
   [ Bas Couwenberg ]
   * New upstream release.
+  * Drop remove-sip-workaround.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 15 Sep 2017 22:57:03 +0200
 
diff --git a/debian/patches/remove-sip-workaround.patch b/debian/patches/remove-sip-workaround.patch
deleted file mode 100644
index ce96339..0000000
--- a/debian/patches/remove-sip-workaround.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Remove SIP workaround to fix FTBFS with sip 4.19.3.
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Bug-Debian: https://bugs.debian.org/872640
-Bug: https://issues.qgis.org/issues/17039
-Applied-Upstream: https://github.com/qgis/QGIS/commit/91171370514b558ea7f0ae34af7503ddb31d68e6
-
---- a/python/core/qgscoordinatetransform.sip
-+++ b/python/core/qgscoordinatetransform.sip
-@@ -15,7 +15,6 @@
- class QgsCoordinateTransform : QObject
- {
- %TypeHeaderCode
--extern PyObject *sipExportedExceptions__core[2];  // workaround: sipExportedExceptions__core is only defined in the first sip part
- #include <qgscoordinatetransform.h>
- %End
- 
diff --git a/debian/patches/series b/debian/patches/series
index b6922d3..47d4596 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@ qtermwidget-hurd.patch
 qt4-without-qtwebkit.patch
 columns-typo.patch
 grass72.patch
-remove-sip-workaround.patch

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