x11-apps: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/x11-apps.postinst.in | 20 --------------------
debian/x11-apps.postrm.in | 20 --------------------
debian/x11-apps.preinst.in | 20 --------------------
4 files changed, 7 insertions(+), 60 deletions(-)
New commits:
commit 8bac5db6f3ce382f1ed5cfb80003ddefa1c71043
Author: Steve Langasek <vorlon@debian.org>
Date: Fri Mar 12 11:36:50 2010 -0800
Since we have xedit again, drop the conffile removal handling from the maintainer scripts. LP: #518045.
diff --git a/debian/changelog b/debian/changelog
index dde49c4..47d661a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-apps (7.5+4) UNRELEASED; urgency=low
+
+ * Since we have xedit again, drop the conffile removal handling from the
+ maintainer scripts. LP: #518045.
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 12 Mar 2010 11:32:04 -0800
+
x11-apps (7.5+3) unstable; urgency=low
* Add 01_xedit_mkdir_races.diff to fix FTBFS, closes: #569430.
diff --git a/debian/x11-apps.postinst.in b/debian/x11-apps.postinst.in
deleted file mode 100644
index a984869..0000000
--- a/debian/x11-apps.postinst.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=x11-apps
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- configure)
- if dpkg --compare-versions "$2" lt-nl "7.3+4"; then
- remove_conffile_commit "/etc/X11/app-defaults/Xedit"
- remove_conffile_commit "/etc/X11/app-defaults/Xedit-color"
- fi
-esac
-
-#DEBHELPER#
-
-# vim:set ai et sts=2 sw=2 tw=0:
diff --git a/debian/x11-apps.postrm.in b/debian/x11-apps.postrm.in
deleted file mode 100644
index 2344983..0000000
--- a/debian/x11-apps.postrm.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=x11-apps
-THIS_SCRIPT=postrm
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- abort-install|abort-upgrade)
- if dpkg --compare-versions "$2" lt-nl "7.3+4"; then
- remove_conffile_rollback "/etc/X11/app-defaults/Xedit"
- remove_conffile_rollback "/etc/X11/app-defaults/Xedit-color"
- fi
-esac
-
-#DEBHELPER#
-
-# vim:set ai et sts=2 sw=2 tw=0:
diff --git a/debian/x11-apps.preinst.in b/debian/x11-apps.preinst.in
deleted file mode 100644
index 86ad37e..0000000
--- a/debian/x11-apps.preinst.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=x11-apps
-THIS_SCRIPT=preinst
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- install|upgrade)
- if dpkg --compare-versions "$2" lt-nl "7.3+4"; then
- remove_conffile_lookup $THIS_PACKAGE "/etc/X11/app-defaults/Xedit"
- remove_conffile_lookup $THIS_PACKAGE "/etc/X11/app-defaults/Xedit-color"
- fi
-esac
-
-#DEBHELPER#
-
-# vim:set ai et sts=2 sw=2 tw=0:
Reply to: