X Strike Force X.Org X11 SVN commit: r4158 - in trunk/util/xutils-dev/debian: . patches
Author: dnusinow
Date: 2006-12-19 21:08:40 -0500 (Tue, 19 Dec 2006)
New Revision: 4158
Added:
trunk/util/xutils-dev/debian/patches/06_font_path.diff
Modified:
trunk/util/xutils-dev/debian/changelog
trunk/util/xutils-dev/debian/patches/series
Log:
* 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?\195?\169raud Meyer for reporting the bug and Julien Cristau for finding the fix.
Closes: #403765
Modified: trunk/util/xutils-dev/debian/changelog
===================================================================
--- trunk/util/xutils-dev/debian/changelog 2006-12-17 23:05:11 UTC (rev 4157)
+++ trunk/util/xutils-dev/debian/changelog 2006-12-20 02:08:40 UTC (rev 4158)
@@ -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
Added: trunk/util/xutils-dev/debian/patches/06_font_path.diff
===================================================================
--- trunk/util/xutils-dev/debian/patches/06_font_path.diff (rev 0)
+++ trunk/util/xutils-dev/debian/patches/06_font_path.diff 2006-12-20 02:08:40 UTC (rev 4158)
@@ -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
Modified: trunk/util/xutils-dev/debian/patches/series
===================================================================
--- trunk/util/xutils-dev/debian/patches/series 2006-12-17 23:05:11 UTC (rev 4157)
+++ trunk/util/xutils-dev/debian/patches/series 2006-12-20 02:08:40 UTC (rev 4158)
@@ -3,3 +3,4 @@
03_xutils-dev-FHS.diff -p1
04_xutils-dev-debian.diff
05_xaw_without_xp.diff
+06_font_path.diff
Reply to: