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

xorg-server: Changes to 'ubuntu'



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

New commits:
commit 101b3e638c9763a0b087fe7d30fdc385c94abcf2
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Jan 14 00:52:47 2010 +0100

    * Release 2:1.7.3.902-1ubuntu5.
    * debian/xserver-xorg-core.preinst.in:
      - Make sure that the alternative which was previously provided by
        xserver-xorg-core is removed.

diff --git a/debian/changelog b/debian/changelog
index 78438c0..8a5acba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.7.3.902-1ubuntu5) lucid; urgency=low
+
+  * debian/xserver-xorg-core.preinst.in:
+    - Make sure that the alternative which was previously provided by
+      xserver-xorg-core is removed.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Tue, 12 Jan 2010 11:37:49 +0100
+
 xorg-server (2:1.7.3.902-1ubuntu4) lucid; urgency=low
 
   * debian/patches/191-Xorg-add-an-extra-module-path.patch:
diff --git a/debian/xserver-xorg-core.preinst.in b/debian/xserver-xorg-core.preinst.in
index c1b84a2..21e9fcb 100644
--- a/debian/xserver-xorg-core.preinst.in
+++ b/debian/xserver-xorg-core.preinst.in
@@ -12,6 +12,10 @@ upgrade|install)
   if dpkg --compare-versions "$2" lt-nl 2:1.5.2-1; then
     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
+  fi
 esac
 
 #DEBHELPER#


Reply to: