Bug#126519: letter + current pick qaqkrge e

2003-09-21 Thread Hallie Peterson



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



Bug#211890: xfree86: japanese debconf template

2003-09-21 Thread Kenshi Muto
At Sun, 21 Sep 2003 10:44:08 +0900 (JST),
Tomohiro KUBOTA wrote:
> Package: xfree86
> Version: 4.2.1-11
> Severity: wishlist
> 
> Here is an updated Japanese translation of po-debconf file.
> The file should go to debian/po directory of the xfree86 source
> package.

Hmm, I've already sent new ja.po file for XFree86 4.3.0 to ISHIKAWA
Mutsumi-san directly some days ago, and he will commit it into
Subversion repository.
-- 
Kenshi Muto
[EMAIL PROTECTED]



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



XFree86 4.3.0-0pre1v1 aborts on signal 11

2003-09-21 Thread Joshua Kwan
In the middle of an uneventful X session where I was simply typing some
stuff up in vim, it aborts on signal 11 and flings me back into the
console. As per the crash advice, I've attached the XFree86.0.log,
although it doesn't seem to show anything useful in my eyes hopefully it
can help the X Strike Force.

A friend with a nVidia card has also been experiencing this equally
sporadically. I don't see the correlation so maybe it is not a problem
with my choice of video card? (radeon X server)

HTH,

-- 
Joshua Kwan

XFree86 Version 4.3.0 (Debian 4.3.0-0pre1v1 20030731221840 root@)
Release Date: 18 March 2003
X Protocol Version 11, Revision 0, Release 6.6
Build Operating System: Linux 2.6.0-test1-bk2 i686 [ELF] 
Build Date: 31 July 2003
Before reporting problems, check http://www.XFree86.Org/
to make sure that you have the latest version.
Module Loader present
OS Kernel: Linux version 2.6.0-test5-mm3 ([EMAIL PROTECTED]) (gcc version 3.3.2 
20030908 (Debian prerelease)) #5 Fri Sep 19 00:28:24 PDT 2003 
Markers: (--) probed, (**) from config file, (==) default setting,
 (++) from command line, (!!) notice, (II) informational,
 (WW) warning, (EE) error, (NI) not implemented, (??) unknown.
(==) Log file: "/var/log/XFree86.0.log", Time: Sat Sep 20 10:19:40 2003
(==) Using config file: "/etc/X11/XF86Config-4"
(==) ServerLayout "Default Layout"
(**) |-->Screen "Default Screen" (0)
(**) |   |-->Monitor "Dell Smartstep 200N LCD"
(**) |   |-->Device "ATI Mobility Radeon M6"
(**) |-->Input Device "Generic Keyboard"
(**) Option "XkbRules" "xfree86"
(**) XKB: rules: "xfree86"
(**) Option "XkbModel" "pc104"
(**) XKB: model: "pc104"
(**) Option "XkbLayout" "us"
(**) XKB: layout: "us"
(==) Keyboard: CustomKeycode disabled
(**) |-->Input Device "Generic Mouse"
(WW) The directory "/usr/lib/X11/fonts/CID" does not exist.
Entry deleted from font path.
(WW) The directory "/usr/lib/X11/fonts/cyrillic" does not exist.
Entry deleted from font path.
(**) FontPath set to 
"unix/:7100,/usr/lib/X11/fonts/Type1,/usr/lib/X11/fonts/Speedo,/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
(==) RgbPath set to "/usr/X11R6/lib/X11/rgb"
(==) ModulePath set to "/usr/X11R6/lib/modules"
(--) using VT number 7

(WW) Open APM failed (/dev/apm_bios) (No such device)
(II) Module ABI versions:
XFree86 ANSI C Emulation: 0.2
XFree86 Video Driver: 0.6
XFree86 XInput driver : 0.4
XFree86 Server Extension : 0.2
XFree86 Font Renderer : 0.4
(II) Loader running on linux
(II) LoadModule: "bitmap"
(II) Loading /usr/X11R6/lib/modules/fonts/libbitmap.a
(II) Module bitmap: vendor="The XFree86 Project"
compiled for 4.3.0, module version = 1.0.0
Module class: XFree86 Font Renderer
ABI class: XFree86 Font Renderer, version 0.4
(II) Loading font Bitmap
(II) LoadModule: "pcidata"
(II) Loading /usr/X11R6/lib/modules/libpcidata.a
(II) Module pcidata: vendor="The XFree86 Project"
compiled for 4.3.0, module version = 1.0.0
ABI class: XFree86 Video Driver, version 0.6
(II) PCI: Probing config type using method 1
(II) PCI: Config type is 1
(II) PCI: stages = 0x03, oldVal1 = 0x8002483c, mode1Res1 = 0x8000
(II) PCI: PCI scan (all values are in hex)
(II) PCI: 00:00:0: chip 8086,1a30 card 1025,1027 rev 04 class 06,00,00 hdr 00
(II) PCI: 00:01:0: chip 8086,1a31 card , rev 04 class 06,04,00 hdr 01
(II) PCI: 00:1e:0: chip 8086,244e card , rev 05 class 06,04,00 hdr 01
(II) PCI: 00:1f:0: chip 8086,2440 card , rev 05 class 06,01,00 hdr 80
(II) PCI: 00:1f:1: chip 8086,244b card 1025,1027 rev 05 class 01,01,80 hdr 00
(II) PCI: 00:1f:2: chip 8086,2442 card 1025,1027 rev 05 class 0c,03,00 hdr 00
(II) PCI: 00:1f:3: chip 8086,2443 card 1025,1027 rev 05 class 0c,05,00 hdr 00
(II) PCI: 00:1f:4: chip 8086,2444 card 1025,1027 rev 05 class 0c,03,00 hdr 00
(II) PCI: 00:1f:5: chip 8086,2445 card 1025,1027 rev 05 class 04,01,00 hdr 00
(II) PCI: 00:1f:6: chip 8086,2446 card 1025,1027 rev 05 class 07,03,00 hdr 00
(II) PCI: 01:00:0: chip 1002,4c59 card 1025,101d rev 00 class 03,00,00 hdr 00
(II) PCI: 02:03:0: chip 104c,8026 card 1025,1027 rev 00 class 0c,00,10 hdr 00
(II) PCI: 02:05:0: chip 10ec,8139 card 1025,1027 rev 10 class 02,00,00 hdr 00
(II) PCI: 02:09:0: chip 104c,ac55 card 1000, rev 01 class 06,07,00 hdr 82
(II) PCI: 02:09:1: chip 104c,ac55 card 1800, rev 01 class 06,07,00 hdr 82
(II) PCI: End of PCI scan
(II) Host-to-PCI bridge:
(II) Bus 0: bridge is at (0:0:0), (0,0,7), BCTRL: 0x0008 (VGA_EN is set)
(II) Bus 0 I/O range:
[0] -1  0   0x - 0x (0x1) IX[B]
(II) Bus 0 non-prefetchable memory range:
[0] -1  0   0x - 0x (0x0) MX[B]
(II) Bus 0 prefetchable memory range:
[0] -1  0   0x - 0x (0x0) MX[B]
(II) PCI-to-PCI bridge:
(II) Bus 1: bridge is at (0:1:0), (0,1,1), BCTRL: 0x000c (VGA_EN is set)
(II) Bus 1 I/O range:
   

Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread Warren Turkal
Branden Robinson wrote:

> On Fri, Sep 19, 2003 at 01:36:38PM -0500, X Strike Force SVN Admin wrote:
>> Author: wt
>> Date: 2003-09-19 13:36:17 -0500 (Fri, 19 Sep 2003)
>> New Revision: 555
>> 
>> Added:
>>branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff
>> Removed:
>>branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff
>> Modified:
>>branches/4.3.0/sid/debian/MANIFEST.i386
>>branches/4.3.0/sid/debian/rules
>>branches/4.3.0/sid/debian/xlibs-dev.install
>> Log:
>> Enabling pkg-config for libX11. The main artifact is that
>> there is now a file called /usr/lib/pkgconfig/X11.pc.
> 
> This commit was defective, in my opinion.
> 
> In the future, please do not alter a MANIFEST file without altering all
> of them, when the change being made is expected to affect all
> architectures.  If the change affects only some architectures, update
> the MANIFEST files exactly as you expect them to change.

Okay, I was just under the impression that that should be done by someone on
the arch...sorry.

> Also, don't use the same patch number for a radical alteration of the
> patch's function.  It would have been better to delete patch #017 and
> add the new patch at the first available number, which is somewhere
> around #070, I think.

Okay, gotcha.

wt
-- 
President, GOLUM, Inc.
http://www.golum.org


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



Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread Warren Turkal
Branden Robinson wrote:

> On Sat, Sep 20, 2003 at 02:17:40PM +0200, Michel Dänzer wrote:
>> On Fri, 2003-09-19 at 20:36, X Strike Force SVN Admin wrote:
>> > 
>> > Log:
>> > Enabling pkg-config for libX11. The main artifact is that
>> > there is now a file called /usr/lib/pkgconfig/X11.pc.
>> 
>> Shouldn't we wait for an upstream decision on this?
> 
> Warren, please expand on your rationale for this change.
> 

The 017 that was in the svn was not useful to any architecture and was
baggage from prior X versions AFAICT since there is already a "depend::" in
the Imakefile in the xc/lib/X11 dir.

The 017 that was added simply adds pkg-config support for X11. This change
in no way affects the executables or libs. I think this change will be
useful to software developers. I also know that it will be helpful to my
effort at autotoolizing the X programs. Without this support for pkg-config
in place, I am unable to easily detect the location of libs such as Xrender
and set an arbitrary define via autoconf methods. With the pkg-config
support, I am supposed able to even keep portability with Cygwin relatively
easily. This is related to the xrender.pc, xcursor.pc, etc. Also, I really
do not have enough knowledge to build a fully independent autotooled libX11
at this point as has been done with xcursor, xrender, and xft.

Although I am working on repackaging libX11 with autotools, it is not done
yet. Also, it is not trivial to make the XFree86 build system use an
external libX11 even if I did. Thus, adding the X11.pc to the current build
system makes a lot of sense to me at this point.

wt
-- 
President, GOLUM, Inc.
http://www.golum.org


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



Fw: coIIege naive girIs ready for H/\RD /\CTlON OPq zXe i D co tgZ CNeFB

2003-09-21 Thread Tilarot
Title: IFYgF dJ


Huffington blasts   The thing is in 1970
Eye on how much tTe Congress to  dLan fxApzYm in 1911 Can you tell me?
You are on... in 2005  in 1815 And if you in 1844



Re: O_SYNC patch -> slow fb memory access

