[SCM] laditools/master: Drop 0002-refiles_path.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Mar 24 08:55:16 UTC 2012


The following commit has been merged in the master branch:
commit 60431aab1d5d697545b2aef045731f963411e60b
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Mar 8 10:02:20 2012 +0100

    Drop 0002-refiles_path.patch, applied upstream.

diff --git a/debian/patches/0002-resfiles_path.patch b/debian/patches/0002-resfiles_path.patch
deleted file mode 100644
index 9635597..0000000
--- a/debian/patches/0002-resfiles_path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix path resolution for data files.
-Origin: upstream, commit:283aa030dd29def63b013bf79bbf9a3cd54004dd
----
- laditools/gtk/utils.py |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- laditools.orig/laditools/gtk/utils.py
-+++ laditools/laditools/gtk/utils.py
-@@ -28,8 +28,8 @@ def find_data_file(path):
- 
-     paths = [
-         os.path.join(sys.path[0], 'data', path),
--        os.path.join(os.path.join(sys.path[0], os.pardir), 'data', path),
--        os.path.join(os.path.join(sys.path[0], os.pardir), 'share', 'laditools', 'data', path),
-+        os.path.join(sys.prefix, 'share', 'laditools', path),
-+        os.path.join(sys.prefix, 'share', 'laditools', 'data', path),
-         ]
- 
-     for path in paths:
diff --git a/debian/patches/series b/debian/patches/series
index 92d0297..ca202ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-disable_i18n.patch
-0002-resfiles_path.patch

-- 
laditools packaging



More information about the pkg-multimedia-commits mailing list