X Strike Force X.Org X11 SVN commit: r665 - trunk/debian

[X Strike Force SVN Repository Admin]

Author: dnusinow
Date: 2005-10-06 18:51:51 -0500 (Thu, 06 Oct 2005)
New Revision: 665

Modified:
   trunk/debian/changelog
   trunk/debian/xserver-xorg.config.in
Log:
* Back out change from last revision that reset all debconf questions with
  "autodetect" in their name no matter what. This is unnecessary and only
  lead to annoyances. (closes: #332336)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2005-10-06 16:44:49 UTC (rev 664)
+++ trunk/debian/changelog      2005-10-06 23:51:51 UTC (rev 665)
@@ -6,8 +6,13 @@
     with packages that are not in stable, some even in oldstable, or others 
even
     from before.
 
- -- David Martínez Moreno <[EMAIL PROTECTED]>  Thu,  6 Oct 2005 18:40:16 +0200
+  [ David Nusinow ]
+  * Back out change from last revision that reset all debconf questions with
+    "autodetect" in their name no matter what. This is unnecessary and only
+    lead to annoyances. (closes: #332336)
 
+ -- David Nusinow <[EMAIL PROTECTED]>  Thu,  6 Oct 2005 19:48:30 -0400
+
 xorg-x11 (6.8.2.dfsg.1-8) unstable; urgency=low
 
   [ Denis Barbier ]

Modified: trunk/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xserver-xorg.config.in 2005-10-06 16:44:49 UTC (rev 664)
+++ trunk/debian/xserver-xorg.config.in 2005-10-06 23:51:51 UTC (rev 665)
@@ -332,10 +332,6 @@
   DEFAULT_ANSWER=$4
   set +e
   debug_echo "auto_answer() \"$INPUT_COMMAND $PRIORITY $TEMPLATE\" with 
default \"$DEFAULT_ANSWER\""
-  if echo $TEMPLATE | grep "autodetect" > /dev/null; then
-    db_reset $TEMPLATE
-    echo "auto_answer() resetting template $TEMPLATE"
-  fi
   db_fget "$TEMPLATE" seen
   # are we re-configuring?
   if [ -z "$FIRSTINST" ] && [ "$RET" = "true" ]; then


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]