X Strike Force XFree86 SVN commit: r1825 - in trunk/debian: . patches

2004-09-18 Thread X Strike Force SVN Repository Admin
Author: barbier
Date: 2004-09-18 02:39:44 -0500 (Sat, 18 Sep 2004)
New Revision: 1825

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/changelog
   trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
Log:
  * Declare hu_US layout as being in old format (thanks, Veres Lajos)
(Closes: #247463)
  * Really list all old format layouts in rules/xfree86 ($oldlayouts),
do not grep only those listed in xfree86.lst


Modified: trunk/debian/CHANGESETS
===
--- trunk/debian/CHANGESETS 2004-09-17 23:23:50 UTC (rev 1824)
+++ trunk/debian/CHANGESETS 2004-09-18 07:39:44 UTC (rev 1825)
@@ -34,14 +34,14 @@
 Fix inconsistencies in rules/xfree86* files:
 + rules/xfree86: List in $oldlayouts all layouts which are currently not
   available in xlibs Debian package under the new multilayout format.
-  (Closes: #270810)
++ rules/xfree86: Declare hu_US layout as being in old format (thanks,
+  Veres Lajos)
 + rules/xfree86: The lv3:ralt_switch option, which does exist in
   xfree86.lst, was forgotten in this file.
 + rules/xfree86.{lst,xml}: Options altwin:meta_super and altwin:meta_hyper
   are replaced by their right names altwin:super_win and altwin:hyper_win.
-  (Closes: #271259)
 + rules/xfree86.{lst,xml}: Perform changes to synchronize these files.
-1822
+1822, 1825
 
 Add FAQ entry: My keyboard configuration worked with XFree86 4.2, why is
 it messed up now?

Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2004-09-17 23:23:50 UTC (rev 1824)
+++ trunk/debian/changelog  2004-09-18 07:39:44 UTC (rev 1825)
@@ -28,6 +28,9 @@
 why is it messed up now?
 (Closes: #259740)
 
+  * Declare hu_US layout as being in old format (thanks, Veres Lajos)
+(Closes: #247463)
+
   Changes by Branden Robinson:
 
   * In the Xsession script, attempt to create a file of non-zero length in

Modified: trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
===
--- trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff2004-09-17 
23:23:50 UTC (rev 1824)
+++ trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff2004-09-18 
07:39:44 UTC (rev 1825)
@@ -5,20 +5,22 @@
 Fix inconsistencies in rules/xfree86* files.
 
 rules/xfree86:
-List in $oldlayouts all layouts which are currently not available
+  + List in $oldlayouts all layouts which are currently not available
 in xlibs Debian package under the new multilayout format.
 (Closes: #271259)
-The lv3:ralt_switch option, which does exist in xfree86.lst, was
+  + The lv3:ralt_switch option, which does exist in xfree86.lst, was
 forgotten in this file.
+  + Add support for hu_US layout in old format (thanks, Veres Lajos)
+(Closes: #247463)
 
 rules/xfree86.lst rules/xfree86.xml:
-Options altwin:meta_super and altwin:meta_hyper are replaced by
+  + Options altwin:meta_super and altwin:meta_hyper are replaced by
 their right names altwin:super_win and altwin:hyper_win in
 rules/xfree86.lst and rules/xfree86.xml
 (Closes: #271259)
 
 rules/xfree86.lst rules/xfree86.xml:
-Perform changes to synchronize these files.
+  + Perform changes to synchronize these files.
 
 diff -ruN xc-old/programs/xkbcomp/rules/xfree86 
xc/programs/xkbcomp/rules/xfree86
 --- xc-old/programs/xkbcomp/rules/xfree86  Thu Sep 16 17:03:12 2004
@@ -28,7 +30,7 @@
  
  // Layouts that still need be composed by old rules
 -! $oldlayouts = az bs ca ca_enhanced de_CH fr_CH hu hu_qwerty lt_std mn vn 
hr_US
-+! $oldlayouts = az bs ca ca_enhanced de_CH fr_CH hr_US hu hu_qwerty jp lt_std 
mn ru_yawerty se_FI se_NO se_SE tr_f vn
++! $oldlayouts = az bs ca ca_enhanced czsk de_CH fr_CH hr_US hu hu_US 
hu_qwerty jp lt_a lt_p lt_std mn ro2 ru_yawerty se_FI se_NO se_SE tr_f vn
  
  // If you want non-latin layouts implicitly include the en_US layout
  // uncomment lines below
@@ -41,9 +43,14 @@
ctrl:swapcaps   =   +ctrl(swapcaps)
ctrl:ctrl_ac=   +ctrl(ctrl_ac)
 diff -ruN xc-old/programs/xkbcomp/rules/xfree86.lst 
xc/programs/xkbcomp/rules/xfree86.lst
 xc-old/programs/xkbcomp/rules/xfree86.lst  Thu Sep 16 17:03:12 2004
-+++ xc/programs/xkbcomp/rules/xfree86.lst  Thu Sep 16 17:04:46 2004
-@@ -144,7 +144,9 @@
+--- xc-old/programs/xkbcomp/rules/xfree86.lst  2004-09-18 07:18:23.0 
+
 xc/programs/xkbcomp/rules/xfree86.lst  2004-09-18 07:26:12.0 
+
+@@ -140,11 +140,14 @@
+   gur Gurmukhi
+   dev Hindi
+   hu  Hungarian
++  hu_US   Hungarian (US)
+   hu_qwerty   Hungarian (qwerty)
is  Icelandic
iu  Inuktitut
ir  Iranian
@@ -53,7 +60,7 @@
it  Italian
jp  Japanese
kan Kannada
-@@ -198,7 +200,8 @@
+@@ -198,7 +201,8 @@
  
  ! option
grp Group 

Processed: Reassign from xlibs to xserver-xfree86

2004-09-18 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 reassign 270976 xserver-xfree86
Bug#270976: xlibs: doesn't understand IRIX xinerama X servers
Bug reassigned from package `xlibs' to `xserver-xfree86'.

 retitle 270976 Doesn't understand IRIX xinerama X servers
Bug#270976: xlibs: doesn't understand IRIX xinerama X servers
Changed Bug title.


End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)



Processed: xlibs: Fixed in SVN

2004-09-18 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 tags 247463 + pending
Bug#247463: xlibs: hu_US needs to be listed in xfree86 rules file's 'oldlayouts'
Tags were: upstream patch
Tags added: pending

 tags 259740 + pending
Bug#259740: xlibs: Windows key no longer treated as modifer, just as Super_L
Tags were: patch upstream
Tags added: pending

 tags 270810 + pending
Bug#270810: /etc/X11/xkb/rules/xfree86 does not list all old layout files
Tags were: patch
Tags added: pending

 tags 271259 + pending
Bug#271259: xlibs: wrong altwin options listed in /etc/X11/xkb/rules/xfree86.lst
Tags were: patch upstream
Tags added: pending

 tags 271326 + pending
Bug#271326: Please add a multi-layout version of us_intl
Tags were: patch
Tags added: pending


End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)



X Strike Force XFree86 SVN commit: r1826 - in trunk/debian: . patches

2004-09-18 Thread X Strike Force SVN Repository Admin
Author: barbier
Date: 2004-09-18 03:21:17 -0500 (Sat, 18 Sep 2004)
New Revision: 1826

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/changelog
   trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
Log:
rules/xfree86: Remove special casing for us_intl layout (Closes: #234085)


Modified: trunk/debian/CHANGESETS
===
--- trunk/debian/CHANGESETS 2004-09-18 07:39:44 UTC (rev 1825)
+++ trunk/debian/CHANGESETS 2004-09-18 08:21:17 UTC (rev 1826)
@@ -38,10 +38,11 @@
   Veres Lajos)
 + rules/xfree86: The lv3:ralt_switch option, which does exist in
   xfree86.lst, was forgotten in this file.
++ rules/xfree86: Remove special casing for us_intl layout
 + rules/xfree86.{lst,xml}: Options altwin:meta_super and altwin:meta_hyper
   are replaced by their right names altwin:super_win and altwin:hyper_win.
 + rules/xfree86.{lst,xml}: Perform changes to synchronize these files.
-1822, 1825
+1822, 1825, 1826
 
 Add FAQ entry: My keyboard configuration worked with XFree86 4.2, why is
 it messed up now?

Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2004-09-18 07:39:44 UTC (rev 1825)
+++ trunk/debian/changelog  2004-09-18 08:21:17 UTC (rev 1826)
@@ -5,8 +5,8 @@
   * Update Danish debconf template translations (thanks, Claus Hindsgaul).
 (Closes: #270503)
 
-  * Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04).
-(Closes: #271326)
+  * Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04)
+(Closes: #271326, #234085)
 
   * The fix about altwin introduced in 4.3.0.dfsg.1-1 is reverted, Meta_*
 keysyms must be removed from shift level of Alt keys when altwin:meta_win

Modified: trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
===
--- trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff2004-09-18 
07:39:44 UTC (rev 1825)
+++ trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff2004-09-18 
08:21:17 UTC (rev 1826)
@@ -12,6 +12,7 @@
 forgotten in this file.
   + Add support for hu_US layout in old format (thanks, Veres Lajos)
 (Closes: #247463)
+  + Remove special casing for us_intl layout to load new format file.
 
 rules/xfree86.lst rules/xfree86.xml:
   + Options altwin:meta_super and altwin:meta_hyper are replaced by
@@ -34,7 +35,15 @@
  
  // If you want non-latin layouts implicitly include the en_US layout
  // uncomment lines below
-@@ -157,6 +157,7 @@
+@@ -65,7 +65,6 @@
+ ! model   layout  =   symbols
+   pc98nec/jp  =   nec/jp(pc98)
+   abnt2   br  =   us(pc101)+br
+- $pcmodelsus_intl =   us(%m)+us_intl
+  $mac us  =   macintosh/us(extended)
+  $mac en_US   =   macintosh/us(extended)
+  $mac *   =   macintosh/us(extended)+macintosh/%l%(v)
+@@ -157,6 +156,7 @@
lv3:win_switch  =   +level3(win_switch)
lv3:lwin_switch =   +level3(lwin_switch)
lv3:rwin_switch =   +level3(rwin_switch)



Processed: xlibs: Fixed in SVN

2004-09-18 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 tags 234085 + pending
Bug#234085: xlibs: [xkb] aring, oslash, and ae keys don't work on Danish Happy 
Hacking keyboard
Tags were: moreinfo upstream
Tags added: pending


End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)



Processed: Re: Bug#272208: xserver-xfree86: Problem using Mod4 modifier in Metacity and Openbox

2004-09-18 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 reassign 272208 metacity
Bug#272208: xserver-xfree86: Problem using Mod4 modifier in Metacity and Openbox
Bug reassigned from package `xserver-xfree86' to `metacity'.

 retitle 272208 metacity: tabbing does not work with Mod4+Tab
Bug#272208: xserver-xfree86: Problem using Mod4 modifier in Metacity and Openbox
Changed Bug title.

 thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)



Bug#272208: xserver-xfree86: Problem using Mod4 modifier in Metacity and Openbox

2004-09-18 Thread Denis Barbier
reassign 272208 metacity
retitle 272208 metacity: tabbing does not work with Mod4+Tab
thanks

On Sat, Sep 18, 2004 at 01:08:59PM +0200, DaVinci wrote:
 Package: xserver-xfree86
 Version: 4.3.0.dfsg.1-7
 Severity: normal
 
  Hi.
 
  I have problems configuring key combination Mod4+Tab in order to switch
  windows using Metacity and Openbox window managers.
  
  In Openbox it seems Mod4 key it isn't properly recognized when I
  release it; so, focus changes from one window to another, but I need to
  pulse other key to continue working.
 
  In Metacity, I directly can't configure Mod4+Tab, because when it tells
  me to press key combination, it is impossible get that working (there
  is no problem with other combinations like Alt+Tab).
 
  I don't know where is the problem, but supose it is an xserver error.

Hi,

this problem is discussed in #255286.  I didn't look at openbox yet,
but metacity has similar code than emacs21, i.e. it cannot work when it
believes that several different keys are bound to the same modifier.
So its reload_modmap function (in src/keybindings.c) should be fixed
to ensure that num_lock_mask, scroll_lock_mask, meta_mask, hyper_mask
and super_mask have no matching bits.

This also applies to #231076, there is no reason to assume that
different keys cannot return the same KeySym.

Denis



Bug#271235: Bug#270228: Bug#269025: new nv driver. please test!

2004-09-18 Thread David Vanderson

Fabio,

Thanks for the new driver.  I submitted bug 271235 - that's the one I'm 
testing:


I installed xserver-xfree86_4.3.0.dfsg.1-7_i386.deb (originally had the 
problem).  Then I overwrote nv_drv.o with your new one.  X started fine 
but the problem was still there (no output in mplayer with XVideo).


I downgraded to xserver-xfree86_4.3.0.dfsg.1-6_i386.deb (originally was 
fine).  I overwrote nv_drv.o with your new one.  X started fine but the 
problem showed up again.


Let me know if there is anything I can do to help out.

Thanks,
Dave


Fabio Massimo Di Nitto wrote:


The new driver is at:

http://people.no-name-yet.com/~fabbione/nv/i386/

 


snip


I ask you kindly to test this driver again and let me know as soon as
possible if it works or not.

Thanks
Fabio
 






X Strike Force XFree86 SVN commit: r1827 - branches/4.1.0/woody/debian/patches

2004-09-18 Thread X Strike Force SVN Repository Admin
Author: branden
Date: 2004-09-18 12:44:13 -0500 (Sat, 18 Sep 2004)
New Revision: 1827

Modified:
   branches/4.1.0/woody/debian/patches/076_SECURITY_libXpm_vulnerabilities.diff
Log:
Fix missing #endif in security patch.


Modified: 
branches/4.1.0/woody/debian/patches/076_SECURITY_libXpm_vulnerabilities.diff
===
--- 
branches/4.1.0/woody/debian/patches/076_SECURITY_libXpm_vulnerabilities.diff
2004-09-18 08:21:17 UTC (rev 1826)
+++ 
branches/4.1.0/woody/debian/patches/076_SECURITY_libXpm_vulnerabilities.diff
2004-09-18 17:44:13 UTC (rev 1827)
@@ -63,8 +63,8 @@
 This patch by Matthieu Herrb.
 
 diff -urN xc/extras/Xpm~/lib/Attrib.c xc/extras/Xpm/lib/Attrib.c
 xc/extras/Xpm~/lib/Attrib.c1999-01-11 08:23:09.0 -0500
-+++ xc/extras/Xpm/lib/Attrib.c 2004-09-15 16:30:40.0 -0500
+--- xc/extras/Xpm~/lib/Attrib.c2004-09-18 12:39:38.0 -0500
 xc/extras/Xpm/lib/Attrib.c 2004-09-18 12:42:05.0 -0500
 @@ -35,7 +35,7 @@
  #include XpmI.h
  
@@ -92,8 +92,8 @@
  if (!colorTable) {
*oldct = NULL;
 diff -urN xc/extras/Xpm~/lib/CrDatFrI.c xc/extras/Xpm/lib/CrDatFrI.c
 xc/extras/Xpm~/lib/CrDatFrI.c  1999-01-11 08:23:09.0 -0500
-+++ xc/extras/Xpm/lib/CrDatFrI.c   2004-09-15 16:30:40.0 -0500
+--- xc/extras/Xpm~/lib/CrDatFrI.c  2004-09-18 12:39:38.0 -0500
 xc/extras/Xpm/lib/CrDatFrI.c   2004-09-18 12:42:05.0 -0500
 @@ -123,6 +123,8 @@
   */
  header_nlines = 1 + image-ncolors;
@@ -104,8 +104,8 @@
  if (!header)
return (XpmNoMemory);
 diff -urN xc/extras/Xpm~/lib/WrFFrI.c xc/extras/Xpm/lib/WrFFrI.c
 xc/extras/Xpm~/lib/WrFFrI.c1999-01-11 08:23:10.0 -0500
-+++ xc/extras/Xpm/lib/WrFFrI.c 2004-09-15 16:30:40.0 -0500
+--- xc/extras/Xpm~/lib/WrFFrI.c2004-09-18 12:39:38.0 -0500
 xc/extras/Xpm/lib/WrFFrI.c 2004-09-18 12:42:05.0 -0500
 @@ -247,6 +247,8 @@
  unsigned int x, y, h;
  
@@ -116,8 +116,8 @@
  if (!buf)
return (XpmNoMemory);
 diff -urN xc/extras/Xpm~/lib/XpmI.h xc/extras/Xpm/lib/XpmI.h
 xc/extras/Xpm~/lib/XpmI.h  2000-09-26 10:56:42.0 -0500
-+++ xc/extras/Xpm/lib/XpmI.h   2004-09-15 16:30:40.0 -0500
+--- xc/extras/Xpm~/lib/XpmI.h  2004-09-18 12:39:38.0 -0500
 xc/extras/Xpm/lib/XpmI.h   2004-09-18 12:42:05.0 -0500
 @@ -116,6 +116,18 @@
boundCheckingCalloc((long)(nelem),(long) (elsize))
  #endif
@@ -151,8 +151,8 @@
  }  xpmHashTable;
  
 diff -urN xc/extras/Xpm~/lib/create.c xc/extras/Xpm/lib/create.c
 xc/extras/Xpm~/lib/create.c1999-01-11 08:23:10.0 -0500
-+++ xc/extras/Xpm/lib/create.c 2004-09-15 16:30:40.0 -0500
+--- xc/extras/Xpm~/lib/create.c2004-09-18 12:39:46.0 -0500
 xc/extras/Xpm/lib/create.c 2004-09-18 12:42:05.0 -0500
 @@ -1,3 +1,4 @@
 +/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */
  /*
@@ -208,8 +208,8 @@
if (USE_HASHTABLE) {
xpmHashAtom *slot;
 diff -urN xc/extras/Xpm~/lib/data.c xc/extras/Xpm/lib/data.c
 xc/extras/Xpm~/lib/data.c  2000-02-23 15:28:14.0 -0500
-+++ xc/extras/Xpm/lib/data.c   2004-09-15 16:30:40.0 -0500
+--- xc/extras/Xpm~/lib/data.c  2004-09-18 12:39:46.0 -0500
 xc/extras/Xpm/lib/data.c   2004-09-18 12:42:05.0 -0500
 @@ -374,7 +374,7 @@
  {
  if (!data-type)
@@ -220,8 +220,8 @@
strncpy(*cmt, data-Comment, data-CommentLength);
(*cmt)[data-CommentLength] = '\0';
 diff -urN xc/extras/Xpm~/lib/hashtab.c xc/extras/Xpm/lib/hashtab.c
 xc/extras/Xpm~/lib/hashtab.c   1999-01-11 08:23:11.0 -0500
-+++ xc/extras/Xpm/lib/hashtab.c2004-09-15 16:30:40.0 -0500
+--- xc/extras/Xpm~/lib/hashtab.c   2004-09-18 12:39:46.0 -0500
 xc/extras/Xpm/lib/hashtab.c2004-09-18 12:42:05.0 -0500
 @@ -135,7 +135,7 @@
  xpmHashTable *table;
  {
@@ -250,14 +250,14 @@
  if (!atomTable)
return (XpmNoMemory);
 diff -urN xc/extras/Xpm~/lib/parse.c xc/extras/Xpm/lib/parse.c
 xc/extras/Xpm~/lib/parse.c 2000-09-26 10:56:43.0 -0500
-+++ xc/extras/Xpm/lib/parse.c  2004-09-16 15:31:32.0 -0500
+--- xc/extras/Xpm~/lib/parse.c 2004-09-18 12:39:46.0 -0500
 xc/extras/Xpm/lib/parse.c  2004-09-18 12:42:05.0 -0500
 @@ -1,3 +1,4 @@
 +/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */
  /*
   * Copyright (C) 1989-95 GROUPE BULL
   *
-@@ -43,6 +44,23 @@
+@@ -43,6 +44,24 @@
  #include ctype.h
  #include string.h
  
@@ -277,11 +277,12 @@
 +  if (strlen(src)  (dstsize)) \
 +  strcpy(dst, src); \
 +  else return (XpmFileInvalid); }
++#endif
 +
  LFUNC(ParsePixels, int, (xpmData *data, unsigned int width,
 unsigned int height, unsigned int ncolors,

X Strike Force XFree86 SVN commit: r1828 - in trunk/debian: . patches

2004-09-18 Thread X Strike Force SVN Repository Admin
Author: branden
Date: 2004-09-18 13:43:15 -0500 (Sat, 18 Sep 2004)
New Revision: 1828

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff
Log:
(cosmetic) Replace an attempt at a Vim kludge (which didn't work) with a
warning not to recode the file.


Modified: trunk/debian/CHANGESETS
===
--- trunk/debian/CHANGESETS 2004-09-18 17:44:13 UTC (rev 1827)
+++ trunk/debian/CHANGESETS 2004-09-18 18:43:15 UTC (rev 1828)
@@ -9,7 +9,7 @@
 files anywhere.)
 
 Miscellaneous cosmetic fixes.
-1811, 1812, 1815, 1816
+1811, 1812, 1815, 1816, 1828
 
 Update Danish debconf template translations (thanks, Claus Hindsgaul)
 1806

Modified: trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff
===
--- trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-09-18 
17:44:13 UTC (rev 1827)
+++ trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-09-18 
18:43:15 UTC (rev 1828)
@@ -1,6 +1,6 @@
 $Id$
 
-vim:set encoding=latin1:
+[Do not recode this file!]
 
 This file is for XKB data.  This basically means any subdirectory of
 xc/programs/xkbcomp (except xc/programs/xkbcomp/cross).  Changes within



X Strike Force XFree86 SVN commit: r1829 - in trunk/debian: . patches

2004-09-18 Thread X Strike Force SVN Repository Admin
Author: branden
Date: 2004-09-18 13:44:56 -0500 (Sat, 18 Sep 2004)
New Revision: 1829

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/changelog
   trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
Log:
(cosmetic) Tidy up recent XKB change descriptions.


Modified: trunk/debian/CHANGESETS
===
--- trunk/debian/CHANGESETS 2004-09-18 18:43:15 UTC (rev 1828)
+++ trunk/debian/CHANGESETS 2004-09-18 18:44:56 UTC (rev 1829)
@@ -9,9 +9,9 @@
 files anywhere.)
 
 Miscellaneous cosmetic fixes.
-1811, 1812, 1815, 1816, 1828
+1811, 1812, 1815, 1816, 1828, 1829
 
-Update Danish debconf template translations (thanks, Claus Hindsgaul)
+Update Danish debconf template translations (thanks, Claus Hindsgaul).
 1806
 
 In the Xsession script, attempt to create a file of non-zero length in
@@ -22,30 +22,32 @@
 is defined.  Fixes FTBFS on s390.
 1814
 
-Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04).
+Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04).  This
+makes us_intl multi-layout aware, and binds the right Meta key to
+Mode_Switch.  (Closes: #271326, #234085)
 1820, 1824
 
-The fix about altwin introduced in 4.3.0.dfsg.1-1 is reverted, Meta_*
-keysyms must be removed from shift level of Alt keys when altwin:meta_win
-or altwin:left_meta_win are used.  Otherwise XKB-unaware applications
-may believe that mod1 and mod4 are bound to Meta keys.
+Revert upstream change to altwin behavior applied in 4.3.0.dfsg.1-1.
+The Meta_* keysyms must be removed from the shift level of Alt keys when
+altwin:meta_win or altwin:left_meta_win are used; otherwise, XKB-unaware
+applications (like GNU Emacs) may believe that mod1 and mod4 are bound to
+Meta keys.
 1821
 
 Fix inconsistencies in rules/xfree86* files:
 + rules/xfree86: List in $oldlayouts all layouts which are currently not
-  available in xlibs Debian package under the new multilayout format.
-+ rules/xfree86: Declare hu_US layout as being in old format (thanks,
-  Veres Lajos)
-+ rules/xfree86: The lv3:ralt_switch option, which does exist in
-  xfree86.lst, was forgotten in this file.
-+ rules/xfree86: Remove special casing for us_intl layout
-+ rules/xfree86.{lst,xml}: Options altwin:meta_super and altwin:meta_hyper
-  are replaced by their right names altwin:super_win and altwin:hyper_win.
-+ rules/xfree86.{lst,xml}: Perform changes to synchronize these files.
+  multi-layout aware in the Debian xlibs package, including hu_US (thanks,
+  Veres Lajos).  (Closes: #247463, #270810)
++ rules/xfree86: Support the lv3:ralt_switch option, which exists in
+  xfree86.lst but was forgotten in this file.
++ rules/xfree86.{lst,xml}: Replace the options altwin:meta_super and
+  altwin:meta_hyper with the correct names altwin:super_win and
+  altwin:hyper_win.  (Closes: #271259)
++ rules/xfree86.{lst,xml}: Synchronize these files.
 1822, 1825, 1826
 
-Add FAQ entry: My keyboard configuration worked with XFree86 4.2, why is
-it messed up now?
+Add FAQ entry: My keyboard configuration worked with XFree86 4.2; why is
+it messed up now?  (Closes: #259740)
 1823
 
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2004-09-18 18:43:15 UTC (rev 1828)
+++ trunk/debian/changelog  2004-09-18 18:44:56 UTC (rev 1829)
@@ -5,32 +5,33 @@
   * Update Danish debconf template translations (thanks, Claus Hindsgaul).
 (Closes: #270503)
 
-  * Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04)
-(Closes: #271326, #234085)
+  * Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04).  This
+makes us_intl multi-layout aware, and binds the right Meta key to
+Mode_Switch.  (Closes: #271326, #234085)
 
-  * The fix about altwin introduced in 4.3.0.dfsg.1-1 is reverted, Meta_*
-keysyms must be removed from shift level of Alt keys when altwin:meta_win
-or altwin:left_meta_win are used.  Otherwise XKB-unaware applications
-may believe that mod1 and mod4 are bound to Meta keys.
+  * Revert upstream change to altwin behavior applied in 4.3.0.dfsg.1-1.
+The Meta_* keysyms must be removed from the shift level of Alt keys when
+altwin:meta_win or altwin:left_meta_win are used; otherwise, XKB-unaware
+applications (like GNU Emacs) may believe that mod1 and mod4 are bound to
+Meta keys.
 
   * Fix inconsistencies in rules/xfree86* files:
 + rules/xfree86: List in $oldlayouts all layouts which are currently not
-  available in xlibs Debian package under the new multilayout format.
-  (Closes: #270810)
-+ rules/xfree86: The lv3:ralt_switch option, which does exist in
-  xfree86.lst, was forgotten in this file.
-+ rules/xfree86.{lst,xml}: Options altwin:meta_super and altwin:meta_hyper
-  are replaced by their right names altwin:super_win and altwin:hyper_win.
-  

X Strike Force XFree86 SVN property change: propchange - r1820 svn:log

2004-09-18 Thread X Strike Force SVN Repository Admin
Author: branden
Revision: 1820
Property Name: svn:log

New Property Value:
Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04).  This
makes us_intl multi-layout aware, and binds the right Meta key to
Mode_Switch.  (Closes: #271326, #234085)




X Strike Force XFree86 SVN property change: propchange - r1821 svn:log

2004-09-18 Thread X Strike Force SVN Repository Admin
Author: branden
Revision: 1821
Property Name: svn:log

New Property Value:
Revert upstream change to altwin behavior applied in 4.3.0.dfsg.1-1.
The Meta_* keysyms must be removed from the shift level of Alt keys when
altwin:meta_win or altwin:left_meta_win are used; otherwise, XKB-unaware
applications (like GNU Emacs) may believe that mod1 and mod4 are bound to
Meta keys.




X Strike Force XFree86 SVN property change: propchange - r1822 svn:log

2004-09-18 Thread X Strike Force SVN Repository Admin
Author: branden
Revision: 1822
Property Name: svn:log

New Property Value:
Fix inconsistencies in rules/xfree86* files:
+ rules/xfree86: List in $oldlayouts all layouts which are currently not
  multi-layout aware in the Debian xlibs package.  (Closes: #270810)
+ rules/xfree86: Support the lv3:ralt_switch option, which exists in
  xfree86.lst but was forgotten in this file.
+ rules/xfree86.{lst,xml}: Replace the options altwin:meta_super and
  altwin:meta_hyper with the correct names altwin:super_win and
  altwin:hyper_win.  (Closes: #271259)
+ rules/xfree86.{lst,xml}: Synchronize these files.




X Strike Force XFree86 SVN property change: propchange - r1823 svn:log

2004-09-18 Thread X Strike Force SVN Repository Admin
Author: branden
Revision: 1823
Property Name: svn:log

New Property Value:
Add FAQ entry: My keyboard configuration worked with XFree86 4.2; why is it
messed up now?




X Strike Force XFree86 SVN property change: propchange - r1824 svn:log

2004-09-18 Thread X Strike Force SVN Repository Admin
Author: branden
Revision: 1824
Property Name: svn:log

New Property Value:
Move patch #087 to #000_stolen_from_HEAD_xkb_data where it belongs.




X Strike Force XFree86 SVN property change: propchange - r1825 svn:log

2004-09-18 Thread X Strike Force SVN Repository Admin
Author: branden
Revision: 1825
Property Name: svn:log

New Property Value:
Improve fix to rules/xfree86 $oldlayouts update:
+ Declare hu_US layout as not being multi-layout aware (thanks, Veres Lajos).
  (Closes: #247463)
+ Really list all old format layouts in rules/xfree86 ($oldlayouts); don't
  just grep those listed in xfree86.lst.




X Strike Force XFree86 SVN property change: propchange - r1826 svn:log

2004-09-18 Thread X Strike Force SVN Repository Admin
Author: branden
Revision: 1826
Property Name: svn:log

New Property Value:
Remove special case in XKB rules/xfree86 file that causes PC keyboard
models with the us_intl layout to load the us layout and add the us_intl
layout to it.  (Closes: #234085)




X Strike Force XFree86 SVN commit: r1830 - trunk/debian

2004-09-18 Thread X Strike Force SVN Repository Admin
Author: branden
Date: 2004-09-18 13:54:02 -0500 (Sat, 18 Sep 2004)
New Revision: 1830

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/changelog
Log:
(cosmetic) Resynchronize some changelog/changeset information.


Modified: trunk/debian/CHANGESETS
===
--- trunk/debian/CHANGESETS 2004-09-18 18:44:56 UTC (rev 1829)
+++ trunk/debian/CHANGESETS 2004-09-18 18:54:02 UTC (rev 1830)
@@ -9,7 +9,7 @@
 files anywhere.)
 
 Miscellaneous cosmetic fixes.
-1811, 1812, 1815, 1816, 1828, 1829
+1811, 1812, 1815, 1816, 1828, 1829, 1830
 
 Update Danish debconf template translations (thanks, Claus Hindsgaul).
 1806
@@ -40,6 +40,9 @@
   Veres Lajos).  (Closes: #247463, #270810)
 + rules/xfree86: Support the lv3:ralt_switch option, which exists in
   xfree86.lst but was forgotten in this file.
++ rules/xfree86: Remove special case that causes PC keyboard models with
+  the us_intl layout to load the us layout and add the us_intl layout to
+  it.  (Closes: #234085)
 + rules/xfree86.{lst,xml}: Replace the options altwin:meta_super and
   altwin:meta_hyper with the correct names altwin:super_win and
   altwin:hyper_win.  (Closes: #271259)

Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2004-09-18 18:44:56 UTC (rev 1829)
+++ trunk/debian/changelog  2004-09-18 18:54:02 UTC (rev 1830)
@@ -23,7 +23,7 @@
   xfree86.lst but was forgotten in this file.
 + rules/xfree86: Remove special case that causes PC keyboard models with
   the us_intl layout to load the us layout and add the us_intl layout to
-  it.
+  it.  (Closes: #234085)
 + rules/xfree86.{lst,xml}: Replace the options altwin:meta_super and
   altwin:meta_hyper with the correct names altwin:super_win and
   altwin:hyper_win.  (Closes: #271259)



Bug#272294: xserver-xfree86: xserver locks while running xlockmore and 830M

2004-09-18 Thread Alexander Tait Brotman
Package: xserver-xfree86
Version: 4.3.0.dfsg.1-4
Severity: normal

xserver locks while screen locked using gnome's lock icon .. Cannot get to VTs 
due to previously ignored bug.  It happens randomly and it could perhaps be a 
problem with xlockmore(GL screesaver?).  Usually i also have the laptop lid 
closed.  I have to hardboot the system.

(XFree86.0.log.old actually attached as it was moved on reboot)

-- Package-specific info:
Contents of /var/lib/xfree86/X.roster:
xserver-xfree86

/var/lib/xfree86/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx  1 root root 20 2003-09-06 18:14 /etc/X11/X - /usr/bin/X11/XFree86
-rwxr-xr-x  1 root root 1745132 2004-05-29 08:33 /usr/bin/X11/XFree86

Contents of /var/lib/xfree86/XF86Config-4.roster:
xserver-xfree86

VGA-compatible devices on PCI bus:
00:02.0 VGA compatible controller: Intel Corp.: Unknown device 3582 (rev 01)
00:02.0 Class 0300: 8086:3582 (rev 01)

/var/lib/xfree86/XF86Config-4.md5sum does not exist.

XFree86 X server configuration file status:
-rw-r--r--  1 root root 2544 2004-05-15 18:20 /etc/X11/XF86Config-4

Contents of /etc/X11/XF86Config-4:
Section ServerLayout
Identifier XFree86 Configured
Screen  0  Screen0 0 0
InputDeviceMouse0 CorePointer
InputDeviceKeyboard0 CoreKeyboard
EndSection

Section Files
RgbPath  /usr/X11R6/lib/X11/rgb
ModulePath   /usr/X11R6/lib/modules
FontPath /usr/X11R6/lib/X11/fonts/misc/
FontPath /usr/X11R6/lib/X11/fonts/Speedo/
FontPath /usr/X11R6/lib/X11/fonts/Type1/
FontPath /usr/X11R6/lib/X11/fonts/CID/
FontPath /usr/X11R6/lib/X11/fonts/75dpi/
FontPath /usr/X11R6/lib/X11/fonts/100dpi/
EndSection

Section Module
Load  dbe
Load  dri
Load  extmod
Load  glx
Load  record
Load  xtrap
Load  speedo
Load  type1
EndSection

Section InputDevice
Identifier  Keyboard0
Driver  keyboard
Option   XkbRules xfree86
Option  XkbLayout us
Option  XkbModel pc104
EndSection

Section InputDevice
Identifier  Mouse0
Driver  mouse
Option  Protocol Auto
Option  Device /dev/psaux
EndSection

Section Monitor
Identifier   Monitor0
VendorName   Monitor Vendor
ModelNameMonitor Model
EndSection

Section Device

### Available Driver options are:-
### Values: i: integer, f: float, bool: True/False,
### string: String, freq: f Hz/kHz/MHz
### [arg]: arg optional
#Option NoAccel   # [bool]
#Option SWcursor  # [bool]
#Option ColorKey  # i
#Option CacheLines# i
#Option Dac6Bit   # [bool]
Option DRI# [bool]
#Option NoDDC # [bool]
#Option ShowCache # [bool]
#Option XvMCSurfaces  # i
Identifier  Card0
Driver  i810
VendorName  Intel Corp.
BoardName   852GM/852GME/855GM/855GME Chipset Graphics Controller
BusID   PCI:0:2:0
VideoRam32768
Option  AGPMode 1
Option  DPMS Off
EndSection

Section Screen
Identifier Screen0
Device Card0
MonitorMonitor0
DefaultDepth16
SubSection Display
Depth 1
EndSubSection
SubSection Display
Depth 4
EndSubSection
SubSection Display
Depth 8
EndSubSection
SubSection Display
Depth 15
EndSubSection
SubSection Display
Depth 16
EndSubSection
SubSection Display
Depth 24
EndSubSection
EndSection

Section DRI
Group0
Mode0666
EndSection



XFree86 X server log files on system:
-rw-r--r--  1 root root 48430 2003-09-07 10:29 /var/log/XFree86.8.log
-rw-r--r--  1 root root  1450 2003-10-25 09:32 /var/log/XFree86.1.log
-rw-r--r--  1 root root 65646 2004-09-18 22:51 /var/log/XFree86.0.log

Contents of most recent XFree86 X server log file
/var/log/XFree86.0.log.old:



This is a pre-release version of XFree86, and is not supported in any
way.  Bugs may be reported to XFree86@XFree86.Org and patches submitted
to [EMAIL PROTECTED]  Before reporting bugs in pre-release versions,
please check the latest version in the XFree86 CVS repository
(http://www.XFree86.Org/cvs).

XFree86 Version 4.3.0.1 (Debian 4.3.0.dfsg.1-4 20040529113443 [EMAIL PROTECTED])
Release Date: 15 August 2003
X Protocol Version 11, Revision 0, Release 6.6
Build Operating System: Linux 2.6.6-rc3-bk9 i686 [ELF] 
Build Date: 29 May 2004
Before reporting problems, check 

Bug#164767: marked as done (xlibs: altgr doesn't work on german keyboards with altwin:meta_win)

2004-09-18 Thread Debian Bug Tracking System
Your message dated Sat, 18 Sep 2004 10:43:05 +0200
with message-id [EMAIL PROTECTED]
and subject line Bug#164767: xlibs: altgr doesn't work on german keyboards with 
altwin:meta_win
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--
Received: (at submit) by bugs.debian.org; 14 Oct 2002 23:50:08 +
From [EMAIL PROTECTED] Mon Oct 14 18:50:08 2002
Return-path: [EMAIL PROTECTED]
Received: from bender.toppoint.de (mail.toppoint.de) [195.244.243.1] 
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 181EyN-0007ap-00; Mon, 14 Oct 2002 18:50:07 -0500
Received: (from [EMAIL PROTECTED])
by mail.toppoint.de (8.9.3/8.9.3) id BAA20481
for [EMAIL PROTECTED]; Tue, 15 Oct 2002 01:50:03 +0200 (MET DST)
Received: from eris.wurm.lan (localhost [127.0.0.1])
by eris.wurm.lan (8.12.6/8.12.6/Debian-6) with ESMTP id g9ENmY6T010857
for [EMAIL PROTECTED]; Tue, 15 Oct 2002 01:48:34 +0200
Received: (from [EMAIL PROTECTED])
by eris.wurm.lan (8.12.6/8.12.6/Debian-6) id g9ENmX8F010853;
Tue, 15 Oct 2002 01:48:33 +0200
Sender: [EMAIL PROTECTED]
To: Debian Bug Tracking System [EMAIL PROTECTED]
Subject: xlibs: altgr doesn't work on german keyboards with altwin:meta_win
From: David Spreen [EMAIL PROTECTED]
Date: 15 Oct 2002 01:48:33 +0200
Message-ID: [EMAIL PROTECTED]
Lines: 57
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Delivered-To: [EMAIL PROTECTED]


Package: xlibs
Version: 4.2.1-2
Severity: wishlist
Tags: patch

Configuring the old meta-win behavour confuses the german keyboard layout
(alt_r doesn't act as Mode_switch and Multi_key anymore).
The following patch adds a partial modifier_keys block to 
/etc/X11/xkb/symbols/altwin which provides a german keyboard-layout
with the old meta_win behavour. I don't know if this is the best
way to solve the problem but it works for me.

--Begin--

--- /etc/X11/xkb/symbols/altwin 2002-10-15 01:44:22.0 +0200
+++ /etc/X11/xkb/symbols/altwin.new 2002-10-15 01:45:55.0 +0200
@@ -19,6 +19,17 @@
 };
 
 partial modifier_keys 
+xkb_symbols meta_win_de {
+key LALT {[   Alt_L,  Alt_L   ]   };
+key RALT {[   Mode_switch, Multi_key, Alt_R,  Alt_R  
 ]   };
+key LWIN {[   Meta_L  ]   };
+key RWIN {[   Meta_R  ]   };
+modifier_map Mod1   { Alt_L };
+modifier_map Mod5   { Alt_R };
+modifier_map Mod4   { Meta_L, Meta_R };
+};
+
+partial modifier_keys 
 xkb_symbols left_meta_win {
 key LALT {   [   Alt_L,  Alt_L   ]   };
 key LWIN {   [   Meta_L  ]   };

--End--


-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux eris 2.4.18 #1 Son Sep 29 23:38:51 CEST 2002 i686
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (ignored: LC_ALL set)

Versions of packages xlibs depends on:
ii  libc6 2.2.5-15   GNU C Library: Shared libraries an
ii  libfreetype6  2.1.2-7FreeType 2 font engine, shared lib
ii  xfree86-common4.2.1-2X Window System (XFree86) infrastr

-- no debconf information

-- 
 /\
  Debian GNU/Linux  - _The_ free oprating system   
  David Spreen  -  [EMAIL PROTECTED] - C8B6823A (keyring.debian.org) 
 \/


---
Received: (at 164767-done) by bugs.debian.org; 18 Sep 2004 08:39:37 +
From [EMAIL PROTECTED] Sat Sep 18 01:39:37 2004
Return-path: [EMAIL PROTECTED]
Received: from postfix4-2.free.fr [213.228.0.176] 
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1C8akr-0004hc-00; Sat, 18 Sep 2004 01:39:37 -0700
Received: from localhost.localdomain (lns-vlq-26-82-254-147-148.adsl.proxad.net 
[82.254.147.148])
by postfix4-2.free.fr (Postfix) with ESMTP id C08D21EA5B1
for [EMAIL PROTECTED]; Sat, 18 Sep 2004 10:39:36 +0200 (CEST)
Received: by localhost.localdomain (Postfix, from userid 1000)
id BC2F923D9C; Sat, 18 Sep 2004 10:43:05 +0200 (CEST)
Date: Sat, 18 Sep 2004 10:43:05 +0200
To: [EMAIL PROTECTED]
Subject: Re: Bug#164767: xlibs: altgr doesn't work on german keyboards with 
altwin:meta_win
Message-ID: [EMAIL PROTECTED]
Mime-Version: 1.0
Content-Type: 

Bug#128420: marked as done (xlibs: [xkb] support for Logitech 'Cordless Desktop iTouch' keyboard)

2004-09-18 Thread Debian Bug Tracking System
Your message dated Sat, 18 Sep 2004 10:40:09 +0200
with message-id [EMAIL PROTECTED]
and subject line Bug #128420 already fixed in unstable
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--
Received: (at submit) by bugs.debian.org; 9 Jan 2002 12:12:37 +
From [EMAIL PROTECTED] Wed Jan 09 06:12:37 2002
Return-path: [EMAIL PROTECTED]
Received: from o05.xray.mpe.mpg.de [130.183.72.185] 
by master.debian.org with smtp (Exim 3.12 1 (Debian))
id 16OHau-00011I-00; Wed, 09 Jan 2002 06:12:37 -0600
Received: (qmail 15604 invoked from network); 9 Jan 2002 12:12:32 -
Received: from ds10.xray.mpe.mpg.de (130.183.72.190)
  by o05.xray.mpe.mpg.de with SMTP; 9 Jan 2002 12:12:32 -
Received: from ach by ds10.xray.mpe.mpg.de with local (Exim 3.33 #1 (Debian))
id 16OHap-0001VP-00; Wed, 09 Jan 2002 13:12:31 +0100
From: Achim Bohnet [EMAIL PROTECTED]
To: Debian Bug Tracking System [EMAIL PROTECTED]
Subject: xlibs: [xkb patch] Support for Logitech 'Cordless Desktop iTouch' 
keyboard
X-Reportbug-Version: 1.41.1421
X-Mailer: reportbug 1.41.1421
Date: Wed, 09 Jan 2002 13:12:31 +0100
Message-Id: [EMAIL PROTECTED]
Sender: Achim Bohnet [EMAIL PROTECTED]
Delivered-To: [EMAIL PROTECTED]

Package: xlibs
Version: 4.1.0-11
Severity: normal
Tags: patch

Hi Brandon,

we use here 2 Logitech keyboard models: 'Cordless Desktop iTouch' (
as listed on the package):

UK  18 'Internet' keys (bought in 2001)  xkb id 
cordlessdesktopitouch
US  12 'Internet' keys (bought in 2000)  xdb id logicordless

New: cordlessdesktopitouch UK 
o UK layout has the EuroSign to the left of '4'.  Because I do
  not know better I assumed that Key '$/4/Euro' is usual in UK
  and I defined a basiceurosign in gb instead of adding it to
  cordlessdesktopitouch.

o I assumed Eurosign left to '5' is somehow standard for us
  so I defined a pc104eurosign

Changed in logicordless US:
o the US layout keyboard has left to '5' an EuroSign
  There is only a right Alt key and no AltGr.  Because
  we (in Germany at least) need the EuroSign. I redefined
  Alt_R to Mode_switch aka AltGr to access Euro 'as usual'.

o There's an 'Internet' key labeled (/||) for play/pause
  but only Play was defined not pause

The patch was against -9 but still applies (with some line offsets)
and works with -11

If you have question, suggestions how to enhance the
'Cordless Desktop iTouch' support let me know.

Thx for your big/great work with Xfree86 for Debian.

Achim

--- lib/X11/xkb/rules/xfree86.lst.orig  Mon Dec 10 11:34:26 2001
+++ lib/X11/xkb/rules/xfree86.lst   Fri Dec 14 01:03:08 2001
@@ -24,6 +24,7 @@
   itouch   Logitech iTouch
   logicordless Logitech Cordless Desktop Pro
   logiinternet Logitech Internet Keyboard
+  cordlessdesktopitouchLogitech Cordless Desktop iTouch
   compaq   Compaq Internet
   microsoftpro Microsoft Natural Pro
   geniuscomfy  Genius Comfy KB-16M
--- lib/X11/xkb/rules/xfree86.orig  Fri Dec 14 03:15:39 2001
+++ lib/X11/xkb/rules/xfree86   Fri Dec 14 02:01:29 2001
@@ -25,6 +25,7 @@
   itouch   =   xfree86 pc(pc104)
   logicordless  =  xfree86 pc(pc104)
   logiinternet  =  xfree86 pc(pc104)
+  cordlessdesktopitouch  = xfree86 pc(pc104)
   compaq   =   xfree86 pc(pc104)
   microsoftpro =   xfree86 microsoft(natural)
   geniuscomfy  =   xfree86 pc(pc104)
@@ -92,12 +93,16 @@
   itouch   us  =   us(pc104)+inet(itouch)
   itouch   en_US   =   en_US(pc104)+inet(itouch)
   itouch   *   =   en_US(pc104)+inet(itouch)+%l%(v)
-  logicordless us  =   us(pc104)+inet(logicordless)
+  logicordless us  =   us(pc104eurosign)+inet(logicordless)
   logicordless en_US   =   en_US(pc104)+inet(logicordless)
   logicordless *   =   en_US(pc104)+inet(logicordless)+%l%(v)
   logiinternet us  =   us(pc104)+inet(logiinternet)
   logiinternet en_US   =   en_US(pc104)+inet(logiinternet)
   logiinternet *   =   en_US(pc104)+inet(logiinternet)+%l%(v)
+  cordlessdesktopitouchus  =   
us(pc104)+inet(cordlessdesktopitouch)
+  cordlessdesktopitouchen_US   =   
en_US(pc104)+inet(cordlessdesktopitouch)
+  cordlessdesktopitouchgb  =   
en_US(pc104)+inet(cordlessdesktopitouch)+gb(basiceurosign)
+  cordlessdesktopitouch

Bug#271235: Bug#270228: Bug#269025: new nv driver. please test!

2004-09-18 Thread Fabio Massimo Di Nitto
On Sat, 18 Sep 2004, David Vanderson wrote:

 Fabio,

 Thanks for the new driver.  I submitted bug 271235 - that's the one I'm
 testing:

 I installed xserver-xfree86_4.3.0.dfsg.1-7_i386.deb (originally had the
 problem).  Then I overwrote nv_drv.o with your new one.  X started fine
 but the problem was still there (no output in mplayer with XVideo).

Ok thanks! Yes we are aware of the XV problem. Can you try to use xine and
see if that works? We have a couple of reports where it is only mplayer
having problems. Please also attach the output of xvinfo. It will help us
isolating the problem that seems to be specific to a range of nvidia cards
and not all of them.

 I downgraded to xserver-xfree86_4.3.0.dfsg.1-6_i386.deb (originally was
 fine).  I overwrote nv_drv.o with your new one.  X started fine but the
 problem showed up again.

Yes the problem is the driver itself. You can keep -7 and use the new
driver while we figure what is wrong.

 Let me know if there is anything I can do to help out.

Thanks! I will let you when we will have something new to test.

Fabio

-- 
user fajita: step one
fajita Whatever the problem, step one is always to look in the error log.
user fajita: step two
fajita When in danger or in doubt, step two is to scream and shout.



Bug#272208: xserver-xfree86: Problem using Mod4 modifier in Metacity and Openbox

2004-09-18 Thread DaVinci
Package: xserver-xfree86
Version: 4.3.0.dfsg.1-7
Severity: normal

 Hi.

 I have problems configuring key combination Mod4+Tab in order to switch
 windows using Metacity and Openbox window managers.
 
 In Openbox it seems Mod4 key it isn't properly recognized when I
 release it; so, focus changes from one window to another, but I need to
 pulse other key to continue working.

 In Metacity, I directly can't configure Mod4+Tab, because when it tells
 me to press key combination, it is impossible get that working (there
 is no problem with other combinations like Alt+Tab).

 I don't know where is the problem, but supose it is an xserver error.

 Thanks for all.

David

-- Package-specific info:
Contents of /var/lib/xfree86/X.roster:
xserver-xfree86

/etc/X11/X target unchanged from checksum in /var/lib/xfree86/X.md5sum.

X server symlink status:
lrwxrwxrwx  1 root root 20 2002-01-04 06:15 /etc/X11/X - /usr/bin/X11/XFree86
-rwxr-xr-x  1 root root 1745484 2004-09-06 13:16 /usr/bin/X11/XFree86

Contents of /var/lib/xfree86/XF86Config-4.roster:
xserver-xfree86

VGA-compatible devices on PCI bus:
:01:00.0 VGA compatible controller: ATI Technologies Inc Radeon RV100 QY 
[Radeon 7000/VE]

/var/lib/xfree86/XF86Config-4.md5sum does not exist.

XFree86 X server configuration file status:
-rw-r--r--  1 root root 2685 2003-04-23 08:30 /etc/X11/XF86Config-4

Contents of /etc/X11/XF86Config-4:
### BEGIN DEBCONF SECTION
# XF86Config-4 (XFree86 server configuration file) generated by dexconf, the
# Debian X Configuration tool, using values from the debconf database.
#
# Edit this file with caution, and see the XF86Config-4 manual page.
# (Type man XF86Config-4 at the shell prompt.)
#
# If you want your changes to this file preserved by dexconf, only make changes
# before the ### BEGIN DEBCONF SECTION line above, and/or after the
# ### END DEBCONF SECTION line below.
#
# To change things within the debconf section, run the command:
#   dpkg-reconfigure xserver-xfree86
# as root.  Also see How do I add custom sections to a dexconf-generated
# XF86Config or XF86Config-4 file? in /usr/share/doc/xfree86-common/FAQ.gz.

Section Module
LoadGLcore
Loadbitmap
Loaddbe
Loadddc
Loaddri
Loadextmod
Loadfreetype
Loadglx
Loadint10
Loadrecord
Loadspeedo
Loadtype1
Loadvbe
EndSection

Section InputDevice
Identifier  Generic Keyboard
Driver  keyboard
Option  CoreKeyboard
Option  XkbRules  xfree86
Option  XkbModel  pc105
Option  XkbLayout es
EndSection

Section InputDevice
Identifier  Configured Mouse
Driver  mouse
Option  CorePointer
Option  Device/dev/psaux
Option  Protocol  ImPS/2
Option  ZAxisMapping  4 5
EndSection

Section InputDevice
Identifier  Generic Mouse
Driver  mouse
Option  SendCoreEventstrue
Option  Device/dev/input/mice
Option  Protocol  ImPS/2
Option  ZAxisMapping  4 5
EndSection

Section Device
Identifier  ATI Radeon 7000
Driver  ati
EndSection

Section Monitor
Identifier  AOC
HorizSync   30-95
VertRefresh 50-160
Option  DPMS
EndSection

Section Screen
Identifier  Default Screen
Device  ATI Radeon 7000
Monitor AOC
DefaultDepth24
SubSection Display
Depth   1
Modes   1152x864 1024x768 800x600 640x480
EndSubSection
SubSection Display
Depth   4
Modes   1152x864 1024x768 800x600 640x480
EndSubSection
SubSection Display
Depth   8
Modes   1152x864 1024x768 800x600 640x480
EndSubSection
SubSection Display
Depth   15
Modes   1152x864 1024x768 800x600 640x480
EndSubSection
SubSection Display
Depth   16
Modes   1152x864 1024x768 800x600 640x480
EndSubSection
SubSection Display
Depth   24
Modes   1152x864 1024x768 800x600 640x480
EndSubSection
EndSection

Section ServerLayout
Identifier  Default Layout
Screen  Default Screen
InputDevice Generic Keyboard
InputDevice Configured Mouse
InputDevice Generic Mouse
EndSection

Section DRI
Mode0666
EndSection

### END DEBCONF SECTION