Author: fabbione Date: 2004-10-29 23:53:58 -0500 (Fri, 29 Oct 2004) New Revision: 1979
Modified: branches/ubuntu/debian/changelog branches/ubuntu/debian/po/ca.po branches/ubuntu/debian/po/cs.po branches/ubuntu/debian/po/da.po branches/ubuntu/debian/po/de.po branches/ubuntu/debian/po/el.po branches/ubuntu/debian/po/es.po branches/ubuntu/debian/po/fr.po branches/ubuntu/debian/po/gl.po branches/ubuntu/debian/po/it.po branches/ubuntu/debian/po/ja.po branches/ubuntu/debian/po/nl.po branches/ubuntu/debian/po/pl.po branches/ubuntu/debian/po/pt_BR.po branches/ubuntu/debian/po/ru.po branches/ubuntu/debian/po/sv.po branches/ubuntu/debian/po/templates.pot branches/ubuntu/debian/po/tr.po branches/ubuntu/debian/xserver-xfree86.config.in Log: Import 4.3.0.dfsg.1-6ubuntu3 release. Modified: branches/ubuntu/debian/changelog =================================================================== --- branches/ubuntu/debian/changelog 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/changelog 2004-10-30 04:53:58 UTC (rev 1979) @@ -1,3 +1,13 @@ +xfree86 (4.3.0.dfsg.1-6ubuntu3) warty; urgency=low + + Warty specific changes: + + * Disable mouse autodetection and default to /dev/input/mice. + + * Do not ask if your monitor is LCD. Default to Medium covers all cases. + + -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Sat, 31 Jul 2004 11:27:21 +0200 + xfree86 (4.3.0.dfsg.1-6ubuntu2) warty; urgency=low Warty specific changes: Modified: branches/ubuntu/debian/po/ca.po =================================================================== --- branches/ubuntu/debian/po/ca.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/ca.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: xfree86 4.3.0.dfsg.1-5\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: 2004-06-09 20:08+0200\n" "Last-Translator: Ivan Vilata i Balaguer <[EMAIL PROTECTED]>\n" "Language-Team: Catalan <[email protected]>\n" @@ -77,13 +77,13 @@ "guions d'inici en «/etc/init.d», i deshabiliteu la comprovació de gestor de " "pantalla per defecte.)" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "Voleu detenir el dimoni «xdm»?" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/cs.po =================================================================== --- branches/ubuntu/debian/po/cs.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/cs.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: xfree86\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: 2004-05-29 17:03+0200\n" "Last-Translator: Miroslav Kure <[EMAIL PROTECTED]>\n" "Language-Team: Czech <[EMAIL PROTECTED]>\n" @@ -75,13 +75,13 @@ "upravit jejich spouštěcí skripty v /etc/init.d a zakázat kontrolu " "standardního správce obrazovky.)" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "Chcete zastavit démona xdm?" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/da.po =================================================================== --- branches/ubuntu/debian/po/da.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/da.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: xfree86_4.3.0-3_da\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: 2004-03-02 21:22+0100\n" "Last-Translator: Claus Hindsgaul <[EMAIL PROTECTED]>\n" "Language-Team: Danish <[EMAIL PROTECTED]>\n" @@ -79,13 +79,13 @@ "logindh�ndteringenerne s�ttes op til det. Det g�r du ved at fjerne tjekket " "for standard logindh�ndtering i deres initialiseringsskripter i /etc/init.d.)" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "Vil du stoppe xdm-d�monen?" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/de.po =================================================================== --- branches/ubuntu/debian/po/de.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/de.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -33,8 +33,8 @@ msgid "" msgstr "" "Project-Id-Version: de\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: 2004-07-24 15:03+0200\n" "Last-Translator: Alwin Meschede <[EMAIL PROTECTED]>\n" "Language-Team: <[email protected]>\n" @@ -86,13 +86,13 @@ "jedes der Init-Skripte in /etc/init.d, und schalten Sie den Check nach einem " "Standard-Display-Manager ab.)" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "Soll der xdm-Daemon gestoppt werden?" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/el.po =================================================================== --- branches/ubuntu/debian/po/el.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/el.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: el\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: 2004-05-27 21:10EEST\n" "Last-Translator: Konstantinos Margaritis <[EMAIL PROTECTED]>\n" "Language-Team: Greek <[email protected]>\n" @@ -78,13 +78,13 @@ "εκκίνησής τους στον κατάλογο /etc/init.d, και απενεργοποιήστε τον έλεγχο για " "προκαθορισμένο διαχειριστή οθόνης." -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "Θέλετε να σταματήσετε να χρησιμοποιείτε τον δαίμονα xdm;" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/es.po =================================================================== --- branches/ubuntu/debian/po/es.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/es.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: xfree86 4.2.1-6\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: 2003-03-24 20:21+0100\n" "Last-Translator: Javier Fernandez-Sanguino Pe�a <[EMAIL PROTECTED]>\n" "Language-Team: ES <[email protected]>\n" @@ -79,13 +79,13 @@ "guiones de inicio en /etc/init.d, y desactive el chequeo de un gestor de " "sesiones por defecto)" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "�Desea parar el demonio de xdm?" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/fr.po =================================================================== --- branches/ubuntu/debian/po/fr.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/fr.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -30,8 +30,8 @@ msgid "" msgstr "" "Project-Id-Version: xfree86 4.2.1-10\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: 2004-06-21 08:55+0200\n" "Last-Translator: Christian Perrier <[EMAIL PROTECTED]>\n" "Language-Team: French <[email protected]>\n" @@ -84,13 +84,13 @@ "des gestionnaires graphiques, modifiez leurs scripts de lancement dans /etc/" "init.d, et d�sactivvez le test de gestionnaire graphique par d�faut." -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "Souhaitez-vous arr�ter le d�mon xdm�?" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/gl.po =================================================================== --- branches/ubuntu/debian/po/gl.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/gl.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n" "Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n" @@ -68,13 +68,13 @@ "check for a default display manager.)" msgstr "" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/it.po =================================================================== --- branches/ubuntu/debian/po/it.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/it.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -26,8 +26,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n" "Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n" @@ -77,13 +77,13 @@ "init in /etc/init.d, e disabilitate il controllo per un display manager di " "default.)" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/ja.po =================================================================== --- branches/ubuntu/debian/po/ja.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/ja.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -28,8 +28,8 @@ msgid "" msgstr "" "Project-Id-Version: xfree86 4.3.0\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: 2004-06-25 09:21+0900\n" "Last-Translator: Kenshi Muto <[EMAIL PROTECTED]> and ISHIKAWA Mutsumi " "<[EMAIL PROTECTED]>\n" @@ -80,13 +80,13 @@ "�����������ץȤ��Խ������ǥե����ȥǥ����ץ쥤�ޥ͡������Υ����å���̵���ˤ�" "�Ʋ�������)" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "xdm �ǡ����������ߤ��ޤ���?" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/nl.po =================================================================== --- branches/ubuntu/debian/po/nl.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/nl.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: xfree86\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: 2004-07-04 20:22-0500\n" "Last-Translator: Bart Cornelis <[EMAIL PROTECTED]>\n" "Language-Team: debian-l10n-dutch <[email protected]>\n" @@ -80,13 +80,13 @@ "te passen zodat deze niet controleren of ze de standaard beeldscherm-" "beheerder zijn)" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "Wenst u de xdm-achtergronddienst te stoppen?" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/pl.po =================================================================== --- branches/ubuntu/debian/po/pl.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/pl.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n" "Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n" @@ -76,13 +76,13 @@ "z nich i wy��czaj�c w ich skryptach startowych fragment sprawdzaj�cy " "domy�lny display manager.)" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/pt_BR.po =================================================================== --- branches/ubuntu/debian/po/pt_BR.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/pt_BR.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: xfree86\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: 2004-07-25 15:41-0300\n" "Last-Translator: Andr� Lu�s Lopes <[EMAIL PROTECTED]>\n" "Language-Team: Debian-BR Project <[email protected]>\n" @@ -79,13 +79,13 @@ "seus scripts de inicializa��o em /etc/init.d, e desabilite a checagem por um " "gerenciador de display padr�o.)" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "Deseja parar o daemon xdm ?" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/ru.po =================================================================== --- branches/ubuntu/debian/po/ru.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/ru.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -26,8 +26,8 @@ msgid "" msgstr "" "Project-Id-Version: xfree86_4.2.1-11\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: 2003-10-05 16:57+0600\n" "Last-Translator: Ilgiz Kalmetev <[EMAIL PROTECTED]>\n" "Language-Team: russian <[email protected]>\n" @@ -78,13 +78,13 @@ "�������������� ��������� ��������� ��������, �������������� �� �������� � " "�������� /etc/init.d � ��������� �������� �� �������� �������� �� ���������.)" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "������ ���������� ������-����� xdm?" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/sv.po =================================================================== --- branches/ubuntu/debian/po/sv.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/sv.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n" "Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n" @@ -77,13 +77,13 @@ "olika servrar. F�r att uppn� detta, konfigurera sk�rmhanterarnas initskript " "i /etc/init.d, och st�ng av kollen efter standard sk�rmhanteraren.)" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/templates.pot =================================================================== --- branches/ubuntu/debian/po/templates.pot 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/templates.pot 2004-10-30 04:53:58 UTC (rev 1979) @@ -14,17 +14,21 @@ # info -n '(gettext)PO Files' # info -n '(gettext)Header Entry' # -# Some information specific to po-debconf is available at +# Some information specific to po-debconf are available at # /usr/share/doc/po-debconf/README-trans # or http://www.debian.org/intl/l10n/po-debconf/README-trans # # Developers do not need to manually edit POT or PO files. # +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: 4.3.0.dfsg.1-6+SVN\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n" +"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -62,13 +66,13 @@ "check for a default display manager.)" msgstr "" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/po/tr.po =================================================================== --- branches/ubuntu/debian/po/tr.po 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/po/tr.po 2004-10-30 04:53:58 UTC (rev 1979) @@ -26,8 +26,8 @@ msgid "" msgstr "" "Project-Id-Version: xserver-xfree86\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2004-07-29 02:25:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-31 11:50+0000\n" "PO-Revision-Date: 2004-06-26 16:54+0300\n" "Last-Translator: Osman Yüksel <[EMAIL PROTECTED]>\n" "Language-Team: Turkish <[email protected]>\n" @@ -76,13 +76,13 @@ "değiştirin ve öntanımlı ekran yöneticisini denetleyen işlevleri devre dışı " "bırakın.)" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "Do you wish to stop the xdm daemon?" msgstr "xdm servisini durdurmak istiyor musunuz?" -#. Type: boolean +#. Type: string #. Description #: ../xdm.templates:26 msgid "" Modified: branches/ubuntu/debian/xserver-xfree86.config.in =================================================================== --- branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 04:49:56 UTC (rev 1978) +++ branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 04:53:58 UTC (rev 1979) @@ -881,6 +881,9 @@ # mouse device detection +# Warty changes: skip mouse autodetection completely and use /dev/input/mice per +# default. Let's keep the changes not intrusive, even if less elegant. + # priority of xserver-xfree86/config/inputdevice/mouse/{port,protocol} PRIORITY=high AUTODETECTED_PORT= @@ -903,7 +906,8 @@ # if configuring for the first time, ask if user wants to autodetect if [ -z "$RECONFIGURE" ]; then - db_set xserver-xfree86/autodetect_mouse "true" + # this will exit the loop immediatly + db_set xserver-xfree86/autodetect_mouse "false" while :; do # bail out if autodetection tool not available which mdetect > /dev/null 2>&1 || break @@ -954,8 +958,9 @@ debug_echo "not prompting for mouse autodetection; reconfiguring" fi -db_subst xserver-xfree86/config/inputdevice/mouse/port choices $MOUSE_PORT_CHOICES -auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/mouse/port "${AUTODETECTED_PORT:-$DEFAULT_PORT}" +#db_subst xserver-xfree86/config/inputdevice/mouse/port choices $MOUSE_PORT_CHOICES +#auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/mouse/port "${AUTODETECTED_PORT:-$DEFAULT_PORT}" +db_set xserver-xfree86/config/inputdevice/mouse/port "/dev/input/mice" db_get xserver-xfree86/config/inputdevice/mouse/port case "$RET" in @@ -981,12 +986,12 @@ ;; esac db_subst xserver-xfree86/config/inputdevice/mouse/protocol choices $MOUSE_PROTOCOL_CHOICES -if ! expr "$MOUSE_PROTOCOL_CHOICES" : ".*,.*" > /dev/null 2>&1; then - debug_echo "\$MOUSE_PROTOCOL_CHOICES has only one value; setting xserver-xfree86/config/inputdevice/mouse/protocol to \"$DEFAULT_PROTOCOL\"" +#if ! expr "$MOUSE_PROTOCOL_CHOICES" : ".*,.*" > /dev/null 2>&1; then +# debug_echo "\$MOUSE_PROTOCOL_CHOICES has only one value; setting xserver-xfree86/config/inputdevice/mouse/protocol to \"$DEFAULT_PROTOCOL\"" db_set xserver-xfree86/config/inputdevice/mouse/protocol "$DEFAULT_PROTOCOL" -else - auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/mouse/protocol "${AUTODETECTED_PROTOCOL:-$DEFAULT_PROTOCOL}" -fi +#else +# auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/mouse/protocol "${AUTODETECTED_PROTOCOL:-$DEFAULT_PROTOCOL}" +#fi db_input "$(priority_ceil low)" xserver-xfree86/config/inputdevice/mouse/emulate3buttons || debug_report_status "db_input $(priority_ceil low) xserver-xfree86/config/inputdevice/mouse/emulate3buttons" "$?" db_input "$(priority_ceil low)" xserver-xfree86/config/inputdevice/mouse/zaxismapping || debug_report_status "db_input $(priority_ceil low) xserver-xfree86/config/inputdevice/mouse/zaxismapping" "$?" @@ -1112,18 +1117,18 @@ debug_echo "monitor hsync and vrefresh question priority is $PRIORITY" -# Warty note: check which lib asks for this already -auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/lcd "false" -db_get xserver-xfree86/config/monitor/lcd -debug_echo "xserver-xfree86/config/monitor/lcd is $RET" -MONITOR_IS_LCD="$RET" -if [ "$RET" = "true" ]; then - db_subst xserver-xfree86/config/monitor/selection-method choices "Medium, Advanced" +# Warty note: we don't care about lcd displays +#auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/lcd "false" +#db_get xserver-xfree86/config/monitor/lcd +#debug_echo "xserver-xfree86/config/monitor/lcd is $RET" +#MONITOR_IS_LCD="$RET" +#if [ "$RET" = "true" ]; then +# db_subst xserver-xfree86/config/monitor/selection-method choices "Medium, Advanced" +# db_subst xserver-xfree86/config/monitor/selection-method default "Medium" +#else # not an LCD + db_subst xserver-xfree86/config/monitor/selection-method choices "Simple, Medium, Advanced" db_subst xserver-xfree86/config/monitor/selection-method default "Medium" -else # not an LCD - db_subst xserver-xfree86/config/monitor/selection-method choices "Simple, Medium, Advanced" - db_subst xserver-xfree86/config/monitor/selection-method default "Simple" -fi +#fi auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/selection-method "Medium"
