debian/changelog | 8 ++++++++
debian/xkb-data.postinst.in | 6 +++++-
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit ccbe464c5164396bc0f41f2bb81a502c97e7fa89
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Nov 30 13:43:23 2009 +0100
xkb-data.postinst: don't error out if /etc/X11/xkb is a symlink
Apparently some people have /etc/X11/xkb as a symlink, which makes rmdir
fail. Try to handle that case as well (closes: #558761). Thanks, Arjan
Opmeer!
diff --git a/debian/changelog b/debian/changelog
index 16cbc73..f6ff96a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xkeyboard-config (1.7-2) UNRELEASED; urgency=low
+
+ * Apparently some people have /etc/X11/xkb as a symlink, which makes rmdir
+ fail. Try to handle that case as well (closes: #558761). Thanks, Arjan
+ Opmeer!
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 30 Nov 2009 13:42:03 +0100
+
xkeyboard-config (1.7-1) unstable; urgency=low
[ David Nusinow ]
diff --git a/debian/xkb-data.postinst.in b/debian/xkb-data.postinst.in
index cb4429e..ef5279e 100644
--- a/debian/xkb-data.postinst.in
+++ b/debian/xkb-data.postinst.in
@@ -11,7 +11,11 @@ case $1 in
configure)
if dpkg --compare-versions "$2" lt-nl 1.6-2; then
remove_conffile_commit /etc/X11/xkb/base.xml
- rmdir --ignore-fail-on-non-empty /etc/X11/xkb 2>/dev/null
+ if [ -h /etc/X11/xkb ]; then
+ rm /etc/X11/xkb
+ elif [ -d /etc/X11/xkb ]; then
+ rmdir --ignore-fail-on-non-empty /etc/X11/xkb
+ fi
fi
;;
esac
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
