xorg-server: Changes to 'debian-experimental'

[Loïc Minier <lool@alioth.debian.org>]

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

New commits:
commit 72362062318c15d5e3cbc5a4f6e53e2601a01b00
Author: Loïc Minier <lool@dooz.org>
Date:   Wed Oct 15 21:50:44 2008 +0200

    Shut up rmdir error when trying to remove dirs; this might confuse debconf.

diff --git a/debian/changelog b/debian/changelog
index 76e2ffd..5e7bea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.5.2-2) UNRELEASED; urgency=low
+
+  * Shut up rmdir error when trying to remove dirs; this might confuse
+    debconf.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 15 Oct 2008 21:50:15 +0200
+
 xorg-server (2:1.5.2-1) experimental; urgency=low
 
   * New upstream bugfix release.
diff --git a/debian/xserver-xorg-core.postinst.in b/debian/xserver-xorg-core.postinst.in
index d047bb1..a8cb2a2 100644
--- a/debian/xserver-xorg-core.postinst.in
+++ b/debian/xserver-xorg-core.postinst.in
@@ -11,7 +11,7 @@ case "$1" in
   configure)
   if dpkg --compare-versions "$2" lt-nl 2:1.5.2-1; then
     remove_conffile_commit /etc/X11/xserver/SecurityPolicy
-    rmdir /etc/X11/xserver || true
+    rmdir /etc/X11/xserver 2>/dev/null || true
   fi
 esac