debian/changelog | 9 ++++++++-
debian/rules | 2 +-
debian/x11-common.postinst.in | 8 +++-----
debian/x11-common.postrm.in | 18 ++++++++----------
debian/x11-common.preinst.in | 18 ++++++++----------
5 files changed, 28 insertions(+), 27 deletions(-)
New commits:
commit 91504666cdcbe0c8c3695c29cd6bb99374ecb9f9
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Fri May 20 17:30:03 2011 +0300
Fix whitespace in x11-common.postinst.in
diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index f0f29a1..2e86601 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -41,7 +41,7 @@ if [ -e "$XWRAPPER_CONFIG" ] || [ -z "$UPGRADE" ]; then
ALLOWED_USERS=
if db_get x11-common/xwrapper/actual_allowed_users; then
ALLOWED_USERS="$RET"
- fi
+ fi
if [ -n "$ALLOWED_USERS" ]; then
NEW_XWRAPPER_CONFIG=$(tempfile -m 644)
if ! [ -e "$XWRAPPER_CONFIG" ]; then
commit a5cece8fd27c7cd5a8a16d9acf45788b2248daf4
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Fri May 20 17:27:11 2011 +0300
Rework the x11-common.{postinst,postrm,preinst} failsafe conffile handling
the previous ones added in 1:7.6+4ubuntu1 were wrong too.
diff --git a/debian/changelog b/debian/changelog
index 3a775a6..3ed8943 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ xorg (1:7.6+4ubuntu4) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* rules: A stampfile generation was commented out by mistake, uncomment
it.
+ * Rework the x11-common.{postinst,postrm,preinst} failsafe conffile
+ handling, the previous ones added in 1:7.6+4ubuntu1 were wrong too.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 20 May 2011 17:07:13 +0300
diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index 8e38199..f0f29a1 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -23,15 +23,13 @@
XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_ROSTER_BASE"
case "$1" in
configure)
- if dpkg --compare-versions "$2" lt-nl "1:7.6+4ubuntu1"; then
+ if dpkg --compare-versions "$2" lt-nl "1:7.6+4ubuntu4"; then
remove_conffile_commit "/etc/gdm/failsafe-xorg.conf"
+ remove_conffile_commit "/etc/gdm/failsafeBlacklist"
remove_conffile_commit "/etc/gdm/failsafeDexconf"
remove_conffile_commit "/etc/gdm/failsafeDexconf.old"
remove_conffile_commit "/etc/gdm/failsafeHelpmsg"
remove_conffile_commit "/etc/gdm/failsafeInstall"
- fi
- if dpkg --compare-versions "$2" lt-nl "1:7.6+4ubuntu4"; then
- remove_conffile_commit "/etc/gdm/failsafeBlacklist"
remove_conffile_commit "/etc/gdm/failsafeXServer"
remove_conffile_commit "/etc/gdm/failsafeXinit"
fi
diff --git a/debian/x11-common.postrm.in b/debian/x11-common.postrm.in
index 91a5961..6d54cfb 100644
--- a/debian/x11-common.postrm.in
+++ b/debian/x11-common.postrm.in
@@ -20,17 +20,15 @@
XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/${XWRAPPER_CONFIG##*/}.roster"
case "$1" in
abort-install|abort-upgrade)
- if dpkg --compare-versions "$2" lt-nl "1:7.6+4ubuntu1"; then
- remove_conffile_commit "/etc/gdm/failsafe-xorg.conf"
- remove_conffile_commit "/etc/gdm/failsafeDexconf"
- remove_conffile_commit "/etc/gdm/failsafeDexconf.old"
- remove_conffile_commit "/etc/gdm/failsafeHelpmsg"
- remove_conffile_commit "/etc/gdm/failsafeInstall"
- fi
if dpkg --compare-versions "$2" lt-nl "1:7.6+4ubuntu4"; then
- remove_conffile_commit "/etc/gdm/failsafeBlacklist"
- remove_conffile_commit "/etc/gdm/failsafeXServer"
- remove_conffile_commit "/etc/gdm/failsafeXinit"
+ remove_conffile_rollback "/etc/gdm/failsafe-xorg.conf"
+ remove_conffile_rollback "/etc/gdm/failsafeBlacklist"
+ remove_conffile_rollback "/etc/gdm/failsafeDexconf"
+ remove_conffile_rollback "/etc/gdm/failsafeDexconf.old"
+ remove_conffile_rollback "/etc/gdm/failsafeHelpmsg"
+ remove_conffile_rollback "/etc/gdm/failsafeInstall"
+ remove_conffile_rollback "/etc/gdm/failsafeXServer"
+ remove_conffile_rollback "/etc/gdm/failsafeXinit"
fi
esac
diff --git a/debian/x11-common.preinst.in b/debian/x11-common.preinst.in
index 45dd07c..6fbfae1 100644
--- a/debian/x11-common.preinst.in
+++ b/debian/x11-common.preinst.in
@@ -16,17 +16,15 @@ CONFIG_DIR=/etc/X11
#INCLUDE_SHELL_LIB#
if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
- if dpkg --compare-versions "$2" lt-nl "1:7.6+4ubuntu1"; then
- remove_conffile_commit "/etc/gdm/failsafe-xorg.conf"
- remove_conffile_commit "/etc/gdm/failsafeDexconf"
- remove_conffile_commit "/etc/gdm/failsafeDexconf.old"
- remove_conffile_commit "/etc/gdm/failsafeHelpmsg"
- remove_conffile_commit "/etc/gdm/failsafeInstall"
- fi
if dpkg --compare-versions "$2" lt-nl "1:7.6+4ubuntu4"; then
- remove_conffile_commit "/etc/gdm/failsafeXBackup"
- remove_conffile_commit "/etc/gdm/failsafeXServer"
- remove_conffile_commit "/etc/gdm/failsafeXinit"
+ remove_conffile_lookup x11-common "/etc/gdm/failsafe-xorg.conf"
+ remove_conffile_lookup x11-common "/etc/gdm/failsafeBlacklist"
+ remove_conffile_lookup x11-common "/etc/gdm/failsafeDexconf"
+ remove_conffile_lookup x11-common "/etc/gdm/failsafeDexconf.old"
+ remove_conffile_lookup x11-common "/etc/gdm/failsafeHelpmsg"
+ remove_conffile_lookup x11-common "/etc/gdm/failsafeInstall"
+ remove_conffile_lookup x11-common "/etc/gdm/failsafeXServer"
+ remove_conffile_lookup x11-common "/etc/gdm/failsafeXinit"
fi
fi
commit eca0b91e6e0e1019485bb12e44415629aac92db1
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Fri May 20 17:08:07 2011 +0300
rules: A stampfile generation was commented out by mistake, uncomment it.
diff --git a/debian/changelog b/debian/changelog
index e7e7e59..3a775a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xorg (1:7.6+4ubuntu4) UNRELEASED; urgency=low
+ [ Bryce Harrington ]
* apport/source_xorg.py:
- Move Failsafe-X out of the xorg package to xdiagnose
(LP: #480744)
@@ -10,7 +11,11 @@ xorg (1:7.6+4ubuntu4) UNRELEASED; urgency=low
call makes bug reports a bit cluttered since it adds a lot of lines to
the report itself.
- -- Bryce Harrington <br...@ubuntu.com> Wed, 18 May 2011 03:14:19 +0200
+ [ Timo Aaltonen ]
+ * rules: A stampfile generation was commented out by mistake, uncomment
+ it.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 20 May 2011 17:07:13 +0300
xorg (1:7.6+4ubuntu3) natty; urgency=low
diff --git a/debian/rules b/debian/rules
index 0196549..7c83937 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ ifneq (,$(filter sparc sparc64,$(DEB_HOST_ARCH)))
endif
# build XSF docs, under xvfb for wkhtmltodpf:
# xvfb-run -- $(MAKE) -C xsf-docs
-# touch $@
+ touch $@
build-arch-only: build
build-all:
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qnqii-0000yv...@alioth.debian.org
