debian/changelog | 7 +++++++
debian/x11-common.postinst.in | 3 +++
debian/x11-common.postrm.in | 3 +++
debian/x11-common.preinst.in | 3 +++
4 files changed, 16 insertions(+)
New commits:
commit 6cd9a37e5902672b4ac0eef093cf1ae276abf292
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Fri Aug 26 13:01:56 2011 +0300
Add '/etc/init/failsafe-x.conf' to the list of old failsafe-x config files
to purge.
diff --git a/debian/changelog b/debian/changelog
index 73fb79e..8a2c372 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.6+7ubuntu7) UNRELEASED; urgency=low
+
+ * Add '/etc/init/failsafe-x.conf' to the list of old failsafe-x config
+ files to purge.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 26 Aug 2011 11:49:20 +0300
+
xorg (1:7.6+7ubuntu6) oneiric; urgency=low
* debian/control: Remove Recommends on xdiagnose as well; apparently it
diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index b834efa..8fe6e97 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -33,6 +33,9 @@ configure)
remove_conffile_commit "/etc/gdm/failsafeXServer"
remove_conffile_commit "/etc/gdm/failsafeXinit"
fi
+ if dpkg --compare-versions "$2" lt-nl "1:7.6+7ubuntu7"; then
+ remove_conffile_commit "/etc/init/failsafe-x.conf"
+ fi
esac
# only mess with config file it exists; otherwise, assume that's the way the
diff --git a/debian/x11-common.postrm.in b/debian/x11-common.postrm.in
index af470e8..e960f71 100644
--- a/debian/x11-common.postrm.in
+++ b/debian/x11-common.postrm.in
@@ -30,6 +30,9 @@ abort-install|abort-upgrade)
remove_conffile_rollback "/etc/gdm/failsafeXServer"
remove_conffile_rollback "/etc/gdm/failsafeXinit"
fi
+ if dpkg --compare-versions "$2" lt-nl "1:7.6+7ubuntu7"; then
+ remove_conffile_rollback "/etc/init/failsafe-x.conf"
+ fi
esac
# clean up non-conffile configuration files and related materials on purge
diff --git a/debian/x11-common.preinst.in b/debian/x11-common.preinst.in
index 3609fa2..290b5c1 100644
--- a/debian/x11-common.preinst.in
+++ b/debian/x11-common.preinst.in
@@ -26,6 +26,9 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
remove_conffile_lookup x11-common "/etc/gdm/failsafeXServer"
remove_conffile_lookup x11-common "/etc/gdm/failsafeXinit"
fi
+ if dpkg --compare-versions "$2" lt-nl "1:7.6+7ubuntu7"; then
+ remove_conffile_lookup x11-common "/etc/init/failsafe-x.conf"
+ fi
fi
#DEBHELPER#
--
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/e1qwtes-0006yi...@vasks.debian.org
