X Strike Force XFree86 SVN commit: r1998 - in branches/ubuntu/debian: . patches po
Author: fabbione
Date: 2004-10-30 01:07:03 -0500 (Sat, 30 Oct 2004)
New Revision: 1998
Modified:
branches/ubuntu/debian/changelog
branches/ubuntu/debian/patches/000_stolen_from_HEAD.diff
branches/ubuntu/debian/patches/000_stolen_from_x.org.diff
branches/ubuntu/debian/patches/030_Xserver_and_driver_region_primitive_fixups.diff
branches/ubuntu/debian/po/cs.po
branches/ubuntu/debian/po/ja.po
Log:
Import 4.3.0.dfsg.1-6ubuntu22 release.
Modified: branches/ubuntu/debian/changelog
===================================================================
--- branches/ubuntu/debian/changelog 2004-10-30 06:05:50 UTC (rev 1997)
+++ branches/ubuntu/debian/changelog 2004-10-30 06:07:03 UTC (rev 1998)
@@ -1,3 +1,14 @@
+xfree86 (4.3.0.dfsg.1-6ubuntu22) warty; urgency=low
+
+ * Update 000_stolen_from_HEAD.diff:
+ + Include Xv/framebuffer fix for xf86xv.c.
+ * Update 030_Xserver_and_driver_region_primitive_fixups.diff:
+ + Fix REGION_EQUAL call in nv_driver.c.
+ * Update Czech debconf template translations (thanks, Miroslav Kure).
+ * Apply fix for Keycodes for PrintScreen and SysRq. (Closes: #1762)
+
+ -- Fabio M. Di Nitto <fabbione@fabbione.net> Mon, 27 Sep 2004 07:58:55 +0200
+
xfree86 (4.3.0.dfsg.1-6ubuntu21) warty; urgency=low
Changes by Fabio Massimo Di Nitto:
Modified: branches/ubuntu/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- branches/ubuntu/debian/patches/000_stolen_from_HEAD.diff 2004-10-30 06:05:50 UTC (rev 1997)
+++ branches/ubuntu/debian/patches/000_stolen_from_HEAD.diff 2004-10-30 06:07:03 UTC (rev 1998)
@@ -151,6 +151,13 @@
xc/programs/Xserver/hw/xfree86/common/xf86xv.c @ 1.35
156. Fix precision problems in xf86XVClipVideoHelper [...] (Marc La France).
+xc/programs/Xserver/hw/xfree86/common/xf86xv.c @ 1.38
+ 808. Fix big-endian typo in xf86CopyYUV12ToPacked (#6131, Rene Rebe).
+ [Marc Aurele La France]
+ Rene Rebe: "Yes, the change was done under the Version 1.0 license without
+ the advertising clause. I just double checked it is in X.Org - where indeed
+ is present, too."
+
xc/programs/xdm/access.c @ 3.14
Fix parsing of IPv4 host names in Xaccess (Chisato Yamauchi). [David Dawes]
@@ -23597,3 +23604,30 @@
}
}
if ((expr->type!=TypeInt)&&(expr->type!=TypeFloat)) {
+diff -Naurd xc.orig/programs/Xserver/hw/xfree86/common/xf86xv.c xc/programs/Xserver/hw/xfree86/common/xf86xv.c
+--- xc.orig/programs/Xserver/hw/xfree86/common/xf86xv.c 2004-09-22 08:59:32.000000000 +0000
++++ xc/programs/Xserver/hw/xfree86/common/xf86xv.c 2004-09-22 09:03:55.000000000 +0000
+@@ -1953,10 +1953,10 @@
+ Dst[3] = Y[6] | (Y[7] << 16) | (U[3] << 8) | (V[3] << 24);
+ #else
+ /* This assumes a little-endian framebuffer */
+- Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | Y[0];
+- Dst[1] = (Y[2] << 24) | (Y[3] << 8) | (U[1] << 16) | Y[1];
+- Dst[2] = (Y[4] << 24) | (Y[5] << 8) | (U[2] << 16) | Y[2];
+- Dst[3] = (Y[6] << 24) | (Y[7] << 8) | (U[3] << 16) | Y[3];
++ Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0];
++ Dst[1] = (Y[2] << 24) | (Y[3] << 8) | (U[1] << 16) | V[1];
++ Dst[2] = (Y[4] << 24) | (Y[5] << 8) | (U[2] << 16) | V[2];
++ Dst[3] = (Y[6] << 24) | (Y[7] << 8) | (U[3] << 16) | V[3];
+ #endif
+ Dst += 4; Y += 8; V += 4; U += 4;
+ i -= 4;
+@@ -1967,7 +1967,7 @@
+ Dst[0] = Y[0] | (Y[1] << 16) | (U[0] << 8) | (V[0] << 24);
+ #else
+ /* This assumes a little-endian framebuffer */
+- Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | Y[0];
++ Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0];
+ #endif
+ Dst++; Y += 2; V++; U++;
+ }
Modified: branches/ubuntu/debian/patches/000_stolen_from_x.org.diff
===================================================================
--- branches/ubuntu/debian/patches/000_stolen_from_x.org.diff 2004-10-30 06:05:50 UTC (rev 1997)
+++ branches/ubuntu/debian/patches/000_stolen_from_x.org.diff 2004-10-30 06:07:03 UTC (rev 1998)
@@ -744,3 +744,26 @@
+extern int XAAGetPatternROP_PM(int i);
+
#endif /* _XAAROP_H */
+diff -Naurd xc.orig/programs/Xserver/hw/xfree86/input/keyboard/kbd.c xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c
+--- xc.orig/programs/Xserver/hw/xfree86/input/keyboard/kbd.c 2003-02-17 16:08:29.000000000 +0000
++++ xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c 2004-09-27 07:46:15.000000000 +0000
+@@ -573,6 +573,19 @@
+ return;
+ }
+
++#ifndef __sparc64__
++ /*
++ * PC keyboards generate separate key codes for
++ * Alt+Print and Control+Pause but in the X keyboard model
++ * they need to get the same key code as the base key on the same
++ * physical keyboard key.
++ */
++ if (scanCode == KEY_SysReqest)
++ scanCode = KEY_Print;
++ else if (scanCode == KEY_Break)
++ scanCode = KEY_Pause;
++#endif
++
+ /*
+ * Now map the scancodes to real X-keycodes ...
+ */
Modified: branches/ubuntu/debian/patches/030_Xserver_and_driver_region_primitive_fixups.diff
===================================================================
--- branches/ubuntu/debian/patches/030_Xserver_and_driver_region_primitive_fixups.diff 2004-10-30 06:05:50 UTC (rev 1997)
+++ branches/ubuntu/debian/patches/030_Xserver_and_driver_region_primitive_fixups.diff 2004-10-30 06:07:03 UTC (rev 1998)
@@ -208,7 +208,7 @@
if(pPriv->autopaintColorKey &&
(pPriv->grabbedByV4L ||
- !REGION_EQUAL(pScrnInfo->pScreen, &pPriv->clip, clipBoxes)))
-+ RegionsEqual(&pPriv->clip, clipBoxes)))
++ !RegionsEqual(&pPriv->clip, clipBoxes)))
{
/* we always paint V4L's color key */
if(!pPriv->grabbedByV4L)
Modified: branches/ubuntu/debian/po/cs.po
===================================================================
--- branches/ubuntu/debian/po/cs.po 2004-10-30 06:05:50 UTC (rev 1997)
+++ branches/ubuntu/debian/po/cs.po 2004-10-30 06:07:03 UTC (rev 1998)
@@ -27,7 +27,7 @@
"Project-Id-Version: xfree86\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
"POT-Creation-Date: 2004-08-30 11:49+0000\n"
-"PO-Revision-Date: 2004-05-29 17:03+0200\n"
+"PO-Revision-Date: 2004-09-26 17:19+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <provoz@debian.cz>\n"
"MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@
#. Description
#: ../libx11-6.templates:4
msgid "Migrate XKB configuration directory?"
-msgstr ""
+msgstr "Přenést adresář s nastavením XKB?"
#. Type: boolean
#. Description
@@ -48,6 +48,8 @@
"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
"lib/X11/xkb to /etc/X11/xkb."
msgstr ""
+"Adresář, ve kterém je uloženo nastavení X KEYBOARD Extension (XKB), se "
+"přesunul z /usr/X11R6/lib/X11/xkb do /etc/X11/xkb."
#. Type: boolean
#. Description
@@ -56,6 +58,8 @@
"Your system is using the old location, and some programs, such as those from "
"old or unofficial Debian packages, may continue to install files there."
msgstr ""
+"Váš systém používá staré umístění a některé programy, např. neoficiální nebo "
+"staré balíky, tam mohou stále instalovat soubory."
#. Type: boolean
#. Description
@@ -67,12 +71,17 @@
"files from the old location. A symbolic link from the old location to the "
"new one will be created to prevent legacy applications from breaking."
msgstr ""
+"Chcete přesunout nastavení XKB ze starého umístění na nové místo? Případné "
+"soubory v novém adresáři, jež by měly stejné jméno jako soubory v původním "
+"umístění, budou zazálohovány a nahrazeny soubory ze starého umístění. "
+"Abychom zamezili porušení starších aplikací, vytvoří se symbolický odkaz z "
+"původního umístění na nový adresář."
#. Type: boolean
#. Description
#: ../libxt6.templates:4
msgid "Migrate Xt application defaults directory?"
-msgstr ""
+msgstr "Přenést adresář s implicitním nastavením Xt?"
#. Type: boolean
#. Description
@@ -82,6 +91,9 @@
"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
msgstr ""
+"Adresář, ve kterém jsou uloženy implicitní hodnoty aplikací X Window Systému "
+"využívající X Toolkit Intrinsics (Xt), se přesunul z /usr/X11R6/lib/X11/app-"
+"defaults do /etc/X11/app-defaults."
#. Type: boolean
#. Description
@@ -93,6 +105,11 @@
"files from the old location. A symbolic link from the old location to the "
"new one will be created to prevent legacy applications from breaking."
msgstr ""
+"Chcete přesunout tyto soubory s implicitním nastavením ze starého umístění "
+"na nové místo? Případné soubory v novém adresáři, jež by měly stejné jméno "
+"jako soubory v původním umístění, budou zazálohovány a nahrazeny soubory ze "
+"starého umístění. Abychom zamezili porušení starších aplikací, vytvoří se "
+"symbolický odkaz z původního umístění na nový adresář."
#. Type: select
#. Description
@@ -1126,9 +1143,9 @@
"the computer's power, connect the mouse, turn the computer back on, and "
"reboot. If you wish to select a mouse type manually, decline this option."
msgstr ""
-"Pokud máte k počítači připojenou myš, můžete nechat systém, aby ji "
-"zkusilrozpoznat. Rozpoznávání napomůže, pokud s myší budete pohybovat (také "
-"by neměl běžet program gpm). Pokud chcete k počítači připojit sériovou, "
+"Pokud máte k počítači připojenou myš, můžete nechat systém, aby ji zkusil "
+"rozpoznat. Rozpoznávání napomůže, pokud s myší budete pohybovat (také by "
+"neměl běžet program gpm). Pokud chcete k počítači připojit sériovou, "
"sběrnicovou, nebo PS/2 myš, měli byste vypnout systém, odpojit napájení, "
"připojit myš, zapnout počítač a restartovat. Pokud chcete zadat typ myši "
"ručně, tuto možnost zamítněte."
@@ -1627,9 +1644,6 @@
msgid "Characters other than digits are not allowed in the entry."
msgstr "Znaky odlišné od číslic nejsou v položce povoleny."
-#~ msgid "PCI:nn:nn:nn"
-#~ msgstr "PCI:nn:nn:nn"
-
#~ msgid ""
#~ "(where each nn is a decimal number referring to the card's bus, device, "
#~ "and function number, respectively)."
Modified: branches/ubuntu/debian/po/ja.po
===================================================================
--- branches/ubuntu/debian/po/ja.po 2004-10-30 06:05:50 UTC (rev 1997)
+++ branches/ubuntu/debian/po/ja.po 2004-10-30 06:07:03 UTC (rev 1998)
@@ -29,7 +29,7 @@
msgstr ""
"Project-Id-Version: xfree86 4.3.0\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-08-30 11:49+0000\n"
"PO-Revision-Date: 2004-09-18 15:41+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org> and ISHIKAWA Mutsumi "
"<ishikawa@debian.org>\n"
@@ -51,7 +51,9 @@
"The directory where configuration information (including keyboard data) for "
"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
"lib/X11/xkb to /etc/X11/xkb."
-msgstr "X KEYBOARD Extension (XKB) ����� (�����ܡ��ɤΥǡ�������γ�����Υǥ��쥯�ȥ���/usr/X11R6/lib/X11/xkb ����etc/X11/xkb ��ѹ�����������"
+msgstr ""
+"X KEYBOARD Extension (XKB) ����� (�����ܡ��ɤΥǡ�������γ������
+"�ǥ��쥯�ȥ���/usr/X11R6/lib/X11/xkb ����etc/X11/xkb ��ѹ�����������"
#. Type: boolean
#. Description
@@ -59,7 +61,10 @@
msgid ""
"Your system is using the old location, and some programs, such as those from "
"old or unofficial Debian packages, may continue to install files there."
-msgstr "���ʤ��Υ����ƥ������θŤ����ȡ��Ť����뤤������Debian �ѥå������Τ褦�ʤ����Ĥ��Υץ�����äƤ��ꡢ�ե����������˥��ȡ��뤷���ޤޤˤ��Ƥ����Ƥ⤫�ޤ��ޤ���
+msgstr ""
+"���ʤ��Υ����ƥ������θŤ����ȡ��Ť����뤤������Debian �ѥå�������
+"�褦�ʤ����Ĥ��Υץ�����äƤ��ꡢ�ե����������˥��ȡ��뤷���ޤ�
+"�ˤ��Ƥ����Ƥ⤫�ޤ��ޤ���
#. Type: boolean
#. Description
@@ -70,7 +75,11 @@
"new location that have the same name will be backed up and replaced by the "
"files from the old location. A symbolic link from the old location to the "
"new one will be created to prevent legacy applications from breaking."
-msgstr "�����ƥ� XKB ���ե�������ưŪ�˸Ť������鿷�������˰ܹԤ��ޤ���? ���������ˤ�����̾���Ĵ��ե������Хå����åפ��졢�Ť��������ե���������֤��������ޤ������Υ��ץꥱ����������������뤿�ᡢ�Ť������鿷�������ؤΥ����������������������"
+msgstr ""
+"�����ƥ� XKB ���ե�������ưŪ�˸Ť������鿷�������˰ܹԤ��ޤ���? ��"
+"�������ˤ�����̾���Ĵ��ե������Хå����åפ��졢�Ť�������"
+"�ե���������֤��������ޤ������Υ��ץꥱ����������������뤿"
+"�ᡢ�Ť������鿷�������ؤΥ����������������������"
#. Type: boolean
#. Description
@@ -85,7 +94,10 @@
"The directory where application defaults for X Window System client programs "
"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
-msgstr "X Toolkit Intrinsics (Xt) �١�����X Window System ���饤����ץ����Υ��ץꥱ�������Υǥե������γ�����Υǥ��쥯�ȥ���/usr/X11R6/lib/X11/app-defaults ����etc/X11/app-defaults ��ѹ�����������"
+msgstr ""
+"X Toolkit Intrinsics (Xt) �١�����X Window System ���饤����ץ����Υ�"
+"�ץꥱ�������Υǥե������γ�����Υǥ��쥯�ȥ���/usr/X11R6/lib/X11/"
+"app-defaults ����etc/X11/app-defaults ��ѹ�����������"
#. Type: boolean
#. Description
@@ -96,7 +108,11 @@
"new location that have the same name will be backed up and replaced by the "
"files from the old location. A symbolic link from the old location to the "
"new one will be created to prevent legacy applications from breaking."
-msgstr "�����ƥ� app-defaults �ե�������ưŪ�˸Ť������鿷�������˰ܹԤ��ޤ���? ���������ˤ�����̾���Ĵ��ե������Хå����åפ��졢�Ť��������ե���������֤��������ޤ������Υ��ץꥱ����������������뤿�ᡢ�Ť������鿷�������ؤΥ����������������������"
+msgstr ""
+"�����ƥ� app-defaults �ե�������ưŪ�˸Ť������鿷�������˰ܹԤ��ޤ�"
+"��? ���������ˤ�����̾���Ĵ��ե������Хå����åפ��졢�Ť���"
+"�����ե���������֤��������ޤ������Υ��ץꥱ���������������"
+"�뤿�ᡢ�Ť������鿷�������ؤΥ����������������������"
#. Type: select
#. Description
@@ -140,13 +156,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 ""
Reply to: