xorg: Changes to 'debian-experimental'
debian/changelog | 3 ++-
debian/xserver-xorg.preinst.in | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 6a0112d4eb8e56318a3364e7e22290c4f1909263
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 23 14:02:50 2008 +0100
Remove the obsolete /etc/init.d/xserver-xorg
diff --git a/debian/changelog b/debian/changelog
index ee2abc0..7e71a01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ xorg (1:7.4~1) UNRELEASED; urgency=low
[ Brice Goglin ]
* Remove the dependency of xutils against xutils-dev, it was only useful
for transitional purpose in Etch, closes: #418123.
+ * Remove the obsolete /etc/init.d/xserver-xorg, closes: #459507.
- -- Brice Goglin <bgoglin@debian.org> Sun, 23 Mar 2008 11:40:56 +0100
+ -- Brice Goglin <bgoglin@debian.org> Sun, 23 Mar 2008 14:02:30 +0100
xorg (1:7.3+11) UNRELEASED; urgency=low
diff --git a/debian/xserver-xorg.preinst.in b/debian/xserver-xorg.preinst.in
index 9dc06d0..e535ef5 100644
--- a/debian/xserver-xorg.preinst.in
+++ b/debian/xserver-xorg.preinst.in
@@ -94,6 +94,30 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
fi
fi
+rm_conffile() {
+ PKGNAME="$1"
+ CONFFILE="$2"
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" lt "1:7.4~1"; then
+ rm_conffile mypackage "/etc/init.d/xserver-xorg"
+ fi
+esac
+
#DEBHELPER#
exit 0
Reply to: