[SCM] inkscape/master: Move the patches applied upstream under an upstream/trunk directory

[mattia at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9a519cddaafbd0530e2075c3ede2f90ac20b8155
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Jan 22 19:53:57 2017 +0100

    Move the patches applied upstream under an upstream/trunk directory
    
    and rename them after the upstream commit number

diff --git a/debian/patches/series b/debian/patches/series
index 3327adb..daec364 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
 0001-Drop_PS_and_PDF_support_in_MimeType.patch
-0002-Fix-lintian-s-executable-not-elf-or-script.patch
-0003-Install-the-localized-manpages-in-the-correct-path.patch
 0004-typos-libcroco.patch
+upstream/trunk/15399.patch
+upstream/trunk/15400.patch
 upstream/0.92.x/15311.patch
 upstream/0.92.x/15309.patch
 upstream/0.92.x/15320.patch
diff --git a/debian/patches/0002-Fix-lintian-s-executable-not-elf-or-script.patch b/debian/patches/upstream/trunk/15399.patch
similarity index 93%
rename from debian/patches/0002-Fix-lintian-s-executable-not-elf-or-script.patch
rename to debian/patches/upstream/trunk/15399.patch
index 1214959..bf67b9c 100644
--- a/debian/patches/0002-Fix-lintian-s-executable-not-elf-or-script.patch
+++ b/debian/patches/upstream/trunk/15399.patch
@@ -3,6 +3,7 @@ Date: Sat, 7 Jan 2017 13:34:03 +0100
 Subject: Fix lintian's executable-not-elf-or-script
 
 Forwarded: https://code.launchpad.net/~mapreri/inkscape/executable-not-elf-or-script/+merge/314278
+Applied: http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/15399
 ---
  share/extensions/CMakeLists.txt | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/debian/patches/0003-Install-the-localized-manpages-in-the-correct-path.patch b/debian/patches/upstream/trunk/15400.patch
similarity index 95%
rename from debian/patches/0003-Install-the-localized-manpages-in-the-correct-path.patch
rename to debian/patches/upstream/trunk/15400.patch
index 0fa5183..bfa6ff8 100644
--- a/debian/patches/0003-Install-the-localized-manpages-in-the-correct-path.patch
+++ b/debian/patches/upstream/trunk/15400.patch
@@ -5,6 +5,7 @@ Subject: Install the localized manpages in the correct path
 Also fixes (hides?) a bunch of manpage related lintian.
 
 Forwarded: https://code.launchpad.net/~mapreri/inkscape/correct-manpage-path/+merge/314284
+Applied: http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/15400
 ---
  CMakeScripts/Pod2man.cmake | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)

-- 
inkscape packaging