Author: dnusinow
Date: 2005-09-26 18:48:50 -0500 (Mon, 26 Sep 2005)
New Revision: 621
Modified:
trunk/debian/changelog
trunk/debian/x11-common.preinst.in
Log:
* Have x11-common preinst check for xfree86-common conffile modification. If
there are no modifications, remove them so that dpkg doesn't prompt the
user due to the package name change. Thanks Steve Langasek. (closes: #318688)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-26 02:52:41 UTC (rev 620)
+++ trunk/debian/changelog 2005-09-26 23:48:50 UTC (rev 621)
@@ -29,8 +29,12 @@
xorg.conf.dpkg-new. Thanks Mike O'Connor. (Closes: #319323)
* Add freebsd/003_gnu-kbsd_sessreg.diff to allow GNU/kFreeBSD to use GNU
UTMP. Thanks Robert Millan. (Closes: #325615)
+ * Have x11-common preinst check for xfree86-common conffile modification. If
+ there are no modifications, remove them so that dpkg doesn't prompt the
+ user due to the package name change. Thanks Steve Langasek.
+ (closes: #318688)
- -- David Nusinow <[EMAIL PROTECTED]> Sat, 24 Sep 2005 18:16:25 -0400
+ -- David Nusinow <[EMAIL PROTECTED]> Mon, 26 Sep 2005 19:46:41 -0400
xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
Modified: trunk/debian/x11-common.preinst.in
===================================================================
--- trunk/debian/x11-common.preinst.in 2005-09-26 02:52:41 UTC (rev 620)
+++ trunk/debian/x11-common.preinst.in 2005-09-26 23:48:50 UTC (rev 621)
@@ -42,6 +42,34 @@
b370a42803aec72f27da67ca6a225402
fi
+ # Pre-X.Org packages were named xfree86-common. dpkg doesn't understand that
+ # the conffiles are being transferred, so we'll check to see if they haven't
+ # been modified from the stable sarge version. If they have been modified,
we
+ # don't do anything, but if they are untouched then we remove them to let
the
+ # upgrade continue without errors
+ if dpkg --compare-versions "$2" eq "4.3.0.dfsg.1-14"; then
+ remove_conffile_prepare /etc/X11/Xresources/xfree86-common \
+ a0f3911120c49038cb87607e3c545b90
+ remove_conffile_prepare /etc/X11/Xsession \
+ 196e175a2cd90326da746f5287fd7a2e
+ remove_conffile_prepare /etc/X11/Xsession.d/20xfree86-common_process-args \
+ 234df7ef4e57d97a446c6b81d5dc6ddd
+ remove_conffile_prepare /etc/X11/Xsession.d/30xfree86-common_xresources \
+ e148b414b3f7433ffd9314b86aff3350
+ remove_conffile_prepare
/etc/X11/Xsession.d/50xfree86-common_determine-startup \
+ b93298febffc253a5d90431677cc7c75
+ remove_conffile_prepare /etc/X11/Xsession.d/90xfree86-common_ssh-agent \
+ 0c2826f6163c7219ebbf91abfa251a20
+ remove_conffile_prepare /etc/X11/Xsession.d/99xfree86-common_start \
+ 84ffa95821ba703d6bc203afbfd4bcac
+ remove_conffile_prepare /etc/X11/Xsession.options \
+ e675efbb486930e08bc779cbeb53a44e
+ remove_conffile_prepare /etc/X11/rgb.txt \
+ 4896b3e3380a6a2af1920709bc31b140
+ remove_conffile_prepare /etc/init.d/xfree86-common \
+ 034165e48abb370e9c3e276850755219
+ fi
+
check_symlinks_and_warn /usr/bin/X11 \
/usr/include/X11 \
/usr/lib/X11
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
