xorg-server: Changes to 'ubuntu'

[Alberto Milone <tseliot-guest@alioth.debian.org>]

 debian/changelog                    |    8 ++++++++
 debian/xserver-xorg-core.preinst.in |    4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit c198370f2e692df6486b7cc3ad83be6eeb53d522
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Jan 14 12:54:26 2010 +0100

    * Release 2:1.7.3.902-1ubuntu6
    * debian/xserver-xorg-core.preinst.in:
      - Correct the name of the alternative that we need to remove.
        Thanks to Steve Langasek for spotting the error.

diff --git a/debian/changelog b/debian/changelog
index 8a5acba..438699e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.7.3.902-1ubuntu6) lucid; urgency=low
+
+  * debian/xserver-xorg-core.preinst.in:
+    - Correct the name of the alternative that we need to remove.
+      Thanks to Steve Langasek for spotting the error.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 14 Jan 2010 12:50:19 +0100
+
 xorg-server (2:1.7.3.902-1ubuntu5) lucid; urgency=low
 
   * debian/xserver-xorg-core.preinst.in:
diff --git a/debian/xserver-xorg-core.preinst.in b/debian/xserver-xorg-core.preinst.in
index 21e9fcb..11e9f41 100644
--- a/debian/xserver-xorg-core.preinst.in
+++ b/debian/xserver-xorg-core.preinst.in
@@ -13,8 +13,8 @@ upgrade|install)
     remove_conffile_lookup xserver-xorg-core /etc/X11/xserver/SecurityPolicy
   fi
 
-  if dpkg --compare-versions "$2" lt-nl 2:1.7.3.902-1ubuntu5; then 
-    update-alternatives --remove gl_conf /usr/lib/standard-x11/standard.conf || true
+  if dpkg --compare-versions "$2" lt-nl 2:1.7.3.902-1ubuntu6; then 
+    update-alternatives --remove gl_conf /usr/lib/standard-x11/ld.so.conf || true
   fi
 esac