File: usr_local.diff

package info (click to toggle)
xgridfit 2.3-7
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid, trixie
  • size: 3,000 kB
  • sloc: python: 1,262; xml: 466; sh: 283; makefile: 116; sed: 45
file content (61 lines) | stat: -rw-r--r-- 2,407 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
From: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
Date: Sun, 8 Dec 2019 20:48:33 +0900
Subject: usr_local

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
---
 python/xgflib.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/python/xgflib.py b/python/xgflib.py
index 0785242..8700512 100644
--- 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/share/xml/xgridfit/"):
         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/xml/xgridfit/"):
         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/xml/xgridfit/"):
         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