severity 625587 important
tags 625587 patch
thanks
Hi Kęstutis,
since this bug starts to hold back other peoples work I consider to
upload the attached NMU. Personally I would like to see this fixed
in stable aswell.
Would be nice to get a comment on this one to know if you're working
on it or if I can go ahead directly.
TIA,
Sven
--
And I don't know much, but I do know this:
With a golden heart comes a rebel fist.
[ Streetlight Manifesto - Here's To Life ]
diff -Nru xgridfit-2.2a/debian/changelog xgridfit-2.2a/debian/changelog
--- xgridfit-2.2a/debian/changelog 2010-06-18 10:41:32.000000000 +0200
+++ xgridfit-2.2a/debian/changelog 2011-05-26 16:13:31.000000000 +0200
@@ -1,3 +1,11 @@
+xgridfit (2.2a-1.1) unstable; urgency=low
+
+ * Non maintainer upload.
+ * Add debian/patches/usr_local.diff to remove the 'local' part hard coded
+ in python/xgflib.py. (Closes: #625587)
+
+ -- Sven Hoexter <hoexter@debian.org> Thu, 26 May 2011 15:57:42 +0200
+
xgridfit (2.2a-1) unstable; urgency=low
* New upstream release.
diff -Nru xgridfit-2.2a/debian/patches/series xgridfit-2.2a/debian/patches/series
--- xgridfit-2.2a/debian/patches/series 2010-06-17 18:41:49.000000000 +0200
+++ xgridfit-2.2a/debian/patches/series 2011-05-26 16:12:05.000000000 +0200
@@ -1 +1,2 @@
002_fix_makefile_clean.diff
+usr_local.diff
diff -Nru xgridfit-2.2a/debian/patches/usr_local.diff xgridfit-2.2a/debian/patches/usr_local.diff
--- xgridfit-2.2a/debian/patches/usr_local.diff 1970-01-01 01:00:00.000000000 +0100
+++ xgridfit-2.2a/debian/patches/usr_local.diff 2011-05-26 16:19:41.000000000 +0200
@@ -0,0 +1,52 @@
+On a Debian system the installed files end up in
+/usr/share/xml/xgridfit/ so we have to edit the hard coded
+search path accordingly.
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625587
+
+--- a/python/xgflib.py
++++ b/python/xgflib.py
+@@ -18,7 +18,7 @@ except ImportError:
+ VERSION = '2.2'
+ JAVA_EXECUTABLE = 'java'
+ DISPLAY_DIAGNOSTIC_MESSAGES = False
+-XGRIDFIT_DIR = abspath('/usr/local/share/xml/xgridfit/')
++XGRIDFIT_DIR = abspath('/usr/share/xml/xgridfit/')
+ XSLT_DIR = abspath(join(XGRIDFIT_DIR, 'lib'))
+ UTIL_DIR = abspath(join(XGRIDFIT_DIR, 'utils'))
+ SCHEMA_DIR = abspath(join(XGRIDFIT_DIR, 'schemas'))
+@@ -1202,7 +1202,7 @@ class Configuration():
+ stderr.write("I don't know a processor or validator " + priority_item + "\n")
+ exit(1)
+
+-def run_xgridfit(xgfdir="/usr/local/share/xml/xgridfit/"):
++def run_xgridfit(xgfdir="/usr/share/xml/xgridfit/"):
+ XGRIDFIT_DIR = abspath(xgfdir)
+ """ Validates and compiles an Xgridfit program. """
+ start_time = time()
+@@ -1322,7 +1322,7 @@ def run_xgridfit(xgfdir="/usr/local/shar
+ print "Elapsed time:", time() - start_time
+ return error_free
+
+-def run_config(xgfdir="/usr/local/share/xml/xgridfit/"):
++def run_config(xgfdir="/usr/share/xml/xgridfit/"):
+ XGRIDFIT_DIR = abspath(xgfdir)
+ """ Creates/reads/updates a configuration file. """
+ # Parse the command line
+@@ -1354,7 +1354,7 @@ def run_config(xgfdir="/usr/local/share/
+ return False
+ return True
+
+-def run_ttx2xgf(xgfdir="/usr/local/share/xml/xgridfit/"):
++def run_ttx2xgf(xgfdir="/usr/share/xml/xgridfit/"):
+ XGRIDFIT_DIR = abspath(xgfdir)
+ """ Extract TT instructions from a TTX file. """
+ start_time = time()
+@@ -1445,7 +1445,7 @@ def run_ttx2xgf(xgfdir="/usr/local/share
+ print "Elapsed time:", time() - start_time
+ return error_free
+
+-def run_xgfmerge(xgfdir="/usr/local/share/xml/xgridfit/"):
++def run_xgfmerge(xgfdir="/usr/share/xml/xgridfit/"):
+ XGRIDFIT_DIR = abspath(xgfdir)
+ start_time = time()
+ # Parse the command line
Attachment:
xgridfit_2.2a-1.1.debian.tar.gz
Description: Binary data
Format: 3.0 (quilt) Source: xgridfit Binary: xgridfit, xgridfit-doc Architecture: all Version: 2.2a-1.1 Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org> Uploaders: Kęstutis Biliūnas <kebil@kaunas.init.lt> Dm-Upload-Allowed: yes Homepage: http://xgridfit.sourceforge.net/ Standards-Version: 3.8.4 Vcs-Browser: http://svn.debian.org/wsvn/pkg-fonts/packages/xgridfit/ Vcs-Svn: svn://svn.debian.org/pkg-fonts/packages/xgridfit/ Build-Depends: debhelper (>= 7.0.50~) Build-Depends-Indep: python, python-support Checksums-Sha1: 1dc2cd30f60d626c68e286ec568aa846e3cebb4a 621506 xgridfit_2.2a.orig.tar.gz dccb1ae6dcee2d1a9fe6b366cfcd5cb2463422d3 3600 xgridfit_2.2a-1.1.debian.tar.gz Checksums-Sha256: 5d17681b748c064100f8dc924c6dcd9d25d5d53336fd37306d333d93f959bc35 621506 xgridfit_2.2a.orig.tar.gz 1083cc23be8d08a53c9733a4784af9787e3dc933d679b0719f8c929aa095a42c 3600 xgridfit_2.2a-1.1.debian.tar.gz Files: b6959a505d8276fc0dab133fa39d5c2d 621506 xgridfit_2.2a.orig.tar.gz d03904270328fe2b27fd2df7ceefad4d 3600 xgridfit_2.2a-1.1.debian.tar.gz Python-Version: >= 2.6