X Strike Force X.Org X11 SVN commit: r2094 - trunk/debian/xorg/debian

[X Strike Force SVN Repository Admin]

Author: dnusinow
Date: 2006-05-04 20:27:38 -0400 (Thu, 04 May 2006)
New Revision: 2094

Modified:
   trunk/debian/xorg/debian/changelog
   trunk/debian/xorg/debian/x11-common.postinst.in
Log:
* Have x11-common move Xsession.xfree86 back to Xsession if Xsession doesn't
  exist. This is to clean up the mess made on last upload

Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog  2006-05-04 23:16:22 UTC (rev 2093)
+++ trunk/debian/xorg/debian/changelog  2006-05-05 00:27:38 UTC (rev 2094)
@@ -15,8 +15,12 @@
     include xserver-xorg-input-synaptics on m68k and the newly released
     xserver-xorg-input-wacom driver.
 
- -- David Martínez Moreno <[EMAIL PROTECTED]>  Thu,  4 May 2006 18:52:16 +0200
+  [ David Nusinow ]
+  * Have x11-common move Xsession.xfree86 back to Xsession if Xsession doesn't
+    exist. This is to clean up the mess made on last upload
 
+ -- David Nusinow <[EMAIL PROTECTED]>  Thu,  4 May 2006 20:26:57 -0400
+
 xorg (1:7.0.16) unstable; urgency=low
 
   [ David Nusinow ]

Modified: trunk/debian/xorg/debian/x11-common.postinst.in
===================================================================
--- trunk/debian/xorg/debian/x11-common.postinst.in     2006-05-04 23:16:22 UTC 
(rev 2093)
+++ trunk/debian/xorg/debian/x11-common.postinst.in     2006-05-05 00:27:38 UTC 
(rev 2094)
@@ -116,6 +116,13 @@
   observe "not updating $XWRAPPER_CONFIG; file does not exist"
 fi
 
+# Clean up my idiocy
+if [ -z "$UPGRADE" ] && [ dpkg --compare-versions "$2" eq "1:7.0.16" ]; then
+  if [ -e "/etc/X11/Xsession.xfree86" ] && [ ! -e "/etc/X11/Xsession" ]; then
+    mv "/etc/X11/Xsession.xfree86" "/etc/X11/Xsession"
+  fi
+fi
+
 #DEBHELPER#
 
 exit 0


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]