[SCM] inkscape/master: patches: drop 15484 patch, applied upstream

[mattia at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1f824c619848e6ac070faedaa8551b318ca02755
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed Jul 26 16:05:43 2017 +0200

    patches: drop 15484 patch, applied upstream
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>

diff --git a/debian/patches/series b/debian/patches/series
index 653e10f..ea8a806 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Drop_PS_and_PDF_support_in_MimeType.patch
 0002-typos-libcroco.patch
 upstream/trunk/15400.patch
-upstream/trunk/15484.patch
diff --git a/debian/patches/upstream/trunk/15484.patch b/debian/patches/upstream/trunk/15484.patch
deleted file mode 100644
index c2ced5f..0000000
--- a/debian/patches/upstream/trunk/15484.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Eduard Braun <Eduard.Braun2 at gmx.de>
-Date: Mon, 6 Feb 2017 08:02:57 +0100
-Subject: Add compatibility with old Scour 0.26, as found in Debian jessie
-
-Origin: upstream
-Applied: http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/15484
-Bug: https://code.launchpad.net/~mapreri/inkscape/support-scour-0.26/+merge/315348
-Bug-Debian: https://bugs.debian.org/852290
----
- share/extensions/scour.inkscape.py | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/share/extensions/scour.inkscape.py b/share/extensions/scour.inkscape.py
-index eb31f30..bf60b96 100755
---- a/share/extensions/scour.inkscape.py
-+++ b/share/extensions/scour.inkscape.py
-@@ -4,7 +4,14 @@ import sys, platform, inkex
- 
- try:
-     import scour
--    from scour.scour import scourString
-+    try:
-+        from scour.scour import scourString
-+    except ImportError:  # compatibility for very old Scour (<= 0.26) - deprecated!
-+        try:
-+            from scour import scourString
-+            scour.__version__ = scour.VER
-+        except:
-+            raise
- except Exception as e:
-     inkex.errormsg("Failed to import Python module 'scour'.\nPlease make sure it is installed (e.g. using 'pip install scour' or 'sudo apt-get install python-scour') and try again.")
-     inkex.errormsg("\nDetails:\n" + str(e))

-- 
inkscape packaging