]>
Commit | Line | Data |
---|---|---|
2a3bf0da JB |
1 | diff -Nur xpat2-1.07.orig/lib/french/XPat xpat2-1.07/lib/french/XPat |
2 | --- xpat2-1.07.orig/lib/french/XPat Tue Feb 14 08:31:48 1995 | |
3 | +++ xpat2-1.07/lib/french/XPat Thu Oct 4 19:30:45 2001 | |
4 | @@ -1,4 +1,4 @@ | |
5 | -#include "../../app-defaults/XPat" | |
6 | +#include "../XPat" | |
7 | XPat*Dialog*Translations: #override \n\ | |
8 | <Key>o: Ok()\n\ | |
9 | <Key>n: Cancel()\n | |
10 | diff -Nur xpat2-1.07.orig/lib/german/XPat xpat2-1.07/lib/german/XPat | |
11 | --- xpat2-1.07.orig/lib/german/XPat Mon Feb 13 18:57:06 1995 | |
12 | +++ xpat2-1.07/lib/german/XPat Thu Oct 4 19:30:36 2001 | |
13 | @@ -1,4 +1,4 @@ | |
14 | -#include "../../app-defaults/XPat" | |
15 | +#include "../XPat" | |
16 | XPat*Dialog*Translations: #override \n\ | |
17 | <Key>j: Ok()\n\ | |
18 | <Key>n: Cancel()\n | |
19 | diff -Nur xpat2-1.07.orig/lib/italian/XPat xpat2-1.07/lib/italian/XPat | |
20 | --- xpat2-1.07.orig/lib/italian/XPat Thu Jun 23 18:39:18 1994 | |
21 | +++ xpat2-1.07/lib/italian/XPat Thu Oct 4 19:30:52 2001 | |
22 | @@ -1,4 +1,4 @@ | |
23 | -#include "../../app-defaults/XPat" | |
24 | +#include "../XPat" | |
25 | XPat*Dialog*Translations: #override \n\ | |
26 | <Key>s: Ok()\n\ | |
27 | <Key>n: Cancel()\n | |
28 | diff -Nur xpat2-1.07.orig/src/Imakefile xpat2-1.07/src/Imakefile | |
29 | --- xpat2-1.07.orig/src/Imakefile Sun Nov 5 20:05:10 2000 | |
30 | +++ xpat2-1.07/src/Imakefile Thu Oct 4 19:26:14 2001 | |
31 | @@ -192,7 +192,7 @@ | |
32 | ||
33 | ||
34 | MYPROG = xpat2 | |
35 | -LANGUAGES = italian german russian french de_DE fr_FR it_IT | |
36 | +LANGUAGES = de fr it ru | |
37 | DEFINES = $(LOAD_OPTION) $(HELP_OPTION) $(KIT_OPTION) $(ROUND_OPTION) \ | |
38 | $(SOUND_OPTION) $(XPM_OPTION) $(GFX_OPTION) \ | |
39 | -DSCOREFILE=\"$(SCOREFILE)\" -DLIBDIR=\"$(XPATLIBDIR)\" | |
5b609d9e JB |
40 | @@ -214,7 +214,6 @@ |
41 | chmod 644 $(APPDEFSDIR)/$$f/app-defaults/XPat; \ | |
2a3bf0da JB |
42 | done |
43 | (cd ../lib; tar cf - * | (cd $(XPATLIBDIR); tar xf -)) | |
44 | - chown -R root $(XPATLIBDIR) | |
45 | chmod -R a+r $(XPATLIBDIR) | |
46 | for f in $(LANGUAGES); do \ | |
47 | chmod 755 $(XPATLIBDIR)/$$f; \ | |
48 | diff -Nur xpat2-1.07.orig/src/Xpat.tmpl xpat2-1.07/src/Xpat.tmpl | |
49 | --- xpat2-1.07.orig/src/Xpat.tmpl Sun Nov 5 21:03:10 2000 | |
50 | +++ xpat2-1.07/src/Xpat.tmpl Thu Oct 4 19:06:05 2001 | |
51 | @@ -161,13 +161,13 @@ | |
52 | XCOMM ######################################################################### | |
53 | ||
54 | XCOMM Root directory of xpat2 installation | |
55 | -XPATROOT = /usr/games/lib/xpat | |
0bfc77a1 | 56 | +XPATROOT = /usr/share/xpat |
2a3bf0da JB |
57 | XCOMM XPATROOT = /usr/local/lib/xpat |
58 | XCOMM XPATROOT = /opt/XPat2 | |
59 | ||
60 | -XPATLIBDIR = $(XPATROOT) | |
61 | -APPDEFSDIR = $(LIBDIR) | |
62 | -XPATMANDIR = $(XPATROOT)/man/man6 | |
63 | +XPATLIBDIR = $(DESTDIR)$(XPATROOT) | |
5b609d9e | 64 | +APPDEFSDIR = $(DESTDIR)/usr/share/X11 |
0bfc77a1 | 65 | +XPATMANDIR = $(DESTDIR)/usr/share/man/man6 |
2a3bf0da JB |
66 | |
67 | XCOMM This is the name of the log-file, where solved games are stored: | |
68 | SCOREFILE = /var/games/xpat.log | |
69 | @@ -180,8 +180,8 @@ | |
70 | ||
71 | XCOMM Paths for the Qt interface | |
72 | XCOMM QTDIR = /usr/lib/qt1 | |
73 | -QTDIR = /usr/local/qt | |
74 | -QTINCDIR = $(QTDIR)/include | |
0bfc77a1 | 75 | +QTDIR = /usr |
2a3bf0da JB |
76 | +QTINCDIR = $(QTDIR)/include/qt |
77 | QTLIBDIR = $(QTDIR)/lib | |
78 | MOC = $(QTDIR)/bin/moc | |
79 | ||
80 | diff -Nur xpat2-1.07.orig/src/messages.c xpat2-1.07/src/messages.c | |
81 | --- xpat2-1.07.orig/src/messages.c Wed May 5 22:04:48 1999 | |
82 | +++ xpat2-1.07/src/messages.c Thu Oct 4 19:27:45 2001 | |
83 | @@ -214,15 +214,15 @@ | |
84 | iso_code[2] = '\0'; | |
85 | /* map the existing translations (iso3166) to well-known pathnames */ | |
86 | if (!strcmp(iso_code, "DE")) | |
87 | - return langdir = "german"; | |
88 | + return langdir = "de"; | |
89 | if (!strcmp(iso_code, "IT")) | |
90 | - return langdir = "italian"; | |
91 | + return langdir = "it"; | |
92 | if (!strcmp(iso_code, "FR")) | |
93 | - return langdir = "french"; | |
94 | + return langdir = "fr"; | |
95 | if (!strcmp(iso_code, "")) | |
96 | - return langdir = "german"; | |
97 | + return langdir = "de"; | |
98 | if (!strcmp(iso_code, "RU") || !strcmp(iso_code, "BY")) | |
99 | - return langdir = "russian"; | |
100 | + return langdir = "ru"; | |
101 | #ifdef _POSIX_SOURCE | |
102 | /* directory wasn't readable, reset it */ | |
103 | return langdir = ""; |