X Strike Force X.Org X11 SVN commit: r1965 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-04-24 23:55:31 -0400 (Mon, 24 Apr 2006)
New Revision: 1965
Added:
trunk/debian/xorg/debian/xserver-xorg.NEWS
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/xserver-xorg.postinst.in
Log:
* On upgrade, we now are forcing people with custom configs to have some
upgrading done on their xorg.confs. Naturally, we back up modified
xorg.conf's before modifying them. We now do the following:
+ Remove lines to load the glcore and speedo modules
+ 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
* Document the above in NEWS.Debian
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-04-25 03:24:02 UTC (rev 1964)
+++ trunk/debian/xorg/debian/changelog 2006-04-25 03:55:31 UTC (rev 1965)
@@ -47,8 +47,16 @@
Ucko. (closes: #364113)
* Re-add XF86Config-4 -> xorg.conf code in xserver-xorg.config. Thanks to
Steve Langasek for catching this. (closes: #362728)
+ * On upgrade, we now are forcing people with custom configs to have some
+ upgrading done on their xorg.confs. Naturally, we back up modified
+ xorg.conf's before modifying them. We now do the following:
+ + Remove lines to load the glcore and speedo modules
+ + 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
+ * Document the above in NEWS.Debian
- -- David Nusinow <dnusinow@debian.org> Mon, 24 Apr 2006 20:46:19 -0400
+ -- David Nusinow <dnusinow@debian.org> Mon, 24 Apr 2006 23:55:37 -0400
xorg (1:7.0.14) unstable; urgency=low
Copied: trunk/debian/xorg/debian/xserver-xorg.NEWS (from rev 1957, trunk/xserver/xorg-server-1.0.2/debian/xserver-xorg-core.NEWS)
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/xserver-xorg-core.NEWS 2006-04-24 22:54:01 UTC (rev 1957)
+++ trunk/debian/xorg/debian/xserver-xorg.NEWS 2006-04-25 03:55:31 UTC (rev 1965)
@@ -0,0 +1,13 @@
+xserver-xorg (1:7.0.15) unstable; urgency=low
+
+ * As of this release, we now begin actively modifying customized
+ xorg.conf's. We now do the following:
+ + Remove lines to load the glcore and speedo modules
+ + 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
+
+ Your old xorg.conf is backed up before this is done so you can revert
+ any changes we make automatically.
+
+ -- 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 03:24:02 UTC (rev 1964)
+++ trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-04-25 03:55:31 UTC (rev 1965)
@@ -779,7 +779,7 @@
fi
# here's a novel concept: DON'T TOUCH THE CONFIG ON UPGRADES
-if [ -z "$UPGRADE" ] || [ dpkg --compare-versions "$2" le "1:7.0.11" ]; then
+if [ -z "$UPGRADE" ] || [ dpkg --compare-versions "$2" le "1:7.0.14" ]; then
# compare the current and stored checksums; if they do not match, assume
# that's the way the user wants it. if we're reconfiguring, overwrite
# it regardless and back it up.
@@ -816,7 +816,22 @@
fi
rm -f "$NEW_XORGCONFIG"
else
- warn "not updating $XORGCONFIG; file has been customized"
+ # 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 $XORGCONFIG.old. If we screw something up, restore using this file."
+ cp $XORGCONFIG $XORGCONFIG.old
+ # 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
fi
else
debug_echo "not updating $XORGCONFIG; we're upgrading"
Reply to: