X Strike Force X.Org X11 SVN commit: r1787 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-04-13 23:51:14 -0400 (Thu, 13 Apr 2006)
New Revision: 1787
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/xserver-xorg.preinst.in
Log:
* Ensure that config file md5sum gets migrated from /var/lib/xfree86 to
/var/libx11. To do so, separate the test for it from the roster file in
the xserver-xorg preinst.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-04-14 03:47:04 UTC (rev 1786)
+++ trunk/debian/xorg/debian/changelog 2006-04-14 03:51:14 UTC (rev 1787)
@@ -31,8 +31,11 @@
Manterola. (closes: #362255)
* Document the metapackage name change in x11-common's NEWS.Debian.
* Have xserver-xorg depend on xbase-clients
+ * Ensure that config file md5sum gets migrated from /var/lib/xfree86 to
+ /var/libx11. To do so, separate the test for it from the roster file in
+ the xserver-xorg preinst.
- -- David Nusinow <dnusinow@debian.org> Thu, 13 Apr 2006 23:03:09 -0400
+ -- David Nusinow <dnusinow@debian.org> Thu, 13 Apr 2006 23:50:33 -0400
xorg (1:7.0.10) unstable; urgency=low
Modified: trunk/debian/xorg/debian/xserver-xorg.preinst.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.preinst.in 2006-04-14 03:47:04 UTC (rev 1786)
+++ trunk/debian/xorg/debian/xserver-xorg.preinst.in 2006-04-14 03:51:14 UTC (rev 1787)
@@ -44,7 +44,7 @@
# the transition from /var/lib/xfree86 to /var/lib/x11 occurred in
# 7.0.0-0ubuntu1
if [ -n "$UPGRADE" ] && \
- dpkg --compare-versions "$2" lt "7.0.0"; then
+ dpkg --compare-versions "$2" lt "1:7.0.11"; then
if [ -e "/var/lib/xfree86" ]; then
if [ -e "/var/lib/xfree86/$SERVER_SYMLINK_ROSTER_BASE" ] && \
[ -e "/var/lib/xfree86/$SERVER_SYMLINK_CHECKSUM_BASE" ]; then
@@ -61,7 +61,7 @@
if [ -s "/var/lib/xfree86/$SERVER_SYMLINK_ROSTER_BASE.dpkg-tmp" ]; then
# yes, replace the roster file
mv "/var/lib/xfree86/$SERVER_SYMLINK_ROSTER_BASE.dpkg-tmp" \
- "/var/lib/xfree86/$SERVER_SYMLINK_ROSTER_BASE"
+ "$CONFIG_AUX_DIR/$SERVER_SYMLINK_ROSTER_BASE"
else
# no; remove both the original and our temporary copy
rm -f "/var/lib/xfree86/$SERVER_SYMLINK_ROSTER_BASE" \
@@ -78,8 +78,7 @@
fi
fi
- if [ -e "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE" ] && \
- [ -e "/var/lib/xfree86/$XORGCONFIG_CHECKSUM_BASE" ]; then
+ if [ -e "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE" ]; then \
if fgrep -qx "$THIS_PACKAGE" \
"/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE"; then
# construct temporary roster file with our package name removed, ignoring
@@ -98,18 +97,20 @@
# no; remove both the original and our temporary copy
rm -f "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE" \
"/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE.dpkg-tmp"
-
- # migrate the checksum if it doesn't exist
- if [ -e "$XORGCONFIG_CHECKSUM" ]; then
- rm "/var/lib/xfree86/$XORGCONFIG_CHECKSUM_BASE"
- else
- mv "/var/lib/xfree86/$XORGCONFIG_CHECKSUM_BASE" \
- "$XORGCONFIG_CHECKSUM"
- fi
fi
fi
fi
+ if [ -e "/var/lib/xfree86/$XORGCONFIG_CHECKSUM_BASE" ]; then
+ # migrate the checksum if it doesn't exist
+ if [ -e "$XORGCONFIG_CHECKSUM" ]; then
+ rm "/var/lib/xfree86/$XORGCONFIG_CHECKSUM_BASE"
+ else
+ mv "/var/lib/xfree86/$XORGCONFIG_CHECKSUM_BASE" \
+ "$XORGCONFIG_CHECKSUM"
+ fi
+ fi
+
rmdir /var/lib/xfree86 2>/dev/null || true
fi
fi
Reply to: