xorg: Changes to 'debian-unstable'
debian/changelog | 1 +
debian/xbase-clients.postinst.in | 20 ++++++++++++++++++++
debian/xbase-clients.postrm.in | 20 ++++++++++++++++++++
debian/xbase-clients.preinst.in | 20 ++++++++++++++++++++
4 files changed, 61 insertions(+)
New commits:
commit 3339a69a819e51a3e0dcb0d5a2ffe1e586b4910d
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 3 02:35:26 2009 +0200
On upgrade, remove leftover conffile from beforelight
Closes: #454219
diff --git a/debian/changelog b/debian/changelog
index 5bfb609..9f7d71b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
* Get rid of the remaining xserver-xorg debconf question (Bus ID).
Detection of the primary device should happen in the kernel and/or X
server. With this change, we don't generate any xorg.conf anymore.
+ * On upgrade, remove leftover conffile from beforelight (closes: #454219).
[ Debconf translations ]
* Bengali added
diff --git a/debian/xbase-clients.postinst.in b/debian/xbase-clients.postinst.in
new file mode 100644
index 0000000..10b168f
--- /dev/null
+++ b/debian/xbase-clients.postinst.in
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=xbase-clients
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+case $1 in
+ configure)
+ if dpkg --compare-versions "$2" lt-nl 1:7.4+2; then
+ remove_conffile_commit /etc/X11/app-defaults/Beforelight
+ fi
+ ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sw=2 ts=2 tw=80:
diff --git a/debian/xbase-clients.postrm.in b/debian/xbase-clients.postrm.in
new file mode 100644
index 0000000..361cc66
--- /dev/null
+++ b/debian/xbase-clients.postrm.in
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=xbase-clients
+THIS_SCRIPT=postrm
+
+#INCLUDE_SHELL_LIB#
+
+case $1 in
+ abort-install|abort-upgrade)
+ if dpkg --compare-versions "$2" lt-nl 1:7.4+2; then
+ remove_conffile_rollback /etc/X11/app-defaults/Beforelight
+ fi
+ ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sw=2 ts=2 tw=80:
diff --git a/debian/xbase-clients.preinst.in b/debian/xbase-clients.preinst.in
new file mode 100644
index 0000000..9428c1d
--- /dev/null
+++ b/debian/xbase-clients.preinst.in
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=xbase-clients
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+case $1 in
+ upgrade|install)
+ if dpkg --compare-versions "$2" lt-nl 1:7.4+2; then
+ remove_conffile_lookup $THIS_PACKAGE /etc/X11/app-defaults/Beforelight
+ fi
+ ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sw=2 ts=2 tw=80:
Reply to: