Author: dnusinow
Date: 2006-05-02 22:02:10 -0400 (Tue, 02 May 2006)
New Revision: 2080
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/xserver-xorg.config.in
Log:
emulate3buttons questions when they don't exist. Thanks Rodney Gordon II,
Adam Borowski. Thanks to Steven Brown for a fix. (closes: #365282)
* Remove obsolete zaxismapping debconf question all together during
xserver-xorg config.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-05-03 01:52:55 UTC (rev 2079)
+++ trunk/debian/xorg/debian/changelog 2006-05-03 02:02:10 UTC (rev 2080)
@@ -4,9 +4,10 @@
* Define the backup config file name before we tell people where we're
backing up :-) Thanks Frans Pop and Flavio Stanchin. (closes: 365278)
* Prevent the xserver-xorg config from failing during migration of
- zaxismapping and emulate3buttons questions when they don't exist. Thanks
- Rodney Gordon II, Adam Borowski. Thanks to Steven Brown for a fix.
- (closes: #365282)
+ emulate3buttons questions when they don't exist. Thanks Rodney Gordon II,
+ Adam Borowski. Thanks to Steven Brown for a fix. (closes: #365282)
+ * Remove obsolete zaxismapping debconf question all together during
+ xserver-xorg config.
* Add xfree86-common transitional package. This package is meant to remove
files that were moved to x11-common, like Xsession. Thanks Frank Kuster.
Thanks to Daniel Stone for the fix. (closes: #354146)
@@ -17,7 +18,7 @@
* [ Debconf translations ]
- Updated Brazilian (André Luis Lopes). Closes: #365531
- -- David Nusinow <[EMAIL PROTECTED]> Mon, 1 May 2006 23:14:19 -0400
+ -- David Nusinow <[EMAIL PROTECTED]> Tue, 2 May 2006 22:02:24 -0400
xorg (1:7.0.15) unstable; urgency=low
Modified: trunk/debian/xorg/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.config.in 2006-05-03 01:52:55 UTC
(rev 2079)
+++ trunk/debian/xorg/debian/xserver-xorg.config.in 2006-05-03 02:02:10 UTC
(rev 2080)
@@ -458,8 +458,7 @@
fi
# migrate from old select-type templates
-for TEMPLATE in xserver-xorg/config/inputdevice/mouse/emulate3buttons \
- xserver-xorg/config/inputdevice/mouse/zaxismapping; do
+for TEMPLATE in xserver-xorg/config/inputdevice/mouse/emulate3buttons ; do
db_get "$TEMPLATE" || continue
if [ "$RET" = "Yes" ]; then
db_set $TEMPLATE "true"
@@ -468,6 +467,12 @@
fi
done
+# Delete obsolete templates
+for TEMPLATE in xserver-xorg/config/inputdevice/mouse/zaxismapping; do
+ db_get "$TEMPLATE" || continue
+ db_unregister "$TEMPLATE"
+done
+
# migrate from "expert" to "advanced"
db_get xserver-xorg/config/monitor/selection-method
if [ "$RET" = "Expert" ]; then
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
