[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#267503: upgrading from potato -- /etc/X11/Xwrapper.config not created



> Nevertheless, I'll accept a patch if it's clean, as long as that's not
> interpreted as a guarantee of potato->sarge support in general.

Okay, how's this?
I haven't actually downloaded the source and rebuilt the packages to test this 
yet, but it looks good...
If someone else is willing to build some test binaries with this patch, I 
could test those a lot faster than I would get around to downloading & 
building the source myself.
--- xserver-common.preinst.in.orig	2005-01-12 17:56:20.000000000 -0500
+++ xserver-common.preinst.in	2005-01-12 18:00:33.000000000 -0500
@@ -44,7 +44,7 @@
 
   # if performing a fresh install, place config files under management if they
   # do *not* already exist
-  if [ "$1" = "install" ]; then
+  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
@@ -56,7 +56,7 @@
   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 [ "$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: