X Strike Force X.Org X11 SVN commit: r1779 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-04-13 22:29:40 -0400 (Thu, 13 Apr 2006)
New Revision: 1779
Added:
trunk/debian/xorg/debian/x11-common.NEWS
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/x11-common.dirs
trunk/debian/xorg/debian/x11-common.links
trunk/debian/xorg/debian/x11-common.preinst.in
Log:
* Several fixes for fonts. Include /usr/X11R6/lib/X11/fonts as a directory
in x11-common for font packages that have not transitioned to the new
directory. /usr/lib/X11/fonts symlinks to this directory. Both of these
used to be symlinks to /usr/share/fonts/X11 but no longer. We explicitly
remove the symlink at /usr/X11R6/lib/X11/fonts in the x11-common preinst
to ensure this transition. Thanks Eugene Konev.
* Document the change of PATH to /usr/X11R6/bin in x11-common NEWS.Debian
file. Thanks Joey Hess. (closes: #362222)
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-04-14 01:50:00 UTC (rev 1778)
+++ trunk/debian/xorg/debian/changelog 2006-04-14 02:29:40 UTC (rev 1779)
@@ -19,8 +19,16 @@
Thanks Steve Langasek. (closes: #362524, #362200)
* Symlink /usr/X11R6/bin to /usr/bin in x11-common.postinst. Thanks Steve
Langasek.
+ * Several fixes for fonts. Include /usr/X11R6/lib/X11/fonts as a directory
+ in x11-common for font packages that have not transitioned to the new
+ directory. /usr/lib/X11/fonts symlinks to this directory. Both of these
+ used to be symlinks to /usr/share/fonts/X11 but no longer. We explicitly
+ remove the symlink at /usr/X11R6/lib/X11/fonts in the x11-common preinst
+ to ensure this transition. Thanks Eugene Konev.
+ * Document the change of PATH to /usr/X11R6/bin in x11-common NEWS.Debian
+ file. Thanks Joey Hess. (closes: #362222)
- -- David Nusinow <dnusinow@debian.org> Thu, 13 Apr 2006 20:18:25 -0400
+ -- David Nusinow <dnusinow@debian.org> Thu, 13 Apr 2006 22:13:17 -0400
xorg (1:7.0.10) unstable; urgency=low
Added: trunk/debian/xorg/debian/x11-common.NEWS
===================================================================
--- trunk/debian/xorg/debian/x11-common.NEWS 2006-04-14 01:50:00 UTC (rev 1778)
+++ trunk/debian/xorg/debian/x11-common.NEWS 2006-04-14 02:29:40 UTC (rev 1779)
@@ -0,0 +1,11 @@
+x11-common (1:7.0.11) unstable; urgency=low
+
+ * With the change to X11R7, various paths have been changed, including
+ where binaries are stored. In X11R6, binaries were installed to
+ /usr/X11R6/bin and /usr/bin/X11 was a symlink pointing to this
+ directory. Now binaries are installed to /usr/bin and /usr/bin/X11 is a
+ symlink that points to /usr/bin. As such, any legacy application that
+ installs its binaries to /usr/X11R6/bin may be outside your PATH, and
+ you will need to update the configuration on your system accordingly.
+
+ -- David Nusinow <dnusinow@debian.org> Thu, 13 Apr 2006 22:13:17 -0400
Modified: trunk/debian/xorg/debian/x11-common.dirs
===================================================================
--- trunk/debian/xorg/debian/x11-common.dirs 2006-04-14 01:50:00 UTC (rev 1778)
+++ trunk/debian/xorg/debian/x11-common.dirs 2006-04-14 02:29:40 UTC (rev 1779)
@@ -2,3 +2,4 @@
usr/include/X11
usr/lib/X11
usr/share/X11
+usr/X11R6/lib/X11/fonts
Modified: trunk/debian/xorg/debian/x11-common.links
===================================================================
--- trunk/debian/xorg/debian/x11-common.links 2006-04-14 01:50:00 UTC (rev 1778)
+++ trunk/debian/xorg/debian/x11-common.links 2006-04-14 02:29:40 UTC (rev 1779)
@@ -1,4 +1,3 @@
usr/bin usr/bin/X11
-usr/share/fonts/X11 usr/lib/X11/fonts
-usr/share/fonts/X11 usr/X11R6/lib/X11/fonts
+usr/X11R6/lib/X11/fonts usr/lib/X11/fonts
etc/X11/rgb.txt usr/share/X11/rgb.txt
Modified: trunk/debian/xorg/debian/x11-common.preinst.in
===================================================================
--- trunk/debian/xorg/debian/x11-common.preinst.in 2006-04-14 01:50:00 UTC (rev 1778)
+++ trunk/debian/xorg/debian/x11-common.preinst.in 2006-04-14 02:29:40 UTC (rev 1779)
@@ -37,6 +37,12 @@
rm /usr/${i}/X11
fi
done
+ # We provided this as a symlink in versions between 7.0.0 and 7.0.11. We want
+ # to be sure this is a directory after install to allow font packages to
+ # install properly even if they haven't transitioned
+ if [ -L "/usr/X11R6/lib/X11/fonts" ]; then
+ rm /usr/X11R6/lib/X11/fonts
+ fi
# migration hilarity
if [ -n "$FIRSTINST" ]; then
Reply to: