[SCM] inkscape/master: The patch have been backported into 0.92.x branch, move the patch to the correct list

mattia at users.alioth.debian.org mattia at users.alioth.debian.org
Sun Jan 22 19:14:14 UTC 2017


The following commit has been merged in the master branch:
commit fb9771f214e8a9f31f84709662e5f4ac1b3f7c82
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Jan 22 20:09:59 2017 +0100

    The patch have been backported into 0.92.x branch, move the patch to the correct list
    
    Gbp-Dch: Ignore

diff --git a/debian/patches/series b/debian/patches/series
index 72ffe27..1638b5e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0001-Drop_PS_and_PDF_support_in_MimeType.patch
 0002-typos-libcroco.patch
-upstream/trunk/15399.patch
 upstream/trunk/15400.patch
 upstream/0.92.x/15311.patch
 upstream/0.92.x/15309.patch
@@ -8,3 +7,4 @@ upstream/0.92.x/15320.patch
 upstream/0.92.x/15323.patch
 upstream/0.92.x/15324.patch
 upstream/0.92.x/15325.patch
+upstream/0.92.x/15332.patch
diff --git a/debian/patches/upstream/trunk/15399.patch b/debian/patches/upstream/0.92.x/15332.patch
similarity index 85%
rename from debian/patches/upstream/trunk/15399.patch
rename to debian/patches/upstream/0.92.x/15332.patch
index bf67b9c..1f9bb97 100644
--- a/debian/patches/upstream/trunk/15399.patch
+++ b/debian/patches/upstream/0.92.x/15332.patch
@@ -1,9 +1,12 @@
 From: Mattia Rizzolo <mattia at debian.org>
 Date: Sat, 7 Jan 2017 13:34:03 +0100
-Subject: Fix lintian's executable-not-elf-or-script
+Subject: Install non-executable scripts without executable bit
+
+Fixes 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
+Applied: http://bazaar.launchpad.net/~inkscape.dev/inkscape/0.92.x/revision/15332
 ---
  share/extensions/CMakeLists.txt | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)

-- 
inkscape packaging



More information about the pkg-multimedia-commits mailing list