X Strike Force X.Org X11 SVN commit: r1968 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-04-25 01:16:07 -0400 (Tue, 25 Apr 2006)
New Revision: 1968
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/xserver-xorg.NEWS
trunk/debian/xorg/debian/xserver-xorg.postinst.in
Log:
Thanks Steve Langasek for re-working my primitive sed.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-04-25 04:16:08 UTC (rev 1967)
+++ trunk/debian/xorg/debian/changelog 2006-04-25 05:16:07 UTC (rev 1968)
@@ -54,10 +54,11 @@
+ Update the font paths for misc, cyrillic, Type1, 100dpi, and 75dpi fonts
to be /usr/share/fonts/X11 rather than /usr/lib/X11/fonts
+ Remove the ModulePath and RgbPath directives if present
+ Thanks Steve Langasek for re-working my primitive sed.
(closes: #362894, #363667, #364692, #364689, #363436, #357714, #363571)
* Document the above in NEWS.Debian
- -- David Nusinow <dnusinow@debian.org> Tue, 25 Apr 2006 00:06:25 -0400
+ -- David Nusinow <dnusinow@debian.org> Tue, 25 Apr 2006 01:15:59 -0400
xorg (1:7.0.14) unstable; urgency=low
Modified: trunk/debian/xorg/debian/xserver-xorg.NEWS
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.NEWS 2006-04-25 04:16:08 UTC (rev 1967)
+++ trunk/debian/xorg/debian/xserver-xorg.NEWS 2006-04-25 05:16:07 UTC (rev 1968)
@@ -10,4 +10,8 @@
Your old xorg.conf is backed up before this is done so you can revert
any changes we make automatically.
+ Note that there is a bug in the script that allows for duplicate font
+ paths entries after migration. While these should be harmless, you may
+ want to clean them out if they do occur in your xorg.conf.
+
-- David Nusinow <dnusinow@debian.org> Mon, 24 Apr 2006 22:39:08 -0400
Modified: trunk/debian/xorg/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-04-25 04:16:08 UTC (rev 1967)
+++ trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-04-25 05:16:07 UTC (rev 1968)
@@ -819,19 +819,42 @@
# I'm going to get in so much shit for this...
warn "$XORGCONFIG has been customized, but we need to make updates. Backing up your config to $BACKUP_XORGCONFIG. If we screw something up, restore using this file."
cp "$XORGCONFIG" "$BACKUP_XORGCONFIG"
- # Dump obsolete modules
- sed -i -e '/^.*Load.*glcore.*$/d' -e '/^.*Load.*speedo.*$/d' $XORGCONFIG
- # Change font paths for the fonts xorg-x11 used to ship
- sed -i -e 's/usr\/lib\/X11\/fonts\/misc/usr\/share\/fonts\/X11\/misc/g' $XORGCONFIG
- sed -i -e 's/usr\/lib\/X11\/fonts\/cyrillic/usr\/share\/fonts\/X11\/cyrillic/g' $XORGCONFIG
- sed -i -e 's/usr\/lib\/X11\/fonts\/100dpi/usr\/share\/fonts\/X11\/100dpi/g' $XORGCONFIG
- sed -i -e 's/usr\/lib\/X11\/fonts\/75dpi/usr\/share\/fonts\/X11\/75dpi/g' $XORGCONFIG
- sed -i -e 's/usr\/lib\/X11\/fonts\/Type1/usr\/share\/fonts\/X11\/Type1/g' $XORGCONFIG
- sed -i -e 's/usr\/lib\/X11\/fonts\/CID/usr\/share\/fonts\/X11\/CID/g' $XORGCONFIG
- # Delete the module path
- sed -i -e '/^.*ModulePath.*$/d' $XORGCONFIG
- # Delete the rgb path
- sed -i -e '/^.*RgbPath.*$/d' $XORGCONFIG
+ sed -e'
+ # Dump obsolete modules
+ /^[[:space:]]*Section[[:space:]]\+"Module"[[:space:]]*$/,/^[[:space:]]*EndSection[[:space:]]*$/ {
+ /^[[:space:]]*Load[[:space:]]\+"GLcore"[[:space:]]*$/d
+ /^[[:space:]]*Load[[:space:]]\+"speedo"[[:space:]]*$/d
+ }
+ /^[[:space:]]*Section[[:space:]]\+"Files"[[:space:]]*$/,/*[[:space:]]*EndSection[[:space:]]*$/ {
+ # Delete the module path
+ /^[[:space:]]*ModulePath[[:space:]]\+/d
+ # Delete the rgb path
+ /^[[:space:]]*RgbPath[[:space:]]\+/d
+ # Change font paths for the fonts xorg-x11 used to ship
+ #/^[[:space:]]*FontPath[[:space:]]\+"\/usr\/share\/fonts\/X11\/misc"[[:space:]]*$/d
+ #/^[[:space:]]*FontPath[[:space:]]\+"\/usr\/share\/fonts\/X11\/cyrillic"[[:space:]]*$/d
+ #/^[[:space:]]*FontPath[[:space:]]\+"\/usr\/share\/fonts\/X11\/100dpi"[[:space:]]*$/d
+ #/^[[:space:]]*FontPath[[:space:]]\+"\/usr\/share\/fonts\/X11\/75dpi"[[:space:]]*$/d
+ #/^[[:space:]]*FontPath[[:space:]]\+"\/usr\/share\/fonts\/X11\/Type1"[[:space:]]*$/d
+ #/^[[:space:]]*FontPath[[:space:]]\+"\/usr\/share\/fonts\/X11\/CID"[[:space:]]*$/d
+ #/^[[:space:]]*FontPath[[:space:]]\+"\/usr\/share\/fonts\/X11\/Speedo"[[:space:]]*$/d
+ /^[[:space:]]*FontPath[[:space:]]\+"\/usr\/lib\/X11\/fonts\/misc"[[:space:]]*$/i\
+ FontPath "/usr/share/fonts/X11/misc"
+ /^[[:space:]]*FontPath[[:space:]]\+"\/usr\/lib\/X11\/fonts\/cyrillic"[[:space:]]*$/i\
+ FontPath "/usr/share/fonts/X11/cyrillic"
+ /^[[:space:]]*FontPath[[:space:]]\+"\/usr\/lib\/X11\/fonts\/100dpi"[[:space:]]*$/i\
+ FontPath "/usr/share/fonts/X11/100dpi"
+ /^[[:space:]]*FontPath[[:space:]]\+"\/usr\/lib\/X11\/fonts\/75dpi"[[:space:]]*$/i\
+ FontPath "/usr/share/fonts/X11/75dpi"
+ /^[[:space:]]*FontPath[[:space:]]\+"\/usr\/lib\/X11\/fonts\/Type1"[[:space:]]*$/i\
+ FontPath "/usr/share/fonts/X11/Type1"
+ /^[[:space:]]*FontPath[[:space:]]\+"\/usr\/lib\/X11\/fonts\/CID"[[:space:]]*$/i\
+ FontPath "/usr/share/fonts/X11/CID"
+ }
+ ' $XORGCONFIG > ${XORGCONFIG}.madwizard-new
+ chown --reference=$XORGCONFIG ${XORGCONFIG}.madwizard-new
+ chmod --reference=$XORGCONFIG ${XORGCONFIG}.madwizard-new
+ mv ${XORGCONFIG}.madwizard-new $XORGCONFIG
fi
else
debug_echo "not updating $XORGCONFIG; we're upgrading"
Reply to: