xorg: Changes to 'debian-unstable'

[Brice Goglin <bgoglin@alioth.debian.org>]

 debian/changelog                |    6 +++++-
 debian/xserver-xorg.postinst.in |    3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 9d677543d31d9da34efc4cfa4e9575f49c296021
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Jun 22 10:18:13 2008 +0200

    Remove obsolete xserver-xorg startup links

diff --git a/debian/changelog b/debian/changelog
index 9247b7e..ecaac71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 xorg (1:7.3+13) UNRELEASED; urgency=low
 
+  [ Christian Perrier ]
   [ Debconf translations]
   * Malayalam. Closes: #486830
 
- -- Christian Perrier <bubulle@debian.org>  Wed, 18 Jun 2008 18:11:18 +0200
+  [ Brice Goglin ]
+  * Remove obsolete xserver-xorg startup links, closes: #487453.
+
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 22 Jun 2008 10:17:19 +0200
 
 xorg (1:7.3+12) unstable; urgency=low
 
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 9cd8ac1..55d4643 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -1003,6 +1003,9 @@ case "$1" in
     if dpkg --compare-versions "$2" lt-nl "1:7.3+11"; then
       remove_conffile_commit "/etc/init.d/xserver-xorg"
     fi
+    if dpkg --compare-versions "$2" lt-nl "1:7.3+13"; then
+      update-rc.d -f xserver-xorg remove
+    fi
     ;;
 esac