[SCM] laditools/master: Fix path resolution for resource files.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0e4b5c4f0949cb4c2607653a9c8dd781c3400890
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Mar 8 09:42:19 2012 +0100

    Fix path resolution for resource files.
    
    Add DEP-3 headers to patches.

diff --git a/debian/patches/0001-disable_i18n.patch b/debian/patches/0001-disable_i18n.patch
index d5fec28..6494cfa 100644
--- a/debian/patches/0001-disable_i18n.patch
+++ b/debian/patches/0001-disable_i18n.patch
@@ -1,3 +1,6 @@
+Description: Disable intltool support.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: not-needed
 ---
  setup.cfg |    2 ++
  1 file changed, 2 insertions(+)
diff --git a/debian/patches/0002-resfiles_path.patch b/debian/patches/0002-resfiles_path.patch
new file mode 100644
index 0000000..9635597
--- /dev/null
+++ b/debian/patches/0002-resfiles_path.patch
@@ -0,0 +1,19 @@
+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 ca202ee..92d0297 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-disable_i18n.patch
+0002-resfiles_path.patch

-- 
laditools packaging