[SCM] inkscape/master: Move patches from upstream's 0.92.x branch into a subdirectory

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


The following commit has been merged in the master branch:
commit 709f9b1f2c58755baafc3bbf36d7b561a344d0c0
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Jan 22 19:38:55 2017 +0100

    Move patches from upstream's 0.92.x branch into a subdirectory
    
    and name them after upstream commit number

diff --git a/debian/patches/series b/debian/patches/series
index e558558..e6bd20c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,5 @@
 0002-Fix-lintian-s-executable-not-elf-or-script.patch
 0003-Install-the-localized-manpages-in-the-correct-path.patch
 0004-typos-libcroco.patch
-0005-Fix-typo-in-a-variable-name.patch
-0006-Suppress-warnings-on-symbols-dialog.patch
+upstream/0.92.x/15311.patch
+upstream/0.92.x/15309.patch
diff --git a/debian/patches/0006-Suppress-warnings-on-symbols-dialog.patch b/debian/patches/upstream/0.92.x/15309.patch
similarity index 100%
rename from debian/patches/0006-Suppress-warnings-on-symbols-dialog.patch
rename to debian/patches/upstream/0.92.x/15309.patch
diff --git a/debian/patches/0005-Fix-typo-in-a-variable-name.patch b/debian/patches/upstream/0.92.x/15311.patch
similarity index 95%
rename from debian/patches/0005-Fix-typo-in-a-variable-name.patch
rename to debian/patches/upstream/0.92.x/15311.patch
index 3a712b1..f356ccc 100644
--- a/debian/patches/0005-Fix-typo-in-a-variable-name.patch
+++ b/debian/patches/upstream/0.92.x/15311.patch
@@ -4,6 +4,8 @@ Subject: Fix typo in a variable name
 
 Bug: https://bugs.launchpad.net/inkscape/+bug/1653371
 Forwarded: https://code.launchpad.net/~mapreri/inkscape/typo/+merge/314287
+Applied: http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/15403
+Applied http://bazaar.launchpad.net/~inkscape.dev/inkscape/0.92.x/revision/15311
 ---
  src/live_effects/lpe-transform_2pts.cpp | 14 +++++++-------
  src/live_effects/lpe-transform_2pts.h   |  2 +-

-- 
inkscape packaging



More information about the pkg-multimedia-commits mailing list