X Strike Force X.Org X11 SVN commit: r634 - trunk/debian
Author: dnusinow
Date: 2005-09-27 22:11:36 -0500 (Tue, 27 Sep 2005)
New Revision: 634
Modified:
trunk/debian/changelog
trunk/debian/xserver-xorg.config.in
Log:
* Don't reset all xserver-xorg debconf templates when "dpkg-reconfigure
xserver-xorg" is called. (closes: #320241)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-28 02:35:38 UTC (rev 633)
+++ trunk/debian/changelog 2005-09-28 03:11:36 UTC (rev 634)
@@ -42,6 +42,8 @@
involves a patch to substitute the default resolutions list in both
the xserver-xorg.preinst and .postinst files using part of
debian/rules. Thanks Robert Millan. (closes: #322902, #330304)
+ * Don't reset all xserver-xorg debconf templates when "dpkg-reconfigure
+ xserver-xorg" is called. (closes: #320241)
[ Branden Robinson ]
* Change xserver-xorg and xserver-xorg-dbg's recommendation of "discover1"
@@ -55,7 +57,7 @@
* Updated Czech translation (cs.po). Thanks, Miroslav Kure (closes:
#327506).
- -- David Nusinow <dnusinow@debian.org> Tue, 27 Sep 2005 22:33:29 -0400
+ -- David Nusinow <dnusinow@debian.org> Tue, 27 Sep 2005 23:10:26 -0400
xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
Modified: trunk/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xserver-xorg.config.in 2005-09-28 02:35:38 UTC (rev 633)
+++ trunk/debian/xserver-xorg.config.in 2005-09-28 03:11:36 UTC (rev 634)
@@ -560,18 +560,6 @@
fi
fi
-# if this argument is given, assume we really want to reconfigure from scratch,
-# using xresprobe; this implies forcing all values back to their defaults
-XORGTEMPLATES="$(debconf-show xserver-xorg | sed -e 's/^\*//g' | awk '{print $1}' | sed -e 's/\:$//g')"
-if [ -n "$RECONFIGURE" ]; then
- if [ -z "$XORG_FORCE_PROBE" ] || [ "$XORG_FORCE_PROBE" = "yes" ]; then
- debug_echo "resetting all values."
- for i in $XORGTEMPLATES; do
- db_reset $i
- done
- fi
-fi
-
debug_echo "Configuring $THIS_PACKAGE."
# default X server
Reply to: