xorg: Changes to 'debian-experimental'
debian/changelog | 8 ++++++++
debian/x11-common.preinst.in | 2 +-
debian/xserver-xorg.postinst.in | 4 ++--
debian/xutils.postinst.in | 8 ++++----
4 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 8855ccf3b85df0bfa79bff3efde3125bb3cc2198
Author: Loïc Minier <lool@dooz.org>
Date: Wed Oct 15 22:00:21 2008 +0200
Shut up rmdir errors with 2>/dev/null in all maintainer scripts when trying to remove dirs; this might confuse debconf.
diff --git a/debian/changelog b/debian/changelog
index 74ecf23..8fb1cd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg (1:7.4~5) UNRELEASED; urgency=low
* Also upgrade Driver i810 or via lines which have trailing comments.
+ * Shut up rmdir errors with 2>/dev/null in all maintainer scripts when
+ trying to remove dirs; this might confuse debconf.
-- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 21:52:39 +0200
diff --git a/debian/x11-common.preinst.in b/debian/x11-common.preinst.in
index 1a2ffb5..1d651ba 100644
--- a/debian/x11-common.preinst.in
+++ b/debian/x11-common.preinst.in
@@ -25,7 +25,7 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
# We need to remove /usr/X11R6/bin so we can replace it with a symlink
if [ -d "/usr/X11R6/bin" ] && [ ! -L /usr/X11R6/bin ]; then
- if ! rmdir "/usr/X11R6/bin"; then
+ if ! rmdir "/usr/X11R6/bin" 2>/dev/null; then
run db_fset x11-common/x11r6_bin_not_empty seen false
run db_input critical x11-common/x11r6_bin_not_empty
run db_go
diff --git a/debian/xutils.postinst.in b/debian/xutils.postinst.in
index 7d59502..78b3123 100644
--- a/debian/xutils.postinst.in
+++ b/debian/xutils.postinst.in
@@ -21,10 +21,10 @@ configure)
remove_conffile_commit "/etc/X11/rstart/contexts/x11r6"
remove_conffile_commit "/etc/X11/rstart/config"
remove_conffile_commit "/etc/X11/rstart/rstartd.real"
- rmdir /etc/X11/rstart/commands/x11r6/ || true
- rmdir /etc/X11/rstart/commands/ || true
- rmdir /etc/X11/rstart/contexts/ || true
- rmdir /etc/X11/rstart/ || true
+ rmdir /etc/X11/rstart/commands/x11r6/ 2>/dev/null || true
+ rmdir /etc/X11/rstart/commands/ 2>/dev/null || true
+ rmdir /etc/X11/rstart/contexts/ 2>/dev/null || true
+ rmdir /etc/X11/rstart/ 2>/dev/null || true
fi
esac
commit 5e3beb55713f5ed639464a152dd709a97e0d69b2
Author: Loïc Minier <lool@dooz.org>
Date: Wed Oct 15 21:57:04 2008 +0200
Also upgrade Driver i810 or via lines which have trailing comments.
diff --git a/debian/changelog b/debian/changelog
index 024c2f2..74ecf23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.4~5) UNRELEASED; urgency=low
+
+ * Also upgrade Driver i810 or via lines which have trailing comments.
+
+ -- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 21:52:39 +0200
+
xorg (1:7.4~4) experimental; urgency=low
[ Loic Minier ]
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 7d3f507..629291e 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -958,8 +958,8 @@ elif dpkg --compare-versions "$2" lt-nl "1:7.4~3"; then
if [ -e "$XORGCONFIG" ]; then
sed -e'
/^[[:space:]]*Section[[:space:]]\+"Device"[[:space:]]*$/,/^[[:space:]]*EndSection[[:space:]]*$/ {
- /^[[:space:]]*Driver[[:space:]]\+"i810"[[:space:]]*$/s/i810/intel/
- /^[[:space:]]*Driver[[:space:]]\+"via"[[:space:]]*$/s/via/openchrome/
+ /^[[:space:]]*Driver[[:space:]]\+"i810"/s/i810/intel/
+ /^[[:space:]]*Driver[[:space:]]\+"via"/s/via/openchrome/
}
' $XORGCONFIG > ${XORGCONFIG}.madwizard-new
if ! cmp -s $XORGCONFIG ${XORGCONFIG}.madwizard-new; then
Reply to: