[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



Author: dnusinow
Date: 2006-08-21 23:41:43 -0400 (Mon, 21 Aug 2006)
New Revision: 2894

Modified:
   trunk/debian/xorg/debian/changelog
   trunk/debian/xorg/debian/xserver-xorg.postinst.in
Log:
* Steal patch from Ubuntu to recreate missing server symlink checksum that
  was lost on some upgrades. This patch by Fabio.

Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog	2006-08-22 03:25:04 UTC (rev 2893)
+++ trunk/debian/xorg/debian/changelog	2006-08-22 03:41:43 UTC (rev 2894)
@@ -30,8 +30,10 @@
   * Steal patch from Ubuntu to update non-latin keymaps by Colin Watson
   * Steal patch from Ubuntu for xserver-xorg.config to help with the Mac mini
     by Fabio.
+  * Steal patch from Ubuntu to recreate missing server symlink checksum that
+    was lost on some upgrades. This patch by Fabio.
 
- -- David Nusinow <dnusinow@debian.org>  Mon, 21 Aug 2006 23:22:33 +0000
+ -- David Nusinow <dnusinow@debian.org>  Mon, 21 Aug 2006 23:39:50 +0000
 
 xorg (1:7.0.23) unstable; urgency=low
 

Modified: trunk/debian/xorg/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.postinst.in	2006-08-22 03:25:04 UTC (rev 2893)
+++ trunk/debian/xorg/debian/xserver-xorg.postinst.in	2006-08-22 03:41:43 UTC (rev 2894)
@@ -744,6 +744,14 @@
     rm /etc/X11/X
     ln -s $THIS_SERVER /etc/X11/X
   fi
+
+  # apparently on some broken upgrades the SERVER_SYMLINK_CHECKSUM has been 
+  # lost. If it does not exists, make sure to recreate it.
+
+  if [ ! -e "$SERVER_SYMLINK_CHECKSUM" ] && [ -L "$SERVER_SYMLINK" ]; then
+    readlink "$SERVER_SYMLINK" | md5sum > "$SERVER_SYMLINK_CHECKSUM"
+  fi
+
   # compare the current and stored checksums; if they do not match, assume
   # that's the way the user wants it.
   # why, why, why, why, why, why, why are we md5suming this? -daniels



Reply to: