diff options
| author | David Nusinow <dnusinow@debian.org> | 2006-12-20 02:08:40 +0000 |
|---|---|---|
| committer | David Nusinow <dnusinow@debian.org> | 2006-12-20 02:08:40 +0000 |
| commit | 454603c4a2cd4cfa24d869afedf7558d1ba7d391 (patch) | |
| tree | 0317266d1646b2cb1d7b6b961a6476c2658dcca4 /debian | |
| parent | 773366e7f0df823015ef4130977ceacff1c63d40 (diff) | |
| download | xutils-dev-454603c4a2cd4cfa24d869afedf7558d1ba7d391.tar.gz | |
* Add 06_font_path.diff. This fixes X11.tmpl so that imake-using apps will
install fonts to /usr/share/fonts/X11 and encodings to
/usr/share/fonts/X11/encodings, just like the xfonts packages. Thanks
Géraud Meyer for reporting the bug and Julien Cristau for finding the fix.
Closes: #403765
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/patches/06_font_path.diff | 17 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 28 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 6ce4ddc..e4b8162 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +xutils-dev (1:7.1.ds-6) unstable; urgency=high + + * Add 06_font_path.diff. This fixes X11.tmpl so that imake-using apps will + install fonts to /usr/share/fonts/X11 and encodings to + /usr/share/fonts/X11/encodings, just like the xfonts packages. Thanks + Géraud Meyer for reporting the bug and Julien Cristau for finding the fix. + Closes: #403765 + + -- David Nusinow <dnusinow@debian.org> Tue, 19 Dec 2006 20:56:23 -0500 + xutils-dev (1:7.1.ds-5) unstable; urgency=low * Remove obsolete qualifier about imake and old gcc conflict from long diff --git a/debian/patches/06_font_path.diff b/debian/patches/06_font_path.diff new file mode 100644 index 0000000..015841b --- /dev/null +++ b/debian/patches/06_font_path.diff @@ -0,0 +1,17 @@ +Index: xutils-dev/xorg-cf-files/X11.tmpl +=================================================================== +--- xutils-dev.orig/xorg-cf-files/X11.tmpl 2006-12-19 20:55:05.000000000 -0500 ++++ xutils-dev/xorg-cf-files/X11.tmpl 2006-12-19 20:56:03.000000000 -0500 +@@ -1512,10 +1512,10 @@ + #define DocPdfDir $(DOCDIR)/PDF + #endif + #ifndef FontDir +-#define FontDir $(LIBDIR)/fonts ++#define FontDir /usr/share/fonts/X11 + #endif + #ifndef FontEncDir +-#define FontEncDir $(LIBDIR)/fonts/encodings ++#define FontEncDir /usr/share/fonts/X11/encodings + #endif + #ifndef AdmDir + #define AdmDir /usr/adm diff --git a/debian/patches/series b/debian/patches/series index de8c6a2..f54478f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 03_xutils-dev-FHS.diff -p1 04_xutils-dev-debian.diff 05_xaw_without_xp.diff +06_font_path.diff |