2003-09-21 Thread Egbert Eich
Thomas Winischhofer writes:
 > 
 > Egbert, Debian folks:
 > 
 > After the release of XFree86 4.3.0, (AFAIK) Egbert Eich commited a patch 
 > which set the O_SYNC flag when opening /dev/mem for framebuffer memory 
 > access.
 > 
 > This caused memory access to the framebuffer area to become terribly 
 > slow on some machines. Among these types of machines are practically all 
 > SiS based ones using a shared memory area for framebuffer memory.
 > 
 > It seems the Debian folks have included this patch in their experimental 
 > pre1 prerelease, as I experience severe performance regressions compared 
 > to plain 4.3 from XFree.org.
 > 
 > Egbert: What exactly did that patch, what file is affected, and when was 
 > this reverted (I know it's not in current HEAD)?

No, I removed it again. O_SYNC causes the memory to be mapped
uncached. I had a system which crashed horribly when this flag
was not set for MMIO. Now I believe the system itself was faulty.
I'm still not sure if caching should be set at all for MMIO registers,
however since O_SYNC is an open() syscall flag and there is no
way of asking for uncached mempry mapping when doing mmap() we'd
have to have two separate file handles.
The affected file was os-support/linux/lnx_video.c

Egbert.


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



Re: propose new virtual package: libxaw-dev

2003-09-21 Thread Branden Robinson
[Followups set.]

On Thu, Sep 18, 2003 at 09:00:03PM -0500, Craig P. Steffen wrote:
> I am prospective DD; as one of my opening packages, I intend to adopt the 
> sound file editor xwave.  One of the bugs against it, 170005, says that 
> depending on the virtual package "libxaw-dev" is wrong.  
> 
> However, reading the debian policy manual sections 3.6 and 7.4, it seems to 
> me to be a perfectly reasonable thing to do.  The real packages libxaw6-dev 
> and libxaw7-dev exist, and are listed as Providing libxaw-dev.  The only 
> other thing that the policy manuals suggest is that virtual packages be 
> mentioned in the virtual-packages-name-list.txt.  
> 
> So I propose that "libxaw-dev" be added to that list.

I disagree; instead, I'm going to kill off libxaw-dev.

My decision to use the libxaw-dev virtual package in the first place
appears to date back to the time when we had multiple implementations of
the Athena library (NeXTaw, Xaw95, and Xaw3D).  The -dev packages for
these implementations could not coexist with each other, nor with
libXaw6's -dev package, because all of them tried to provide
/usr/X11R6/lib/libXaw.so for compile-time linking.

This is no longer a problem.  NeXTaw and Xaw95 have been withdrawn from
the distribution, and Xaw3D now uses the shared object name "libXaw3d".

The only two packages that will collide with each other now are
libxaw6-dev and libxaw7-dev, both of which are under my control.  A
virtual package is not needed to coordinate between two packages I
maintain.

Thanks for bringing this to my attention.

-- 
G. Branden Robinson| I suspect Linus wrote that in a
Debian GNU/Linux   | complicated way only to be able to
[EMAIL PROTECTED] | have that comment in there.
http://people.debian.org/~branden/ | -- Lars Wirzenius


signature.asc
Description: Digital signature


X Strike Force SVN commit: rev 558 - trunk/debian

2003-09-21 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-09-21 12:21:55 -0500 (Sun, 21 Sep 2003)
New Revision: 558

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
Kill off libxaw-dev virtual package per discussion on debian-devel mailing
list.
- debian/control:
  + libxaw6-dev now conflicts with and replaces libxaw7-dev instead of
libxaw-dev
  + libxaw6-dev no longer provides libxaw-dev
  + libxaw7-dev now conflicts with and replaces libxaw6-dev instead of
libxaw-dev
  + libxaw7-dev no longer provides libxaw-dev


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2003-09-20 10:34:14 UTC (rev 557)
+++ trunk/debian/changelog  2003-09-21 17:21:55 UTC (rev 558)
@@ -214,8 +214,18 @@
 xfree86/pc102/fi/nodeadkeys (stock XFree86 4.2.1 works)
 (Closes: #189298)
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Thu, 18 Sep 2003 16:28:22 -0500
+  * Kill off libxaw-dev virtual package per discussion on debian-devel mailing
+list.
+- debian/control:
+  + libxaw6-dev now conflicts with and replaces libxaw7-dev instead of
+libxaw-dev
+  + libxaw6-dev no longer provides libxaw-dev
+  + libxaw7-dev now conflicts with and replaces libxaw6-dev instead of
+libxaw-dev
+  + libxaw7-dev no longer provides libxaw-dev
 
+ -- Branden Robinson <[EMAIL PROTECTED]>  Sun, 21 Sep 2003 12:17:35 -0500
+
 xfree86 (4.2.1-11) unstable; urgency=medium
 
   * urgency set to medium because bug #206790 bites a lot of people (but,

Modified: trunk/debian/control
===
--- trunk/debian/control2003-09-20 10:34:14 UTC (rev 557)
+++ trunk/debian/control2003-09-21 17:21:55 UTC (rev 558)
@@ -99,9 +99,8 @@
 Priority: extra
 Architecture: any
 Depends: xlibs-dev, libxaw6, libc6-dev | libc-dev
-Conflicts: xlib6g-dev (<< 4.0), libxaw-dev
-Provides: libxaw-dev
-Replaces: xlib6g-dev (<< 4.0), libxaw-dev
+Conflicts: xlib6g-dev (<< 4.0), libxaw7-dev
+Replaces: xlib6g-dev (<< 4.0), libxaw7-dev
 Description: X Athena widget set library development files (version 6)
  Xaw header files and a static version of the Athena widget library are
  provided by this package, which supports Xaw6-based clients.
@@ -151,9 +150,8 @@
 Section: libdevel
 Architecture: any
 Depends: xlibs-dev, libxaw7, libc6-dev | libc-dev
-Conflicts: xlib6g-dev (<< 4.0), libxaw-dev
-Provides: libxaw-dev
-Replaces: xlib6g-dev (<< 4.0), libxaw-dev
+Conflicts: xlib6g-dev (<< 4.0), libxaw6-dev
+Replaces: xlib6g-dev (<< 4.0), libxaw6-dev
 Description: X Athena widget set library development files
  Xaw header files, a static library, and a manual page documenting new
  features in version 7 of the Athena widget library are provided by this


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



Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread Branden Robinson
On Sun, Sep 21, 2003 at 06:13:00AM -0500, Warren Turkal wrote:
> Branden Robinson wrote:
> > Warren, please expand on your rationale for this change.
> > 
> 
> The 017 that was in the svn was not useful to any architecture and was
> baggage from prior X versions AFAICT since there is already a "depend::" in
> the Imakefile in the xc/lib/X11 dir.
> 
> The 017 that was added simply adds pkg-config support for X11. This change
> in no way affects the executables or libs. I think this change will be
> useful to software developers. I also know that it will be helpful to my
> effort at autotoolizing the X programs. Without this support for pkg-config
> in place, I am unable to easily detect the location of libs such as Xrender
> and set an arbitrary define via autoconf methods. With the pkg-config
> support, I am supposed able to even keep portability with Cygwin relatively
> easily. This is related to the xrender.pc, xcursor.pc, etc. Also, I really
> do not have enough knowledge to build a fully independent autotooled libX11
> at this point as has been done with xcursor, xrender, and xft.
> 
> Although I am working on repackaging libX11 with autotools, it is not done
> yet. Also, it is not trivial to make the XFree86 build system use an
> external libX11 even if I did. Thus, adding the X11.pc to the current build
> system makes a lot of sense to me at this point.

Michel, does that explanation satisfy you?  I find myself pretty neutral
about this change.

-- 
G. Branden Robinson|I just wanted to see what it looked
Debian GNU/Linux   |like in a spotlight.
[EMAIL PROTECTED] |-- Jim Morrison
http://people.debian.org/~branden/ |


signature.asc
Description: Digital signature


Re: XFree86 4.3.0-0pre1v1 aborts on signal 11

2003-09-21 Thread Branden Robinson
On Sun, Sep 21, 2003 at 02:24:33AM -0700, Joshua Kwan wrote:
> In the middle of an uneventful X session where I was simply typing some
> stuff up in vim, it aborts on signal 11 and flings me back into the
> console. As per the crash advice, I've attached the XFree86.0.log,
> although it doesn't seem to show anything useful in my eyes hopefully it
> can help the X Strike Force.
> 
> A friend with a nVidia card has also been experiencing this equally
> sporadically. I don't see the correlation so maybe it is not a problem
> with my choice of video card? (radeon X server)

Probably the best thing for you to do is install and switch to the
debugging X server so that a reasonable core dump can be obtained and
used for a backtrace.

-- 
G. Branden Robinson| If you have the slightest bit of
Debian GNU/Linux   | intellectual integrity you cannot
[EMAIL PROTECTED] | support the government.
http://people.debian.org/~branden/ | -- anonymous


signature.asc
Description: Digital signature


Bug#198910: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=198910

2003-09-21 Thread Thomas Dickey
>  Debian Bug report logs - [1]#198910
>   xterm(1) confuses ampersand and @ symbol

I just committed a fix for this in XFree86 CVS.
-- 
Thomas E. Dickey <[EMAIL PROTECTED]>
http://invisible-island.net
ftp://invisible-island.net



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



Bug#10445: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=10445

2003-09-21 Thread Thomas Dickey
>  Debian Bug report logs - [1]#10445
> xterm: using -e with -ls fails to open a login shell

This should be closed since the documentation fixes requested were made.
-- 
Thomas E. Dickey <[EMAIL PROTECTED]>
http://invisible-island.net
ftp://invisible-island.net



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



X Strike Force SVN commit: rev 559 - branches/4.3.0/sid/debian

2003-09-21 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-09-21 13:20:05 -0500 (Sun, 21 Sep 2003)
New Revision: 559

Modified:
   branches/4.3.0/sid/debian/changelog
Log:
debian/changelog: fix ISHIKAWA-san's changelog entry


Modified: branches/4.3.0/sid/debian/changelog
===
--- branches/4.3.0/sid/debian/changelog 2003-09-21 17:21:55 UTC (rev 558)
+++ branches/4.3.0/sid/debian/changelog 2003-09-21 18:20:05 UTC (rev 559)
@@ -161,9 +161,10 @@
 
   * debian/patches/069_fix_ugly_r128_driver_warning.diff: fix an ugly
 diagnostic message which was also a multiline string literal
-  
-  * update Japanese translations (thanks, Kenshi Muto and Takeo Nakano)
 
+  * debian/po/ja.po: update Japanese translations (thanks, Kenshi Muto and
+Takeo Nakano)
+
  -- Branden Robinson <[EMAIL PROTECTED]>  Thu, 18 Sep 2003 11:39:10 -0500
 
 xfree86 (4.3.0-0pre1v1) experimental; urgency=low


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



X Strike Force SVN commit: rev 560 - branches/4.3.0/sid/debian

2003-09-21 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-09-21 13:28:55 -0500 (Sun, 21 Sep 2003)
New Revision: 560

Modified:
   branches/4.3.0/sid/debian/changelog
   branches/4.3.0/sid/debian/control
Log:
The XKB implementation in XFree86 4.3.0 has changed in a
non-backward-compatible manner; update package relationships accordingly.

* debian/control:
  - xbase-clients conflicts with xlibs (<< 4.3.0) and xlibs-data (<< 4.3.0)
  - xlibs conflicts with xbase-clients (<< 4.3.0) and xlibs-data (<< 4.3.0)
  - xlibs-data conflicts with xbase-clients (<< 4.3.0)

(xlibs-data already conflicted with xlibs (<< 4.3.0) due to file migration)


Modified: branches/4.3.0/sid/debian/changelog
===
--- branches/4.3.0/sid/debian/changelog 2003-09-21 18:20:05 UTC (rev 559)
+++ branches/4.3.0/sid/debian/changelog 2003-09-21 18:28:55 UTC (rev 560)
@@ -165,8 +165,14 @@
   * debian/po/ja.po: update Japanese translations (thanks, Kenshi Muto and
 Takeo Nakano)
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Thu, 18 Sep 2003 11:39:10 -0500
+  * debian/control: the XKB implementation in XFree86 4.3.0 has changed in a
+non-backward-compatible manner; update package relationships accordingly
+- xbase-clients conflicts with xlibs (<< 4.3.0) and xlibs-data (<< 4.3.0)
+- xlibs conflicts with xbase-clients (<< 4.3.0) and xlibs-data (<< 4.3.0)
+- xlibs-data conflicts with xbase-clients (<< 4.3.0)
 
+ -- Branden Robinson <[EMAIL PROTECTED]>  Sun, 21 Sep 2003 13:22:54 -0500
+
 xfree86 (4.3.0-0pre1v1) experimental; urgency=low
 
   * new upstream release

Modified: branches/4.3.0/sid/debian/control
===
--- branches/4.3.0/sid/debian/control   2003-09-21 18:20:05 UTC (rev 559)
+++ branches/4.3.0/sid/debian/control   2003-09-21 18:28:55 UTC (rev 560)
@@ -184,7 +184,7 @@
 Package: xbase-clients
 Architecture: any
 Depends: cpp-3.2, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: xbase (<< 3.3.2.3a-2), xserver-common (<< 3.3.2.3a-9), xmodmap, 
xaw-wrappers (<< 0.90), xfonts-100dpi (<< 3.3.3.1-3), xfonts-75dpi (<< 3.3.3.1-3), 
xfonts-base (<< 3.3.3.1-3), xfonts-cyrillic (<< 3.3.3.1-3), xfonts-scalable (<< 
3.3.3.1-3), xfnt100 (<= 3.3.2.3a-1), xfnt75 (<= 3.3.2.3a-1), xfntbase (<= 3.3.2.3a-1), 
xfntcyr (<= 3.3.2.3a-1), xfntscl (<= 3.3.2.3a-1), xdm (<< 4.0), xsm, xcontrib, 
xpm4g-dev, xpm-bin
+Conflicts: xbase (<< 3.3.2.3a-2), xserver-common (<< 3.3.2.3a-9), xmodmap, 
xaw-wrappers (<< 0.90), xfonts-100dpi (<< 3.3.3.1-3), xfonts-75dpi (<< 3.3.3.1-3), 
xfonts-base (<< 3.3.3.1-3), xfonts-cyrillic (<< 3.3.3.1-3), xfonts-scalable (<< 
3.3.3.1-3), xfnt100 (<= 3.3.2.3a-1), xfnt75 (<= 3.3.2.3a-1), xfntbase (<= 3.3.2.3a-1), 
xfntcyr (<= 3.3.2.3a-1), xfntscl (<= 3.3.2.3a-1), xdm (<< 4.0), xsm, xcontrib, 
xpm4g-dev, xpm-bin, xlibs (<< 4.3.0), xlibs-data (<< 4.3.0)
 Replaces: xbase (<< 3.3.2.3a-2), xf86setup (<< 3.3.2.3a-9), xserver-common (<< 4.0), 
xmodmap, xcontrib, xpm4g-dev, xpm-bin, xsm
 Provides: xmodmap, xcontrib, xpm-bin, xsm
 Description: miscellaneous X clients
@@ -700,7 +700,7 @@
 Section: libs
 Architecture: any
 Depends: xfree86-common (>> 4.3), xlibs-data (= ${Source-Version}), 
${shlibs:Depends}, ${misc:Depends}
-Conflicts: xlib, xlib6 (<< 3.3.2.3-2), xlib6g (<< 4.0), xlib6g-dev, xbase-clients (<< 
4.0), xcontrib (<< 4.0), xsm (<< 4.0), xpm4g, fvwm-common, qcad (<< 1.4.6-1), 
xbase-clients (<< 4.2.0)
+Conflicts: xlib, xlib6 (<< 3.3.2.3-2), xlib6g (<< 4.0), xlib6g-dev, xbase-clients (<< 
4.0), xcontrib (<< 4.0), xsm (<< 4.0), xpm4g, fvwm-common, qcad (<< 1.4.6-1), 
xbase-clients (<< 4.3.0), xlibs-data (<< 4.3.0)
 Replaces: xlib, xbase (<< 3.3.2.3a-2), xlib6 (<< 3.3.2.3-2), xbase-clients (<< 4.0), 
xlib6g (<< 4.0), xlib6g-dev, xpm4g, fvwm-common, xcontrib, xsm, qcad (<< 1.4.6-1)
 Provides: libxpm4
 Description: X Window System client libraries
@@ -825,7 +825,7 @@
 Section: libs
 Priority: optional
 Architecture: all
-Conflicts: xlibs (<< 4.3.0)
+Conflicts: xlibs (<< 4.3.0), xbase-clients (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: X Window System client data
  This package provides architecture-independent data for the X Window System,


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



X Strike Force SVN commit: rev 561 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-09-21 14:05:25 -0500 (Sun, 21 Sep 2003)
New Revision: 561

Modified:
   branches/4.3.0/sid/debian/changelog
   branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff
Log:
Update xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c to
  latest version from upstream CVS HEAD to resolve severe performance
  problems caused by opening /dev/mem with the O_SYNC flag, per Egbert
  Eich.

* debian/patches/000_stolen_from_HEAD_int10.diff


Modified: branches/4.3.0/sid/debian/changelog
===
--- branches/4.3.0/sid/debian/changelog 2003-09-21 18:28:55 UTC (rev 560)
+++ branches/4.3.0/sid/debian/changelog 2003-09-21 19:05:25 UTC (rev 561)
@@ -171,8 +171,13 @@
 - xlibs conflicts with xbase-clients (<< 4.3.0) and xlibs-data (<< 4.3.0)
 - xlibs-data conflicts with xbase-clients (<< 4.3.0)
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Sun, 21 Sep 2003 13:22:54 -0500
+  * debian/patches/000_stolen_from_HEAD_int10.diff: Update
+xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c to latest
+version from upstream CVS HEAD to resolve severe performance problems
+caused by opening /dev/mem with the O_SYNC flag, per Egbert Eich.
 
+ -- Branden Robinson <[EMAIL PROTECTED]>  Sun, 21 Sep 2003 14:02:39 -0500
+
 xfree86 (4.3.0-0pre1v1) experimental; urgency=low
 
   * new upstream release

Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff
===
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff   2003-09-21 
18:28:55 UTC (rev 560)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff   2003-09-21 
19:05:25 UTC (rev 561)
@@ -5,6 +5,11 @@
   976. Change most of os-support/ to respect VIDMEM_READONLY (Marc La
France).
 
+(xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c):
+  249. Removed O_SYNC from open call for /dev/mem for all Linux platforms.
+   This hopefully takes care of the speed problem
+   (Bugzilla #419, #414, Egbert Eich).
+
 diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c 
xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c
 --- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c 2002-10-17 
07:13:47.0 +1000
 +++ xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c  2003-04-09 
04:48:51.0 +1000
@@ -23,15 +28,14 @@
   MAP_SHARED | MAP_FIXED, fd, SYS_BIOS))
== MAP_FAILED) {
xf86DrvMsg(screen, X_ERROR, "Cannot map SYS BIOS\n");
-diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c 
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
 xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c   2003-02-18 
02:29:22.0 +1100
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c2003-04-09 
04:48:51.0 +1000
-@@ -1,4 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.64 
2003/02/17 15:29:22 dawes Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.65 
2003/03/14 13:46:05 tsi Exp $ */
- /*
-  * Copyright 1992 by Orest Zborowski <[EMAIL PROTECTED]>
-  * Copyright 1993 by David Wexelblat <[EMAIL PROTECTED]>
+Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
+===
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v
+retrieving revision 3.64
+retrieving revision 3.67
+diff -u -u -r3.64 -r3.67
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c17 Feb 2003 
15:29:22 -  3.64
 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c25 Jun 2003 
18:27:07 -  3.67
 @@ -407,6 +407,7 @@
  pointer base;
  int fd;
@@ -40,18 +44,20 @@
  memType realBase, alignOff;
  
  realBase = Base & ~(getpagesize() - 1);
-@@ -429,21 +430,23 @@
+@@ -429,20 +430,26 @@
  mapflags |= MAP_NONCACHED; 
  #endif
  
 -#if defined(__ia64__)
++#if 0
  /* this will disappear when people upgrade their kernels */
 -if ((fd = open(DEV_MEM, O_RDWR|O_SYNC)) < 0) 
--#else
++fd = open(DEV_MEM,
++((flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR) | O_SYNC);
+ #else
 -if ((fd = open(DEV_MEM, O_RDWR)) < 0)
--#endif
-+fd = open(DEV_MEM,
-+  ((flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR) | O_SYNC);
++fd = open(DEV_MEM, (flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);
+ #endif
 +if (fd < 0)
  {
FatalError("xf86MapVidMem: failed to open " DEV_MEM " (%s)\n",
@@ -59,20 +65,18 @@
  }
 +
 +if (flags & VIDMEM_READONLY)
-+  prot = PROT_READ;
++  prot = PROT_READ;
 +else
-+  prot = PROT_READ | PROT_WRITE;
-+
++  prot = PROT_READ | PROT_WRITE

Re: O_SYNC patch -> slow fb memory access

2003-09-21 Thread Branden Robinson
On Sun, Sep 21, 2003 at 10:47:57AM +0200, Egbert Eich wrote:
> No, I removed it again. O_SYNC causes the memory to be mapped
> uncached. I had a system which crashed horribly when this flag
> was not set for MMIO. Now I believe the system itself was faulty.
> I'm still not sure if caching should be set at all for MMIO registers,
> however since O_SYNC is an open() syscall flag and there is no
> way of asking for uncached mempry mapping when doing mmap() we'd
> have to have two separate file handles.
> The affected file was os-support/linux/lnx_video.c

Thanks for the explanation.  I have updated Debian's patches to use the
latest version (3.67) of lnx_video.c.  This fix will appear in the next
release of our packages of XFree86 4.3.0.

-- 
G. Branden Robinson| Human beings rarely imagine a god
Debian GNU/Linux   | that behaves any better than a
[EMAIL PROTECTED] | spoiled child.
http://people.debian.org/~branden/ | -- Robert Heinlein


signature.asc
Description: Digital signature


X Strike Force SVN commit: rev 562 - branches/4.1.0

2003-09-21 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-09-21 14:12:02 -0500 (Sun, 21 Sep 2003)
New Revision: 562

Added:
   branches/4.1.0/woody-proposed-updates/
Removed:
   branches/4.1.0/sarge/
Log:
Rename the 4.1.0/sarge branch to 4.1.0/woody-proposed-updates, since that
is its new purpose.


Copied: branches/4.1.0/woody-proposed-updates (from rev 561, branches/4.1.0/sarge)


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



Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread Michel Dänzer
On Sun, 2003-09-21 at 19:59, Branden Robinson wrote:
> 
> Michel, does that explanation satisfy you?  I find myself pretty neutral
> about this change.

So do I about the technical change per se, my concern is to avoid
gratuitous deviation from upstream.


-- 
Earthling Michel Dänzer   \  Debian (powerpc), XFree86 and DRI developer
Software libre enthusiast  \ http://svcs.affero.net/rm.php?r=daenzer


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



X Strike Force SVN commit: rev 563 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-09-21 16:15:47 -0500 (Sun, 21 Sep 2003)
New Revision: 563

Modified:
   branches/4.3.0/sid/debian/changelog
   branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff
Log:
Resync patch #021 with #000_stolen_from_HEAD_int10.diff and improve
  error reporting when ioperm()/iopl() fail for reasons other then ENODEV).

* debian/patches/021_riscpc_ioport_fix.diff


Modified: branches/4.3.0/sid/debian/changelog
===
--- branches/4.3.0/sid/debian/changelog 2003-09-21 19:12:02 UTC (rev 562)
+++ branches/4.3.0/sid/debian/changelog 2003-09-21 21:15:47 UTC (rev 563)
@@ -171,10 +171,12 @@
 - xlibs conflicts with xbase-clients (<< 4.3.0) and xlibs-data (<< 4.3.0)
 - xlibs-data conflicts with xbase-clients (<< 4.3.0)
 
-  * debian/patches/000_stolen_from_HEAD_int10.diff: Update
-xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c to latest
-version from upstream CVS HEAD to resolve severe performance problems
-caused by opening /dev/mem with the O_SYNC flag, per Egbert Eich.
+  * Update xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c to
+latest version from upstream CVS HEAD to resolve severe performance
+problems caused by opening /dev/mem with the O_SYNC flag, per Egbert Eich.
+- debian/patches/000_stolen_from_HEAD_int10.diff: updated
+- debian/patches/021_riscpc_ioport_fix.diff: resynced (also improve error
+  reporting when ioperm()/iopl() fail for reasons other then ENODEV)
 
  -- Branden Robinson <[EMAIL PROTECTED]>  Sun, 21 Sep 2003 14:02:39 -0500
 

Modified: branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff
===
--- branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff2003-09-21 
19:12:02 UTC (rev 562)
+++ branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff2003-09-21 
21:15:47 UTC (rev 563)
@@ -4,18 +4,19 @@
 
 Not submitted upstream yet.
 
 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c~   Mon Apr  8 
14:00:48 2002
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.cMon Apr  8 
14:03:55 2002
-@@ -25,6 +25,8 @@
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c~   2003-09-21 
16:07:20.0 -0500
 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c2003-09-21 
16:10:30.0 -0500
+@@ -25,6 +25,9 @@
   */
  /* $XConsortium: lnx_video.c /main/9 1996/10/19 18:06:34 kaleb $ */
  
 +#include 
++#include 
 +
  #include "X.h"
  #include "input.h"
  #include "scrnintstr.h"
-@@ -516,8 +518,12 @@
+@@ -520,8 +523,13 @@
}
close(fd);
  #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && 
!defined(__sh__) && !defined(__hppa__)
@@ -25,7 +26,8 @@
 +  if (errno == ENODEV)
 +  ErrorF("xf86EnableIOPorts: no I/O ports found\n");
 +  else
-+  FatalError("xf86EnableIOPorts: Failed to set IOPL for I/O\n");
++  FatalError("xf86EnableIOPorts: failed to set IOPL"
++ " for I/O (%s)\n", strerror(errno));
 +  }
  # if !defined(__alpha__)
ioperm(0x40,4,0); /* trap access to the timer chip */


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



Re: O_SYNC patch -> slow fb memory access

2003-09-21 Thread Thomas Winischhofer
Branden Robinson wrote:
On Sun, Sep 21, 2003 at 10:47:57AM +0200, Egbert Eich wrote:

No, I removed it again. O_SYNC causes the memory to be mapped
uncached. I had a system which crashed horribly when this flag
was not set for MMIO. Now I believe the system itself was faulty.
I'm still not sure if caching should be set at all for MMIO registers,
however since O_SYNC is an open() syscall flag and there is no
way of asking for uncached mempry mapping when doing mmap() we'd
have to have two separate file handles.
The affected file was os-support/linux/lnx_video.c


Thanks for the explanation.  I have updated Debian's patches to use the
latest version (3.67) of lnx_video.c.  This fix will appear in the next
release of our packages of XFree86 4.3.0.
Thanks.

Thomas

--
Thomas Winischhofer
Vienna/Austria
thomas AT winischhofer DOT net  http://www.winischhofer.net/
twini AT xfree86 DOT org
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]


MANIFEST sorting

2003-09-21 Thread Warren Turkal
Is there a sorting order to the MANIFESTS, or can I just add whatever
whereever? I am going to make the changes for the other archs for the
pkg-config stuff.

wt
-- 
Warren Turkal
President, GOLUM, Inc.
http://www.golum.org


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



Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread Warren Turkal
Michel Dänzer wrote:
> So do I about the technical change per se, my concern is to avoid
> gratuitous deviation from upstream.

It is not gratuitous...it's one file. If using pkg-config to locate xlibs
becomes more prevalent, hopefully upstream will be more friendly toward the
change there.

Warren
-- 
Warren Turkal
President, GOLUM, Inc.
http://www.golum.org


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



Re: MANIFEST sorting

2003-09-21 Thread Daniel Stone
On Sun, Sep 21, 2003 at 09:15:34PM -0500, Warren Turkal wrote:
> Is there a sorting order to the MANIFESTS, or can I just add whatever
> whereever? I am going to make the changes for the other archs for the
> pkg-config stuff.

LANG=C sort

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.debian.org - http://www.kde.org - http://www.freedesktop.org
"Configurability is always the best choice when it's pretty simple to implement"
  -- Havoc Pennington, gnome-list


pgp0.pgp
Description: PGP signature


patches for upstream

2003-09-21 Thread Warren Turkal
Is there any reason that I should not submit the patches for building
external Xcursor, Xft, and Xrender upstream?

wt
-- 
Warren Turkal
President, GOLUM, Inc.
http://www.golum.org


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



X Strike Force SVN commit: rev 565 - branches/4.3.0/sid/debian

2003-09-21 Thread X Strike Force SVN Admin
Author: wt
Date: 2003-09-21 22:02:17 -0500 (Sun, 21 Sep 2003)
New Revision: 565

Modified:
   branches/4.3.0/sid/debian/MANIFEST.alpha
   branches/4.3.0/sid/debian/MANIFEST.arm
   branches/4.3.0/sid/debian/MANIFEST.hppa
   branches/4.3.0/sid/debian/MANIFEST.hurd-i386
   branches/4.3.0/sid/debian/MANIFEST.ia64
   branches/4.3.0/sid/debian/MANIFEST.mips
   branches/4.3.0/sid/debian/MANIFEST.mipsel
   branches/4.3.0/sid/debian/MANIFEST.powerpc
   branches/4.3.0/sid/debian/MANIFEST.s390
   branches/4.3.0/sid/debian/MANIFEST.sparc
Log:
Add files for pkg-config of libX11 to manifests for archs other than i386.


Modified: branches/4.3.0/sid/debian/MANIFEST.alpha
===
--- branches/4.3.0/sid/debian/MANIFEST.alpha2003-09-21 22:15:53 UTC (rev 564)
+++ branches/4.3.0/sid/debian/MANIFEST.alpha2003-09-22 03:02:17 UTC (rev 565)
@@ -6121,6 +6121,7 @@
 usr/X11R6/lib/modules/linux/libfbdevhw.a
 usr/X11R6/lib/modules/v10002d.uc
 usr/X11R6/lib/modules/v20002d.uc
+usr/X11R6/lib/pkgconfig/X11.pc
 usr/X11R6/man/man1/XFree86.1x
 usr/X11R6/man/man1/Xmark.1x
 usr/X11R6/man/man1/Xnest.1x
@@ -7819,6 +7820,7 @@
 usr/X11R6/man/man7/Xsecurity.7x
 usr/bin/dexconf
 usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
 usr/sbin/update-fonts-alias
 usr/sbin/update-fonts-dir
 usr/sbin/update-fonts-scale

Modified: branches/4.3.0/sid/debian/MANIFEST.arm
===
--- branches/4.3.0/sid/debian/MANIFEST.arm  2003-09-21 22:15:53 UTC (rev 564)
+++ branches/4.3.0/sid/debian/MANIFEST.arm  2003-09-22 03:02:17 UTC (rev 565)
@@ -6108,6 +6108,7 @@
 usr/X11R6/lib/modules/libxf8_16bpp.a
 usr/X11R6/lib/modules/libxf8_32bpp.a
 usr/X11R6/lib/modules/linux/libfbdevhw.a
+usr/X11R6/lib/pkgconfig/X11.pc
 usr/X11R6/man/man1/XFree86.1x
 usr/X11R6/man/man1/Xmark.1x
 usr/X11R6/man/man1/Xnest.1x
@@ -7807,6 +7808,7 @@
 usr/X11R6/man/man7/Xsecurity.7x
 usr/bin/dexconf
 usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
 usr/sbin/update-fonts-alias
 usr/sbin/update-fonts-dir
 usr/sbin/update-fonts-scale

Modified: branches/4.3.0/sid/debian/MANIFEST.hppa
===
--- branches/4.3.0/sid/debian/MANIFEST.hppa 2003-09-21 22:15:53 UTC (rev 564)
+++ branches/4.3.0/sid/debian/MANIFEST.hppa 2003-09-22 03:02:17 UTC (rev 565)
@@ -6002,6 +6002,7 @@
 usr/X11R6/lib/libxkbui.a
 usr/X11R6/lib/libxkbui_pic.a
 usr/X11R6/lib/libxrx.so.6.3
+usr/X11R6/lib/pkgconfig/X11.pc
 usr/X11R6/man/man1/XFree86.1x
 usr/X11R6/man/man1/Xmark.1x
 usr/X11R6/man/man1/Xnest.1x
@@ -7701,6 +7702,7 @@
 usr/X11R6/man/man7/Xsecurity.7x
 usr/bin/dexconf
 usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
 usr/sbin/update-fonts-alias
 usr/sbin/update-fonts-dir
 usr/sbin/update-fonts-scale

Modified: branches/4.3.0/sid/debian/MANIFEST.hurd-i386
===
--- branches/4.3.0/sid/debian/MANIFEST.hurd-i3862003-09-21 22:15:53 UTC (rev 
564)
+++ branches/4.3.0/sid/debian/MANIFEST.hurd-i3862003-09-22 03:02:17 UTC (rev 
565)
@@ -5960,6 +5960,7 @@
 usr/X11R6/lib/modules/libxf8_32bpp.a
 usr/X11R6/lib/modules/v10002d.uc
 usr/X11R6/lib/modules/v20002d.uc
+usr/X11R6/lib/modules/X11.pc
 usr/X11R6/man/man1/XFree86.1x
 usr/X11R6/man/man1/Xmark.1x
 usr/X11R6/man/man1/Xnest.1x
@@ -7672,6 +7673,7 @@
 usr/X11R6/man/man7/Xsecurity.7x
 usr/bin/dexconf
 usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
 usr/sbin/update-fonts-alias
 usr/sbin/update-fonts-dir
 usr/sbin/update-fonts-scale

Modified: branches/4.3.0/sid/debian/MANIFEST.ia64
===
--- branches/4.3.0/sid/debian/MANIFEST.ia64 2003-09-21 22:15:53 UTC (rev 564)
+++ branches/4.3.0/sid/debian/MANIFEST.ia64 2003-09-22 03:02:17 UTC (rev 565)
@@ -6143,6 +6143,7 @@
 usr/X11R6/lib/modules/linux/libfbdevhw.a
 usr/X11R6/lib/modules/v10002d.uc
 usr/X11R6/lib/modules/v20002d.uc
+usr/X11R6/lib/pkgconfig/X11.pc
 usr/X11R6/man/man1/XFree86.1x
 usr/X11R6/man/man1/Xmark.1x
 usr/X11R6/man/man1/Xnest.1x
@@ -7856,6 +7857,7 @@
 usr/X11R6/man/man7/Xsecurity.7x
 usr/bin/dexconf
 usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
 usr/sbin/update-fonts-alias
 usr/sbin/update-fonts-dir
 usr/sbin/update-fonts-scale

Modified: branches/4.3.0/sid/debian/MANIFEST.mips
===
--- branches/4.3.0/sid/debian/MANIFEST.mips 2003-09-21 22:15:53 UTC (rev 564)
+++ branches/4.3.0/sid/debian/MANIFEST.mips 2003-09-22 03:02:17 UTC (rev 565)
@@ -6003,6 +6003,7 @@
 usr/X11R6/lib/libxkbui.a
 usr/X11R6/lib/libxkbui_pic.a
 usr/X11R6/lib/libxrx.so.6.3
+usr/X11R6/lib/pkgconfig/X11.pc
 usr/X11R6/man/man1/XFree86.1x
 usr/X11R6/man/man1/Xmark.1x
 usr/X11R6/man/man1/Xnest.1x
@@ -7702,6 +7703,7 @@
 usr/X11R6/man/man7/Xsecurity.7x
 usr/bin/dexconf
 usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
 usr/sbin/update-fonts-alias
 usr/sbin/update-fonts-dir
 usr/sbin/update-f

Re: MANIFEST sorting

2003-09-21 Thread Branden Robinson
On Mon, Sep 22, 2003 at 12:26:52PM +1000, Daniel Stone wrote:
> On Sun, Sep 21, 2003 at 09:15:34PM -0500, Warren Turkal wrote:
> > Is there a sorting order to the MANIFESTS, or can I just add whatever
> > whereever? I am going to make the changes for the other archs for the
> > pkg-config stuff.
> 
> LANG=C sort

This isn't the best advice, as the LANG variable is easily overriden.
See locale(7).

Anyway, yes, there is a sorting (collation) order, and it is C/POSIX.

Please see locale(7) to determine the best way to achieve this that
meshes with your existing locale settings.

-- 
G. Branden Robinson|   The last Christian died on the
Debian GNU/Linux   |   cross.
[EMAIL PROTECTED] |   -- Friedrich Nietzsche
http://people.debian.org/~branden/ |


signature.asc
Description: Digital signature


Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread Branden Robinson
On Fri, Sep 19, 2003 at 01:36:38PM -0500, X Strike Force SVN Admin wrote:
> Author: wt
> Date: 2003-09-19 13:36:17 -0500 (Fri, 19 Sep 2003)
> New Revision: 555
> 
> Added:
>branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff
> Removed:
>branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff
> Modified:
>branches/4.3.0/sid/debian/MANIFEST.i386
>branches/4.3.0/sid/debian/rules
>branches/4.3.0/sid/debian/xlibs-dev.install
> Log:
> Enabling pkg-config for libX11. The main artifact is that
> there is now a file called /usr/lib/pkgconfig/X11.pc.

I have noticed another defect with this changeset.

You did not write a debian/changelog entry for it.

I'll take care of it.

-- 
G. Branden Robinson| One doesn't have a sense of humor.
Debian GNU/Linux   | It has you.
[EMAIL PROTECTED] | -- Larry Gelbart
http://people.debian.org/~branden/ |


signature.asc
Description: Digital signature


Processed: Re: Bug#198910: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=198910

2003-09-21 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

> tag 198910 + fixed-upstream
Bug#198910: xterm(1) confuses ampersand and @ symbol
There were no tags set.
Tags added: fixed-upstream

> thanks
Stopping processing here.

Please contact me if you need assistance.

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



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



Bug#10445: marked as done (xterm: using -e with -ls fails to open a login shell)

2003-09-21 Thread Debian Bug Tracking System
Your message dated Sun, 21 Sep 2003 23:26:54 -0500
with message-id <[EMAIL PROTECTED]>
and subject line Bug#10445: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=10445
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; 8 Jun 1997 18:42:42 +
Received: (qmail 11102 invoked from network); 8 Jun 1997 18:42:41 -
Received: from lilac.csi.cam.ac.uk (131.111.8.44)
  by master.debian.org with SMTP; 8 Jun 1997 18:42:40 -
Received: from piranha.chu.cam.ac.uk [131.111.131.65] (mail)
by lilac.csi.cam.ac.uk with smtp (Exim 1.62 #1)
id 0wamvE-0002ee-00; Sun, 8 Jun 1997 19:42:36 +0100
Received: from jon by piranha.chu.cam.ac.uk with local (Exim 1.61 #1)
id 0wamvB-l6-00 (Debian); Sun, 8 Jun 1997 19:42:33 +0100
Date: Sun, 8 Jun 1997 19:42:32 +0100 (BST)
From: Jon Rabone <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Subject: Xterm -e and -ls options don't work together
Message-ID: <[EMAIL PROTECTED]>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Package: xbase
Version: 3.2-5

The -ls option does not do the right thing if -e is also specified to
execute a command, because xterm does an execvp _before_ the shell (bash
in this case) can read the system and user profiles. This breaks (for
example) 

xterm -ls -e trn

because the environment is not set up properly.

Jon.


---
Received: (at 10445-done) by bugs.debian.org; 22 Sep 2003 04:27:13 +
>From [EMAIL PROTECTED] Sun Sep 21 23:26:55 2003
Return-path: <[EMAIL PROTECTED]>
Received: from dhcp065-026-182-085.indy.rr.com (redwald.deadbeast.net) [65.26.182.85] 
by master.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1A1IHn-00018S-00; Sun, 21 Sep 2003 23:26:55 -0500
Received: by redwald.deadbeast.net (Postfix, from userid 1000)
id E694B640DA; Sun, 21 Sep 2003 23:26:54 -0500 (EST)
Date: Sun, 21 Sep 2003 23:26:54 -0500
From: Branden Robinson <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Subject: Re: Bug#10445: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=10445
Message-ID: <[EMAIL PROTECTED]>
References: <[EMAIL PROTECTED]>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="Q7MaAb+MMjzLKrXy"
Content-Disposition: inline
In-Reply-To: <[EMAIL PROTECTED]>
Mail-Copies-To: nobody
X-No-CC: I subscribe to this list; do not CC me on replies.
User-Agent: Mutt/1.5.4i
Delivered-To: [EMAIL PROTECTED]
X-Spam-Status: No, hits=-4.5 required=4.0
tests=EMAIL_ATTRIBUTION,QUOTED_EMAIL_TEXT,RCVD_IN_NJABL
version=2.53-bugs.debian.org_2003_9_21
X-Spam-Level: 
X-Spam-Checker-Version: SpamAssassin 2.53-bugs.debian.org_2003_9_21 
(1.174.2.15-2003-03-30-exp)


--Q7MaAb+MMjzLKrXy
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Sep 21, 2003 at 01:59:53PM -0400, Thomas Dickey wrote:
> >  Debian Bug report logs - [1]#10445
> > xterm: using -e with -ls fails to open a login shell
>=20
> This should be closed since the documentation fixes requested were made.

Since xterm 4.2.1-8 at the latest (and probably for several package
releases before that) the xterm manpage has said the following:

   -ls This  option  indicates  that  the shell that is started in =
the
   xterm window will be a login shell (i.e., the  first  charac=
ter
   of  argv[0]  will  be  a  dash, indicating to the shell that=
 it
   should read the user's .login or .profile).

   Note that this is incompatible with -e, since the login prog=
ram
   does not provide a way to specify the command to run in the =
new
   shell.  If you specify both, xterm uses -ls.

Closing this report.

--=20
G. Branden Robinson|  If you don't think for yourself,
Debian GNU/Linux   |  others will think for you -- to
[EMAIL PROTECTED] |  their advantage.
http://people.debian.org/~branden/ |  -- Harold Gordon

--Q7MaAb+MMjzLKrXy
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.3 (GNU/Linux)

iEYEARECAAYFAj9ueg4ACgkQ6kxmHytGonw5HgCglG6vmc+sFwhszZyv/hLlz6ZO
c54AnjdAJH21KcwPrMxvWOoLX7suzilm
=hs58
-END PGP SIGNATURE-

--Q7MaAb+MMjzLKrXy--


-- 
To UNSUBSCRIBE, 

Bug#126519: letter + current pick qaqkrge e

2003-09-21 Thread Hallie Peterson




Bug#211890: xfree86: japanese debconf template

2003-09-21 Thread Kenshi Muto
At Sun, 21 Sep 2003 10:44:08 +0900 (JST),
Tomohiro KUBOTA wrote:
> Package: xfree86
> Version: 4.2.1-11
> Severity: wishlist
> 
> Here is an updated Japanese translation of po-debconf file.
> The file should go to debian/po directory of the xfree86 source
> package.

Hmm, I've already sent new ja.po file for XFree86 4.3.0 to ISHIKAWA
Mutsumi-san directly some days ago, and he will commit it into
Subversion repository.
-- 
Kenshi Muto
[EMAIL PROTECTED]




XFree86 4.3.0-0pre1v1 aborts on signal 11

2003-09-21 Thread Joshua Kwan
In the middle of an uneventful X session where I was simply typing some
stuff up in vim, it aborts on signal 11 and flings me back into the
console. As per the crash advice, I've attached the XFree86.0.log,
although it doesn't seem to show anything useful in my eyes hopefully it
can help the X Strike Force.

A friend with a nVidia card has also been experiencing this equally
sporadically. I don't see the correlation so maybe it is not a problem
with my choice of video card? (radeon X server)

HTH,

-- 
Joshua Kwan

XFree86 Version 4.3.0 (Debian 4.3.0-0pre1v1 20030731221840 root@)
Release Date: 18 March 2003
X Protocol Version 11, Revision 0, Release 6.6
Build Operating System: Linux 2.6.0-test1-bk2 i686 [ELF] 
Build Date: 31 July 2003
Before reporting problems, check http://www.XFree86.Org/
to make sure that you have the latest version.
Module Loader present
OS Kernel: Linux version 2.6.0-test5-mm3 ([EMAIL PROTECTED]) (gcc version 3.3.2 
20030908 (Debian prerelease)) #5 Fri Sep 19 00:28:24 PDT 2003 
Markers: (--) probed, (**) from config file, (==) default setting,
 (++) from command line, (!!) notice, (II) informational,
 (WW) warning, (EE) error, (NI) not implemented, (??) unknown.
(==) Log file: "/var/log/XFree86.0.log", Time: Sat Sep 20 10:19:40 2003
(==) Using config file: "/etc/X11/XF86Config-4"
(==) ServerLayout "Default Layout"
(**) |-->Screen "Default Screen" (0)
(**) |   |-->Monitor "Dell Smartstep 200N LCD"
(**) |   |-->Device "ATI Mobility Radeon M6"
(**) |-->Input Device "Generic Keyboard"
(**) Option "XkbRules" "xfree86"
(**) XKB: rules: "xfree86"
(**) Option "XkbModel" "pc104"
(**) XKB: model: "pc104"
(**) Option "XkbLayout" "us"
(**) XKB: layout: "us"
(==) Keyboard: CustomKeycode disabled
(**) |-->Input Device "Generic Mouse"
(WW) The directory "/usr/lib/X11/fonts/CID" does not exist.
Entry deleted from font path.
(WW) The directory "/usr/lib/X11/fonts/cyrillic" does not exist.
Entry deleted from font path.
(**) FontPath set to 
"unix/:7100,/usr/lib/X11/fonts/Type1,/usr/lib/X11/fonts/Speedo,/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
(==) RgbPath set to "/usr/X11R6/lib/X11/rgb"
(==) ModulePath set to "/usr/X11R6/lib/modules"
(--) using VT number 7

(WW) Open APM failed (/dev/apm_bios) (No such device)
(II) Module ABI versions:
XFree86 ANSI C Emulation: 0.2
XFree86 Video Driver: 0.6
XFree86 XInput driver : 0.4
XFree86 Server Extension : 0.2
XFree86 Font Renderer : 0.4
(II) Loader running on linux
(II) LoadModule: "bitmap"
(II) Loading /usr/X11R6/lib/modules/fonts/libbitmap.a
(II) Module bitmap: vendor="The XFree86 Project"
compiled for 4.3.0, module version = 1.0.0
Module class: XFree86 Font Renderer
ABI class: XFree86 Font Renderer, version 0.4
(II) Loading font Bitmap
(II) LoadModule: "pcidata"
(II) Loading /usr/X11R6/lib/modules/libpcidata.a
(II) Module pcidata: vendor="The XFree86 Project"
compiled for 4.3.0, module version = 1.0.0
ABI class: XFree86 Video Driver, version 0.6
(II) PCI: Probing config type using method 1
(II) PCI: Config type is 1
(II) PCI: stages = 0x03, oldVal1 = 0x8002483c, mode1Res1 = 0x8000
(II) PCI: PCI scan (all values are in hex)
(II) PCI: 00:00:0: chip 8086,1a30 card 1025,1027 rev 04 class 06,00,00 hdr 00
(II) PCI: 00:01:0: chip 8086,1a31 card , rev 04 class 06,04,00 hdr 01
(II) PCI: 00:1e:0: chip 8086,244e card , rev 05 class 06,04,00 hdr 01
(II) PCI: 00:1f:0: chip 8086,2440 card , rev 05 class 06,01,00 hdr 80
(II) PCI: 00:1f:1: chip 8086,244b card 1025,1027 rev 05 class 01,01,80 hdr 00
(II) PCI: 00:1f:2: chip 8086,2442 card 1025,1027 rev 05 class 0c,03,00 hdr 00
(II) PCI: 00:1f:3: chip 8086,2443 card 1025,1027 rev 05 class 0c,05,00 hdr 00
(II) PCI: 00:1f:4: chip 8086,2444 card 1025,1027 rev 05 class 0c,03,00 hdr 00
(II) PCI: 00:1f:5: chip 8086,2445 card 1025,1027 rev 05 class 04,01,00 hdr 00
(II) PCI: 00:1f:6: chip 8086,2446 card 1025,1027 rev 05 class 07,03,00 hdr 00
(II) PCI: 01:00:0: chip 1002,4c59 card 1025,101d rev 00 class 03,00,00 hdr 00
(II) PCI: 02:03:0: chip 104c,8026 card 1025,1027 rev 00 class 0c,00,10 hdr 00
(II) PCI: 02:05:0: chip 10ec,8139 card 1025,1027 rev 10 class 02,00,00 hdr 00
(II) PCI: 02:09:0: chip 104c,ac55 card 1000, rev 01 class 06,07,00 hdr 82
(II) PCI: 02:09:1: chip 104c,ac55 card 1800, rev 01 class 06,07,00 hdr 82
(II) PCI: End of PCI scan
(II) Host-to-PCI bridge:
(II) Bus 0: bridge is at (0:0:0), (0,0,7), BCTRL: 0x0008 (VGA_EN is set)
(II) Bus 0 I/O range:
[0] -1  0   0x - 0x (0x1) IX[B]
(II) Bus 0 non-prefetchable memory range:
[0] -1  0   0x - 0x (0x0) MX[B]
(II) Bus 0 prefetchable memory range:
[0] -1  0   0x - 0x (0x0) MX[B]
(II) PCI-to-PCI bridge:
(II) Bus 1: bridge is at (0:1:0), (0,1,1), BCTRL: 0x000c (VGA_EN is set)
(II) Bus 1 I/O range:
   

Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread Warren Turkal
Branden Robinson wrote:

> On Fri, Sep 19, 2003 at 01:36:38PM -0500, X Strike Force SVN Admin wrote:
>> Author: wt
>> Date: 2003-09-19 13:36:17 -0500 (Fri, 19 Sep 2003)
>> New Revision: 555
>> 
>> Added:
>>branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff
>> Removed:
>>branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff
>> Modified:
>>branches/4.3.0/sid/debian/MANIFEST.i386
>>branches/4.3.0/sid/debian/rules
>>branches/4.3.0/sid/debian/xlibs-dev.install
>> Log:
>> Enabling pkg-config for libX11. The main artifact is that
>> there is now a file called /usr/lib/pkgconfig/X11.pc.
> 
> This commit was defective, in my opinion.
> 
> In the future, please do not alter a MANIFEST file without altering all
> of them, when the change being made is expected to affect all
> architectures.  If the change affects only some architectures, update
> the MANIFEST files exactly as you expect them to change.

Okay, I was just under the impression that that should be done by someone on
the arch...sorry.

> Also, don't use the same patch number for a radical alteration of the
> patch's function.  It would have been better to delete patch #017 and
> add the new patch at the first available number, which is somewhere
> around #070, I think.

Okay, gotcha.

wt
-- 
President, GOLUM, Inc.
http://www.golum.org



Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread Warren Turkal
Branden Robinson wrote:

> On Sat, Sep 20, 2003 at 02:17:40PM +0200, Michel Dänzer wrote:
>> On Fri, 2003-09-19 at 20:36, X Strike Force SVN Admin wrote:
>> > 
>> > Log:
>> > Enabling pkg-config for libX11. The main artifact is that
>> > there is now a file called /usr/lib/pkgconfig/X11.pc.
>> 
>> Shouldn't we wait for an upstream decision on this?
> 
> Warren, please expand on your rationale for this change.
> 

The 017 that was in the svn was not useful to any architecture and was
baggage from prior X versions AFAICT since there is already a "depend::" in
the Imakefile in the xc/lib/X11 dir.

The 017 that was added simply adds pkg-config support for X11. This change
in no way affects the executables or libs. I think this change will be
useful to software developers. I also know that it will be helpful to my
effort at autotoolizing the X programs. Without this support for pkg-config
in place, I am unable to easily detect the location of libs such as Xrender
and set an arbitrary define via autoconf methods. With the pkg-config
support, I am supposed able to even keep portability with Cygwin relatively
easily. This is related to the xrender.pc, xcursor.pc, etc. Also, I really
do not have enough knowledge to build a fully independent autotooled libX11
at this point as has been done with xcursor, xrender, and xft.

Although I am working on repackaging libX11 with autotools, it is not done
yet. Also, it is not trivial to make the XFree86 build system use an
external libX11 even if I did. Thus, adding the X11.pc to the current build
system makes a lot of sense to me at this point.

wt
-- 
President, GOLUM, Inc.
http://www.golum.org



Fw: coIIege naive girIs ready for H/\RD /\CTlON OPq zXe i D co tgZ CNeFB

2003-09-21 Thread Tilarot
Title: IFYgF dJ


Huffington blasts   The thing is in 1970
Eye on how much tTe Congress to  dLan fxApzYm in 1911 Can you tell me?
You are on... in 2005  in 1815 And if you in 1844



Re: O_SYNC patch -> slow fb memory access

2003-09-21 Thread Egbert Eich
Thomas Winischhofer writes:
 > 
 > Egbert, Debian folks:
 > 
 > After the release of XFree86 4.3.0, (AFAIK) Egbert Eich commited a patch 
 > which set the O_SYNC flag when opening /dev/mem for framebuffer memory 
 > access.
 > 
 > This caused memory access to the framebuffer area to become terribly 
 > slow on some machines. Among these types of machines are practically all 
 > SiS based ones using a shared memory area for framebuffer memory.
 > 
 > It seems the Debian folks have included this patch in their experimental 
 > pre1 prerelease, as I experience severe performance regressions compared 
 > to plain 4.3 from XFree.org.
 > 
 > Egbert: What exactly did that patch, what file is affected, and when was 
 > this reverted (I know it's not in current HEAD)?

No, I removed it again. O_SYNC causes the memory to be mapped
uncached. I had a system which crashed horribly when this flag
was not set for MMIO. Now I believe the system itself was faulty.
I'm still not sure if caching should be set at all for MMIO registers,
however since O_SYNC is an open() syscall flag and there is no
way of asking for uncached mempry mapping when doing mmap() we'd
have to have two separate file handles.
The affected file was os-support/linux/lnx_video.c

Egbert.



Re: propose new virtual package: libxaw-dev

2003-09-21 Thread Branden Robinson
[Followups set.]

On Thu, Sep 18, 2003 at 09:00:03PM -0500, Craig P. Steffen wrote:
> I am prospective DD; as one of my opening packages, I intend to adopt the 
> sound file editor xwave.  One of the bugs against it, 170005, says that 
> depending on the virtual package "libxaw-dev" is wrong.  
> 
> However, reading the debian policy manual sections 3.6 and 7.4, it seems to 
> me to be a perfectly reasonable thing to do.  The real packages libxaw6-dev 
> and libxaw7-dev exist, and are listed as Providing libxaw-dev.  The only 
> other thing that the policy manuals suggest is that virtual packages be 
> mentioned in the virtual-packages-name-list.txt.  
> 
> So I propose that "libxaw-dev" be added to that list.

I disagree; instead, I'm going to kill off libxaw-dev.

My decision to use the libxaw-dev virtual package in the first place
appears to date back to the time when we had multiple implementations of
the Athena library (NeXTaw, Xaw95, and Xaw3D).  The -dev packages for
these implementations could not coexist with each other, nor with
libXaw6's -dev package, because all of them tried to provide
/usr/X11R6/lib/libXaw.so for compile-time linking.

This is no longer a problem.  NeXTaw and Xaw95 have been withdrawn from
the distribution, and Xaw3D now uses the shared object name "libXaw3d".

The only two packages that will collide with each other now are
libxaw6-dev and libxaw7-dev, both of which are under my control.  A
virtual package is not needed to coordinate between two packages I
maintain.

Thanks for bringing this to my attention.

-- 
G. Branden Robinson| I suspect Linus wrote that in a
Debian GNU/Linux   | complicated way only to be able to
[EMAIL PROTECTED] | have that comment in there.
http://people.debian.org/~branden/ | -- Lars Wirzenius


signature.asc
Description: Digital signature


X Strike Force SVN commit: rev 558 - trunk/debian

2003-09-21 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-09-21 12:21:55 -0500 (Sun, 21 Sep 2003)
New Revision: 558

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
Kill off libxaw-dev virtual package per discussion on debian-devel mailing
list.
- debian/control:
  + libxaw6-dev now conflicts with and replaces libxaw7-dev instead of
libxaw-dev
  + libxaw6-dev no longer provides libxaw-dev
  + libxaw7-dev now conflicts with and replaces libxaw6-dev instead of
libxaw-dev
  + libxaw7-dev no longer provides libxaw-dev


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2003-09-20 10:34:14 UTC (rev 557)
+++ trunk/debian/changelog  2003-09-21 17:21:55 UTC (rev 558)
@@ -214,8 +214,18 @@
 xfree86/pc102/fi/nodeadkeys (stock XFree86 4.2.1 works)
 (Closes: #189298)
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Thu, 18 Sep 2003 16:28:22 -0500
+  * Kill off libxaw-dev virtual package per discussion on debian-devel mailing
+list.
+- debian/control:
+  + libxaw6-dev now conflicts with and replaces libxaw7-dev instead of
+libxaw-dev
+  + libxaw6-dev no longer provides libxaw-dev
+  + libxaw7-dev now conflicts with and replaces libxaw6-dev instead of
+libxaw-dev
+  + libxaw7-dev no longer provides libxaw-dev
 
+ -- Branden Robinson <[EMAIL PROTECTED]>  Sun, 21 Sep 2003 12:17:35 -0500
+
 xfree86 (4.2.1-11) unstable; urgency=medium
 
   * urgency set to medium because bug #206790 bites a lot of people (but,

Modified: trunk/debian/control
===
--- trunk/debian/control2003-09-20 10:34:14 UTC (rev 557)
+++ trunk/debian/control2003-09-21 17:21:55 UTC (rev 558)
@@ -99,9 +99,8 @@
 Priority: extra
 Architecture: any
 Depends: xlibs-dev, libxaw6, libc6-dev | libc-dev
-Conflicts: xlib6g-dev (<< 4.0), libxaw-dev
-Provides: libxaw-dev
-Replaces: xlib6g-dev (<< 4.0), libxaw-dev
+Conflicts: xlib6g-dev (<< 4.0), libxaw7-dev
+Replaces: xlib6g-dev (<< 4.0), libxaw7-dev
 Description: X Athena widget set library development files (version 6)
  Xaw header files and a static version of the Athena widget library are
  provided by this package, which supports Xaw6-based clients.
@@ -151,9 +150,8 @@
 Section: libdevel
 Architecture: any
 Depends: xlibs-dev, libxaw7, libc6-dev | libc-dev
-Conflicts: xlib6g-dev (<< 4.0), libxaw-dev
-Provides: libxaw-dev
-Replaces: xlib6g-dev (<< 4.0), libxaw-dev
+Conflicts: xlib6g-dev (<< 4.0), libxaw6-dev
+Replaces: xlib6g-dev (<< 4.0), libxaw6-dev
 Description: X Athena widget set library development files
  Xaw header files, a static library, and a manual page documenting new
  features in version 7 of the Athena widget library are provided by this



Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread Branden Robinson
On Sun, Sep 21, 2003 at 06:13:00AM -0500, Warren Turkal wrote:
> Branden Robinson wrote:
> > Warren, please expand on your rationale for this change.
> > 
> 
> The 017 that was in the svn was not useful to any architecture and was
> baggage from prior X versions AFAICT since there is already a "depend::" in
> the Imakefile in the xc/lib/X11 dir.
> 
> The 017 that was added simply adds pkg-config support for X11. This change
> in no way affects the executables or libs. I think this change will be
> useful to software developers. I also know that it will be helpful to my
> effort at autotoolizing the X programs. Without this support for pkg-config
> in place, I am unable to easily detect the location of libs such as Xrender
> and set an arbitrary define via autoconf methods. With the pkg-config
> support, I am supposed able to even keep portability with Cygwin relatively
> easily. This is related to the xrender.pc, xcursor.pc, etc. Also, I really
> do not have enough knowledge to build a fully independent autotooled libX11
> at this point as has been done with xcursor, xrender, and xft.
> 
> Although I am working on repackaging libX11 with autotools, it is not done
> yet. Also, it is not trivial to make the XFree86 build system use an
> external libX11 even if I did. Thus, adding the X11.pc to the current build
> system makes a lot of sense to me at this point.

Michel, does that explanation satisfy you?  I find myself pretty neutral
about this change.

-- 
G. Branden Robinson|I just wanted to see what it looked
Debian GNU/Linux   |like in a spotlight.
[EMAIL PROTECTED] |-- Jim Morrison
http://people.debian.org/~branden/ |


signature.asc
Description: Digital signature


Re: XFree86 4.3.0-0pre1v1 aborts on signal 11

2003-09-21 Thread Branden Robinson
On Sun, Sep 21, 2003 at 02:24:33AM -0700, Joshua Kwan wrote:
> In the middle of an uneventful X session where I was simply typing some
> stuff up in vim, it aborts on signal 11 and flings me back into the
> console. As per the crash advice, I've attached the XFree86.0.log,
> although it doesn't seem to show anything useful in my eyes hopefully it
> can help the X Strike Force.
> 
> A friend with a nVidia card has also been experiencing this equally
> sporadically. I don't see the correlation so maybe it is not a problem
> with my choice of video card? (radeon X server)

Probably the best thing for you to do is install and switch to the
debugging X server so that a reasonable core dump can be obtained and
used for a backtrace.

-- 
G. Branden Robinson| If you have the slightest bit of
Debian GNU/Linux   | intellectual integrity you cannot
[EMAIL PROTECTED] | support the government.
http://people.debian.org/~branden/ | -- anonymous


signature.asc
Description: Digital signature


Bug#198910: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=198910

2003-09-21 Thread Thomas Dickey
>  Debian Bug report logs - [1]#198910
>   xterm(1) confuses ampersand and @ symbol

I just committed a fix for this in XFree86 CVS.
-- 
Thomas E. Dickey <[EMAIL PROTECTED]>
http://invisible-island.net
ftp://invisible-island.net




Bug#10445: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=10445

2003-09-21 Thread Thomas Dickey
>  Debian Bug report logs - [1]#10445
> xterm: using -e with -ls fails to open a login shell

This should be closed since the documentation fixes requested were made.
-- 
Thomas E. Dickey <[EMAIL PROTECTED]>
http://invisible-island.net
ftp://invisible-island.net




X Strike Force SVN commit: rev 559 - branches/4.3.0/sid/debian

2003-09-21 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-09-21 13:20:05 -0500 (Sun, 21 Sep 2003)
New Revision: 559

Modified:
   branches/4.3.0/sid/debian/changelog
Log:
debian/changelog: fix ISHIKAWA-san's changelog entry


Modified: branches/4.3.0/sid/debian/changelog
===
--- branches/4.3.0/sid/debian/changelog 2003-09-21 17:21:55 UTC (rev 558)
+++ branches/4.3.0/sid/debian/changelog 2003-09-21 18:20:05 UTC (rev 559)
@@ -161,9 +161,10 @@
 
   * debian/patches/069_fix_ugly_r128_driver_warning.diff: fix an ugly
 diagnostic message which was also a multiline string literal
-  
-  * update Japanese translations (thanks, Kenshi Muto and Takeo Nakano)
 
+  * debian/po/ja.po: update Japanese translations (thanks, Kenshi Muto and
+Takeo Nakano)
+
  -- Branden Robinson <[EMAIL PROTECTED]>  Thu, 18 Sep 2003 11:39:10 -0500
 
 xfree86 (4.3.0-0pre1v1) experimental; urgency=low



X Strike Force SVN commit: rev 560 - branches/4.3.0/sid/debian

2003-09-21 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-09-21 13:28:55 -0500 (Sun, 21 Sep 2003)
New Revision: 560

Modified:
   branches/4.3.0/sid/debian/changelog
   branches/4.3.0/sid/debian/control
Log:
The XKB implementation in XFree86 4.3.0 has changed in a
non-backward-compatible manner; update package relationships accordingly.

* debian/control:
  - xbase-clients conflicts with xlibs (<< 4.3.0) and xlibs-data (<< 4.3.0)
  - xlibs conflicts with xbase-clients (<< 4.3.0) and xlibs-data (<< 4.3.0)
  - xlibs-data conflicts with xbase-clients (<< 4.3.0)

(xlibs-data already conflicted with xlibs (<< 4.3.0) due to file migration)


Modified: branches/4.3.0/sid/debian/changelog
===
--- branches/4.3.0/sid/debian/changelog 2003-09-21 18:20:05 UTC (rev 559)
+++ branches/4.3.0/sid/debian/changelog 2003-09-21 18:28:55 UTC (rev 560)
@@ -165,8 +165,14 @@
   * debian/po/ja.po: update Japanese translations (thanks, Kenshi Muto and
 Takeo Nakano)
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Thu, 18 Sep 2003 11:39:10 -0500
+  * debian/control: the XKB implementation in XFree86 4.3.0 has changed in a
+non-backward-compatible manner; update package relationships accordingly
+- xbase-clients conflicts with xlibs (<< 4.3.0) and xlibs-data (<< 4.3.0)
+- xlibs conflicts with xbase-clients (<< 4.3.0) and xlibs-data (<< 4.3.0)
+- xlibs-data conflicts with xbase-clients (<< 4.3.0)
 
+ -- Branden Robinson <[EMAIL PROTECTED]>  Sun, 21 Sep 2003 13:22:54 -0500
+
 xfree86 (4.3.0-0pre1v1) experimental; urgency=low
 
   * new upstream release

Modified: branches/4.3.0/sid/debian/control
===
--- branches/4.3.0/sid/debian/control   2003-09-21 18:20:05 UTC (rev 559)
+++ branches/4.3.0/sid/debian/control   2003-09-21 18:28:55 UTC (rev 560)
@@ -184,7 +184,7 @@
 Package: xbase-clients
 Architecture: any
 Depends: cpp-3.2, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: xbase (<< 3.3.2.3a-2), xserver-common (<< 3.3.2.3a-9), xmodmap, 
xaw-wrappers (<< 0.90), xfonts-100dpi (<< 3.3.3.1-3), xfonts-75dpi (<< 
3.3.3.1-3), xfonts-base (<< 3.3.3.1-3), xfonts-cyrillic (<< 3.3.3.1-3), 
xfonts-scalable (<< 3.3.3.1-3), xfnt100 (<= 3.3.2.3a-1), xfnt75 (<= 
3.3.2.3a-1), xfntbase (<= 3.3.2.3a-1), xfntcyr (<= 3.3.2.3a-1), xfntscl (<= 
3.3.2.3a-1), xdm (<< 4.0), xsm, xcontrib, xpm4g-dev, xpm-bin
+Conflicts: xbase (<< 3.3.2.3a-2), xserver-common (<< 3.3.2.3a-9), xmodmap, 
xaw-wrappers (<< 0.90), xfonts-100dpi (<< 3.3.3.1-3), xfonts-75dpi (<< 
3.3.3.1-3), xfonts-base (<< 3.3.3.1-3), xfonts-cyrillic (<< 3.3.3.1-3), 
xfonts-scalable (<< 3.3.3.1-3), xfnt100 (<= 3.3.2.3a-1), xfnt75 (<= 
3.3.2.3a-1), xfntbase (<= 3.3.2.3a-1), xfntcyr (<= 3.3.2.3a-1), xfntscl (<= 
3.3.2.3a-1), xdm (<< 4.0), xsm, xcontrib, xpm4g-dev, xpm-bin, xlibs (<< 4.3.0), 
xlibs-data (<< 4.3.0)
 Replaces: xbase (<< 3.3.2.3a-2), xf86setup (<< 3.3.2.3a-9), xserver-common (<< 
4.0), xmodmap, xcontrib, xpm4g-dev, xpm-bin, xsm
 Provides: xmodmap, xcontrib, xpm-bin, xsm
 Description: miscellaneous X clients
@@ -700,7 +700,7 @@
 Section: libs
 Architecture: any
 Depends: xfree86-common (>> 4.3), xlibs-data (= ${Source-Version}), 
${shlibs:Depends}, ${misc:Depends}
-Conflicts: xlib, xlib6 (<< 3.3.2.3-2), xlib6g (<< 4.0), xlib6g-dev, 
xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0), xpm4g, fvwm-common, 
qcad (<< 1.4.6-1), xbase-clients (<< 4.2.0)
+Conflicts: xlib, xlib6 (<< 3.3.2.3-2), xlib6g (<< 4.0), xlib6g-dev, 
xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0), xpm4g, fvwm-common, 
qcad (<< 1.4.6-1), xbase-clients (<< 4.3.0), xlibs-data (<< 4.3.0)
 Replaces: xlib, xbase (<< 3.3.2.3a-2), xlib6 (<< 3.3.2.3-2), xbase-clients (<< 
4.0), xlib6g (<< 4.0), xlib6g-dev, xpm4g, fvwm-common, xcontrib, xsm, qcad (<< 
1.4.6-1)
 Provides: libxpm4
 Description: X Window System client libraries
@@ -825,7 +825,7 @@
 Section: libs
 Priority: optional
 Architecture: all
-Conflicts: xlibs (<< 4.3.0)
+Conflicts: xlibs (<< 4.3.0), xbase-clients (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: X Window System client data
  This package provides architecture-independent data for the X Window System,



X Strike Force SVN commit: rev 561 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-09-21 14:05:25 -0500 (Sun, 21 Sep 2003)
New Revision: 561

Modified:
   branches/4.3.0/sid/debian/changelog
   branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff
Log:
Update xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c to
  latest version from upstream CVS HEAD to resolve severe performance
  problems caused by opening /dev/mem with the O_SYNC flag, per Egbert
  Eich.

* debian/patches/000_stolen_from_HEAD_int10.diff


Modified: branches/4.3.0/sid/debian/changelog
===
--- branches/4.3.0/sid/debian/changelog 2003-09-21 18:28:55 UTC (rev 560)
+++ branches/4.3.0/sid/debian/changelog 2003-09-21 19:05:25 UTC (rev 561)
@@ -171,8 +171,13 @@
 - xlibs conflicts with xbase-clients (<< 4.3.0) and xlibs-data (<< 4.3.0)
 - xlibs-data conflicts with xbase-clients (<< 4.3.0)
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Sun, 21 Sep 2003 13:22:54 -0500
+  * debian/patches/000_stolen_from_HEAD_int10.diff: Update
+xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c to latest
+version from upstream CVS HEAD to resolve severe performance problems
+caused by opening /dev/mem with the O_SYNC flag, per Egbert Eich.
 
+ -- Branden Robinson <[EMAIL PROTECTED]>  Sun, 21 Sep 2003 14:02:39 -0500
+
 xfree86 (4.3.0-0pre1v1) experimental; urgency=low
 
   * new upstream release

Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff
===
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff   
2003-09-21 18:28:55 UTC (rev 560)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff   
2003-09-21 19:05:25 UTC (rev 561)
@@ -5,6 +5,11 @@
   976. Change most of os-support/ to respect VIDMEM_READONLY (Marc La
France).
 
+(xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c):
+  249. Removed O_SYNC from open call for /dev/mem for all Linux platforms.
+   This hopefully takes care of the speed problem
+   (Bugzilla #419, #414, Egbert Eich).
+
 diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c 
xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c
 --- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c 
2002-10-17 07:13:47.0 +1000
 +++ xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c  
2003-04-09 04:48:51.0 +1000
@@ -23,15 +28,14 @@
   MAP_SHARED | MAP_FIXED, fd, SYS_BIOS))
== MAP_FAILED) {
xf86DrvMsg(screen, X_ERROR, "Cannot map SYS BIOS\n");
-diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c 
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
 xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c   
2003-02-18 02:29:22.0 +1100
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
2003-04-09 04:48:51.0 +1000
-@@ -1,4 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 
3.64 2003/02/17 15:29:22 dawes Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 
3.65 2003/03/14 13:46:05 tsi Exp $ */
- /*
-  * Copyright 1992 by Orest Zborowski <[EMAIL PROTECTED]>
-  * Copyright 1993 by David Wexelblat <[EMAIL PROTECTED]>
+Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
+===
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v
+retrieving revision 3.64
+retrieving revision 3.67
+diff -u -u -r3.64 -r3.67
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c17 Feb 
2003 15:29:22 -  3.64
 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c25 Jun 
2003 18:27:07 -  3.67
 @@ -407,6 +407,7 @@
  pointer base;
  int fd;
@@ -40,18 +44,20 @@
  memType realBase, alignOff;
  
  realBase = Base & ~(getpagesize() - 1);
-@@ -429,21 +430,23 @@
+@@ -429,20 +430,26 @@
  mapflags |= MAP_NONCACHED; 
  #endif
  
 -#if defined(__ia64__)
++#if 0
  /* this will disappear when people upgrade their kernels */
 -if ((fd = open(DEV_MEM, O_RDWR|O_SYNC)) < 0) 
--#else
++fd = open(DEV_MEM,
++((flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR) | O_SYNC);
+ #else
 -if ((fd = open(DEV_MEM, O_RDWR)) < 0)
--#endif
-+fd = open(DEV_MEM,
-+  ((flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR) | O_SYNC);
++fd = open(DEV_MEM, (flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);
+ #endif
 +if (fd < 0)
  {
FatalError("xf86MapVidMem: failed to open " DEV_MEM " (%s)\n",
@@ -59,20 +65,18 @@
  }
 +
 +if (flags & VIDMEM_READONLY)
-+  prot = PROT_READ;
++  prot = PROT_READ;
 +else
-+  prot = PROT_READ | PROT_WRITE;
-+
++  prot = PROT_READ | PROT_WRITE

Re: O_SYNC patch -> slow fb memory access

2003-09-21 Thread Branden Robinson
On Sun, Sep 21, 2003 at 10:47:57AM +0200, Egbert Eich wrote:
> No, I removed it again. O_SYNC causes the memory to be mapped
> uncached. I had a system which crashed horribly when this flag
> was not set for MMIO. Now I believe the system itself was faulty.
> I'm still not sure if caching should be set at all for MMIO registers,
> however since O_SYNC is an open() syscall flag and there is no
> way of asking for uncached mempry mapping when doing mmap() we'd
> have to have two separate file handles.
> The affected file was os-support/linux/lnx_video.c

Thanks for the explanation.  I have updated Debian's patches to use the
latest version (3.67) of lnx_video.c.  This fix will appear in the next
release of our packages of XFree86 4.3.0.

-- 
G. Branden Robinson| Human beings rarely imagine a god
Debian GNU/Linux   | that behaves any better than a
[EMAIL PROTECTED] | spoiled child.
http://people.debian.org/~branden/ | -- Robert Heinlein


signature.asc
Description: Digital signature


X Strike Force SVN commit: rev 562 - branches/4.1.0

2003-09-21 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-09-21 14:12:02 -0500 (Sun, 21 Sep 2003)
New Revision: 562

Added:
   branches/4.1.0/woody-proposed-updates/
Removed:
   branches/4.1.0/sarge/
Log:
Rename the 4.1.0/sarge branch to 4.1.0/woody-proposed-updates, since that
is its new purpose.


Copied: branches/4.1.0/woody-proposed-updates (from rev 561, 
branches/4.1.0/sarge)



Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread Michel Dänzer
On Sun, 2003-09-21 at 19:59, Branden Robinson wrote:
> 
> Michel, does that explanation satisfy you?  I find myself pretty neutral
> about this change.

So do I about the technical change per se, my concern is to avoid
gratuitous deviation from upstream.


-- 
Earthling Michel Dänzer   \  Debian (powerpc), XFree86 and DRI developer
Software libre enthusiast  \ http://svcs.affero.net/rm.php?r=daenzer



X Strike Force SVN commit: rev 563 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-09-21 16:15:47 -0500 (Sun, 21 Sep 2003)
New Revision: 563

Modified:
   branches/4.3.0/sid/debian/changelog
   branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff
Log:
Resync patch #021 with #000_stolen_from_HEAD_int10.diff and improve
  error reporting when ioperm()/iopl() fail for reasons other then ENODEV).

* debian/patches/021_riscpc_ioport_fix.diff


Modified: branches/4.3.0/sid/debian/changelog
===
--- branches/4.3.0/sid/debian/changelog 2003-09-21 19:12:02 UTC (rev 562)
+++ branches/4.3.0/sid/debian/changelog 2003-09-21 21:15:47 UTC (rev 563)
@@ -171,10 +171,12 @@
 - xlibs conflicts with xbase-clients (<< 4.3.0) and xlibs-data (<< 4.3.0)
 - xlibs-data conflicts with xbase-clients (<< 4.3.0)
 
-  * debian/patches/000_stolen_from_HEAD_int10.diff: Update
-xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c to latest
-version from upstream CVS HEAD to resolve severe performance problems
-caused by opening /dev/mem with the O_SYNC flag, per Egbert Eich.
+  * Update xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c to
+latest version from upstream CVS HEAD to resolve severe performance
+problems caused by opening /dev/mem with the O_SYNC flag, per Egbert Eich.
+- debian/patches/000_stolen_from_HEAD_int10.diff: updated
+- debian/patches/021_riscpc_ioport_fix.diff: resynced (also improve error
+  reporting when ioperm()/iopl() fail for reasons other then ENODEV)
 
  -- Branden Robinson <[EMAIL PROTECTED]>  Sun, 21 Sep 2003 14:02:39 -0500
 

Modified: branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff
===
--- branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff
2003-09-21 19:12:02 UTC (rev 562)
+++ branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff
2003-09-21 21:15:47 UTC (rev 563)
@@ -4,18 +4,19 @@
 
 Not submitted upstream yet.
 
 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c~   Mon Apr 
 8 14:00:48 2002
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.cMon Apr 
 8 14:03:55 2002
-@@ -25,6 +25,8 @@
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c~   
2003-09-21 16:07:20.0 -0500
 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
2003-09-21 16:10:30.0 -0500
+@@ -25,6 +25,9 @@
   */
  /* $XConsortium: lnx_video.c /main/9 1996/10/19 18:06:34 kaleb $ */
  
 +#include 
++#include 
 +
  #include "X.h"
  #include "input.h"
  #include "scrnintstr.h"
-@@ -516,8 +518,12 @@
+@@ -520,8 +523,13 @@
}
close(fd);
  #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && 
!defined(__sh__) && !defined(__hppa__)
@@ -25,7 +26,8 @@
 +  if (errno == ENODEV)
 +  ErrorF("xf86EnableIOPorts: no I/O ports found\n");
 +  else
-+  FatalError("xf86EnableIOPorts: Failed to set IOPL for 
I/O\n");
++  FatalError("xf86EnableIOPorts: failed to set IOPL"
++ " for I/O (%s)\n", strerror(errno));
 +  }
  # if !defined(__alpha__)
ioperm(0x40,4,0); /* trap access to the timer chip */



Re: O_SYNC patch -> slow fb memory access

2003-09-21 Thread Thomas Winischhofer

Branden Robinson wrote:

On Sun, Sep 21, 2003 at 10:47:57AM +0200, Egbert Eich wrote:


No, I removed it again. O_SYNC causes the memory to be mapped
uncached. I had a system which crashed horribly when this flag
was not set for MMIO. Now I believe the system itself was faulty.
I'm still not sure if caching should be set at all for MMIO registers,
however since O_SYNC is an open() syscall flag and there is no
way of asking for uncached mempry mapping when doing mmap() we'd
have to have two separate file handles.
The affected file was os-support/linux/lnx_video.c



Thanks for the explanation.  I have updated Debian's patches to use the
latest version (3.67) of lnx_video.c.  This fix will appear in the next
release of our packages of XFree86 4.3.0.


Thanks.

Thomas

--
Thomas Winischhofer
Vienna/Austria
thomas AT winischhofer DOT net  http://www.winischhofer.net/
twini AT xfree86 DOT org



MANIFEST sorting

2003-09-21 Thread Warren Turkal
Is there a sorting order to the MANIFESTS, or can I just add whatever
whereever? I am going to make the changes for the other archs for the
pkg-config stuff.

wt
-- 
Warren Turkal
President, GOLUM, Inc.
http://www.golum.org



Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread Warren Turkal
Michel Dänzer wrote:
> So do I about the technical change per se, my concern is to avoid
> gratuitous deviation from upstream.

It is not gratuitous...it's one file. If using pkg-config to locate xlibs
becomes more prevalent, hopefully upstream will be more friendly toward the
change there.

Warren
-- 
Warren Turkal
President, GOLUM, Inc.
http://www.golum.org



Re: MANIFEST sorting

2003-09-21 Thread Daniel Stone
On Sun, Sep 21, 2003 at 09:15:34PM -0500, Warren Turkal wrote:
> Is there a sorting order to the MANIFESTS, or can I just add whatever
> whereever? I am going to make the changes for the other archs for the
> pkg-config stuff.

LANG=C sort

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.debian.org - http://www.kde.org - http://www.freedesktop.org
"Configurability is always the best choice when it's pretty simple to implement"
  -- Havoc Pennington, gnome-list


pgpx7ON3WIQID.pgp
Description: PGP signature


patches for upstream

2003-09-21 Thread Warren Turkal
Is there any reason that I should not submit the patches for building
external Xcursor, Xft, and Xrender upstream?

wt
-- 
Warren Turkal
President, GOLUM, Inc.
http://www.golum.org



X Strike Force SVN commit: rev 565 - branches/4.3.0/sid/debian

2003-09-21 Thread X Strike Force SVN Admin
Author: wt
Date: 2003-09-21 22:02:17 -0500 (Sun, 21 Sep 2003)
New Revision: 565

Modified:
   branches/4.3.0/sid/debian/MANIFEST.alpha
   branches/4.3.0/sid/debian/MANIFEST.arm
   branches/4.3.0/sid/debian/MANIFEST.hppa
   branches/4.3.0/sid/debian/MANIFEST.hurd-i386
   branches/4.3.0/sid/debian/MANIFEST.ia64
   branches/4.3.0/sid/debian/MANIFEST.mips
   branches/4.3.0/sid/debian/MANIFEST.mipsel
   branches/4.3.0/sid/debian/MANIFEST.powerpc
   branches/4.3.0/sid/debian/MANIFEST.s390
   branches/4.3.0/sid/debian/MANIFEST.sparc
Log:
Add files for pkg-config of libX11 to manifests for archs other than i386.


Modified: branches/4.3.0/sid/debian/MANIFEST.alpha
===
--- branches/4.3.0/sid/debian/MANIFEST.alpha2003-09-21 22:15:53 UTC (rev 
564)
+++ branches/4.3.0/sid/debian/MANIFEST.alpha2003-09-22 03:02:17 UTC (rev 
565)
@@ -6121,6 +6121,7 @@
 usr/X11R6/lib/modules/linux/libfbdevhw.a
 usr/X11R6/lib/modules/v10002d.uc
 usr/X11R6/lib/modules/v20002d.uc
+usr/X11R6/lib/pkgconfig/X11.pc
 usr/X11R6/man/man1/XFree86.1x
 usr/X11R6/man/man1/Xmark.1x
 usr/X11R6/man/man1/Xnest.1x
@@ -7819,6 +7820,7 @@
 usr/X11R6/man/man7/Xsecurity.7x
 usr/bin/dexconf
 usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
 usr/sbin/update-fonts-alias
 usr/sbin/update-fonts-dir
 usr/sbin/update-fonts-scale

Modified: branches/4.3.0/sid/debian/MANIFEST.arm
===
--- branches/4.3.0/sid/debian/MANIFEST.arm  2003-09-21 22:15:53 UTC (rev 
564)
+++ branches/4.3.0/sid/debian/MANIFEST.arm  2003-09-22 03:02:17 UTC (rev 
565)
@@ -6108,6 +6108,7 @@
 usr/X11R6/lib/modules/libxf8_16bpp.a
 usr/X11R6/lib/modules/libxf8_32bpp.a
 usr/X11R6/lib/modules/linux/libfbdevhw.a
+usr/X11R6/lib/pkgconfig/X11.pc
 usr/X11R6/man/man1/XFree86.1x
 usr/X11R6/man/man1/Xmark.1x
 usr/X11R6/man/man1/Xnest.1x
@@ -7807,6 +7808,7 @@
 usr/X11R6/man/man7/Xsecurity.7x
 usr/bin/dexconf
 usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
 usr/sbin/update-fonts-alias
 usr/sbin/update-fonts-dir
 usr/sbin/update-fonts-scale

Modified: branches/4.3.0/sid/debian/MANIFEST.hppa
===
--- branches/4.3.0/sid/debian/MANIFEST.hppa 2003-09-21 22:15:53 UTC (rev 
564)
+++ branches/4.3.0/sid/debian/MANIFEST.hppa 2003-09-22 03:02:17 UTC (rev 
565)
@@ -6002,6 +6002,7 @@
 usr/X11R6/lib/libxkbui.a
 usr/X11R6/lib/libxkbui_pic.a
 usr/X11R6/lib/libxrx.so.6.3
+usr/X11R6/lib/pkgconfig/X11.pc
 usr/X11R6/man/man1/XFree86.1x
 usr/X11R6/man/man1/Xmark.1x
 usr/X11R6/man/man1/Xnest.1x
@@ -7701,6 +7702,7 @@
 usr/X11R6/man/man7/Xsecurity.7x
 usr/bin/dexconf
 usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
 usr/sbin/update-fonts-alias
 usr/sbin/update-fonts-dir
 usr/sbin/update-fonts-scale

Modified: branches/4.3.0/sid/debian/MANIFEST.hurd-i386
===
--- branches/4.3.0/sid/debian/MANIFEST.hurd-i3862003-09-21 22:15:53 UTC 
(rev 564)
+++ branches/4.3.0/sid/debian/MANIFEST.hurd-i3862003-09-22 03:02:17 UTC 
(rev 565)
@@ -5960,6 +5960,7 @@
 usr/X11R6/lib/modules/libxf8_32bpp.a
 usr/X11R6/lib/modules/v10002d.uc
 usr/X11R6/lib/modules/v20002d.uc
+usr/X11R6/lib/modules/X11.pc
 usr/X11R6/man/man1/XFree86.1x
 usr/X11R6/man/man1/Xmark.1x
 usr/X11R6/man/man1/Xnest.1x
@@ -7672,6 +7673,7 @@
 usr/X11R6/man/man7/Xsecurity.7x
 usr/bin/dexconf
 usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
 usr/sbin/update-fonts-alias
 usr/sbin/update-fonts-dir
 usr/sbin/update-fonts-scale

Modified: branches/4.3.0/sid/debian/MANIFEST.ia64
===
--- branches/4.3.0/sid/debian/MANIFEST.ia64 2003-09-21 22:15:53 UTC (rev 
564)
+++ branches/4.3.0/sid/debian/MANIFEST.ia64 2003-09-22 03:02:17 UTC (rev 
565)
@@ -6143,6 +6143,7 @@
 usr/X11R6/lib/modules/linux/libfbdevhw.a
 usr/X11R6/lib/modules/v10002d.uc
 usr/X11R6/lib/modules/v20002d.uc
+usr/X11R6/lib/pkgconfig/X11.pc
 usr/X11R6/man/man1/XFree86.1x
 usr/X11R6/man/man1/Xmark.1x
 usr/X11R6/man/man1/Xnest.1x
@@ -7856,6 +7857,7 @@
 usr/X11R6/man/man7/Xsecurity.7x
 usr/bin/dexconf
 usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
 usr/sbin/update-fonts-alias
 usr/sbin/update-fonts-dir
 usr/sbin/update-fonts-scale

Modified: branches/4.3.0/sid/debian/MANIFEST.mips
===
--- branches/4.3.0/sid/debian/MANIFEST.mips 2003-09-21 22:15:53 UTC (rev 
564)
+++ branches/4.3.0/sid/debian/MANIFEST.mips 2003-09-22 03:02:17 UTC (rev 
565)
@@ -6003,6 +6003,7 @@
 usr/X11R6/lib/libxkbui.a
 usr/X11R6/lib/libxkbui_pic.a
 usr/X11R6/lib/libxrx.so.6.3
+usr/X11R6/lib/pkgconfig/X11.pc
 usr/X11R6/man/man1/XFree86.1x
 usr/X11R6/man/man1/Xmark.1x
 usr/X11R6/man/man1/Xnest.1x
@@ -7702,6 +7703,7 @@
 usr/X11R6/man/man7/Xsecurity.7x
 usr/bin/dexconf
 usr/bin/xvfb-run
+usr/lib/pkgconfig/X11.pc
 usr/sbin/update-fonts-alias
 usr/sbin/update-fonts-dir
 usr/sbi

Re: MANIFEST sorting

2003-09-21 Thread Branden Robinson
On Mon, Sep 22, 2003 at 12:26:52PM +1000, Daniel Stone wrote:
> On Sun, Sep 21, 2003 at 09:15:34PM -0500, Warren Turkal wrote:
> > Is there a sorting order to the MANIFESTS, or can I just add whatever
> > whereever? I am going to make the changes for the other archs for the
> > pkg-config stuff.
> 
> LANG=C sort

This isn't the best advice, as the LANG variable is easily overriden.
See locale(7).

Anyway, yes, there is a sorting (collation) order, and it is C/POSIX.

Please see locale(7) to determine the best way to achieve this that
meshes with your existing locale settings.

-- 
G. Branden Robinson|   The last Christian died on the
Debian GNU/Linux   |   cross.
[EMAIL PROTECTED] |   -- Friedrich Nietzsche
http://people.debian.org/~branden/ |


signature.asc
Description: Digital signature


Re: X Strike Force SVN commit: rev 555 - in branches/4.3.0/sid/debian: . patches

2003-09-21 Thread Branden Robinson
On Fri, Sep 19, 2003 at 01:36:38PM -0500, X Strike Force SVN Admin wrote:
> Author: wt
> Date: 2003-09-19 13:36:17 -0500 (Fri, 19 Sep 2003)
> New Revision: 555
> 
> Added:
>branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff
> Removed:
>branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff
> Modified:
>branches/4.3.0/sid/debian/MANIFEST.i386
>branches/4.3.0/sid/debian/rules
>branches/4.3.0/sid/debian/xlibs-dev.install
> Log:
> Enabling pkg-config for libX11. The main artifact is that
> there is now a file called /usr/lib/pkgconfig/X11.pc.

I have noticed another defect with this changeset.

You did not write a debian/changelog entry for it.

I'll take care of it.

-- 
G. Branden Robinson| One doesn't have a sense of humor.
Debian GNU/Linux   | It has you.
[EMAIL PROTECTED] | -- Larry Gelbart
http://people.debian.org/~branden/ |


signature.asc
Description: Digital signature


Processed: Re: Bug#198910: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=198910

2003-09-21 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

> tag 198910 + fixed-upstream
Bug#198910: xterm(1) confuses ampersand and @ symbol
There were no tags set.
Tags added: fixed-upstream

> thanks
Stopping processing here.

Please contact me if you need assistance.

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




Bug#10445: marked as done (xterm: using -e with -ls fails to open a login shell)

2003-09-21 Thread Debian Bug Tracking System
Your message dated Sun, 21 Sep 2003 23:26:54 -0500
with message-id <[EMAIL PROTECTED]>
and subject line Bug#10445: 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=10445
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; 8 Jun 1997 18:42:42 +
Received: (qmail 11102 invoked from network); 8 Jun 1997 18:42:41 -
Received: from lilac.csi.cam.ac.uk (131.111.8.44)
  by master.debian.org with SMTP; 8 Jun 1997 18:42:40 -
Received: from piranha.chu.cam.ac.uk [131.111.131.65] (mail)
by lilac.csi.cam.ac.uk with smtp (Exim 1.62 #1)
id 0wamvE-0002ee-00; Sun, 8 Jun 1997 19:42:36 +0100
Received: from jon by piranha.chu.cam.ac.uk with local (Exim 1.61 #1)
id 0wamvB-l6-00 (Debian); Sun, 8 Jun 1997 19:42:33 +0100
Date: Sun, 8 Jun 1997 19:42:32 +0100 (BST)
From: Jon Rabone <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Subject: Xterm -e and -ls options don't work together
Message-ID: <[EMAIL PROTECTED]>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Package: xbase
Version: 3.2-5

The -ls option does not do the right thing if -e is also specified to
execute a command, because xterm does an execvp _before_ the shell (bash
in this case) can read the system and user profiles. This breaks (for
example) 

xterm -ls -e trn

because the environment is not set up properly.

Jon.


---
Received: (at 10445-done) by bugs.debian.org; 22 Sep 2003 04:27:13 +
>From [EMAIL PROTECTED] Sun Sep 21 23:26:55 2003
Return-path: <[EMAIL PROTECTED]>
Received: from dhcp065-026-182-085.indy.rr.com (redwald.deadbeast.net) 
[65.26.182.85] 
by master.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1A1IHn-00018S-00; Sun, 21 Sep 2003 23:26:55 -0500
Received: by redwald.deadbeast.net (Postfix, from userid 1000)
id E694B640DA; Sun, 21 Sep 2003 23:26:54 -0500 (EST)
Date: Sun, 21 Sep 2003 23:26:54 -0500
From: Branden Robinson <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Subject: Re: Bug#10445: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=10445
Message-ID: <[EMAIL PROTECTED]>
References: <[EMAIL PROTECTED]>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="Q7MaAb+MMjzLKrXy"
Content-Disposition: inline
In-Reply-To: <[EMAIL PROTECTED]>
Mail-Copies-To: nobody
X-No-CC: I subscribe to this list; do not CC me on replies.
User-Agent: Mutt/1.5.4i
Delivered-To: [EMAIL PROTECTED]
X-Spam-Status: No, hits=-4.5 required=4.0
tests=EMAIL_ATTRIBUTION,QUOTED_EMAIL_TEXT,RCVD_IN_NJABL
version=2.53-bugs.debian.org_2003_9_21
X-Spam-Level: 
X-Spam-Checker-Version: SpamAssassin 2.53-bugs.debian.org_2003_9_21 
(1.174.2.15-2003-03-30-exp)


--Q7MaAb+MMjzLKrXy
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Sep 21, 2003 at 01:59:53PM -0400, Thomas Dickey wrote:
> >  Debian Bug report logs - [1]#10445
> > xterm: using -e with -ls fails to open a login shell
>=20
> This should be closed since the documentation fixes requested were made.

Since xterm 4.2.1-8 at the latest (and probably for several package
releases before that) the xterm manpage has said the following:

   -ls This  option  indicates  that  the shell that is started in =
the
   xterm window will be a login shell (i.e., the  first  charac=
ter
   of  argv[0]  will  be  a  dash, indicating to the shell that=
 it
   should read the user's .login or .profile).

   Note that this is incompatible with -e, since the login prog=
ram
   does not provide a way to specify the command to run in the =
new
   shell.  If you specify both, xterm uses -ls.

Closing this report.

--=20
G. Branden Robinson|  If you don't think for yourself,
Debian GNU/Linux   |  others will think for you -- to
[EMAIL PROTECTED] |  their advantage.
http://people.debian.org/~branden/ |  -- Harold Gordon

--Q7MaAb+MMjzLKrXy
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.3 (GNU/Linux)

iEYEARECAAYFAj9ueg4ACgkQ6kxmHytGonw5HgCglG6vmc+sFwhszZyv/hLlz6ZO
c54AnjdAJH21KcwPrMxvWOoLX7suzilm
=hs58
-END PGP SIGNATURE-

--Q7MaAb+MMjzLKrXy--