X Strike Force X.Org X11 SVN commit: r2120 - in trunk/font/xfonts-encodings: . debian debian/patches
Author: dnusinow
Date: 2006-05-10 00:00:35 -0400 (Wed, 10 May 2006)
New Revision: 2120
Added:
trunk/font/xfonts-encodings/debian/patches/
trunk/font/xfonts-encodings/debian/patches/01_encodings_dir_absolute_paths.diff
trunk/font/xfonts-encodings/debian/patches/series
trunk/font/xfonts-encodings/debian/xfonts-encodings.links
Modified:
trunk/font/xfonts-encodings/Makefile.in
trunk/font/xfonts-encodings/configure
trunk/font/xfonts-encodings/debian/changelog
trunk/font/xfonts-encodings/debian/control
trunk/font/xfonts-encodings/debian/rules
Log:
* Add symlink in /usr/X11R6/lib/X11/fonts/encodings/encodings.dir pointing
to /usr/share/fonts/X11/encodings/encodings.dir Also add
01_encodings_dir_absolute_paths.diff. This patch causes the encodings dir
to use absolute font paths, allowing the above symlink to function.
Thanks to Steve Langasek for the analysis and helping figure this
solution. (closes: #365403)
Modified: trunk/font/xfonts-encodings/Makefile.in
===================================================================
--- trunk/font/xfonts-encodings/Makefile.in 2006-05-09 05:23:38 UTC (rev 2119)
+++ trunk/font/xfonts-encodings/Makefile.in 2006-05-10 04:00:35 UTC (rev 2120)
@@ -552,7 +552,7 @@
@GZIP@ -c < $< > $@
encodings.dir:
- @MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . -e large .
+ @MKFONTSCALE@ -b -s -l -n -p $(encodingsdir) -e . -e large .
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: trunk/font/xfonts-encodings/configure
===================================================================
--- trunk/font/xfonts-encodings/configure 2006-05-09 05:23:38 UTC (rev 2119)
+++ trunk/font/xfonts-encodings/configure 2006-05-10 04:00:35 UTC (rev 2120)
@@ -885,7 +885,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
@@ -2599,11 +2599,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -2642,6 +2637,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
+
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
Modified: trunk/font/xfonts-encodings/debian/changelog
===================================================================
--- trunk/font/xfonts-encodings/debian/changelog 2006-05-09 05:23:38 UTC (rev 2119)
+++ trunk/font/xfonts-encodings/debian/changelog 2006-05-10 04:00:35 UTC (rev 2120)
@@ -1,3 +1,14 @@
+xfonts-encodings (1:1.0.0-2) unstable; urgency=low
+
+ * Add symlink in /usr/X11R6/lib/X11/fonts/encodings/encodings.dir pointing
+ to /usr/share/fonts/X11/encodings/encodings.dir Also add
+ 01_encodings_dir_absolute_paths.diff. This patch causes the encodings dir
+ to use absolute font paths, allowing the above symlink to function.
+ Thanks to Steve Langasek for the analysis and helping figure this
+ solution. (closes: #365403)
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 9 May 2006 23:59:39 -0400
+
xfonts-encodings (1:1.0.0-1) experimental; urgency=low
[ David Nusinow ]
Modified: trunk/font/xfonts-encodings/debian/control
===================================================================
--- trunk/font/xfonts-encodings/debian/control 2006-05-09 05:23:38 UTC (rev 2119)
+++ trunk/font/xfonts-encodings/debian/control 2006-05-10 04:00:35 UTC (rev 2120)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, xutils
+Build-Depends: debhelper (>= 4.0.0), pkg-config, xutils, quilt
Standards-Version: 3.6.1.0
Package: xfonts-encodings
Added: trunk/font/xfonts-encodings/debian/patches/01_encodings_dir_absolute_paths.diff
===================================================================
--- trunk/font/xfonts-encodings/debian/patches/01_encodings_dir_absolute_paths.diff 2006-05-09 05:23:38 UTC (rev 2119)
+++ trunk/font/xfonts-encodings/debian/patches/01_encodings_dir_absolute_paths.diff 2006-05-10 04:00:35 UTC (rev 2120)
@@ -0,0 +1,13 @@
+Index: xfonts-encodings/Makefile.am
+===================================================================
+--- xfonts-encodings.orig/Makefile.am 2006-05-09 23:34:03.000000000 -0400
++++ xfonts-encodings/Makefile.am 2006-05-09 23:34:09.000000000 -0400
+@@ -48,7 +48,7 @@
+ @GZIP@ -c < $< > $@
+
+ encodings.dir:
+- @MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . -e large .
++ @MKFONTSCALE@ -b -s -l -n -p $(encodingsdir) -e . -e large .
+
+ encodings_DATA = $(COMPRESSED) encodings.dir
+ CLEANFILES = $(COMPRESSED) encodings.dir
Added: trunk/font/xfonts-encodings/debian/patches/series
===================================================================
--- trunk/font/xfonts-encodings/debian/patches/series 2006-05-09 05:23:38 UTC (rev 2119)
+++ trunk/font/xfonts-encodings/debian/patches/series 2006-05-10 04:00:35 UTC (rev 2120)
@@ -0,0 +1 @@
+01_encodings_dir_absolute_paths.diff
Modified: trunk/font/xfonts-encodings/debian/rules
===================================================================
--- trunk/font/xfonts-encodings/debian/rules 2006-05-09 05:23:38 UTC (rev 2119)
+++ trunk/font/xfonts-encodings/debian/rules 2006-05-10 04:00:35 UTC (rev 2120)
@@ -32,7 +32,7 @@
endif
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -46,7 +46,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
Added: trunk/font/xfonts-encodings/debian/xfonts-encodings.links
===================================================================
--- trunk/font/xfonts-encodings/debian/xfonts-encodings.links 2006-05-09 05:23:38 UTC (rev 2119)
+++ trunk/font/xfonts-encodings/debian/xfonts-encodings.links 2006-05-10 04:00:35 UTC (rev 2120)
@@ -0,0 +1 @@
+usr/share/fonts/X11/encodings/encodings.dir usr/X11R6/lib/X11/fonts/encodings/encodings.dir
Reply to: