Author: branden
Date: 2004-05-27 13:44:07 -0500 (Thu, 27 May 2004)
New Revision: 1453
Modified:
branches/4.3.0/sid/debian/CHANGESETS
branches/4.3.0/sid/debian/TODO
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_xkb_data.diff
Log:
Merge revisions 1443 to HEAD from trunk.
Modified: branches/4.3.0/sid/debian/CHANGESETS
===================================================================
--- branches/4.3.0/sid/debian/CHANGESETS 2004-05-27 09:02:54 UTC (rev
1452)
+++ branches/4.3.0/sid/debian/CHANGESETS 2004-05-27 18:44:07 UTC (rev
1453)
@@ -8,131 +8,10 @@
(It should always be safe to merge the latest version of TODO or CHANGESETS
files anywhere.)
-Post 4.3.0.dfsg.1-1
--------------------
+Begin new changelog entry.
+ 1445
-Start new changelog entry.
- 1326
+#251119: Fix breakage of NumLock.
+ 1452
-Fix up Xsession.d scripts, including fix for #242485.
- 1327, 1328, 1329, 1330
-
-Fix Fabio's name in the Uploaders field to match his changelog entry
convention.
- 1336
-
-Add support for the AMD64 architecture.
- 1346, 1387, 1388, 1395, 1440
-
-Add SVN Id keyword and set svn:keywords property to Id on all files in
-debian/scripts where this was not already the case.
- 1347
-
-Update XFree86 PCI ID database from CVS HEAD as of 2003-10-30. This lays the
-foundation for future updates to drivers and PCI bus handling code.
- 1358, 1359
-
-Update xutils's package description to refer to bdftruncate and ucs2any
programs
-by their correct names.
- 1360, 1364
-
-Grab updated XFree86 X server I2C code from XFree86 CVS as of 2003-08-29.
-Implements and exposes xf86I2CGetScreenBuses() function. This aids in
-backporting updated drivers that use this function (e.g., ati/atimisc).
- 1363
-
-Grab updated XFree86 X server Xv code from XFree86 CVS as of 2003-04-30. This
-aids in backported updated drivers.
- 1367
-
-Backport ATI driver from XFree86 CVS as of 2004-02-11, including support for
-"ForceMinDotClock" option to Radeon driver. Depends on changesets ending in
-1363, 1367.
- 1368
-
-(cosmetic) Rename patches to ATI driver to be more consistent with each other.
- 1370
-
-Grab from XFree86 CVS (2003-11-23) a fix to a problem resolving hostnames of
-indirect entries in xdm's Xaccess file. Resync patch #002.
- 1371
-
-Backport XFree86 X server's PCI bus support code and device databases from
-XFree86 CVS (2003-12-18). The ATI backport requires this to build on x86.
- 1373
-
-Backport XFree86 X server VIA driver.
- 1382
-
-Grab SiS driver from Thomas Winischhofer's website.
- 1384
-
-Stop shipping the "Xterm Control Sequences" document in the xspecs
-package; ship it only in xterm. Add HTML version of this document to the
-xterm package. Update xterm's extended description to mention the
-availability of this document.
- 1390
-
-Update XTerm to Thomas Dickey's latest release, with some inconsequential
-changes from XFree86 CVS post-2004-02-12 rolled back.
- 1400, 1434
-
-Move patch in 009_use_xf86config-4_in_xf86config.diff to
-911_debian_XF86Config_to_XF86Config-4.diff.
- 1401
-
-Grab a couple of minor documentation-related fixes from XFree86 CVS.
-+ There's no config/util/rman.man (Peter Stromberg). [Matthieu Herrb]
- From XFree86 CVS 2003-04-07. Delete superseded patch #006.
-+ One xieperf reference left over. Noticed by ISHIKAWA Mutsumi. Thanks.
- [Matthieu Herrb] From XFree86 CVS 2003-04-14.
-Merge #000_stolen_from_HEAD_doc_extensions_fix into #000_stolen_from_HEAD.
- 1403
-
-Split updates to XKB data from XFree86 CVS out into their own patch file
because
-we may end up incorporating a lot of them.
- 1404
-
-Grab a fix to the XFree86 X server chips driver from XFree86 CVS 2003-04-04.
-+ Fixed DPMS problem on C&T 69000 due to incorrect LCD flag (Bugz: 101,
- Egbert Eich).
- 1405
-
-Grab updates to XKB documentation and code from XFree86 CVS. Grab updates to
-XKB data from XFree86 CVS, none later than 2003-04-30. Resync offsets in
-patches #082 and #084. Update MANIFEST files and xlibs.install to recognize
and
-ship new XKB symbols files hr_US, th_pat, and th_tis.
- 1408, 1419
-
-Apply Michel Dänzer's fix for Radeon driver trying forever to initialize card
if
-card's firmware is not loaded.
- 1410
-
-Add Turkish debconf template translation. Tidy up templates.pot and *.po files
-in general.
- 1412, 1413, 1414, 1415, 1416, 1418
-
-Miscellaneous cosmetic fixes.
- 1421, 1428
-
-Adjust package relationships of libxrandr2 and libxrandr2-dbg so that they no
-longer conflict with and replace xlibs (<< 4.3.0); there are no file overlaps
in
-these cases (though there are with libxrandr-dev), so such declarations are
-spurious.
- 1426
-
-Handle failure of "which" command when processing arguments to Xsession, so
that
-the script is not aborted prematurely (thanks, Oliver Bausinger).
- 1427
-
-Update ARM support patch (#234808). Rename it.
- 1430, 1431
-
-Add dependency of libxp-dev on xlibs-static-dev, since the former's Print.h
-#includes the latter's Xauth.h (thanks, Matt Kraai).
- 1432
-
-Remove spurious sourcing of debconf confmodule from maintainer scripts
-that do not actually need it (thanks, LaMont Jones).
- 1433
-
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/4.3.0/sid/debian/TODO
===================================================================
--- branches/4.3.0/sid/debian/TODO 2004-05-27 09:02:54 UTC (rev 1452)
+++ branches/4.3.0/sid/debian/TODO 2004-05-27 18:44:07 UTC (rev 1453)
@@ -6,7 +6,7 @@
has discretion to identify items that must be fixed for the next package
release.
-4.3.0.dfsg.1-2
+4.3.0.dfsg.1-3
--------------
These items are listed in descending order of priority; that is, the most
@@ -52,7 +52,10 @@
+ start loading dri module by default on sparc again, per Steve King and
Christian Guggenberger [BR]
+ #229850: xserver-xfree86: [debconf] monitor selection methods need to be
- more careful about clobbering autodetected monitor sync ranges [BR]
+ more careful about clobbering autodetected monitor sync ranges; study Jay
+ Berkenbilt's feedback [BR]
+ + #249614: xserver-xfree86: [debconf] autodetect SGI Indy and Indigo2 systems
+ [BR]
* hurd-i386 MANIFEST, and probably some debhelper files, are out of date.
* Should xc/include/{Xw32defs.h,Xwinsock.h} be installed (and shipped) for
the benefit of cross-compilers? Check upstream Imakeage.
@@ -101,6 +104,20 @@
model, if nothing else.
* Scan all -dev packages' *.h files for undeclared dependencies due to
#includes.
+* #237583: xlibs: BKSL key doesn't work when 'us' is one of multiple layouts;
+ patch in upstream CVS by 2003-12-18
+* Merge Josh Triplett's clean-room reimplementation of post-#187 changes to
+ XTerm in XFree86 CVS.
+* Upgrade XTerm to #190. Check for changes pulled from XFree86 CVS and deal
+ with them appropriately.
+* #236817: xserver-xfree86: [ati/r128] xscreensaver screenhacks lock system
+ ('(EE) R128(0): Idle timed out, resetting engine...') on Rage 128 RE/SG rev 0
+ + Apply patch from Dan Jacobowitz.
+* #247387: xlibs: Can't type numbers with AltGr with /etc/X11/xkb/symbols/pc/lt
+ key map
+ + Apply patch by Mantas Kriaučiūnas via Vytautas Lukenskas.
+* Stop building fonts (and possibly docs?) when building binary-arch target.
+ [Fabio, you're going to drag me into this kicking and screaming, aren't you?]
Do opportunistically, only in conjuction with other fixes
---------------------------------------------------------
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-05-27 09:02:54 UTC (rev 1452)
+++ branches/4.3.0/sid/debian/changelog 2004-05-27 18:44:07 UTC (rev 1453)
@@ -1,3 +1,11 @@
+xfree86 (4.3.0.dfsg.1-2+SVN) unstable; urgency=low
+
+ * Fix breakage of NumLock under XKB, caused by crack-addled patch that
+ warped the XKB types/basic file 7 years backwards in time.
+ (Closes: #251119)
+
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 27 May 2004 03:58:57 -0500
+
xfree86 (4.3.0.dfsg.1-2) unstable; urgency=low
Changes by Branden Robinson:
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_xkb_data.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_xkb_data.diff
2004-05-27 09:02:54 UTC (rev 1452)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_xkb_data.diff
2004-05-27 18:44:07 UTC (rev 1453)
@@ -2576,77 +2576,6 @@
+ include "level3(ralt_switch_multikey)"
};
-
-Index: xc/programs/xkbcomp/types/basic
-===================================================================
-RCS file: /cvs/xc/programs/xkbcomp/types/basic,v
-retrieving revision 1.1.1.4
-retrieving revision 1.1
-diff -u -r1.1.1.4 -r1.1
---- xc/programs/xkbcomp/types/basic 16 Jan 2001 23:00:29 -0000 1.1.1.4
-+++ xc/programs/xkbcomp/types/basic 27 Apr 1994 07:21:51 -0000 1.1
-@@ -1,39 +1,28 @@
--// $Xorg: basic,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
--default xkb_types "basic" {
-+// $XConsortium: basic,v 1.3 94/04/08 16:00:43 erik Exp $
-+xkb_types "Common"
-
-- // Fairly standard definitions for
-- // the four required key types
-+virtual_modifiers NumLock;
-
-- virtual_modifiers NumLock;
--
-- type "ONE_LEVEL" {
-- modifiers = None;
-- map[None] = Level1;
-- level_name[Level1]= "Any";
-- };
--
-- type "TWO_LEVEL" {
-- modifiers = Shift;
-- map[Shift] = Level2;
-- level_name[Level1] = "Base";
-- level_name[Level2] = "Shift";
-- };
-+type "ONE_LEVEL" {
-+ modifiers = None;
-+ map[None] = Level1;
-+ level_name[Level1]= "Any";
-+};
-
-- type "ALPHABETIC" {
-- modifiers = Shift+Lock;
-- map[Shift] = Level2;
-- preserve[Lock]= Lock;
-- level_name[Level1] = "Base";
-- level_name[Level2] = "Caps";
-- };
-+type "TWO_LEVEL" {
-+ modifiers = Shift;
-+ map[Shift] = Level2;
-+ level_name[Level1] = "Base";
-+ level_name[Level2] = "Shift";
-+};
-
-- type "KEYPAD" {
-- modifiers = Shift+NumLock;
-- map[None] = Level1;
-- map[Shift] = Level2;
-- map[NumLock] = Level2;
-- map[Shift+NumLock] = Level1;
-- level_name[Level1] = "Base";
-- level_name[Level2] = "Number";
-- };
-+type "KEYPAD" {
-+ modifiers = Shift+NumLock;
-+ map[None] = Level1;
-+ map[Shift] = Level2;
-+ map[NumLock] = Level1;
-+ map[Shift+NumLock] = Level2;
-+ level_name[Level1] = "Base";
-+ level_name[Level2] = "Number";
- };
-+
--- xc/programs/xkbcomp~/rules/xfree86.lst 2004-05-17 03:43:03.000000000
-0500
+++ xc/programs/xkbcomp/rules/xfree86.lst 2004-05-17 03:44:04.000000000
-0500
@@ -4,7 +4,7 @@
