xorg-server: Changes to 'ubuntu'
debian/changelog | 7 +++++++
debian/xserver-xorg-core.postinst.in | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 470be858501dc87196d6d298057906ebec44a427
Author: Loïc Minier <lool@dooz.org>
Date: Wed Oct 15 17:57:20 2008 +0200
Release
diff --git a/debian/changelog b/debian/changelog
index 07ed881..f6b972c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.5.2-1ubuntu3) UNRELEASED; urgency=low
+xorg-server (2:1.5.2-1ubuntu3) intrepid; urgency=low
* Shut up rmdir error when trying to remove dirs; this might confuse
debconf.
- -- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 17:56:39 +0200
+ -- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 17:57:13 +0200
xorg-server (2:1.5.2-1ubuntu2) intrepid; urgency=low
commit f56dc1d069cabd626383eaba994ac814c2f383e7
Author: Loïc Minier <lool@dooz.org>
Date: Wed Oct 15 17:57:11 2008 +0200
Shut up rmdir error when trying to remove dirs; this might confuse debconf.
diff --git a/debian/changelog b/debian/changelog
index cae30f0..07ed881 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.5.2-1ubuntu3) 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 17:56:39 +0200
+
xorg-server (2:1.5.2-1ubuntu2) intrepid; urgency=low
* Update patch 142_psb_auto to also try psb and vesa for 0x8109.
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
Reply to: