X Strike Force XFree86 SVN commit: r2142 - trunk/debian
Author: branden
Date: 2005-01-20 02:10:20 -0500 (Thu, 20 Jan 2005)
New Revision: 2142
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/xserver-common.preinst.in
Log:
Enhance xserver-common's preinst script to support upgrades from package
versions between 4.0.1-6 and 4.2.1-10 (thanks, Brian Sammon).
(Closes: #267503)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-01-20 04:22:51 UTC (rev 2141)
+++ trunk/debian/CHANGESETS 2005-01-20 07:10:20 UTC (rev 2142)
@@ -159,4 +159,9 @@
Update XTerm to patch #199 (2004-01-17) from Thomas Dickey's website.
2141
+Enhance xserver-common's preinst script to support upgrades from package
+versions between 4.0.1-6 and 4.2.1-10 (thanks, Brian Sammon).
+(Closes: #267503)
+ 2142
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-01-20 04:22:51 UTC (rev 2141)
+++ trunk/debian/changelog 2005-01-20 07:10:20 UTC (rev 2142)
@@ -124,8 +124,12 @@
* Add copyright notice and GPL license boilerplate to init scripts.
- -- Branden Robinson <branden@debian.org> Wed, 19 Jan 2005 19:25:13 -0500
+ * Enhance xserver-common's preinst script to support upgrades from package
+ versions between 4.0.1-6 and 4.2.1-10 (thanks, Brian Sammon).
+ (Closes: #267503)
+ -- Branden Robinson <branden@debian.org> Thu, 20 Jan 2005 02:07:49 -0500
+
xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
* Upload urgency set to medium due to fix for stable-release-critical bugs
Modified: trunk/debian/xserver-common.preinst.in
===================================================================
--- trunk/debian/xserver-common.preinst.in 2005-01-20 04:22:51 UTC (rev 2141)
+++ trunk/debian/xserver-common.preinst.in 2005-01-20 07:10:20 UTC (rev 2142)
@@ -42,9 +42,11 @@
# implement (simplified) ucf-style configration file handling
- # if performing a fresh install, place config files under management if they
- # do *not* already exist
- if [ "$1" = "install" ]; then
+ # If performing a fresh install or an upgrade from a sufficiently old version,
+ # place config files under management if they do *not* already exist.
+ if [ "$1" = "install" ] \
+ || ( [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt "4.0.1-6" ); \
+ then
if ! [ -e "$XWRAPPER_CONFIG" ]; then
# only proceed if config file auxiliary directory exists
if [ -d "$CONFIG_AUX_DIR" ]; then
@@ -55,8 +57,10 @@
fi
fi
- # if upgrading from < 4.2.1-10, migrate X wrapper config file
- if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt-nl "4.2.1-10"; then
+ # If upgrading from 4.0.1-6 <= version < 4.2.1-10, migrate X wrapper config
+ # file.
+ if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt-nl "4.2.1-10" \
+ && dpkg --compare-versions "$2" ge "4.0.1-6"; then
# do we have a configuration file to work with?
if [ -e "$XWRAPPER_CONFIG" ]; then
# only proceed if config file auxiliary directory exists
Reply to: