Re: xfree86 on hppa-linux

2003-07-03 Thread ISHIKAWA Mutsumi
> In <[EMAIL PROTECTED]> 
>   Randolph Chung <[EMAIL PROTECTED]> wrote:
>> Hi,
>>
>> i just found out today from the debian x maintainer that he disabled the
>> loadable x-server for hppa because of a patch you submitted that
>> disabled loadable servers for hppa... any particular reason that is
>> needed? iirc xfree86 worked as-is for hppa...

 Humm? I don't remember I submited that kind of patch.
 Which patch is it? Would you tell me the pointer about the patch.


 And I have an question, if you know please teach me :-)


 XFree86 dynamic loading is already supported on HPPA architecture?

 If the answer is YES, we should enable hppa dynamic loading support
on HPPA architecture.I can not found HPPA dynamic loader code under
xc/programs/Xserver/hw/xfree86/loaders/.

--
ISHIKAWA Mutsumi
 <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>
 


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



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

2003-07-03 Thread ISHIKAWA Mutsumi
> In <[EMAIL PROTECTED]> 
>   X Strike Force SVN Admin <[EMAIL PROTECTED]> wrote:
>> Author: daniel
>> Date: 2003-07-02 18:07:39 -0500 (Wed, 02 Jul 2003)
>> New Revision: 278
>>
>> Modified:
>>branches/4.3.0/sid/debian/control
>> Log:
>> control: Don't attempt to package xserver-xfree86 on
>> hppa/mips/mipsel; we don't build a loadable server there,
>> apparently. This should complete the ports.

 Why don't provide normal X server for these architecture ?

 We build X server for hppa/mips/mipsel but it is just disable dynamic
loading (all driverse are static linked into single XFree86 server
binary). It is of cause works fine, and X server is needed on these
architecture.

-- 
ISHIKAWA Mutsumi
 <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>


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



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

2003-07-03 Thread ISHIKAWA Mutsumi
> In <[EMAIL PROTECTED]> 
>   X Strike Force SVN Admin <[EMAIL PROTECTED]> wrote:
>> Author: daniel
>> Date: 2003-07-02 18:07:39 -0500 (Wed, 02 Jul 2003)
>> New Revision: 278
>>
>> Modified:
>>branches/4.3.0/sid/debian/control
>> Log:
>> control: Don't attempt to package xserver-xfree86 on
>> hppa/mips/mipsel; we don't build a loadable server there,
>> apparently. This should complete the ports.

 Why don't provide normal X server for these architecture ?

 We build X server for hppa/mips/mipsel but it is just disable dynamic
loading (all driverse are static linked into single XFree86 server
binary). It is of cause works fine, and X server is needed on these
architecture.

-- 
ISHIKAWA Mutsumi
 <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>


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



Bug#199830: xfree86 fails to build on mipsel

2003-07-03 Thread Adrian Bunk
Package: xfree86
Version: 4.2.1-9
Severity: serious


According to buildd.debian.org the build of xfree86 4.1.2-9
fails on mipsel with the following error:

<--  snip  -->

...
touch debian/stampdir/install
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
cp: cannot stat `debian/tmp//usr/X11R6/man/man4/ati.4x': No such file or direct
ory
dh_install: command returned error code 256
make: *** [debian/stampdir/binary-arch] Error 1

<--  snip  -->






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



Re: 4.3.0-0pre1vX roadmap

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 01:36:33AM -0500, Branden Robinson wrote:
> On Thu, Jul 03, 2003 at 01:15:31AM +0200, Michel D?nzer wrote:
> > On Thu, 2003-07-03 at 00:47, Daniel Stone wrote:
> > > 
> > > pre1v2:
> > >   * Merge Sven Luther's SDK stuff.
> > 
> > [...]
> > 
> > >   * Import Savage driver 1.1.27t (done).
> > >   * Import SiS driver from HEAD (done).
> > 
> > What are people's thoughts on patching drivers vs. providing driver
> > packages built against the SDK? The radeon driver in HEAD is also much
> > better than the one in 4.3 ...
> 
> I'd like to defer this decision past the actual release of 0pre1v1 to
> experimental.

So my "good to go" analysis looks clear to you?

Oh, I still have to fix the patch failure. I reckon I've got 40min until
I can't feel either of my pinkies, so let's see if I can nail it before
then. ;)

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgp0.pgp
Description: PGP signature


Re: xfree86 on hppa-linux

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 10:07:44AM +0900, ISHIKAWA Mutsumi wrote:
> > In <[EMAIL PROTECTED]> 
> > Randolph Chung <[EMAIL PROTECTED]> wrote:
> >> i just found out today from the debian x maintainer that he disabled the
> >> loadable x-server for hppa because of a patch you submitted that
> >> disabled loadable servers for hppa... any particular reason that is
> >> needed? iirc xfree86 worked as-is for hppa...
> 
>  Humm? I don't remember I submited that kind of patch.
>  Which patch is it? Would you tell me the pointer about the patch.
> 
> 
>  And I have an question, if you know please teach me :-)
> 
> 
>  XFree86 dynamic loading is already supported on HPPA architecture?
> 
>  If the answer is YES, we should enable hppa dynamic loading support
> on HPPA architecture.I can not found HPPA dynamic loader code under
> xc/programs/Xserver/hw/xfree86/loaders/.

It's disabled in patch #003, and I based my #003 off yours - I certainly
didn't add any code like that for hppa/mips{,el}. I guess it comes from
you, then. ;)

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgp0.pgp
Description: PGP signature


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

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 01:38:08AM -0500, Branden Robinson wrote:
> On Wed, Jul 02, 2003 at 06:07:43PM -0500, X Strike Force SVN Admin wrote:
> > control: Don't attempt to package xserver-xfree86 on hppa/mips/mipsel; we don't
> >  build a loadable server there, apparently. This should complete the
> >  ports.
> [...]
> > -Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 
> > powerpc sh3 sh4 sparc
> > +Architecture: alpha arm freebsd-i386 hurd-i386 i386 ia64 m68k netbsd-i386 powerpc 
> > sh3 sh4 sparc
> >  Depends: debconf (>> 0.5), xserver-common (>= 4.1.0-10), ${shlibs:Depends}, 
> > ${misc:Depends}
> >  Suggests: discover, mdetect, read-edid
> >  Conflicts: libxfont-xtt
> 
> Eh?
> 
> So DoLoadableServer is NO on those architectures.  That doesn't mean we
> shouldn't provide the package.  We should.
> 
> xserver-xfree86-dbg will still be distinct in that it will be
> unstripped.
> 
> Please elaborate on your justification for this commit, or revert.

Sorry, I'm clearly misunderstanding the loadable vs non-loadable server
stuff - I'll fix this up now.

Sorry about this. I'm too tired. :\

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgp0.pgp
Description: PGP signature


Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Jean-Luc Coulon
Package: xfree86
Version: unavailable; reported 2003-07-03
Severity: normal

Hi,

I have the following error trying to build the source tree :

debian/scripts/source.patch
touch debian/stampdir/source.patch
touch debian/stampdir/source.build
debian/scripts/patch.apply
Applying patch debian/patches/000_post421-2003.02.18.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_ati_driver.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_cyrix_driver.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_neomagic_driver.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_newport_driver.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_nv_driver.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_savage_driver.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_xaw.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_xdm.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_xlib.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_xman.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_xtt.diff...done.
Applying patch debian/patches/001a_damn_cpp_3.3_to_hell.diff...done.
Applying patch debian/patches/001b_m68k_haslinuxinput_too.diff...dry run failed.
patching file config/cf/linux.cf
Hunk #1 FAILED at 157.
1 out of 1 hunk FAILED -- saving rejects to file config/cf/linux.cf.rej
make: *** [debian/stampdir/patchapply] Erreur 1


I run Debian sid with gcc-3.3 on a K6-2 500MHz processor.

---
regards

Jean-Luc

-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux tangerine 2.4.21 #1 sam jun 28 09:40:28 CEST 2003 i586
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (ignored: LC_ALL set)




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



X Strike Force SVN commit: rev 281 - in branches/4.3.0/sid/debian: . scripts

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 06:25:52 -0500 (Thu, 03 Jul 2003)
New Revision: 281

Added:
   branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha
   branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa
   branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i386
   branches/4.3.0/sid/debian/xserver-xfree86.docs.ia64
   branches/4.3.0/sid/debian/xserver-xfree86.docs.mips
   branches/4.3.0/sid/debian/xserver-xfree86.docs.mipsel
   branches/4.3.0/sid/debian/xserver-xfree86.install.hppa
   branches/4.3.0/sid/debian/xserver-xfree86.install.mips
   branches/4.3.0/sid/debian/xserver-xfree86.install.mipsel
Modified:
   branches/4.3.0/sid/debian/MANIFEST.s390
   branches/4.3.0/sid/debian/control
   branches/4.3.0/sid/debian/scripts/manifest-install-reconcile
   branches/4.3.0/sid/debian/xlibs-static-pic.install
   branches/4.3.0/sid/debian/xlibs-static-pic.install.hurd-i386
   branches/4.3.0/sid/debian/xserver-xfree86.install.arm
Log:
Ports to hppa/mips{,el} complete, cleanups from running
manifest-install-reconcile against everything.

manifest-install-reconcile: Add two more dummy cases - Xft.3x and keyboard.4x.

xserver-xfree86.{docs,install}.{hppa,mips{,el}}: Complete the ports of these
three architectures.

control: Revert bogus change that caused only xserver-xfree86-dbg to be built on
hppa/mips/mipsel; also see above entry.

xlibs-static-pic.install{,.hurd-i386}: Start shipping libGLw_pic, since we go to
the effort of building it.

MANIFEST.s390: Restore libGLU stuff (more fallout from that awful commit!).

xserver-xfree86.install.arm: Start shipping 'nv' manpage.


Modified: branches/4.3.0/sid/debian/MANIFEST.s390
==
--- branches/4.3.0/sid/debian/MANIFEST.s390 2003-07-03 06:47:37 UTC (rev 280)
+++ branches/4.3.0/sid/debian/MANIFEST.s390 2003-07-03 11:25:52 UTC (rev 281)
@@ -5848,6 +5848,8 @@
 usr/X11R6/lib/libFS_pic.a
 usr/X11R6/lib/libGL.a
 usr/X11R6/lib/libGL.so.1.2
+usr/X11R6/lib/libGLU.a
+usr/X11R6/lib/libGLU.so.1.3
 usr/X11R6/lib/libGLw.a
 usr/X11R6/lib/libGLw_pic.a
 usr/X11R6/lib/libI810XvMC.a
@@ -7504,6 +7506,58 @@
 usr/X11R6/man/man3/glXUseXFont.3x
 usr/X11R6/man/man3/glXWaitGL.3x
 usr/X11R6/man/man3/glXWaitX.3x
+usr/X11R6/man/man3/gluBeginCurve.3x
+usr/X11R6/man/man3/gluBeginPolygon.3x
+usr/X11R6/man/man3/gluBeginSurface.3x
+usr/X11R6/man/man3/gluBeginTrim.3x
+usr/X11R6/man/man3/gluBuild1DMipmaps.3x
+usr/X11R6/man/man3/gluBuild2DMipmaps.3x
+usr/X11R6/man/man3/gluCylinder.3x
+usr/X11R6/man/man3/gluDeleteNurbsRenderer.3x
+usr/X11R6/man/man3/gluDeleteQuadric.3x
+usr/X11R6/man/man3/gluDeleteTess.3x
+usr/X11R6/man/man3/gluDisk.3x
+usr/X11R6/man/man3/gluEndCurve.3x
+usr/X11R6/man/man3/gluEndPolygon.3x
+usr/X11R6/man/man3/gluEndSurface.3x
+usr/X11R6/man/man3/gluEndTrim.3x
+usr/X11R6/man/man3/gluErrorString.3x
+usr/X11R6/man/man3/gluGetNurbsProperty.3x
+usr/X11R6/man/man3/gluGetString.3x
+usr/X11R6/man/man3/gluGetTessProperty.3x
+usr/X11R6/man/man3/gluLoadSamplingMatrices.3x
+usr/X11R6/man/man3/gluLookAt.3x
+usr/X11R6/man/man3/gluNewNurbsRenderer.3x
+usr/X11R6/man/man3/gluNewQuadric.3x
+usr/X11R6/man/man3/gluNewTess.3x
+usr/X11R6/man/man3/gluNextContour.3x
+usr/X11R6/man/man3/gluNurbsCallback.3x
+usr/X11R6/man/man3/gluNurbsCallbackDataEXT.3x
+usr/X11R6/man/man3/gluNurbsCurve.3x
+usr/X11R6/man/man3/gluNurbsProperty.3x
+usr/X11R6/man/man3/gluNurbsSurface.3x
+usr/X11R6/man/man3/gluOrtho2D.3x
+usr/X11R6/man/man3/gluPartialDisk.3x
+usr/X11R6/man/man3/gluPerspective.3x
+usr/X11R6/man/man3/gluPickMatrix.3x
+usr/X11R6/man/man3/gluProject.3x
+usr/X11R6/man/man3/gluPwlCurve.3x
+usr/X11R6/man/man3/gluQuadricCallback.3x
+usr/X11R6/man/man3/gluQuadricDrawStyle.3x
+usr/X11R6/man/man3/gluQuadricNormals.3x
+usr/X11R6/man/man3/gluQuadricOrientation.3x
+usr/X11R6/man/man3/gluQuadricTexture.3x
+usr/X11R6/man/man3/gluScaleImage.3x
+usr/X11R6/man/man3/gluSphere.3x
+usr/X11R6/man/man3/gluTessBeginContour.3x
+usr/X11R6/man/man3/gluTessBeginPolygon.3x
+usr/X11R6/man/man3/gluTessCallback.3x
+usr/X11R6/man/man3/gluTessEndContour.3x
+usr/X11R6/man/man3/gluTessEndPolygon.3x
+usr/X11R6/man/man3/gluTessNormal.3x
+usr/X11R6/man/man3/gluTessProperty.3x
+usr/X11R6/man/man3/gluTessVertex.3x
+usr/X11R6/man/man3/gluUnProject.3x
 usr/X11R6/man/man7/X.7x
 usr/X11R6/man/man7/X.Org.7x
 usr/X11R6/man/man7/XConsortium.7x

Modified: branches/4.3.0/sid/debian/control
==
--- branches/4.3.0/sid/debian/control   2003-07-03 06:47:37 UTC (rev 280)
+++ branches/4.3.0/sid/debian/control   2003-07-03 11:25:52 UTC (rev 281)
@@ -922,7 +922,7 @@
  xfonts-base, xfonts-100dpi or xfonts-75dpi, and xfonts-scalable packages.
 
 Package: xserver-xfree86
-Architecture: alpha arm freebsd-i386 hurd-i386 i386 ia64 m68k netbsd-i386 powerpc sh3 
sh4 sparc
+Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc 
sh3 sh4 sparc
 Depends: debconf (>> 0.5), xserver-common (>= 4.1.0-10), ${

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

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 06:41:59 -0500 (Thu, 03 Jul 2003)
New Revision: 282

Modified:
   trunk/debian/rules
Log:
rules: seeing as LC_COLLATE is now so braindead as to stupidly break every
convention ever, force it to C, stomping all over whatever the user had. yeah
glibc, i love you too.


Modified: trunk/debian/rules
==
--- trunk/debian/rules  2003-07-03 11:25:52 UTC (rev 281)
+++ trunk/debian/rules  2003-07-03 11:41:59 UTC (rev 282)
@@ -26,6 +26,9 @@
 
 # oh my God, this is a gross hack
 ELSE:=else
+# horrific hack to work around LC_COLLATE braindamage: ensure that patches
+# actually get applied in the right order.
+LC_COLLATE=C
 
 # This is a horrendous kludge to ensure that some scripts we need are executable.
 DUMMY:=$(shell if [ ! -x debian/setperms ]; then chmod 755 debian/setperms; fi)


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



Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 12:35:36PM +0200, Jean-Luc Coulon wrote:
> I have the following error trying to build the source tree :
> 
> debian/scripts/source.patch
> touch debian/stampdir/source.patch
> touch debian/stampdir/source.build
> debian/scripts/patch.apply
> Applying patch debian/patches/000_post421-2003.02.18.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_ati_driver.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_cyrix_driver.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_neomagic_driver.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_newport_driver.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_nv_driver.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_savage_driver.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xaw.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xdm.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xlib.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xman.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xtt.diff...done.
> Applying patch debian/patches/001a_damn_cpp_3.3_to_hell.diff...done.
> Applying patch debian/patches/001b_m68k_haslinuxinput_too.diff...dry run failed.
> patching file config/cf/linux.cf
> Hunk #1 FAILED at 157.
> 1 out of 1 hunk FAILED -- saving rejects to file config/cf/linux.cf.rej
> make: *** [debian/stampdir/patchapply] Erreur 1
> 
> 
> I run Debian sid with gcc-3.3 on a K6-2 500MHz processor.

export LC_COLLATE=C, before you build.

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgp0.pgp
Description: PGP signature


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

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 06:51:41 -0500 (Thu, 03 Jul 2003)
New Revision: 283

Modified:
   branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
   branches/4.3.0/sid/debian/rules
Log:
"yes, but does it *build*?"
rules: force LC_COLLATE=C on user, bah.
#000_stolen_from_HEAD: clean up trident_driver mess - whoever did this didn't do
it very cleanly. :(


Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
==
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-07-03 11:41:59 
UTC (rev 282)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-07-03 11:51:41 
UTC (rev 283)
@@ -298,16 +298,7 @@
 diff -u -p -r1.35 -r1.36
 --- xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 2003/06/01 
23:02:09 1.35
 +++ xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 2003/06/19 
11:01:54 1.36
-@@ -21,7 +21,7 @@
-  *
-  * Author:  Alan Hourihane, [EMAIL PROTECTED]
-  */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v 1.34 
2003/06/01 22:21:01 alanh Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v 1.35 
2003/06/01 23:02:09 alanh Exp $ */
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
-@@ -773,7 +773,7 @@
+@@ -852,7 +852,7 @@
} else {
OUTW(0x3C4, 0x0097); /* 1x line buffers */
}

Modified: branches/4.3.0/sid/debian/rules
==
--- branches/4.3.0/sid/debian/rules 2003-07-03 11:41:59 UTC (rev 282)
+++ branches/4.3.0/sid/debian/rules 2003-07-03 11:51:41 UTC (rev 283)
@@ -26,6 +26,8 @@
 
 # oh my God, this is a gross hack
 ELSE:=else
+# oh my God, this is even worse
+LC_COLLATE=C
 M4:=m4
 
 # This is a horrendous kludge to ensure that some scripts we need are executable.


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



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

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 06:51:47AM -0500, X Strike Force SVN Admin wrote:
> "yes, but does it *build*?"
> rules: force LC_COLLATE=C on user, bah.
> #000_stolen_from_HEAD: clean up trident_driver mess - whoever did this didn't do
> it very cleanly. :(

AFAICS, this should do it for pre1v1; I'll let you know how my builds
go.

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgp0.pgp
Description: PGP signature


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

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 06:58:49 -0500 (Thu, 03 Jul 2003)
New Revision: 284

Modified:
   trunk/debian/changelog
Log:
changelog: document LC_COLLATE=C change.

sorry guys, I forgot about the changelog thing - I'm not used to working in
trunk. God help us if we have to do a -10; the DebianPlanet users will surely
revolt. either that, or switch to Gentoo (here's hoping ...)


Modified: trunk/debian/changelog
==
--- trunk/debian/changelog  2003-07-03 11:51:41 UTC (rev 283)
+++ trunk/debian/changelog  2003-07-03 11:58:49 UTC (rev 284)
@@ -1,5 +1,7 @@
 xfree86 (4.2.1-10) unstable; urgency=low
 
+  * the "glibc, will you be my friend?" release
+
   * debian/scripts/manifest-install-reconcile: new script to help keep
 MANIFEST and *.install* files in sync
 
@@ -20,6 +22,8 @@
   darwinLib.{rules,tmpl} Imake configuration files
 - xutils.install.{m68k,s390}: ship luit program, its manpage, and
   darwinLib.{rules,tmpl} Imake configuration files
+  
+  * debian/rules: force LC_COLLATE=C so as not to break the patch order.
 
  -- Branden Robinson <[EMAIL PROTECTED]>  Wed,  2 Jul 2003 15:00:37 -0500
 


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



X Strike Force SVN commit: rev 285 - people/daniel

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 07:14:21 -0500 (Thu, 03 Jul 2003)
New Revision: 285

Removed:
   people/daniel/STATUS
   people/daniel/checkdotfiles.py
   people/daniel/generateunaccounted.py
Log:
p/daniel/STATUS (deleted): this file is so out-of-date, it's irrelevant.
p/daniel/{checkdotfiles,generateunaccounted}.py (deleted): largely obsoleted by
manifest-install-reconcile, albeit in a slightly less-sophisticated way. if you
desperately want it, svn up -r 284
people/daniel/{checkdotfiles,generateunaccounted}.py


Deleted: people/daniel/STATUS
==
--- people/daniel/STATUS2003-07-03 11:58:49 UTC (rev 284)
+++ people/daniel/STATUS2003-07-03 12:14:21 UTC (rev 285)
@@ -1,57 +0,0 @@
-The old people/daniel/debian is now branches/4.3.0/sid/debian - after I merged
-Branden and Ishikawa-san's work, it became the default branch. If you're looking
-for a tree to check out, go there. This will now become my area for stupidly
-cutting-edge stuff that is almost guaranteed not to build.
-
-Stuff like the xlibs/xbase-clients splits probably won't happen in this tree, as
-I really don't have the time to do stuff like that. I'll probably be looking at
-merging Sven Luther's SDK stuff and abolishing Xcursor next, followed by
-whatever else props up; TinyX could be a distant speck.
-
-Here's the rough status of the various architectures, for 4.3.x (name of the
-main porter in parentheses):
-
-alpha:known good; build completed. (me)
-
-arm:  needs rebuild from new sources, now I have Phil's patch.
-  (pb/BlindMan)
-
-freebsd-i386: MANIFEST needed, otherwise works! (rmh)
-
-hppa: should build and work with MANIFEST update, no response from
-  LaMont wrt building it. (lamont)
-
-hurd-i386:groff issues that need to be hacked around locally - kernel panics
-  when you run it on large documents. (?)
-
-ia64: awaiting third build, after second FTBFS; I think I've fixed the
-  patches now. (bdale)
-
-i386: well, duh. (me)
-
-m68k: problem found, fixed, will be rebuilt with new sources. (cts)
-
-mips/mipsel:  i hate gcc-3.3. ice hell. (Karsten Merker)
-
-netbsd-i386:  no idea. (fenton)
-
-powerpc:  works fine. (me)
-
-sh[34]:   YAEGASHI Takeshi responded to list query late the next evening -
-  he doesn't have the time/resources to do the port, and not to
- let sh hold up 4.3; no SuperH for you. (YAEGASHI Takeshi)
-
-s390: MANIFEST and *.install.s390 completed; will post up new sources
-  for Bastian to rebuild soon. (waldi)
-
-sparc:builds, works. (ilmari)
-
-x86-64:   not started, no-one interested. ([EMAIL PROTECTED])
-   
-To be done:
-  * Chase up outstanding porters.
-  * Look at Sven Luther's SDK stuff to see if it's worth importing.
-  * Look at building TinyX.
-+ Which architectures does it build/work on?
-  
-$Id$

Deleted: people/daniel/checkdotfiles.py
==
--- people/daniel/checkdotfiles.py  2003-07-03 11:58:49 UTC (rev 284)
+++ people/daniel/checkdotfiles.py  2003-07-03 12:14:21 UTC (rev 285)
@@ -1,67 +0,0 @@
-#!/usr/bin/python2.2
-# Searches through debian/tmp for all files in debian/*.files and debian/*.docs;
-# creates a list in broken-packages of missing files.
-
-import os.path, sys, glob, os
-
-dotfiles = glob.glob("debian/*.install")
-dotfiles += glob.glob("debian/*.docs")
-dotfiles += glob.glob("debian/*.install.i386")
-for dotfile in dotfiles:
-   fileList = open(dotfile)
-   tmpline = fileList.readline()
-   errors = []
-   while tmpline:
-   tmpline = tmpline.rstrip()
-   if dotfile[-5:] == ".docs":
-   path = tmpline
-   else:
-   path = "debian/tmp/%s" % tmpline
-   tmpline = path
-   if not os.path.isfile(path):
-   if os.path.isdir(tmpline):
-   reason = "(directory)"
-   elif os.path.islink(tmpline):
-   reason = "(bad link)"
-   else:
-   reason = "(non-existant)"
-   errors.append("%s %s" % (tmpline, reason))
-   tmpline = fileList.readline()
-   if len(errors) > 0:
-   print "%s:" % dotfile
-   for error in errors:
-   print "ERROR - %s" % error
-   print "\n"
-   fileList.close()
-
-linkfiles = glob.glob("debian/*.links")
-linkfiles += glob.glob("debian/*.debugfiles")
-for linkfile in linkfiles:
-   linkList = open(linkfile)
-   tmpline = linkList.readline()
-   errors = []
-   while tmpline:
-   tmpline = tmpline.rstrip()
-   links = tmpline.split(' ')
-

Re: X Strike Force SVN commit: rev 285 - people/daniel

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 07:14:23AM -0500, X Strike Force SVN Admin wrote:
> Removed:
>people/daniel/STATUS
>people/daniel/checkdotfiles.py
>people/daniel/generateunaccounted.py
> Log:
> p/daniel/STATUS (deleted): this file is so out-of-date, it's irrelevant.
> p/daniel/{checkdotfiles,generateunaccounted}.py (deleted): largely obsoleted by
> manifest-install-reconcile, albeit in a slightly less-sophisticated way. if you
> desperately want it, svn up -r 284
> people/daniel/{checkdotfiles,generateunaccounted}.py

That's me for tonight; I can't feel either of my pinkies anymore. I
think pre1v1 should be ready for release; I'll give you guys a yell in
the morning as to how my i386 build went (my powerpc buildd mysteriously
went down, is 220km away, and I can't get to it until Saturday).

That's sorta why I haven't been able to do anywhere near as much work as
I'd hoped this holidays - my RSI's only getting worse, and ... well,
apparently I'm moving next week. So I've been told. Put it that way. ;)

So, I might be offline for large chunks of next week; don't expect a
reply, even though you might get one.

Cheers!
:) d

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgp0.pgp
Description: PGP signature


X Strike Force SVN commit: rev 286 - /

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 07:32:33 -0500 (Thu, 03 Jul 2003)
New Revision: 286

Modified:
   COMMITTERS
Log:
COMMITTERS: update my email address ([EMAIL PROTECTED]>[EMAIL PROTECTED])


Modified: COMMITTERS
==
--- COMMITTERS  2003-07-03 12:14:21 UTC (rev 285)
+++ COMMITTERS  2003-07-03 12:32:33 UTC (rev 286)
@@ -13,7 +13,7 @@
 IPv6 support integration specialist
 Branden Robinson <[EMAIL PROTECTED]>
 czar, autocrat, release monkey, coordinator, scapegoat
-Daniel Stone <[EMAIL PROTECTED]>
+Daniel Stone <[EMAIL PROTECTED]>
 integrator and gadfly
 Matt Zimmerman <[EMAIL PROTECTED]>
 Debian Security Team liaison


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



Bug#199838: Re : Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Jean-Luc
Daniel,

Thanks, but it does not works here.

---
Regards
Jean-Luc
On 03-07-2003 13:37, Daniel Stone wrote:
On Thu, Jul 03, 2003 at 12:35:36PM +0200, Jean-Luc Coulon wrote:
> I have the following error trying to build the source tree :
> 
> debian/scripts/source.patch
> touch debian/stampdir/source.patch
> touch debian/stampdir/source.build
> debian/scripts/patch.apply
> Applying patch debian/patches/000_post421-2003.02.18.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_ati_driver.
diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_cyrix_driver.
diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_neomagic_driver.
diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_newport_driver.
diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_nv_driver.
diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_savage_driver.
diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xaw.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xdm.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xlib.diff...
done.
> Applying patch debian/patches/000_stolen_from_HEAD_xman.diff...
done.
> Applying patch debian/patches/000_stolen_from_HEAD_xtt.diff...done.
> Applying patch debian/patches/001a_damn_cpp_3.3_to_hell.diff...
done.
> Applying patch debian/patches/001b_m68k_haslinuxinput_too.diff...
dry
run failed.
> patching file config/cf/linux.cf
> Hunk #1 FAILED at 157.
> 1 out of 1 hunk FAILED -- saving rejects to file
config/cf/linux.cf.rej
> make: *** [debian/stampdir/patchapply] Erreur 1
> 
>
> I run Debian sid with gcc-3.3 on a K6-2 500MHz processor.
export LC_COLLATE=C, before you build.

--
Daniel Stone
<[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


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


Bug#199838: Tr : Re: Bug#199838: xfree86: 4.2.1-9 src fails to build [jean-luc.coulon@wanadoo.fr]

2003-07-03 Thread Jean-Luc
 --- Begin Message ---
Hi,

I tried to remove 001b_m68k_haslinuxinput_too.diff as I have not a m68k 
architecture. It failed again apply some patches, you will find 
attached the .log of these patches.

---
Regards
Jean-Lucpatching file config/cf/linux.cf
Hunk #1 succeeded at 87 with fuzz 2.
Hunk #2 succeeded at 130 (offset 1 line).
Hunk #3 succeeded at 287 (offset 1 line).
Hunk #4 succeeded at 367 (offset 1 line).
Hunk #5 succeeded at 565 (offset 1 line).
Hunk #6 succeeded at 572 (offset 1 line).
Hunk #7 succeeded at 586 (offset 1 line).
Hunk #8 succeeded at 596 (offset 1 line).
Hunk #9 succeeded at 611 (offset 1 line).
Hunk #10 succeeded at 627 (offset 1 line).
Hunk #11 succeeded at 635 (offset 1 line).
Hunk #12 succeeded at 672 (offset 1 line).
Hunk #13 succeeded at 687 (offset 1 line).
Hunk #14 succeeded at 723 (offset 1 line).
Hunk #15 succeeded at 782 (offset 1 line).
Hunk #16 succeeded at 800 (offset 1 line).
Hunk #17 succeeded at 876 (offset 1 line).
patching file config/cf/linux.cf
Hunk #1 succeeded at 774 (offset 3 lines).
patching file programs/Xserver/hw/xfree86/common/xf86.h
patching file programs/Xserver/hw/xfree86/common/xf86Bus.h
patching file programs/Xserver/hw/xfree86/common/xf86Resources.h
patching file programs/Xserver/hw/xfree86/common/xf86pciBus.c
patching file programs/Xserver/hw/xfree86/common/xf86str.h
patching file programs/Xserver/hw/xfree86/drivers/ati/Imakefile
patching file programs/Xserver/hw/xfree86/drivers/ati/aticonfig.c
patching file programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c
patching file programs/Xserver/hw/xfree86/os-support/bus/Imakefile
patching file programs/Xserver/hw/xfree86/os-support/bus/Pci.c
patching file programs/Xserver/hw/xfree86/os-support/bus/Pci.h
patching file programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c
patching file programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h
patching file programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c
patching file programs/Xserver/hw/xfree86/os-support/shared/stdResource.c
patching file programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h
patching file programs/Xserver/hw/xfree86/common/xf86Bus.c
--- End Message ---


Bug#199830: xfree86 fails to build on mipsel

2003-07-03 Thread Branden Robinson
On Thu, Jul 03, 2003 at 12:06:36PM +0200, Adrian Bunk wrote:
> According to buildd.debian.org the build of xfree86 4.1.2-9
> fails on mipsel with the following error:

A quick perusal of the debian-x list will reveal that I am already aware
of this problem and have committed a fix.

-- 
G. Branden Robinson|Religion is regarded by the common
Debian GNU/Linux   |people as true, by the wise as
[EMAIL PROTECTED] |false, and by the rulers as useful.
http://people.debian.org/~branden/ |-- Lucius Annaeus Seneca


pgp0.pgp
Description: PGP signature


Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Branden Robinson
tag 199838 + unreproducible
thanks

On Thu, Jul 03, 2003 at 02:19:43PM +0200, Jean-Luc wrote:
> I tried to remove 001b_m68k_haslinuxinput_too.diff as I have not a m68k 
> architecture. It failed again apply some patches, you will find 
> attached the .log of these patches.

I cannot reproduce this problem; nor could the approximately 10
autobuilders that compiled this same package from source.

-- 
G. Branden Robinson| The Rehnquist Court has never
Debian GNU/Linux   | encountered a criminal statute it
[EMAIL PROTECTED] | did not like.
http://people.debian.org/~branden/ | -- John Dean


pgp0.pgp
Description: PGP signature


Re: xfree86 on hppa-linux

2003-07-03 Thread ISHIKAWA Mutsumi
> In <[EMAIL PROTECTED]> 
>   Daniel Stone <[EMAIL PROTECTED]> wrote:

>> On Thu, Jul 03, 2003 at 10:07:44AM +0900, ISHIKAWA Mutsumi wrote:
>> > > In <[EMAIL PROTECTED]> 
>> > >  Randolph Chung <[EMAIL PROTECTED]> wrote:
>> > >> i just found out today from the debian x maintainer that he disabled the
>> > >> loadable x-server for hppa because of a patch you submitted that
>> > >> disabled loadable servers for hppa... any particular reason that is
>> > >> needed? iirc xfree86 worked as-is for hppa...
>> > 
>> >  Humm? I don't remember I submited that kind of patch.
>> >  Which patch is it? Would you tell me the pointer about the patch.

>> It's disabled in patch #003, and I based my #003 off yours - I certainly
>> didn't add any code like that for hppa/mips{,el}. I guess it comes from
>> you, then. ;)


 Perhaps you talks about this chunk:

@@ -701,7 +752,7 @@
 
 #if UseElfFormat
 # ifndef DoLoadableServer
-#  ifdef HPArchitecture
+#  if defined(HPArchitecture) || defined(MipsArchitecture) || 
defined(SuperHArchitecture)
 #   define DoLoadableServerNO
 #  else
 #   define DoLoadableServerYES


 I only add about SuperHArchiecture and MIPSArchitecture
when xfree86 4.2.0 deb test package was released. I don't added
about HPPA architectures, they are exists before 4.2.0 (for example
please see #001 patch of xfree86_4.1.0-16 source)

 And it just means `HPPA, MIPS (mips and mipsel) and SuperH
(sh3,sh3eb,sh4 and sh4eb) Linux are not supported XFree86
Dynamic loader, so we will disable the loader on these
architectures. We want to build XFree86 drivers will be
linked staticaly to XFree86 server binary'.

 We will build and provide normal (not debug purpose) X
server package for those architectures.

>> >  And I have an question, if you know please teach me :-)
>> > 
>> > 
>> >  XFree86 dynamic loading is already supported on HPPA architecture?
>> > 
>> >  If the answer is YES, we should enable hppa dynamic loading support
>> > on HPPA architecture.I can not found HPPA dynamic loader code under
>> > xc/programs/Xserver/hw/xfree86/loaders/.

 XFree86 loader for HPPA is not implemented yet (and perhaps it will
be added to randlph's TODO list ;-). SuperH still does not have the
loader, too. (I don't know about MIPS detail. But they do not
support yet, too)

-- 
ISHIKAWA Mutsumi
 <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>


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



Re: 4.3.0-0pre1vX roadmap

2003-07-03 Thread Branden Robinson
On Thu, Jul 03, 2003 at 08:43:45PM +1000, Daniel Stone wrote:
> So my "good to go" analysis looks clear to you?

Actually, no.  Try running manifest-install-reconcile on the 4.3.0-sid
branch.

Doesn't look very good at all.  In addition to all the ordinary stuff
that isn't shipped, I am alarmed and concerned by the fact that
/etc/X11/Xresources/xbase-clients is in the MANIFEST files.

I'll try and work on this over the weekend.

-- 
G. Branden Robinson|  Mob rule isn't any prettier just
Debian GNU/Linux   |  because you call your mob a
[EMAIL PROTECTED] |  government.
http://people.debian.org/~branden/ |


pgp0.pgp
Description: PGP signature


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

2003-07-03 Thread Branden Robinson
On Thu, Jul 03, 2003 at 06:26:27AM -0500, X Strike Force SVN Admin wrote:
> Author: daniel
> Date: 2003-07-03 06:25:52 -0500 (Thu, 03 Jul 2003)
> New Revision: 281
[...]
> Log:
> Ports to hppa/mips{,el} complete, cleanups from running
> manifest-install-reconcile against everything.
> 
> manifest-install-reconcile: Add two more dummy cases - Xft.3x and keyboard.4x.

Eh?  Why are those dummy cases?  Why aren't we shipping those.

Oh.  For Xft.3x it's obvious.

ISHIKAWA-san, can you update your "shut off Xft,Xrender,Xcursor" patch
to ensure that the manpage doesn't get shipped?  That way we can have a
patch that's clean for upstream.

But what about keyboard.4x?  I don't understand why that shouldn't be
shipped.

> xserver-xfree86.{docs,install}.{hppa,mips{,el}}: Complete the ports of these
> three architectures.

1) You also modified xserver-xfree86.doc.{alpha,hurd-i386,ia64} in this
commit.  Why is there no log about this?

2) You appear to be pretty indiscriminately shipping various documents.
Why not follow the example from XFree86 4.2.1, where I endeavored to
ship only files germane to that architecture?  (I.e., don't ship READMEs
for drivers that aren't even shipped for that arch.)

-- 
G. Branden Robinson|   The only way to get rid of a
Debian GNU/Linux   |   temptation is to yield to it.
[EMAIL PROTECTED] |   -- Oscar Wilde
http://people.debian.org/~branden/ |


pgp0.pgp
Description: PGP signature


Re: X Strike Force SVN commit: rev 282 - trunk/debian

2003-07-03 Thread Branden Robinson
On Thu, Jul 03, 2003 at 06:42:04AM -0500, X Strike Force SVN Admin wrote:
> Author: daniel
> Date: 2003-07-03 06:41:59 -0500 (Thu, 03 Jul 2003)
> New Revision: 282
> 
> Modified:
>trunk/debian/rules
> Log:
> rules: seeing as LC_COLLATE is now so braindead as to stupidly break every
> convention ever, force it to C, stomping all over whatever the user had. yeah
> glibc, i love you too.

Uh, this change is overbroad.  Surely all we need to do is set this
variable in doogie's patch.apply and patch.unapply scripts?

-- 
G. Branden Robinson| I had thought very carefully about
Debian GNU/Linux   | comitting hara-kiri over this, but
[EMAIL PROTECTED] | I overslept this morning.
http://people.debian.org/~branden/ | -- Toshio Yamaguchi


pgp0.pgp
Description: PGP signature


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

2003-07-03 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-07-03 11:20:38 -0500 (Thu, 03 Jul 2003)
New Revision: 287

Modified:
   trunk/debian/changelog
Log:
debian/changelog: add bug closer to already-fixed mipsel FTBFS


Modified: trunk/debian/changelog
==
--- trunk/debian/changelog  2003-07-03 12:32:33 UTC (rev 286)
+++ trunk/debian/changelog  2003-07-03 16:20:38 UTC (rev 287)
@@ -12,7 +12,7 @@
 - xserver-xfree86.install.hppa: ship tdfx manpage
 - xserver-xfree86.install.mips: ship XFree86 manpage
 - xserver-xfree86.install.mipsel: stop shipping ati manpage (fixes FTBFS);
-  ship dmc, penmount, and r128 manpages
+  ship dmc, penmount, and r128 manpages (Closes: #199830)
 - xserver-xfree86.install.{sh3,sh4}: ship citron manpage
 - xserver-xfree86.install.sparc: ship calcomp, dmc, hyperpen, and penmount
   drivers


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



X Strike Force SVN commit: rev 288 - in trunk/debian: . scripts

2003-07-03 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-07-03 11:24:34 -0500 (Thu, 03 Jul 2003)
New Revision: 288

Modified:
   trunk/debian/changelog
   trunk/debian/rules
   trunk/debian/scripts/patch.apply
   trunk/debian/scripts/patch.unapply
Log:
debian/rules: stop setting LC_COLLATE

debian/scripts/patch.{apply,unapply}: set LC_COLLATE to C before iterating
  over patch files


Modified: trunk/debian/changelog
==
--- trunk/debian/changelog  2003-07-03 16:20:38 UTC (rev 287)
+++ trunk/debian/changelog  2003-07-03 16:24:34 UTC (rev 288)
@@ -1,11 +1,13 @@
 xfree86 (4.2.1-10) unstable; urgency=low
 
-  * the "glibc, will you be my friend?" release
-
   * debian/scripts/manifest-install-reconcile: new script to help keep
 MANIFEST and *.install* files in sync
 
-  * use above script to find and fix several bugs in *.install* files:
+  * debian/scripts/patch.{apply,unapply}: set LC_COLLATE=C to ensure that
+patches are applied in the correct order
+
+  * use manifest-install-reconcile script to find and fix several bugs in
+*.install* files:
 - xlibs-dev.install.{,netbsd-i386,s390}: ship several missing extension
   header files: XLbx.h, bigreqstr.h, extutil.h, mitmiscstr.h,
   multibufst.h, shapestr.h, shmstr.h, syncstr.h, xcmiscstr.h, xteststr.h
@@ -22,8 +24,6 @@
   darwinLib.{rules,tmpl} Imake configuration files
 - xutils.install.{m68k,s390}: ship luit program, its manpage, and
   darwinLib.{rules,tmpl} Imake configuration files
-  
-  * debian/rules: force LC_COLLATE=C so as not to break the patch order.
 
  -- Branden Robinson <[EMAIL PROTECTED]>  Wed,  2 Jul 2003 15:00:37 -0500
 

Modified: trunk/debian/rules
==
--- trunk/debian/rules  2003-07-03 16:20:38 UTC (rev 287)
+++ trunk/debian/rules  2003-07-03 16:24:34 UTC (rev 288)
@@ -26,9 +26,6 @@
 
 # oh my God, this is a gross hack
 ELSE:=else
-# horrific hack to work around LC_COLLATE braindamage: ensure that patches
-# actually get applied in the right order.
-LC_COLLATE=C
 
 # This is a horrendous kludge to ensure that some scripts we need are executable.
 DUMMY:=$(shell if [ ! -x debian/setperms ]; then chmod 755 debian/setperms; fi)

Modified: trunk/debian/scripts/patch.apply
==
--- trunk/debian/scripts/patch.apply2003-07-03 16:20:38 UTC (rev 287)
+++ trunk/debian/scripts/patch.apply2003-07-03 16:24:34 UTC (rev 288)
@@ -4,6 +4,8 @@
 
 [ ! -d debian/patches ] && exit
 
+LC_COLLATE=C
+
 mkdir -p $STAMP_DIR/patches $SOURCE_TREE
 
 for f in $(find debian/patches \( -type f -or -type l \) -not -name "*~" | sort); do

Modified: trunk/debian/scripts/patch.unapply
==
--- trunk/debian/scripts/patch.unapply  2003-07-03 16:20:38 UTC (rev 287)
+++ trunk/debian/scripts/patch.unapply  2003-07-03 16:24:34 UTC (rev 288)
@@ -2,6 +2,8 @@
 
 . debian/scripts/vars
 
+LC_COLLATE=C
+
 mkdir -p $STAMP_DIR/patches/
 
 for f in $(find debian/patches -type f -not -name "*~" | sort -r); do


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



Re: 4.3.0-0pre1vX roadmap

2003-07-03 Thread Branden Robinson
On Thu, Jul 03, 2003 at 11:02:01AM -0500, Branden Robinson wrote:
[...]
> I am alarmed and concerned by the fact that
> /etc/X11/Xresources/xbase-clients is in the MANIFEST files.

Never mind that part.  I was momentarily on crack.  The MANIFEST *is*
supposed to be generated *after* all the debian/local stuff has been
installed, and it is, and you never changed that.

I apologize.

-- 
G. Branden Robinson|
Debian GNU/Linux   | Ab abusu ad usum non valet
[EMAIL PROTECTED] | consequentia.
http://people.debian.org/~branden/ |


pgp0.pgp
Description: PGP signature


Processed: Re: Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

> tag 199838 + unreproducible
Bug#199838: xfree86: 4.2.1-9 src fails to build
There were no tags set.
Tags added: unreproducible

> 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]



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

2003-07-03 Thread ISHIKAWA Mutsumi
> In <[EMAIL PROTECTED]> 
>   Branden Robinson <[EMAIL PROTECTED]> wrote:

>> On Thu, Jul 03, 2003 at 06:26:27AM -0500, X Strike Force SVN Admin wrote:

>> Oh.  For Xft.3x it's obvious.

>> ISHIKAWA-san, can you update your "shut off Xft,Xrender,Xcursor" patch
>> to ensure that the manpage doesn't get shipped?  That way we can have a
>> patch that's clean for upstream.

 The Xft.3x is installed from xc/lib/Xft1. It is not same from
libxft2-dev package... Ah... OK I found a problem.

 I think it is upstream bug of man page name confliction.

 Both xc/lib/Xft and xc/lib/Xft1 contain different man page with
same file name (Xft.man). When both BuildXft and BuildXft1 are enabled,
xc/lib/Xft/Xft.man and xc/lib/Xft1/Xft.man will be instaled on
same place with same file name (e.g Xft.3x), perhaps
xc/lib/Xft/Xft.man will overwrite xc/lib/Xft1/Xft.man.

 I think better that Xft.man under xc/lib/Xft1 would be renamed to
Xft1.man or so.

-- 
ISHIKAWA Mutsumi
 <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>


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



Xfree-4.3.0 branch 20030703

2003-07-03 Thread Joel Soete
Hi all,

On my hppa boxe, I tried to launch to compile xfree86-4.3 from snapshot 

and the first pb I encounter was to replace in debian/patches/000_stolen_from_HEAD.diff
the attached trident_video.c patch.

As new in X, I have a lot of question about many warning as:
[...]
make[3]: Entering directory `/CAD/XFree86/Dpkg/xfree86-4.3.0/build-tree/xc'
In file included from ../config/cf/Imake.tmpl:104,
 from Imakefile.c:40:
../config/cf/linux.cf:114: warning: "InstallAppDefFiles" is not defined
In file included from ../config/cf/linux.cf:1007,
 from ../config/cf/Imake.tmpl:104,
 from Imakefile.c:40:
../config/cf/xfree86.cf:1031: warning: "HasGlide3" is not defined
[...]
[...]
ConnDis.c:57: warning: function declaration isn't a prototype
ConnDis.c:60: warning: function declaration isn't a prototype
ConnDis.c:99: warning: function declaration isn't a prototype
ConnDis.c:443: warning: function declaration isn't a prototype
ConnDis.c:481: warning: function declaration isn't a prototype
ConnDis.c:493: warning: function declaration isn't a prototype
ConnDis.c:971: warning: function declaration isn't a prototype

But the main for me now is certainly:
[...]
In file included from lexer.l:45:
pswpriv.h:150: warning: redundant redeclaration of `yylineno' in same scope
:349: warning: previous declaration of `yylineno'
:1062: warning: redundant redeclaration of `yylex' in same scope
pswpriv.h:153: warning: previous declaration of `yylex'
lexer.l: In function `yylex':
lexer.l:349: warning: long unsigned int format, long int arg (arg 3)
lexer.l:358: warning: long unsigned int format, long int arg (arg 3)
: At top level:
:2612: warning: redundant redeclaration of `isatty' in same scope
/usr/include/unistd.h:686: warning: previous declaration of `isatty'
:2883: warning: no previous prototype for `yyget_lineno'
:2892: warning: no previous prototype for `yyget_in'
:2900: warning: no previous prototype for `yyget_out'
:2908: warning: no previous prototype for `yyget_leng'
:2917: warning: no previous prototype for `yyget_text'
:2926: warning: no previous prototype for `yyset_lineno'
:2938: warning: no previous prototype for `yyset_in'
:2943: warning: no previous prototype for `yyset_out'
:2948: warning: no previous prototype for `yyget_debug'
:2953: warning: no previous prototype for `yyset_debug'
:2959: warning: no previous prototype for `yylex_destroy'
:2992: warning: `yy_flex_strlen' defined but not used

Is it a flex release pb (apt-get installed 2.5.31-11 for my unstable debian
gnu/linux hppa boxe)?

Thanks in advance for your attention,
Joel



--
Soldes Tiscali ADSL : 27,50 euros/mois jusque fin 2003.
On s'habitue vite à payer son ADSL moins cher!
Plus d'info? Cliquez ici... http://reg.tiscali.be/default.asp?lg=fr 




trident_video.c-diff
Description: Binary data


Bug#199906: xlibmesa3-gl: opengl broke on the last upgrade of this package

2003-07-03 Thread Peter Jay Salzman
Package: xlibmesa3-gl
Version: 4.2.1-8
Severity: important
Tags: sid

I get the following run-time errors whenever I run an OpenGL program:

libGL error: can't find Glide library, dlopen(libglide3-v5.so) and
dlopen(libglide3.so) both failed.

libGL error: dlerror() message: /usr/lib/libglide3.so: undefined symbol:
_trisetup_Default_win_nocull_valid

I *think* (but am not sure) these are separate issues.  libglide3.so
exists, is not a dangling symlink and is located in /usr/lib.  I'm not
sure why dlopen() isn't finding it.

I get these errors on a Sarge system with a Voodoo5 card.  I upgrade
this package to Sid's version, and the error messages still persist.

Note that I do not get these messages on Sid with a first generation
radeon, so these messages are libglide3 related.  However, libglid3
hasn't been updated in a dog's age, so I believe this package is the
culprit.

Thanks,
Pete


-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux satan 2.4.20 #4 SMP Mon Mar 24 08:52:15 PST 2003 i686
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8

Versions of packages xlibmesa3-gl depends on:
hi  libc6 2.3.1-16   GNU C Library: Shared libraries an
ii  xlibs 4.2.1-6X Window System client libraries

-- no debconf information




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



Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Jezuch
Użytkownik Branden Robinson napisał:
I tried to remove 001b_m68k_haslinuxinput_too.diff as I have not a m68k 
architecture. It failed again apply some patches, you will find 
attached the .log of these patches.
I cannot reproduce this problem; nor could the approximately 10
autobuilders that compiled this same package from source.
I can reproduce this bug. And I have a solution.
debian/scripts/patch.apply reads:
for f in $(find debian/patches \( -type f -or -type l \) -not -name "*~" | 
sort); do

This is supposed to list patches to apply in corect order. But sort puts 
001_linux_cf.diff *after* 001a_* and 001b_* (it should be applied first). My 
solution was to rename 001b->001c, 001a->001b and 001->001a. It seems that 
this fixed the problem.
I suppose this is sort's bug. I am using sort from coreutils 5.0-4 (from 
sarge/sid). I didn't try to downgrade to version from stable.
--
Ecce Jezuch
"I went in killing the sun
I once one" - T. Meeks





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


Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Branden Robinson
On Thu, Jul 03, 2003 at 09:01:02PM +0200, Jezuch wrote:
> U?ytkownik Branden Robinson napisa?:
> >>I tried to remove 001b_m68k_haslinuxinput_too.diff as I have not a m68k 
> >>architecture. It failed again apply some patches, you will find 
> >>attached the .log of these patches.
> >
> >I cannot reproduce this problem; nor could the approximately 10
> >autobuilders that compiled this same package from source.
> 
> I can reproduce this bug. And I have a solution.

set LC_COLLATE=C in your build environment.

A fix has already been applied to the patch.{apply,unapply} scripts.

-- 
G. Branden Robinson|Any man who does not realize that
Debian GNU/Linux   |he is half an animal is only half a
[EMAIL PROTECTED] |man.
http://people.debian.org/~branden/ |-- Thornton Wilder


pgp0.pgp
Description: PGP signature


Bug#178242: #178242: xlibmesa3: [radeon_dri] hardware acceleration non-functional on Radeon 7500 QW

2003-07-03 Thread Aurelien Jarno
Hello,

Since the upgrade of xlibmesa3-gl to version 4.2.1-9 the hardware
acceleration seems to work again, at least on my computer (on i386).

Aurelien



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



Re: 4.3.0-0pre1vX roadmap

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 11:02:01AM -0500, Branden Robinson wrote:
> On Thu, Jul 03, 2003 at 08:43:45PM +1000, Daniel Stone wrote:
> > So my "good to go" analysis looks clear to you?
> 
> Actually, no.  Try running manifest-install-reconcile on the 4.3.0-sid
> branch.
> 
> Doesn't look very good at all.  In addition to all the ordinary stuff
> that isn't shipped, I am alarmed and concerned by the fact that
> /etc/X11/Xresources/xbase-clients is in the MANIFEST files.
> 
> I'll try and work on this over the weekend.

See my commits below.

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgp0.pgp
Description: PGP signature


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

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 11:12:53AM -0500, Branden Robinson wrote:
> On Thu, Jul 03, 2003 at 06:26:27AM -0500, X Strike Force SVN Admin wrote:
> > Author: daniel
> > Date: 2003-07-03 06:25:52 -0500 (Thu, 03 Jul 2003)
> > New Revision: 281
> [...]
> > Log:
> > Ports to hppa/mips{,el} complete, cleanups from running
> > manifest-install-reconcile against everything.
> > 
> > manifest-install-reconcile: Add two more dummy cases - Xft.3x and keyboard.4x.
> 
> Eh?  Why are those dummy cases?  Why aren't we shipping those.
> 
> Oh.  For Xft.3x it's obvious.
> 
> ISHIKAWA-san, can you update your "shut off Xft,Xrender,Xcursor" patch
> to ensure that the manpage doesn't get shipped?  That way we can have a
> patch that's clean for upstream.

Umm, the Xft2 stuff isn't getting shipped, but we're still shipping
Xft.so.1, remember?

> But what about keyboard.4x?  I don't understand why that shouldn't be
> shipped.

'keyboard' has been renamed to 'kbd'.

> > xserver-xfree86.{docs,install}.{hppa,mips{,el}}: Complete the ports of these
> > three architectures.
> 
> 1) You also modified xserver-xfree86.doc.{alpha,hurd-i386,ia64} in this
> commit.  Why is there no log about this?

I'll edit it.

> 2) You appear to be pretty indiscriminately shipping various documents.
> Why not follow the example from XFree86 4.2.1, where I endeavored to
> ship only files germane to that architecture?  (I.e., don't ship READMEs
> for drivers that aren't even shipped for that arch.)

OK, I'll work on this if you want me to.

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgp0.pgp
Description: PGP signature


X Strike Force SVN property change: propchange - rev 281 svn:log

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Revision: 281
Property Name: svn:log

New Property Value:
Ports to hppa/mips{,el} complete, cleanups from running
manifest-install-reconcile against everything.

manifest-install-reconcile: Add two more dummy cases - Xft.3x and keyboard.4x.

xserver-xfree86.{docs,install}.{hppa,mips{,el}}: Complete the ports of these
three architectures.

xserver-xfree86.docs.{alpha,hurd-i386,ia64}: New, and roughly unchanged from
.docs.i386.

control: Revert bogus change that caused only xserver-xfree86-dbg to be built on
hppa/mips/mipsel; also see above entry.

xlibs-static-pic.install{,.hurd-i386}: Start shipping libGLw_pic, since we go to
the effort of building it.

MANIFEST.s390: Restore libGLU stuff (more fallout from that awful commit!).

xserver-xfree86.install.arm: Start shipping 'nv' manpage.



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



X Strike Force SVN commit: rev 289 - in branches/4.3.0/sid/debian: . scripts

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 19:25:54 -0500 (Thu, 03 Jul 2003)
New Revision: 289

Modified:
   branches/4.3.0/sid/debian/rules
   branches/4.3.0/sid/debian/scripts/patch.apply
   branches/4.3.0/sid/debian/scripts/patch.unapply
Log:
rules, patch.{,un}apply: Moving LC_COLLATE=C decl to the scripts, in line with
trunk's #288


Modified: branches/4.3.0/sid/debian/rules
==
--- branches/4.3.0/sid/debian/rules 2003-07-03 16:24:34 UTC (rev 288)
+++ branches/4.3.0/sid/debian/rules 2003-07-04 00:25:54 UTC (rev 289)
@@ -26,8 +26,6 @@
 
 # oh my God, this is a gross hack
 ELSE:=else
-# oh my God, this is even worse
-LC_COLLATE=C
 M4:=m4
 
 # This is a horrendous kludge to ensure that some scripts we need are executable.

Modified: branches/4.3.0/sid/debian/scripts/patch.apply
==
--- branches/4.3.0/sid/debian/scripts/patch.apply   2003-07-03 16:24:34 UTC (rev 
288)
+++ branches/4.3.0/sid/debian/scripts/patch.apply   2003-07-04 00:25:54 UTC (rev 
289)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+LC_COLLATE=C
+
 . debian/scripts/vars
 
 [ ! -d debian/patches ] && exit

Modified: branches/4.3.0/sid/debian/scripts/patch.unapply
==
--- branches/4.3.0/sid/debian/scripts/patch.unapply 2003-07-03 16:24:34 UTC (rev 
288)
+++ branches/4.3.0/sid/debian/scripts/patch.unapply 2003-07-04 00:25:54 UTC (rev 
289)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+LC_COLLATE=C
+
 . debian/scripts/vars
 
 mkdir -p $STAMP_DIR/patches/


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



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

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 19:43:28 -0500 (Thu, 03 Jul 2003)
New Revision: 290

Modified:
   branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha
   branches/4.3.0/sid/debian/xserver-xfree86.docs.arm
   branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa
   branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i386
   branches/4.3.0/sid/debian/xserver-xfree86.docs.i386
   branches/4.3.0/sid/debian/xserver-xfree86.docs.ia64
   branches/4.3.0/sid/debian/xserver-xfree86.docs.mips
   branches/4.3.0/sid/debian/xserver-xfree86.docs.mipsel
   branches/4.3.0/sid/debian/xserver-xfree86.docs.powerpc
   branches/4.3.0/sid/debian/xserver-xfree86.docs.sparc
Log:
xserver-xfree86.docs.*: cleanup - start shipping README.fonts on all
architectures, and stop shipping docs that are irrelevant to that architecture
(i.e, the relevant driver isn't even built)


Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha2003-07-04 00:25:54 
UTC (rev 289)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha2003-07-04 00:43:28 
UTC (rev 290)
@@ -1,16 +1,9 @@
 debian/tmp/usr/X11R6/lib/X11/doc/DESIGN
 debian/tmp/usr/X11R6/lib/X11/doc/README.DECtga
 debian/tmp/usr/X11R6/lib/X11/doc/README.DGA
-debian/tmp/usr/X11R6/lib/X11/doc/README.I128
-debian/tmp/usr/X11R6/lib/X11/doc/README.SiS
-debian/tmp/usr/X11R6/lib/X11/doc/README.apm
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
-debian/tmp/usr/X11R6/lib/X11/doc/README.chips
-debian/tmp/usr/X11R6/lib/X11/doc/README.cyrix
-debian/tmp/usr/X11R6/lib/X11/doc/README.i740
-debian/tmp/usr/X11R6/lib/X11/doc/README.i810
+debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
-debian/tmp/usr/X11R6/lib/X11/doc/README.newport
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128
 debian/tmp/usr/X11R6/lib/X11/doc/README.rapidaccess
 debian/tmp/usr/X11R6/lib/X11/doc/README.rendition

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.arm
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.arm  2003-07-04 00:25:54 UTC (rev 
289)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.arm  2003-07-04 00:43:28 UTC (rev 
290)
@@ -1,20 +1,12 @@
 debian/tmp/usr/X11R6/lib/X11/doc/DESIGN
-debian/tmp/usr/X11R6/lib/X11/doc/README.DECtga
 debian/tmp/usr/X11R6/lib/X11/doc/README.DGA
-debian/tmp/usr/X11R6/lib/X11/doc/README.I128
 debian/tmp/usr/X11R6/lib/X11/doc/README.SiS
-debian/tmp/usr/X11R6/lib/X11/doc/README.apm
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
-debian/tmp/usr/X11R6/lib/X11/doc/README.cyrix
-debian/tmp/usr/X11R6/lib/X11/doc/README.dps
-debian/tmp/usr/X11R6/lib/X11/doc/README.i740
-debian/tmp/usr/X11R6/lib/X11/doc/README.i810
+debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
-debian/tmp/usr/X11R6/lib/X11/doc/README.newport
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128
 debian/tmp/usr/X11R6/lib/X11/doc/README.rapidaccess
-debian/tmp/usr/X11R6/lib/X11/doc/README.rendition
 debian/tmp/usr/X11R6/lib/X11/doc/README.s3virge
 debian/tmp/usr/X11R6/lib/X11/doc/README.XKB-Config
 debian/tmp/usr/X11R6/lib/X11/doc/README.XKB-Enhancing

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa 2003-07-04 00:25:54 UTC (rev 
289)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa 2003-07-04 00:43:28 UTC (rev 
290)
@@ -1,22 +1,13 @@
 debian/tmp/usr/X11R6/lib/X11/doc/Design
-debian/tmp/usr/X11R6/lib/X11/doc/README.DECtga
 debian/tmp/usr/X11R6/lib/X11/doc/README.DGA
-debian/tmp/usr/X11R6/lib/X11/doc/README.I128
 debian/tmp/usr/X11R6/lib/X11/doc/README.SiS
 debian/tmp/usr/X11R6/lib/X11/doc/README.XKB-Config
 debian/tmp/usr/X11R6/lib/X11/doc/README.XKB-Enhancing
-debian/tmp/usr/X11R6/lib/X11/doc/README.apm
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
-debian/tmp/usr/X11R6/lib/X11/doc/README.cyrix
-debian/tmp/usr/X11R6/lib/X11/doc/README.dps
 debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
-debian/tmp/usr/X11R6/lib/X11/doc/README.i740
-debian/tmp/usr/X11R6/lib/X11/doc/README.i810
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
-debian/tmp/usr/X11R6/lib/X11/doc/README.newport
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128
 debian/tmp/usr/X11R6/lib/X11/doc/README.rapidaccess
-debian/tmp/usr/X11R6/lib/X11/doc/README.rendition
 debian/tmp/usr/X11R6/lib/X11/doc/README.s3virge
 debian/tmp/usr/X11R6/lib/X11/doc/Status

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i386
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i3862003-07-04 00:25:54 
UTC (rev 289)
+++ branches/4.3.0/sid/debian/xse

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

2003-07-03 Thread ISHIKAWA Mutsumi
> In <[EMAIL PROTECTED]> 
>   X Strike Force SVN Admin <[EMAIL PROTECTED]> wrote:
>> Author: daniel
>> Date: 2003-07-03 19:43:28 -0500 (Thu, 03 Jul 2003)
>> New Revision: 290

>> Log:
>> xserver-xfree86.docs.*: cleanup - start shipping README.fonts on all
>> architectures, and stop shipping docs that are irrelevant to that architecture
>> (i.e, the relevant driver isn't even built)

 README.fonts is shipped a part of xfree86-common package.
 Why is it needed to include xserver-xfree86 ?

-- 
ISHIKAWA Mutsumi
 <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>


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



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

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 21:45:17 -0500 (Thu, 03 Jul 2003)
New Revision: 291

Modified:
   branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha
   branches/4.3.0/sid/debian/xserver-xfree86.docs.arm
   branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa
   branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i386
   branches/4.3.0/sid/debian/xserver-xfree86.docs.i386
   branches/4.3.0/sid/debian/xserver-xfree86.docs.mips
   branches/4.3.0/sid/debian/xserver-xfree86.docs.mipsel
   branches/4.3.0/sid/debian/xserver-xfree86.docs.powerpc
   branches/4.3.0/sid/debian/xserver-xfree86.docs.sparc
Log:
xserver-xfree86.docs.*: stop shipping README.fonts; xfree86-common already ships
it. i'm stupid.


Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha2003-07-04 00:43:28 
UTC (rev 290)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha2003-07-04 02:45:17 
UTC (rev 291)
@@ -2,7 +2,6 @@
 debian/tmp/usr/X11R6/lib/X11/doc/README.DECtga
 debian/tmp/usr/X11R6/lib/X11/doc/README.DGA
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128
 debian/tmp/usr/X11R6/lib/X11/doc/README.rapidaccess

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.arm
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.arm  2003-07-04 00:43:28 UTC (rev 
290)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.arm  2003-07-04 02:45:17 UTC (rev 
291)
@@ -3,7 +3,6 @@
 debian/tmp/usr/X11R6/lib/X11/doc/README.SiS
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128
 debian/tmp/usr/X11R6/lib/X11/doc/README.rapidaccess

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa 2003-07-04 00:43:28 UTC (rev 
290)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa 2003-07-04 02:45:17 UTC (rev 
291)
@@ -5,7 +5,6 @@
 debian/tmp/usr/X11R6/lib/X11/doc/README.XKB-Enhancing
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128
 debian/tmp/usr/X11R6/lib/X11/doc/README.rapidaccess

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i386
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i3862003-07-04 00:43:28 
UTC (rev 290)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i3862003-07-04 02:45:17 
UTC (rev 291)
@@ -6,7 +6,6 @@
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
 debian/tmp/usr/X11R6/lib/X11/doc/README.cyrix
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.i740
 debian/tmp/usr/X11R6/lib/X11/doc/README.i810
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.i386
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.i386 2003-07-04 00:43:28 UTC (rev 
290)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.i386 2003-07-04 02:45:17 UTC (rev 
291)
@@ -6,7 +6,6 @@
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
 debian/tmp/usr/X11R6/lib/X11/doc/README.cyrix
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.i740
 debian/tmp/usr/X11R6/lib/X11/doc/README.i810
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.mips
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.mips 2003-07-04 00:43:28 UTC (rev 
290)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.mips 2003-07-04 02:45:17 UTC (rev 
291)
@@ -6,7 +6,6 @@
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
 debian/tmp/usr/X11R6/lib/X11/doc/README.dps
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
 debian/tmp/usr/X11R6/lib/X11/doc/README.newport
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.mipsel
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.mipsel   2003-07-04 00:43:28 
UTC (rev 290

Bug#199838: Re : Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Marc Wilson
On Thu, Jul 03, 2003 at 01:55:37PM +0200, Jean-Luc wrote:
> Thanks, but it does not works here.

Just as a data point, I built 4.2.1-9 from source here last night, with no
problem.  Even used pentium-builder and did an athlon-xp build, just to see
if I could. ^_^

Wanted to build it since the complete set of packages for i386 didn't
appear in the archive on the same night, unfortunately.

LC_COLLATE does the job here.

> On 03-07-2003 13:37, Daniel Stone wrote:
> >export LC_COLLATE=C, before you build.
> >
> >--
> >Daniel Stone
> ><[EMAIL PROTECTED]>
> >http://www.kde.org - http://www.debian.org - http://www.xwin.org
> >

-- 
 Marc Wilson | Who loves me will also love my dog.  -- John Donne
 [EMAIL PROTECTED] |



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



Re: 4.3.0-0pre1vX roadmap

2003-07-03 Thread Branden Robinson
On Thu, Jul 03, 2003 at 01:15:31AM +0200, Michel Dänzer wrote:
> On Thu, 2003-07-03 at 00:47, Daniel Stone wrote:
> > 
> > pre1v2:
> >   * Merge Sven Luther's SDK stuff.
> 
> [...]
> 
> >   * Import Savage driver 1.1.27t (done).
> >   * Import SiS driver from HEAD (done).
> 
> What are people's thoughts on patching drivers vs. providing driver
> packages built against the SDK? The radeon driver in HEAD is also much
> better than the one in 4.3 ...

I'd like to defer this decision past the actual release of 0pre1v1 to
experimental.

-- 
G. Branden Robinson| You could wire up a dead rat to a
Debian GNU/Linux   | DIMM socket and the PC BIOS memory
[EMAIL PROTECTED] | test would pass it just fine.
http://people.debian.org/~branden/ | -- Ethan Benson


pgpeCafX6iRih.pgp
Description: PGP signature


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

2003-07-03 Thread Branden Robinson
On Wed, Jul 02, 2003 at 06:07:43PM -0500, X Strike Force SVN Admin wrote:
> Author: daniel
> Date: 2003-07-02 18:07:39 -0500 (Wed, 02 Jul 2003)
> New Revision: 278
> 
> Modified:
>branches/4.3.0/sid/debian/control
> Log:
> control: Don't attempt to package xserver-xfree86 on hppa/mips/mipsel; we 
> don't
>  build a loadable server there, apparently. This should complete the
>ports.
[...]
> -Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel 
> netbsd-i386 powerpc sh3 sh4 sparc
> +Architecture: alpha arm freebsd-i386 hurd-i386 i386 ia64 m68k netbsd-i386 
> powerpc sh3 sh4 sparc
>  Depends: debconf (>> 0.5), xserver-common (>= 4.1.0-10), ${shlibs:Depends}, 
> ${misc:Depends}
>  Suggests: discover, mdetect, read-edid
>  Conflicts: libxfont-xtt

Eh?

So DoLoadableServer is NO on those architectures.  That doesn't mean we
shouldn't provide the package.  We should.

xserver-xfree86-dbg will still be distinct in that it will be
unstripped.

Please elaborate on your justification for this commit, or revert.

-- 
G. Branden Robinson|America is at that awkward stage.
Debian GNU/Linux   |It's too late to work within the
[EMAIL PROTECTED] |system, but too early to shoot the
http://people.debian.org/~branden/ |bastards.   -- Claire Wolfe


pgpS1PFZsg5io.pgp
Description: PGP signature


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

2003-07-03 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-07-03 01:41:03 -0500 (Thu, 03 Jul 2003)
New Revision: 279

Modified:
   branches/4.3.0/sid/debian/changelog
Log:
debian/changelog: merge in 4.2.1-9 changelog entry from trunk


Modified: branches/4.3.0/sid/debian/changelog
==
--- branches/4.3.0/sid/debian/changelog 2003-07-02 23:07:39 UTC (rev 278)
+++ branches/4.3.0/sid/debian/changelog 2003-07-03 06:41:03 UTC (rev 279)
@@ -53,9 +53,6 @@
   * fix weak deps (many on X11/Xext in xlibs):
 - patch #063: new (Closes: #187374)
 
-  * fix deadlock problems in Xi (XINPUT) library when threads enabled
-- patch #064: new (Closes: #191463)
-
   * xlibs-pic package renamed to xlibs-static-pic
 - reintegrate piclib_support.diff (previously patch #046, now patch #909)
 
@@ -80,6 +77,50 @@
 
  -- Branden Robinson <[EMAIL PROTECTED]>  Thu, 26 Jun 2003 10:14:27 -0500
 
+xfree86 (4.2.1-9) unstable; urgency=high
+
+  * urgency due to xterm security fixes; see below
+
+  * patch #001b: remove special-case logic in linux.cf that defined
+"HasLinuxInput" to "NO" for Mc68020Architecture; m68k is now supported by
+the Linux 2.4.20 kernel (at least in Debian), so we let this symbol be
+defined to "YES" just like all the other architectures.  This only really
+affects the Wacom input driver and should not cause any regressions.
+(thanks to James Troup for pointing out this no-longer-needed conditional)
+
+  * build and ship more static-PIC versions of libraries; Xau (for xcb) and
+xf86misc (for xfce4)
+- patch #046: updated
+- debian/{MANIFEST,xlibs-pic.install}.*: add libXau_pic.a,
+  libXxf86misc_pic.a
+- debian/control: update xlibs-pic's extended description
+
+  * patch #093: new; SECURITY: disable window title reporting to work around
+potentially malicious text being spewed to terminal window
+
+
+  * patch #094: new; SECURITY: fix for xterm DoS attack; malformed DEC UDK
+escape sequences can lock the terminal window
+
+
+  * patch #095: new; fix hangs when threaded apps use XInput library
+(Closes: #191463)
+
+  * debian/control: move xlibs-pic from section devel to section libdevel
+(syncrhonize with Debian archive override file)
+  * debian/rules: replace presently-useless $(DEBUGFLAGS) variable in
+$(SERVERDEBUG_IMAKE_DEFINES) with -DDefaultGcc2OptimizeOpt=-O0 to turn off
+optimiziation when compiling the debugging XFree86 X server
+  * debian/xserver-xfree86.install.arm: get this file up to date:
+- stop shipping things that aren't built for this arch: imstt_drv, libafb,
+  imstt manpage
+- start shipping more things that are built for this arch: nv_drv, s3_drv,
+  calcomp_drv, dmc_drv, hyperpen_drv, penmount_drv, dmc manpage, nv
+  manpage, penmount manpage
+- tdfx driver name corrected to tdfx_drv
+
+ -- Branden Robinson <[EMAIL PROTECTED]>  Thu, 26 Jun 2003 14:28:34 -0500
+
 xfree86 (4.2.1-8) unstable; urgency=high
 
   * the "you're damn right I'm bitter" release



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

2003-07-03 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-07-03 01:47:37 -0500 (Thu, 03 Jul 2003)
New Revision: 280

Added:
   branches/4.3.0/sid/debian/scripts/manifest-install-reconcile
Log:
debian/scripts/manifest-install-reconcile: haul this script over from the
  trunk


Copied: branches/4.3.0/sid/debian/scripts/manifest-install-reconcile (from rev 
279, trunk/debian/scripts/manifest-install-reconcile)
==
--- trunk/debian/scripts/manifest-install-reconcile 2003-07-03 06:41:03 UTC 
(rev 279)
+++ branches/4.3.0/sid/debian/scripts/manifest-install-reconcile
2003-07-03 06:47:37 UTC (rev 280)
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Run this from the debian/ directory of the unpacked source tree.
+# It will generate INSTALL.$(ARCH) files.  You can then use a command like:
+#   diff -U 0 MANIFEST.$ARCH INSTALL.$ARCH
+# to check for discrepancies between what's built for that arch and what
+# the packages ship.
+
+# Minuses in the diff are things that are built but not shipped; pluses are
+# things that are shipped but not build (these can cause build failures!)
+
+# There are false results for every architecture.
+
+# Known false "minuses" (ignore these):
+# etc/X11/twm/system.twmrc
+# etc/X11/xdm/GiveConsole
+# etc/X11/xdm/TakeConsole
+# etc/X11/xdm/Xsetup_0
+# etc/X11/xkb/xkbcomp
+# usr/X11R6/lib/X11/XF86Config.98
+# usr/X11R6/lib/X11/XF86Config.eg
+# usr/X11R6/lib/X11/XF86Config.indy
+# usr/X11R6/lib/X11/doc/*
+# usr/X11R6/lib/X11/etc/sun.termcap
+# usr/X11R6/lib/X11/etc/sun.terminfo
+# usr/X11R6/lib/X11/etc/xterm.termcap
+# usr/X11R6/lib/X11/etc/xterm.terminfo
+# usr/X11R6/lib/X11/fonts/*/{encoding.dir,fonts.alias,fonts.dir}
+# var/lib/xkb/README
+
+# Known false "pluses" (ignore these):
+#   Files from *.install for a package that isn't built for that arch.  Check
+#   debian/control.  Examples include xserver-xfree86* for s390 and xlibosmesa*
+#   for several architectures.
+
+for F in MANIFEST.*; do
+ARCH=$(echo $F | sed 's/MANIFEST\.//')
+echo $ARCH
+FILE=$(tempfile)
+for G in *.install; do
+if [ -e $G.$ARCH ]; then
+awk '{print $1}' < $G.$ARCH >> $FILE
+else
+awk '{print $1}' < $G >> $FILE
+fi
+done
+sort -u < $FILE > INSTALL.$ARCH
+rm $FILE
+done



Re: xfree86 on hppa-linux

2003-07-03 Thread ISHIKAWA Mutsumi
> In <[EMAIL PROTECTED]> 
>   Randolph Chung <[EMAIL PROTECTED]> wrote:
>> Hi,
>>
>> i just found out today from the debian x maintainer that he disabled the
>> loadable x-server for hppa because of a patch you submitted that
>> disabled loadable servers for hppa... any particular reason that is
>> needed? iirc xfree86 worked as-is for hppa...

 Humm? I don't remember I submited that kind of patch.
 Which patch is it? Would you tell me the pointer about the patch.


 And I have an question, if you know please teach me :-)


 XFree86 dynamic loading is already supported on HPPA architecture?

 If the answer is YES, we should enable hppa dynamic loading support
on HPPA architecture.I can not found HPPA dynamic loader code under
xc/programs/Xserver/hw/xfree86/loaders/.

--
ISHIKAWA Mutsumi
 <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>
 



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

2003-07-03 Thread ISHIKAWA Mutsumi
> In <[EMAIL PROTECTED]> 
>   X Strike Force SVN Admin <[EMAIL PROTECTED]> wrote:
>> Author: daniel
>> Date: 2003-07-02 18:07:39 -0500 (Wed, 02 Jul 2003)
>> New Revision: 278
>>
>> Modified:
>>branches/4.3.0/sid/debian/control
>> Log:
>> control: Don't attempt to package xserver-xfree86 on
>> hppa/mips/mipsel; we don't build a loadable server there,
>> apparently. This should complete the ports.

 Why don't provide normal X server for these architecture ?

 We build X server for hppa/mips/mipsel but it is just disable dynamic
loading (all driverse are static linked into single XFree86 server
binary). It is of cause works fine, and X server is needed on these
architecture.

-- 
ISHIKAWA Mutsumi
 <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>



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

2003-07-03 Thread ISHIKAWA Mutsumi
> In <[EMAIL PROTECTED]> 
>   X Strike Force SVN Admin <[EMAIL PROTECTED]> wrote:
>> Author: daniel
>> Date: 2003-07-02 18:07:39 -0500 (Wed, 02 Jul 2003)
>> New Revision: 278
>>
>> Modified:
>>branches/4.3.0/sid/debian/control
>> Log:
>> control: Don't attempt to package xserver-xfree86 on
>> hppa/mips/mipsel; we don't build a loadable server there,
>> apparently. This should complete the ports.

 Why don't provide normal X server for these architecture ?

 We build X server for hppa/mips/mipsel but it is just disable dynamic
loading (all driverse are static linked into single XFree86 server
binary). It is of cause works fine, and X server is needed on these
architecture.

-- 
ISHIKAWA Mutsumi
 <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>



Bug#199830: xfree86 fails to build on mipsel

2003-07-03 Thread Adrian Bunk
Package: xfree86
Version: 4.2.1-9
Severity: serious


According to buildd.debian.org the build of xfree86 4.1.2-9
fails on mipsel with the following error:

<--  snip  -->

...
touch debian/stampdir/install
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
cp: cannot stat `debian/tmp//usr/X11R6/man/man4/ati.4x': No such file or direct
ory
dh_install: command returned error code 256
make: *** [debian/stampdir/binary-arch] Error 1

<--  snip  -->







Re: 4.3.0-0pre1vX roadmap

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 01:36:33AM -0500, Branden Robinson wrote:
> On Thu, Jul 03, 2003 at 01:15:31AM +0200, Michel D?nzer wrote:
> > On Thu, 2003-07-03 at 00:47, Daniel Stone wrote:
> > > 
> > > pre1v2:
> > >   * Merge Sven Luther's SDK stuff.
> > 
> > [...]
> > 
> > >   * Import Savage driver 1.1.27t (done).
> > >   * Import SiS driver from HEAD (done).
> > 
> > What are people's thoughts on patching drivers vs. providing driver
> > packages built against the SDK? The radeon driver in HEAD is also much
> > better than the one in 4.3 ...
> 
> I'd like to defer this decision past the actual release of 0pre1v1 to
> experimental.

So my "good to go" analysis looks clear to you?

Oh, I still have to fix the patch failure. I reckon I've got 40min until
I can't feel either of my pinkies, so let's see if I can nail it before
then. ;)

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgpAUWpLrWKn3.pgp
Description: PGP signature


Re: xfree86 on hppa-linux

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 10:07:44AM +0900, ISHIKAWA Mutsumi wrote:
> > In <[EMAIL PROTECTED]> 
> > Randolph Chung <[EMAIL PROTECTED]> wrote:
> >> i just found out today from the debian x maintainer that he disabled the
> >> loadable x-server for hppa because of a patch you submitted that
> >> disabled loadable servers for hppa... any particular reason that is
> >> needed? iirc xfree86 worked as-is for hppa...
> 
>  Humm? I don't remember I submited that kind of patch.
>  Which patch is it? Would you tell me the pointer about the patch.
> 
> 
>  And I have an question, if you know please teach me :-)
> 
> 
>  XFree86 dynamic loading is already supported on HPPA architecture?
> 
>  If the answer is YES, we should enable hppa dynamic loading support
> on HPPA architecture.I can not found HPPA dynamic loader code under
> xc/programs/Xserver/hw/xfree86/loaders/.

It's disabled in patch #003, and I based my #003 off yours - I certainly
didn't add any code like that for hppa/mips{,el}. I guess it comes from
you, then. ;)

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgpu9khE90wxt.pgp
Description: PGP signature


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

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 01:38:08AM -0500, Branden Robinson wrote:
> On Wed, Jul 02, 2003 at 06:07:43PM -0500, X Strike Force SVN Admin wrote:
> > control: Don't attempt to package xserver-xfree86 on hppa/mips/mipsel; we 
> > don't
> >  build a loadable server there, apparently. This should complete the
> >  ports.
> [...]
> > -Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel 
> > netbsd-i386 powerpc sh3 sh4 sparc
> > +Architecture: alpha arm freebsd-i386 hurd-i386 i386 ia64 m68k netbsd-i386 
> > powerpc sh3 sh4 sparc
> >  Depends: debconf (>> 0.5), xserver-common (>= 4.1.0-10), 
> > ${shlibs:Depends}, ${misc:Depends}
> >  Suggests: discover, mdetect, read-edid
> >  Conflicts: libxfont-xtt
> 
> Eh?
> 
> So DoLoadableServer is NO on those architectures.  That doesn't mean we
> shouldn't provide the package.  We should.
> 
> xserver-xfree86-dbg will still be distinct in that it will be
> unstripped.
> 
> Please elaborate on your justification for this commit, or revert.

Sorry, I'm clearly misunderstanding the loadable vs non-loadable server
stuff - I'll fix this up now.

Sorry about this. I'm too tired. :\

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgp4O99UwLuqS.pgp
Description: PGP signature


Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Jean-Luc Coulon
Package: xfree86
Version: unavailable; reported 2003-07-03
Severity: normal

Hi,

I have the following error trying to build the source tree :

debian/scripts/source.patch
touch debian/stampdir/source.patch
touch debian/stampdir/source.build
debian/scripts/patch.apply
Applying patch debian/patches/000_post421-2003.02.18.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_ati_driver.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_cyrix_driver.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_neomagic_driver.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_newport_driver.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_nv_driver.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_savage_driver.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_xaw.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_xdm.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_xlib.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_xman.diff...done.
Applying patch debian/patches/000_stolen_from_HEAD_xtt.diff...done.
Applying patch debian/patches/001a_damn_cpp_3.3_to_hell.diff...done.
Applying patch debian/patches/001b_m68k_haslinuxinput_too.diff...dry run failed.
patching file config/cf/linux.cf
Hunk #1 FAILED at 157.
1 out of 1 hunk FAILED -- saving rejects to file config/cf/linux.cf.rej
make: *** [debian/stampdir/patchapply] Erreur 1


I run Debian sid with gcc-3.3 on a K6-2 500MHz processor.

---
regards

Jean-Luc

-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux tangerine 2.4.21 #1 sam jun 28 09:40:28 CEST 2003 i586
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (ignored: LC_ALL set)





X Strike Force SVN commit: rev 281 - in branches/4.3.0/sid/debian: . scripts

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 06:25:52 -0500 (Thu, 03 Jul 2003)
New Revision: 281

Added:
   branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha
   branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa
   branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i386
   branches/4.3.0/sid/debian/xserver-xfree86.docs.ia64
   branches/4.3.0/sid/debian/xserver-xfree86.docs.mips
   branches/4.3.0/sid/debian/xserver-xfree86.docs.mipsel
   branches/4.3.0/sid/debian/xserver-xfree86.install.hppa
   branches/4.3.0/sid/debian/xserver-xfree86.install.mips
   branches/4.3.0/sid/debian/xserver-xfree86.install.mipsel
Modified:
   branches/4.3.0/sid/debian/MANIFEST.s390
   branches/4.3.0/sid/debian/control
   branches/4.3.0/sid/debian/scripts/manifest-install-reconcile
   branches/4.3.0/sid/debian/xlibs-static-pic.install
   branches/4.3.0/sid/debian/xlibs-static-pic.install.hurd-i386
   branches/4.3.0/sid/debian/xserver-xfree86.install.arm
Log:
Ports to hppa/mips{,el} complete, cleanups from running
manifest-install-reconcile against everything.

manifest-install-reconcile: Add two more dummy cases - Xft.3x and keyboard.4x.

xserver-xfree86.{docs,install}.{hppa,mips{,el}}: Complete the ports of these
three architectures.

control: Revert bogus change that caused only xserver-xfree86-dbg to be built on
hppa/mips/mipsel; also see above entry.

xlibs-static-pic.install{,.hurd-i386}: Start shipping libGLw_pic, since we go to
the effort of building it.

MANIFEST.s390: Restore libGLU stuff (more fallout from that awful commit!).

xserver-xfree86.install.arm: Start shipping 'nv' manpage.


Modified: branches/4.3.0/sid/debian/MANIFEST.s390
==
--- branches/4.3.0/sid/debian/MANIFEST.s390 2003-07-03 06:47:37 UTC (rev 
280)
+++ branches/4.3.0/sid/debian/MANIFEST.s390 2003-07-03 11:25:52 UTC (rev 
281)
@@ -5848,6 +5848,8 @@
 usr/X11R6/lib/libFS_pic.a
 usr/X11R6/lib/libGL.a
 usr/X11R6/lib/libGL.so.1.2
+usr/X11R6/lib/libGLU.a
+usr/X11R6/lib/libGLU.so.1.3
 usr/X11R6/lib/libGLw.a
 usr/X11R6/lib/libGLw_pic.a
 usr/X11R6/lib/libI810XvMC.a
@@ -7504,6 +7506,58 @@
 usr/X11R6/man/man3/glXUseXFont.3x
 usr/X11R6/man/man3/glXWaitGL.3x
 usr/X11R6/man/man3/glXWaitX.3x
+usr/X11R6/man/man3/gluBeginCurve.3x
+usr/X11R6/man/man3/gluBeginPolygon.3x
+usr/X11R6/man/man3/gluBeginSurface.3x
+usr/X11R6/man/man3/gluBeginTrim.3x
+usr/X11R6/man/man3/gluBuild1DMipmaps.3x
+usr/X11R6/man/man3/gluBuild2DMipmaps.3x
+usr/X11R6/man/man3/gluCylinder.3x
+usr/X11R6/man/man3/gluDeleteNurbsRenderer.3x
+usr/X11R6/man/man3/gluDeleteQuadric.3x
+usr/X11R6/man/man3/gluDeleteTess.3x
+usr/X11R6/man/man3/gluDisk.3x
+usr/X11R6/man/man3/gluEndCurve.3x
+usr/X11R6/man/man3/gluEndPolygon.3x
+usr/X11R6/man/man3/gluEndSurface.3x
+usr/X11R6/man/man3/gluEndTrim.3x
+usr/X11R6/man/man3/gluErrorString.3x
+usr/X11R6/man/man3/gluGetNurbsProperty.3x
+usr/X11R6/man/man3/gluGetString.3x
+usr/X11R6/man/man3/gluGetTessProperty.3x
+usr/X11R6/man/man3/gluLoadSamplingMatrices.3x
+usr/X11R6/man/man3/gluLookAt.3x
+usr/X11R6/man/man3/gluNewNurbsRenderer.3x
+usr/X11R6/man/man3/gluNewQuadric.3x
+usr/X11R6/man/man3/gluNewTess.3x
+usr/X11R6/man/man3/gluNextContour.3x
+usr/X11R6/man/man3/gluNurbsCallback.3x
+usr/X11R6/man/man3/gluNurbsCallbackDataEXT.3x
+usr/X11R6/man/man3/gluNurbsCurve.3x
+usr/X11R6/man/man3/gluNurbsProperty.3x
+usr/X11R6/man/man3/gluNurbsSurface.3x
+usr/X11R6/man/man3/gluOrtho2D.3x
+usr/X11R6/man/man3/gluPartialDisk.3x
+usr/X11R6/man/man3/gluPerspective.3x
+usr/X11R6/man/man3/gluPickMatrix.3x
+usr/X11R6/man/man3/gluProject.3x
+usr/X11R6/man/man3/gluPwlCurve.3x
+usr/X11R6/man/man3/gluQuadricCallback.3x
+usr/X11R6/man/man3/gluQuadricDrawStyle.3x
+usr/X11R6/man/man3/gluQuadricNormals.3x
+usr/X11R6/man/man3/gluQuadricOrientation.3x
+usr/X11R6/man/man3/gluQuadricTexture.3x
+usr/X11R6/man/man3/gluScaleImage.3x
+usr/X11R6/man/man3/gluSphere.3x
+usr/X11R6/man/man3/gluTessBeginContour.3x
+usr/X11R6/man/man3/gluTessBeginPolygon.3x
+usr/X11R6/man/man3/gluTessCallback.3x
+usr/X11R6/man/man3/gluTessEndContour.3x
+usr/X11R6/man/man3/gluTessEndPolygon.3x
+usr/X11R6/man/man3/gluTessNormal.3x
+usr/X11R6/man/man3/gluTessProperty.3x
+usr/X11R6/man/man3/gluTessVertex.3x
+usr/X11R6/man/man3/gluUnProject.3x
 usr/X11R6/man/man7/X.7x
 usr/X11R6/man/man7/X.Org.7x
 usr/X11R6/man/man7/XConsortium.7x

Modified: branches/4.3.0/sid/debian/control
==
--- branches/4.3.0/sid/debian/control   2003-07-03 06:47:37 UTC (rev 280)
+++ branches/4.3.0/sid/debian/control   2003-07-03 11:25:52 UTC (rev 281)
@@ -922,7 +922,7 @@
  xfonts-base, xfonts-100dpi or xfonts-75dpi, and xfonts-scalable packages.
 
 Package: xserver-xfree86
-Architecture: alpha arm freebsd-i386 hurd-i386 i386 ia64 m68k netbsd-i386 
powerpc sh3 sh4 sparc
+Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 
powerpc sh3 sh4 sparc
 Depends: debconf (>> 0.5), xserver-common (>= 4.1.0-10), 

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

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 06:41:59 -0500 (Thu, 03 Jul 2003)
New Revision: 282

Modified:
   trunk/debian/rules
Log:
rules: seeing as LC_COLLATE is now so braindead as to stupidly break every
convention ever, force it to C, stomping all over whatever the user had. yeah
glibc, i love you too.


Modified: trunk/debian/rules
==
--- trunk/debian/rules  2003-07-03 11:25:52 UTC (rev 281)
+++ trunk/debian/rules  2003-07-03 11:41:59 UTC (rev 282)
@@ -26,6 +26,9 @@
 
 # oh my God, this is a gross hack
 ELSE:=else
+# horrific hack to work around LC_COLLATE braindamage: ensure that patches
+# actually get applied in the right order.
+LC_COLLATE=C
 
 # This is a horrendous kludge to ensure that some scripts we need are 
executable.
 DUMMY:=$(shell if [ ! -x debian/setperms ]; then chmod 755 debian/setperms; fi)



Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 12:35:36PM +0200, Jean-Luc Coulon wrote:
> I have the following error trying to build the source tree :
> 
> debian/scripts/source.patch
> touch debian/stampdir/source.patch
> touch debian/stampdir/source.build
> debian/scripts/patch.apply
> Applying patch debian/patches/000_post421-2003.02.18.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_ati_driver.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_cyrix_driver.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD.diff...done.
> Applying patch 
> debian/patches/000_stolen_from_HEAD_neomagic_driver.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_newport_driver.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_nv_driver.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_savage_driver.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xaw.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xdm.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xlib.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xman.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xtt.diff...done.
> Applying patch debian/patches/001a_damn_cpp_3.3_to_hell.diff...done.
> Applying patch debian/patches/001b_m68k_haslinuxinput_too.diff...dry run 
> failed.
> patching file config/cf/linux.cf
> Hunk #1 FAILED at 157.
> 1 out of 1 hunk FAILED -- saving rejects to file config/cf/linux.cf.rej
> make: *** [debian/stampdir/patchapply] Erreur 1
> 
> 
> I run Debian sid with gcc-3.3 on a K6-2 500MHz processor.

export LC_COLLATE=C, before you build.

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgpq6pMMBE5Rn.pgp
Description: PGP signature


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

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 06:51:41 -0500 (Thu, 03 Jul 2003)
New Revision: 283

Modified:
   branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
   branches/4.3.0/sid/debian/rules
Log:
"yes, but does it *build*?"
rules: force LC_COLLATE=C on user, bah.
#000_stolen_from_HEAD: clean up trident_driver mess - whoever did this didn't do
it very cleanly. :(


Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
==
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-07-03 
11:41:59 UTC (rev 282)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-07-03 
11:51:41 UTC (rev 283)
@@ -298,16 +298,7 @@
 diff -u -p -r1.35 -r1.36
 --- xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 
2003/06/01 23:02:09 1.35
 +++ xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 
2003/06/19 11:01:54 1.36
-@@ -21,7 +21,7 @@
-  *
-  * Author:  Alan Hourihane, [EMAIL PROTECTED]
-  */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v 
1.34 2003/06/01 22:21:01 alanh Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v 
1.35 2003/06/01 23:02:09 alanh Exp $ */
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
-@@ -773,7 +773,7 @@
+@@ -852,7 +852,7 @@
} else {
OUTW(0x3C4, 0x0097); /* 1x line buffers */
}

Modified: branches/4.3.0/sid/debian/rules
==
--- branches/4.3.0/sid/debian/rules 2003-07-03 11:41:59 UTC (rev 282)
+++ branches/4.3.0/sid/debian/rules 2003-07-03 11:51:41 UTC (rev 283)
@@ -26,6 +26,8 @@
 
 # oh my God, this is a gross hack
 ELSE:=else
+# oh my God, this is even worse
+LC_COLLATE=C
 M4:=m4
 
 # This is a horrendous kludge to ensure that some scripts we need are 
executable.



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

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 06:51:47AM -0500, X Strike Force SVN Admin wrote:
> "yes, but does it *build*?"
> rules: force LC_COLLATE=C on user, bah.
> #000_stolen_from_HEAD: clean up trident_driver mess - whoever did this didn't 
> do
> it very cleanly. :(

AFAICS, this should do it for pre1v1; I'll let you know how my builds
go.

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgpRGcE3JHqw9.pgp
Description: PGP signature


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

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 06:58:49 -0500 (Thu, 03 Jul 2003)
New Revision: 284

Modified:
   trunk/debian/changelog
Log:
changelog: document LC_COLLATE=C change.

sorry guys, I forgot about the changelog thing - I'm not used to working in
trunk. God help us if we have to do a -10; the DebianPlanet users will surely
revolt. either that, or switch to Gentoo (here's hoping ...)


Modified: trunk/debian/changelog
==
--- trunk/debian/changelog  2003-07-03 11:51:41 UTC (rev 283)
+++ trunk/debian/changelog  2003-07-03 11:58:49 UTC (rev 284)
@@ -1,5 +1,7 @@
 xfree86 (4.2.1-10) unstable; urgency=low
 
+  * the "glibc, will you be my friend?" release
+
   * debian/scripts/manifest-install-reconcile: new script to help keep
 MANIFEST and *.install* files in sync
 
@@ -20,6 +22,8 @@
   darwinLib.{rules,tmpl} Imake configuration files
 - xutils.install.{m68k,s390}: ship luit program, its manpage, and
   darwinLib.{rules,tmpl} Imake configuration files
+  
+  * debian/rules: force LC_COLLATE=C so as not to break the patch order.
 
  -- Branden Robinson <[EMAIL PROTECTED]>  Wed,  2 Jul 2003 15:00:37 -0500
 



X Strike Force SVN commit: rev 285 - people/daniel

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 07:14:21 -0500 (Thu, 03 Jul 2003)
New Revision: 285

Removed:
   people/daniel/STATUS
   people/daniel/checkdotfiles.py
   people/daniel/generateunaccounted.py
Log:
p/daniel/STATUS (deleted): this file is so out-of-date, it's irrelevant.
p/daniel/{checkdotfiles,generateunaccounted}.py (deleted): largely obsoleted by
manifest-install-reconcile, albeit in a slightly less-sophisticated way. if you
desperately want it, svn up -r 284
people/daniel/{checkdotfiles,generateunaccounted}.py


Deleted: people/daniel/STATUS
==
--- people/daniel/STATUS2003-07-03 11:58:49 UTC (rev 284)
+++ people/daniel/STATUS2003-07-03 12:14:21 UTC (rev 285)
@@ -1,57 +0,0 @@
-The old people/daniel/debian is now branches/4.3.0/sid/debian - after I merged
-Branden and Ishikawa-san's work, it became the default branch. If you're 
looking
-for a tree to check out, go there. This will now become my area for stupidly
-cutting-edge stuff that is almost guaranteed not to build.
-
-Stuff like the xlibs/xbase-clients splits probably won't happen in this tree, 
as
-I really don't have the time to do stuff like that. I'll probably be looking at
-merging Sven Luther's SDK stuff and abolishing Xcursor next, followed by
-whatever else props up; TinyX could be a distant speck.
-
-Here's the rough status of the various architectures, for 4.3.x (name of the
-main porter in parentheses):
-
-alpha:known good; build completed. (me)
-
-arm:  needs rebuild from new sources, now I have Phil's patch.
-  (pb/BlindMan)
-
-freebsd-i386: MANIFEST needed, otherwise works! (rmh)
-
-hppa: should build and work with MANIFEST update, no response from
-  LaMont wrt building it. (lamont)
-
-hurd-i386:groff issues that need to be hacked around locally - kernel 
panics
-  when you run it on large documents. (?)
-
-ia64: awaiting third build, after second FTBFS; I think I've fixed the
-  patches now. (bdale)
-
-i386: well, duh. (me)
-
-m68k: problem found, fixed, will be rebuilt with new sources. (cts)
-
-mips/mipsel:  i hate gcc-3.3. ice hell. (Karsten Merker)
-
-netbsd-i386:  no idea. (fenton)
-
-powerpc:  works fine. (me)
-
-sh[34]:   YAEGASHI Takeshi responded to list query late the next evening -
-  he doesn't have the time/resources to do the port, and not to
- let sh hold up 4.3; no SuperH for you. (YAEGASHI Takeshi)
-
-s390: MANIFEST and *.install.s390 completed; will post up new sources
-  for Bastian to rebuild soon. (waldi)
-
-sparc:builds, works. (ilmari)
-
-x86-64:   not started, no-one interested. ([EMAIL PROTECTED])
-   
-To be done:
-  * Chase up outstanding porters.
-  * Look at Sven Luther's SDK stuff to see if it's worth importing.
-  * Look at building TinyX.
-+ Which architectures does it build/work on?
-  
-$Id$

Deleted: people/daniel/checkdotfiles.py
==
--- people/daniel/checkdotfiles.py  2003-07-03 11:58:49 UTC (rev 284)
+++ people/daniel/checkdotfiles.py  2003-07-03 12:14:21 UTC (rev 285)
@@ -1,67 +0,0 @@
-#!/usr/bin/python2.2
-# Searches through debian/tmp for all files in debian/*.files and 
debian/*.docs;
-# creates a list in broken-packages of missing files.
-
-import os.path, sys, glob, os
-
-dotfiles = glob.glob("debian/*.install")
-dotfiles += glob.glob("debian/*.docs")
-dotfiles += glob.glob("debian/*.install.i386")
-for dotfile in dotfiles:
-   fileList = open(dotfile)
-   tmpline = fileList.readline()
-   errors = []
-   while tmpline:
-   tmpline = tmpline.rstrip()
-   if dotfile[-5:] == ".docs":
-   path = tmpline
-   else:
-   path = "debian/tmp/%s" % tmpline
-   tmpline = path
-   if not os.path.isfile(path):
-   if os.path.isdir(tmpline):
-   reason = "(directory)"
-   elif os.path.islink(tmpline):
-   reason = "(bad link)"
-   else:
-   reason = "(non-existant)"
-   errors.append("%s %s" % (tmpline, reason))
-   tmpline = fileList.readline()
-   if len(errors) > 0:
-   print "%s:" % dotfile
-   for error in errors:
-   print "ERROR - %s" % error
-   print "\n"
-   fileList.close()
-
-linkfiles = glob.glob("debian/*.links")
-linkfiles += glob.glob("debian/*.debugfiles")
-for linkfile in linkfiles:
-   linkList = open(linkfile)
-   tmpline = linkList.readline()
-   errors = []
-   while tmpline:
-   tmpline = tmpline.rstrip()
-   links = tmpline.split(' ')
-

Re: X Strike Force SVN commit: rev 285 - people/daniel

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 07:14:23AM -0500, X Strike Force SVN Admin wrote:
> Removed:
>people/daniel/STATUS
>people/daniel/checkdotfiles.py
>people/daniel/generateunaccounted.py
> Log:
> p/daniel/STATUS (deleted): this file is so out-of-date, it's irrelevant.
> p/daniel/{checkdotfiles,generateunaccounted}.py (deleted): largely obsoleted 
> by
> manifest-install-reconcile, albeit in a slightly less-sophisticated way. if 
> you
> desperately want it, svn up -r 284
> people/daniel/{checkdotfiles,generateunaccounted}.py

That's me for tonight; I can't feel either of my pinkies anymore. I
think pre1v1 should be ready for release; I'll give you guys a yell in
the morning as to how my i386 build went (my powerpc buildd mysteriously
went down, is 220km away, and I can't get to it until Saturday).

That's sorta why I haven't been able to do anywhere near as much work as
I'd hoped this holidays - my RSI's only getting worse, and ... well,
apparently I'm moving next week. So I've been told. Put it that way. ;)

So, I might be offline for large chunks of next week; don't expect a
reply, even though you might get one.

Cheers!
:) d

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgpFC0d4zi5ww.pgp
Description: PGP signature


X Strike Force SVN commit: rev 286 - /

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 07:32:33 -0500 (Thu, 03 Jul 2003)
New Revision: 286

Modified:
   COMMITTERS
Log:
COMMITTERS: update my email address ([EMAIL PROTECTED]>[EMAIL PROTECTED])


Modified: COMMITTERS
==
--- COMMITTERS  2003-07-03 12:14:21 UTC (rev 285)
+++ COMMITTERS  2003-07-03 12:32:33 UTC (rev 286)
@@ -13,7 +13,7 @@
 IPv6 support integration specialist
 Branden Robinson <[EMAIL PROTECTED]>
 czar, autocrat, release monkey, coordinator, scapegoat
-Daniel Stone <[EMAIL PROTECTED]>
+Daniel Stone <[EMAIL PROTECTED]>
 integrator and gadfly
 Matt Zimmerman <[EMAIL PROTECTED]>
 Debian Security Team liaison



Bug#199838: Re : Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Jean-Luc

Daniel,

Thanks, but it does not works here.

---
Regards
Jean-Luc

On 03-07-2003 13:37, Daniel Stone wrote:

On Thu, Jul 03, 2003 at 12:35:36PM +0200, Jean-Luc Coulon wrote:
> I have the following error trying to build the source tree :
> 
> debian/scripts/source.patch
> touch debian/stampdir/source.patch
> touch debian/stampdir/source.build
> debian/scripts/patch.apply
> Applying patch debian/patches/000_post421-2003.02.18.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_ati_driver.
diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_cyrix_driver.
diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_neomagic_driver.
diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_newport_driver.
diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_nv_driver.
diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_savage_driver.
diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xaw.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xdm.diff...done.
> Applying patch debian/patches/000_stolen_from_HEAD_xlib.diff...
done.
> Applying patch debian/patches/000_stolen_from_HEAD_xman.diff...
done.
> Applying patch debian/patches/000_stolen_from_HEAD_xtt.diff...done.
> Applying patch debian/patches/001a_damn_cpp_3.3_to_hell.diff...
done.
> Applying patch debian/patches/001b_m68k_haslinuxinput_too.diff...
dry
run failed.
> patching file config/cf/linux.cf
> Hunk #1 FAILED at 157.
> 1 out of 1 hunk FAILED -- saving rejects to file
config/cf/linux.cf.rej
> make: *** [debian/stampdir/patchapply] Erreur 1
> 
>
> I run Debian sid with gcc-3.3 on a K6-2 500MHz processor.

export LC_COLLATE=C, before you build.

--
Daniel Stone
<[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org






Bug#199838: Tr : Re: Bug#199838 : xfree86: 4.2.1-9 src fails to build [jean-luc.coulon@wanadoo.fr]

2003-07-03 Thread Jean-Luc
 --- Begin Message ---

Hi,

I tried to remove 001b_m68k_haslinuxinput_too.diff as I have not a m68k 
architecture. It failed again apply some patches, you will find 
attached the .log of these patches.


---
Regards
Jean-Lucpatching file config/cf/linux.cf
Hunk #1 succeeded at 87 with fuzz 2.
Hunk #2 succeeded at 130 (offset 1 line).
Hunk #3 succeeded at 287 (offset 1 line).
Hunk #4 succeeded at 367 (offset 1 line).
Hunk #5 succeeded at 565 (offset 1 line).
Hunk #6 succeeded at 572 (offset 1 line).
Hunk #7 succeeded at 586 (offset 1 line).
Hunk #8 succeeded at 596 (offset 1 line).
Hunk #9 succeeded at 611 (offset 1 line).
Hunk #10 succeeded at 627 (offset 1 line).
Hunk #11 succeeded at 635 (offset 1 line).
Hunk #12 succeeded at 672 (offset 1 line).
Hunk #13 succeeded at 687 (offset 1 line).
Hunk #14 succeeded at 723 (offset 1 line).
Hunk #15 succeeded at 782 (offset 1 line).
Hunk #16 succeeded at 800 (offset 1 line).
Hunk #17 succeeded at 876 (offset 1 line).
patching file config/cf/linux.cf
Hunk #1 succeeded at 774 (offset 3 lines).
patching file programs/Xserver/hw/xfree86/common/xf86.h
patching file programs/Xserver/hw/xfree86/common/xf86Bus.h
patching file programs/Xserver/hw/xfree86/common/xf86Resources.h
patching file programs/Xserver/hw/xfree86/common/xf86pciBus.c
patching file programs/Xserver/hw/xfree86/common/xf86str.h
patching file programs/Xserver/hw/xfree86/drivers/ati/Imakefile
patching file programs/Xserver/hw/xfree86/drivers/ati/aticonfig.c
patching file programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c
patching file programs/Xserver/hw/xfree86/os-support/bus/Imakefile
patching file programs/Xserver/hw/xfree86/os-support/bus/Pci.c
patching file programs/Xserver/hw/xfree86/os-support/bus/Pci.h
patching file programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c
patching file programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h
patching file programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c
patching file programs/Xserver/hw/xfree86/os-support/shared/stdResource.c
patching file programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h
patching file programs/Xserver/hw/xfree86/common/xf86Bus.c
--- End Message ---


Bug#199830: xfree86 fails to build on mipsel

2003-07-03 Thread Branden Robinson
On Thu, Jul 03, 2003 at 12:06:36PM +0200, Adrian Bunk wrote:
> According to buildd.debian.org the build of xfree86 4.1.2-9
> fails on mipsel with the following error:

A quick perusal of the debian-x list will reveal that I am already aware
of this problem and have committed a fix.

-- 
G. Branden Robinson|Religion is regarded by the common
Debian GNU/Linux   |people as true, by the wise as
[EMAIL PROTECTED] |false, and by the rulers as useful.
http://people.debian.org/~branden/ |-- Lucius Annaeus Seneca


pgpnAYihffhFb.pgp
Description: PGP signature


Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Branden Robinson
tag 199838 + unreproducible
thanks

On Thu, Jul 03, 2003 at 02:19:43PM +0200, Jean-Luc wrote:
> I tried to remove 001b_m68k_haslinuxinput_too.diff as I have not a m68k 
> architecture. It failed again apply some patches, you will find 
> attached the .log of these patches.

I cannot reproduce this problem; nor could the approximately 10
autobuilders that compiled this same package from source.

-- 
G. Branden Robinson| The Rehnquist Court has never
Debian GNU/Linux   | encountered a criminal statute it
[EMAIL PROTECTED] | did not like.
http://people.debian.org/~branden/ | -- John Dean


pgp29kyh8bwqm.pgp
Description: PGP signature


Re: xfree86 on hppa-linux

2003-07-03 Thread ISHIKAWA Mutsumi
> In <[EMAIL PROTECTED]> 
>   Daniel Stone <[EMAIL PROTECTED]> wrote:

>> On Thu, Jul 03, 2003 at 10:07:44AM +0900, ISHIKAWA Mutsumi wrote:
>> > > In <[EMAIL PROTECTED]> 
>> > >  Randolph Chung <[EMAIL PROTECTED]> wrote:
>> > >> i just found out today from the debian x maintainer that he disabled the
>> > >> loadable x-server for hppa because of a patch you submitted that
>> > >> disabled loadable servers for hppa... any particular reason that is
>> > >> needed? iirc xfree86 worked as-is for hppa...
>> > 
>> >  Humm? I don't remember I submited that kind of patch.
>> >  Which patch is it? Would you tell me the pointer about the patch.

>> It's disabled in patch #003, and I based my #003 off yours - I certainly
>> didn't add any code like that for hppa/mips{,el}. I guess it comes from
>> you, then. ;)


 Perhaps you talks about this chunk:

@@ -701,7 +752,7 @@
 
 #if UseElfFormat
 # ifndef DoLoadableServer
-#  ifdef HPArchitecture
+#  if defined(HPArchitecture) || defined(MipsArchitecture) || 
defined(SuperHArchitecture)
 #   define DoLoadableServerNO
 #  else
 #   define DoLoadableServerYES


 I only add about SuperHArchiecture and MIPSArchitecture
when xfree86 4.2.0 deb test package was released. I don't added
about HPPA architectures, they are exists before 4.2.0 (for example
please see #001 patch of xfree86_4.1.0-16 source)

 And it just means `HPPA, MIPS (mips and mipsel) and SuperH
(sh3,sh3eb,sh4 and sh4eb) Linux are not supported XFree86
Dynamic loader, so we will disable the loader on these
architectures. We want to build XFree86 drivers will be
linked staticaly to XFree86 server binary'.

 We will build and provide normal (not debug purpose) X
server package for those architectures.

>> >  And I have an question, if you know please teach me :-)
>> > 
>> > 
>> >  XFree86 dynamic loading is already supported on HPPA architecture?
>> > 
>> >  If the answer is YES, we should enable hppa dynamic loading support
>> > on HPPA architecture.I can not found HPPA dynamic loader code under
>> > xc/programs/Xserver/hw/xfree86/loaders/.

 XFree86 loader for HPPA is not implemented yet (and perhaps it will
be added to randlph's TODO list ;-). SuperH still does not have the
loader, too. (I don't know about MIPS detail. But they do not
support yet, too)

-- 
ISHIKAWA Mutsumi
 <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>



Re: 4.3.0-0pre1vX roadmap

2003-07-03 Thread Branden Robinson
On Thu, Jul 03, 2003 at 08:43:45PM +1000, Daniel Stone wrote:
> So my "good to go" analysis looks clear to you?

Actually, no.  Try running manifest-install-reconcile on the 4.3.0-sid
branch.

Doesn't look very good at all.  In addition to all the ordinary stuff
that isn't shipped, I am alarmed and concerned by the fact that
/etc/X11/Xresources/xbase-clients is in the MANIFEST files.

I'll try and work on this over the weekend.

-- 
G. Branden Robinson|  Mob rule isn't any prettier just
Debian GNU/Linux   |  because you call your mob a
[EMAIL PROTECTED] |  government.
http://people.debian.org/~branden/ |


pgpyJVpRnGzmX.pgp
Description: PGP signature


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

2003-07-03 Thread Branden Robinson
On Thu, Jul 03, 2003 at 06:26:27AM -0500, X Strike Force SVN Admin wrote:
> Author: daniel
> Date: 2003-07-03 06:25:52 -0500 (Thu, 03 Jul 2003)
> New Revision: 281
[...]
> Log:
> Ports to hppa/mips{,el} complete, cleanups from running
> manifest-install-reconcile against everything.
> 
> manifest-install-reconcile: Add two more dummy cases - Xft.3x and keyboard.4x.

Eh?  Why are those dummy cases?  Why aren't we shipping those.

Oh.  For Xft.3x it's obvious.

ISHIKAWA-san, can you update your "shut off Xft,Xrender,Xcursor" patch
to ensure that the manpage doesn't get shipped?  That way we can have a
patch that's clean for upstream.

But what about keyboard.4x?  I don't understand why that shouldn't be
shipped.

> xserver-xfree86.{docs,install}.{hppa,mips{,el}}: Complete the ports of these
> three architectures.

1) You also modified xserver-xfree86.doc.{alpha,hurd-i386,ia64} in this
commit.  Why is there no log about this?

2) You appear to be pretty indiscriminately shipping various documents.
Why not follow the example from XFree86 4.2.1, where I endeavored to
ship only files germane to that architecture?  (I.e., don't ship READMEs
for drivers that aren't even shipped for that arch.)

-- 
G. Branden Robinson|   The only way to get rid of a
Debian GNU/Linux   |   temptation is to yield to it.
[EMAIL PROTECTED] |   -- Oscar Wilde
http://people.debian.org/~branden/ |


pgpWdaFWuhs7J.pgp
Description: PGP signature


Re: X Strike Force SVN commit: rev 282 - trunk/debian

2003-07-03 Thread Branden Robinson
On Thu, Jul 03, 2003 at 06:42:04AM -0500, X Strike Force SVN Admin wrote:
> Author: daniel
> Date: 2003-07-03 06:41:59 -0500 (Thu, 03 Jul 2003)
> New Revision: 282
> 
> Modified:
>trunk/debian/rules
> Log:
> rules: seeing as LC_COLLATE is now so braindead as to stupidly break every
> convention ever, force it to C, stomping all over whatever the user had. yeah
> glibc, i love you too.

Uh, this change is overbroad.  Surely all we need to do is set this
variable in doogie's patch.apply and patch.unapply scripts?

-- 
G. Branden Robinson| I had thought very carefully about
Debian GNU/Linux   | comitting hara-kiri over this, but
[EMAIL PROTECTED] | I overslept this morning.
http://people.debian.org/~branden/ | -- Toshio Yamaguchi


pgp8K8815or2a.pgp
Description: PGP signature


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

2003-07-03 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-07-03 11:20:38 -0500 (Thu, 03 Jul 2003)
New Revision: 287

Modified:
   trunk/debian/changelog
Log:
debian/changelog: add bug closer to already-fixed mipsel FTBFS


Modified: trunk/debian/changelog
==
--- trunk/debian/changelog  2003-07-03 12:32:33 UTC (rev 286)
+++ trunk/debian/changelog  2003-07-03 16:20:38 UTC (rev 287)
@@ -12,7 +12,7 @@
 - xserver-xfree86.install.hppa: ship tdfx manpage
 - xserver-xfree86.install.mips: ship XFree86 manpage
 - xserver-xfree86.install.mipsel: stop shipping ati manpage (fixes FTBFS);
-  ship dmc, penmount, and r128 manpages
+  ship dmc, penmount, and r128 manpages (Closes: #199830)
 - xserver-xfree86.install.{sh3,sh4}: ship citron manpage
 - xserver-xfree86.install.sparc: ship calcomp, dmc, hyperpen, and penmount
   drivers



X Strike Force SVN commit: rev 288 - in trunk/debian: . scripts

2003-07-03 Thread X Strike Force SVN Admin
Author: branden
Date: 2003-07-03 11:24:34 -0500 (Thu, 03 Jul 2003)
New Revision: 288

Modified:
   trunk/debian/changelog
   trunk/debian/rules
   trunk/debian/scripts/patch.apply
   trunk/debian/scripts/patch.unapply
Log:
debian/rules: stop setting LC_COLLATE

debian/scripts/patch.{apply,unapply}: set LC_COLLATE to C before iterating
  over patch files


Modified: trunk/debian/changelog
==
--- trunk/debian/changelog  2003-07-03 16:20:38 UTC (rev 287)
+++ trunk/debian/changelog  2003-07-03 16:24:34 UTC (rev 288)
@@ -1,11 +1,13 @@
 xfree86 (4.2.1-10) unstable; urgency=low
 
-  * the "glibc, will you be my friend?" release
-
   * debian/scripts/manifest-install-reconcile: new script to help keep
 MANIFEST and *.install* files in sync
 
-  * use above script to find and fix several bugs in *.install* files:
+  * debian/scripts/patch.{apply,unapply}: set LC_COLLATE=C to ensure that
+patches are applied in the correct order
+
+  * use manifest-install-reconcile script to find and fix several bugs in
+*.install* files:
 - xlibs-dev.install.{,netbsd-i386,s390}: ship several missing extension
   header files: XLbx.h, bigreqstr.h, extutil.h, mitmiscstr.h,
   multibufst.h, shapestr.h, shmstr.h, syncstr.h, xcmiscstr.h, xteststr.h
@@ -22,8 +24,6 @@
   darwinLib.{rules,tmpl} Imake configuration files
 - xutils.install.{m68k,s390}: ship luit program, its manpage, and
   darwinLib.{rules,tmpl} Imake configuration files
-  
-  * debian/rules: force LC_COLLATE=C so as not to break the patch order.
 
  -- Branden Robinson <[EMAIL PROTECTED]>  Wed,  2 Jul 2003 15:00:37 -0500
 

Modified: trunk/debian/rules
==
--- trunk/debian/rules  2003-07-03 16:20:38 UTC (rev 287)
+++ trunk/debian/rules  2003-07-03 16:24:34 UTC (rev 288)
@@ -26,9 +26,6 @@
 
 # oh my God, this is a gross hack
 ELSE:=else
-# horrific hack to work around LC_COLLATE braindamage: ensure that patches
-# actually get applied in the right order.
-LC_COLLATE=C
 
 # This is a horrendous kludge to ensure that some scripts we need are 
executable.
 DUMMY:=$(shell if [ ! -x debian/setperms ]; then chmod 755 debian/setperms; fi)

Modified: trunk/debian/scripts/patch.apply
==
--- trunk/debian/scripts/patch.apply2003-07-03 16:20:38 UTC (rev 287)
+++ trunk/debian/scripts/patch.apply2003-07-03 16:24:34 UTC (rev 288)
@@ -4,6 +4,8 @@
 
 [ ! -d debian/patches ] && exit
 
+LC_COLLATE=C
+
 mkdir -p $STAMP_DIR/patches $SOURCE_TREE
 
 for f in $(find debian/patches \( -type f -or -type l \) -not -name "*~" | 
sort); do

Modified: trunk/debian/scripts/patch.unapply
==
--- trunk/debian/scripts/patch.unapply  2003-07-03 16:20:38 UTC (rev 287)
+++ trunk/debian/scripts/patch.unapply  2003-07-03 16:24:34 UTC (rev 288)
@@ -2,6 +2,8 @@
 
 . debian/scripts/vars
 
+LC_COLLATE=C
+
 mkdir -p $STAMP_DIR/patches/
 
 for f in $(find debian/patches -type f -not -name "*~" | sort -r); do



Re: 4.3.0-0pre1vX roadmap

2003-07-03 Thread Branden Robinson
On Thu, Jul 03, 2003 at 11:02:01AM -0500, Branden Robinson wrote:
[...]
> I am alarmed and concerned by the fact that
> /etc/X11/Xresources/xbase-clients is in the MANIFEST files.

Never mind that part.  I was momentarily on crack.  The MANIFEST *is*
supposed to be generated *after* all the debian/local stuff has been
installed, and it is, and you never changed that.

I apologize.

-- 
G. Branden Robinson|
Debian GNU/Linux   | Ab abusu ad usum non valet
[EMAIL PROTECTED] | consequentia.
http://people.debian.org/~branden/ |


pgpPVZJ2IWAjt.pgp
Description: PGP signature


Processed: Re: Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

> tag 199838 + unreproducible
Bug#199838: xfree86: 4.2.1-9 src fails to build
There were no tags set.
Tags added: unreproducible

> thanks
Stopping processing here.

Please contact me if you need assistance.

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




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

2003-07-03 Thread ISHIKAWA Mutsumi
> In <[EMAIL PROTECTED]> 
>   Branden Robinson <[EMAIL PROTECTED]> wrote:

>> On Thu, Jul 03, 2003 at 06:26:27AM -0500, X Strike Force SVN Admin wrote:

>> Oh.  For Xft.3x it's obvious.

>> ISHIKAWA-san, can you update your "shut off Xft,Xrender,Xcursor" patch
>> to ensure that the manpage doesn't get shipped?  That way we can have a
>> patch that's clean for upstream.

 The Xft.3x is installed from xc/lib/Xft1. It is not same from
libxft2-dev package... Ah... OK I found a problem.

 I think it is upstream bug of man page name confliction.

 Both xc/lib/Xft and xc/lib/Xft1 contain different man page with
same file name (Xft.man). When both BuildXft and BuildXft1 are enabled,
xc/lib/Xft/Xft.man and xc/lib/Xft1/Xft.man will be instaled on
same place with same file name (e.g Xft.3x), perhaps
xc/lib/Xft/Xft.man will overwrite xc/lib/Xft1/Xft.man.

 I think better that Xft.man under xc/lib/Xft1 would be renamed to
Xft1.man or so.

-- 
ISHIKAWA Mutsumi
 <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>



Xfree-4.3.0 branch 20030703

2003-07-03 Thread Joel Soete
Hi all,

On my hppa boxe, I tried to launch to compile xfree86-4.3 from snapshot 

and the first pb I encounter was to replace in 
debian/patches/000_stolen_from_HEAD.diff
the attached trident_video.c patch.

As new in X, I have a lot of question about many warning as:
[...]
make[3]: Entering directory `/CAD/XFree86/Dpkg/xfree86-4.3.0/build-tree/xc'
In file included from ../config/cf/Imake.tmpl:104,
 from Imakefile.c:40:
../config/cf/linux.cf:114: warning: "InstallAppDefFiles" is not defined
In file included from ../config/cf/linux.cf:1007,
 from ../config/cf/Imake.tmpl:104,
 from Imakefile.c:40:
../config/cf/xfree86.cf:1031: warning: "HasGlide3" is not defined
[...]
[...]
ConnDis.c:57: warning: function declaration isn't a prototype
ConnDis.c:60: warning: function declaration isn't a prototype
ConnDis.c:99: warning: function declaration isn't a prototype
ConnDis.c:443: warning: function declaration isn't a prototype
ConnDis.c:481: warning: function declaration isn't a prototype
ConnDis.c:493: warning: function declaration isn't a prototype
ConnDis.c:971: warning: function declaration isn't a prototype

But the main for me now is certainly:
[...]
In file included from lexer.l:45:
pswpriv.h:150: warning: redundant redeclaration of `yylineno' in same scope
:349: warning: previous declaration of `yylineno'
:1062: warning: redundant redeclaration of `yylex' in same scope
pswpriv.h:153: warning: previous declaration of `yylex'
lexer.l: In function `yylex':
lexer.l:349: warning: long unsigned int format, long int arg (arg 3)
lexer.l:358: warning: long unsigned int format, long int arg (arg 3)
: At top level:
:2612: warning: redundant redeclaration of `isatty' in same scope
/usr/include/unistd.h:686: warning: previous declaration of `isatty'
:2883: warning: no previous prototype for `yyget_lineno'
:2892: warning: no previous prototype for `yyget_in'
:2900: warning: no previous prototype for `yyget_out'
:2908: warning: no previous prototype for `yyget_leng'
:2917: warning: no previous prototype for `yyget_text'
:2926: warning: no previous prototype for `yyset_lineno'
:2938: warning: no previous prototype for `yyset_in'
:2943: warning: no previous prototype for `yyset_out'
:2948: warning: no previous prototype for `yyget_debug'
:2953: warning: no previous prototype for `yyset_debug'
:2959: warning: no previous prototype for `yylex_destroy'
:2992: warning: `yy_flex_strlen' defined but not used

Is it a flex release pb (apt-get installed 2.5.31-11 for my unstable debian
gnu/linux hppa boxe)?

Thanks in advance for your attention,
Joel



--
Soldes Tiscali ADSL : 27,50 euros/mois jusque fin 2003.
On s'habitue vite à payer son ADSL moins cher!
Plus d'info? Cliquez ici... http://reg.tiscali.be/default.asp?lg=fr 




trident_video.c-diff
Description: Binary data


Bug#199906: xlibmesa3-gl: opengl broke on the last upgrade of this package

2003-07-03 Thread Peter Jay Salzman
Package: xlibmesa3-gl
Version: 4.2.1-8
Severity: important
Tags: sid

I get the following run-time errors whenever I run an OpenGL program:

libGL error: can't find Glide library, dlopen(libglide3-v5.so) and
dlopen(libglide3.so) both failed.

libGL error: dlerror() message: /usr/lib/libglide3.so: undefined symbol:
_trisetup_Default_win_nocull_valid

I *think* (but am not sure) these are separate issues.  libglide3.so
exists, is not a dangling symlink and is located in /usr/lib.  I'm not
sure why dlopen() isn't finding it.

I get these errors on a Sarge system with a Voodoo5 card.  I upgrade
this package to Sid's version, and the error messages still persist.

Note that I do not get these messages on Sid with a first generation
radeon, so these messages are libglide3 related.  However, libglid3
hasn't been updated in a dog's age, so I believe this package is the
culprit.

Thanks,
Pete


-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux satan 2.4.20 #4 SMP Mon Mar 24 08:52:15 PST 2003 i686
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8

Versions of packages xlibmesa3-gl depends on:
hi  libc6 2.3.1-16   GNU C Library: Shared libraries an
ii  xlibs 4.2.1-6X Window System client libraries

-- no debconf information





Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Jezuch

Użytkownik Branden Robinson napisał:
I tried to remove 001b_m68k_haslinuxinput_too.diff as I have not a m68k 
architecture. It failed again apply some patches, you will find 
attached the .log of these patches.


I cannot reproduce this problem; nor could the approximately 10
autobuilders that compiled this same package from source.


I can reproduce this bug. And I have a solution.
debian/scripts/patch.apply reads:

for f in $(find debian/patches \( -type f -or -type l \) -not -name "*~" | 
sort); do


This is supposed to list patches to apply in corect order. But sort puts 
001_linux_cf.diff *after* 001a_* and 001b_* (it should be applied first). My 
solution was to rename 001b->001c, 001a->001b and 001->001a. It seems that 
this fixed the problem.
I suppose this is sort's bug. I am using sort from coreutils 5.0-4 (from 
sarge/sid). I didn't try to downgrade to version from stable.

--
Ecce Jezuch
"I went in killing the sun
I once one" - T. Meeks






Bug#199838: xfree86: 4.2.1-9 src fails to build

2003-07-03 Thread Branden Robinson
On Thu, Jul 03, 2003 at 09:01:02PM +0200, Jezuch wrote:
> U?ytkownik Branden Robinson napisa?:
> >>I tried to remove 001b_m68k_haslinuxinput_too.diff as I have not a m68k 
> >>architecture. It failed again apply some patches, you will find 
> >>attached the .log of these patches.
> >
> >I cannot reproduce this problem; nor could the approximately 10
> >autobuilders that compiled this same package from source.
> 
> I can reproduce this bug. And I have a solution.

set LC_COLLATE=C in your build environment.

A fix has already been applied to the patch.{apply,unapply} scripts.

-- 
G. Branden Robinson|Any man who does not realize that
Debian GNU/Linux   |he is half an animal is only half a
[EMAIL PROTECTED] |man.
http://people.debian.org/~branden/ |-- Thornton Wilder


pgplIhpJHdifn.pgp
Description: PGP signature


Bug#178242: #178242: xlibmesa3: [radeon_dri] hardware acceleration non-functional on Radeon 7500 QW

2003-07-03 Thread Aurelien Jarno
Hello,

Since the upgrade of xlibmesa3-gl to version 4.2.1-9 the hardware
acceleration seems to work again, at least on my computer (on i386).

Aurelien




Re: 4.3.0-0pre1vX roadmap

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 11:02:01AM -0500, Branden Robinson wrote:
> On Thu, Jul 03, 2003 at 08:43:45PM +1000, Daniel Stone wrote:
> > So my "good to go" analysis looks clear to you?
> 
> Actually, no.  Try running manifest-install-reconcile on the 4.3.0-sid
> branch.
> 
> Doesn't look very good at all.  In addition to all the ordinary stuff
> that isn't shipped, I am alarmed and concerned by the fact that
> /etc/X11/Xresources/xbase-clients is in the MANIFEST files.
> 
> I'll try and work on this over the weekend.

See my commits below.

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgpHHX5RaoXlb.pgp
Description: PGP signature


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

2003-07-03 Thread Daniel Stone
On Thu, Jul 03, 2003 at 11:12:53AM -0500, Branden Robinson wrote:
> On Thu, Jul 03, 2003 at 06:26:27AM -0500, X Strike Force SVN Admin wrote:
> > Author: daniel
> > Date: 2003-07-03 06:25:52 -0500 (Thu, 03 Jul 2003)
> > New Revision: 281
> [...]
> > Log:
> > Ports to hppa/mips{,el} complete, cleanups from running
> > manifest-install-reconcile against everything.
> > 
> > manifest-install-reconcile: Add two more dummy cases - Xft.3x and 
> > keyboard.4x.
> 
> Eh?  Why are those dummy cases?  Why aren't we shipping those.
> 
> Oh.  For Xft.3x it's obvious.
> 
> ISHIKAWA-san, can you update your "shut off Xft,Xrender,Xcursor" patch
> to ensure that the manpage doesn't get shipped?  That way we can have a
> patch that's clean for upstream.

Umm, the Xft2 stuff isn't getting shipped, but we're still shipping
Xft.so.1, remember?

> But what about keyboard.4x?  I don't understand why that shouldn't be
> shipped.

'keyboard' has been renamed to 'kbd'.

> > xserver-xfree86.{docs,install}.{hppa,mips{,el}}: Complete the ports of these
> > three architectures.
> 
> 1) You also modified xserver-xfree86.doc.{alpha,hurd-i386,ia64} in this
> commit.  Why is there no log about this?

I'll edit it.

> 2) You appear to be pretty indiscriminately shipping various documents.
> Why not follow the example from XFree86 4.2.1, where I endeavored to
> ship only files germane to that architecture?  (I.e., don't ship READMEs
> for drivers that aren't even shipped for that arch.)

OK, I'll work on this if you want me to.

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.kde.org - http://www.debian.org - http://www.xwin.org


pgpP0xwjvHRCY.pgp
Description: PGP signature


X Strike Force SVN property change: propchange - rev 281 svn:log

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Revision: 281
Property Name: svn:log

New Property Value:
Ports to hppa/mips{,el} complete, cleanups from running
manifest-install-reconcile against everything.

manifest-install-reconcile: Add two more dummy cases - Xft.3x and keyboard.4x.

xserver-xfree86.{docs,install}.{hppa,mips{,el}}: Complete the ports of these
three architectures.

xserver-xfree86.docs.{alpha,hurd-i386,ia64}: New, and roughly unchanged from
.docs.i386.

control: Revert bogus change that caused only xserver-xfree86-dbg to be built on
hppa/mips/mipsel; also see above entry.

xlibs-static-pic.install{,.hurd-i386}: Start shipping libGLw_pic, since we go to
the effort of building it.

MANIFEST.s390: Restore libGLU stuff (more fallout from that awful commit!).

xserver-xfree86.install.arm: Start shipping 'nv' manpage.




X Strike Force SVN commit: rev 289 - in branches/4.3.0/sid/debian: . scripts

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 19:25:54 -0500 (Thu, 03 Jul 2003)
New Revision: 289

Modified:
   branches/4.3.0/sid/debian/rules
   branches/4.3.0/sid/debian/scripts/patch.apply
   branches/4.3.0/sid/debian/scripts/patch.unapply
Log:
rules, patch.{,un}apply: Moving LC_COLLATE=C decl to the scripts, in line with
trunk's #288


Modified: branches/4.3.0/sid/debian/rules
==
--- branches/4.3.0/sid/debian/rules 2003-07-03 16:24:34 UTC (rev 288)
+++ branches/4.3.0/sid/debian/rules 2003-07-04 00:25:54 UTC (rev 289)
@@ -26,8 +26,6 @@
 
 # oh my God, this is a gross hack
 ELSE:=else
-# oh my God, this is even worse
-LC_COLLATE=C
 M4:=m4
 
 # This is a horrendous kludge to ensure that some scripts we need are 
executable.

Modified: branches/4.3.0/sid/debian/scripts/patch.apply
==
--- branches/4.3.0/sid/debian/scripts/patch.apply   2003-07-03 16:24:34 UTC 
(rev 288)
+++ branches/4.3.0/sid/debian/scripts/patch.apply   2003-07-04 00:25:54 UTC 
(rev 289)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+LC_COLLATE=C
+
 . debian/scripts/vars
 
 [ ! -d debian/patches ] && exit

Modified: branches/4.3.0/sid/debian/scripts/patch.unapply
==
--- branches/4.3.0/sid/debian/scripts/patch.unapply 2003-07-03 16:24:34 UTC 
(rev 288)
+++ branches/4.3.0/sid/debian/scripts/patch.unapply 2003-07-04 00:25:54 UTC 
(rev 289)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+LC_COLLATE=C
+
 . debian/scripts/vars
 
 mkdir -p $STAMP_DIR/patches/



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

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 19:43:28 -0500 (Thu, 03 Jul 2003)
New Revision: 290

Modified:
   branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha
   branches/4.3.0/sid/debian/xserver-xfree86.docs.arm
   branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa
   branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i386
   branches/4.3.0/sid/debian/xserver-xfree86.docs.i386
   branches/4.3.0/sid/debian/xserver-xfree86.docs.ia64
   branches/4.3.0/sid/debian/xserver-xfree86.docs.mips
   branches/4.3.0/sid/debian/xserver-xfree86.docs.mipsel
   branches/4.3.0/sid/debian/xserver-xfree86.docs.powerpc
   branches/4.3.0/sid/debian/xserver-xfree86.docs.sparc
Log:
xserver-xfree86.docs.*: cleanup - start shipping README.fonts on all
architectures, and stop shipping docs that are irrelevant to that architecture
(i.e, the relevant driver isn't even built)


Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha2003-07-04 
00:25:54 UTC (rev 289)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha2003-07-04 
00:43:28 UTC (rev 290)
@@ -1,16 +1,9 @@
 debian/tmp/usr/X11R6/lib/X11/doc/DESIGN
 debian/tmp/usr/X11R6/lib/X11/doc/README.DECtga
 debian/tmp/usr/X11R6/lib/X11/doc/README.DGA
-debian/tmp/usr/X11R6/lib/X11/doc/README.I128
-debian/tmp/usr/X11R6/lib/X11/doc/README.SiS
-debian/tmp/usr/X11R6/lib/X11/doc/README.apm
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
-debian/tmp/usr/X11R6/lib/X11/doc/README.chips
-debian/tmp/usr/X11R6/lib/X11/doc/README.cyrix
-debian/tmp/usr/X11R6/lib/X11/doc/README.i740
-debian/tmp/usr/X11R6/lib/X11/doc/README.i810
+debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
-debian/tmp/usr/X11R6/lib/X11/doc/README.newport
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128
 debian/tmp/usr/X11R6/lib/X11/doc/README.rapidaccess
 debian/tmp/usr/X11R6/lib/X11/doc/README.rendition

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.arm
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.arm  2003-07-04 00:25:54 UTC 
(rev 289)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.arm  2003-07-04 00:43:28 UTC 
(rev 290)
@@ -1,20 +1,12 @@
 debian/tmp/usr/X11R6/lib/X11/doc/DESIGN
-debian/tmp/usr/X11R6/lib/X11/doc/README.DECtga
 debian/tmp/usr/X11R6/lib/X11/doc/README.DGA
-debian/tmp/usr/X11R6/lib/X11/doc/README.I128
 debian/tmp/usr/X11R6/lib/X11/doc/README.SiS
-debian/tmp/usr/X11R6/lib/X11/doc/README.apm
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
-debian/tmp/usr/X11R6/lib/X11/doc/README.cyrix
-debian/tmp/usr/X11R6/lib/X11/doc/README.dps
-debian/tmp/usr/X11R6/lib/X11/doc/README.i740
-debian/tmp/usr/X11R6/lib/X11/doc/README.i810
+debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
-debian/tmp/usr/X11R6/lib/X11/doc/README.newport
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128
 debian/tmp/usr/X11R6/lib/X11/doc/README.rapidaccess
-debian/tmp/usr/X11R6/lib/X11/doc/README.rendition
 debian/tmp/usr/X11R6/lib/X11/doc/README.s3virge
 debian/tmp/usr/X11R6/lib/X11/doc/README.XKB-Config
 debian/tmp/usr/X11R6/lib/X11/doc/README.XKB-Enhancing

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa 2003-07-04 00:25:54 UTC 
(rev 289)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa 2003-07-04 00:43:28 UTC 
(rev 290)
@@ -1,22 +1,13 @@
 debian/tmp/usr/X11R6/lib/X11/doc/Design
-debian/tmp/usr/X11R6/lib/X11/doc/README.DECtga
 debian/tmp/usr/X11R6/lib/X11/doc/README.DGA
-debian/tmp/usr/X11R6/lib/X11/doc/README.I128
 debian/tmp/usr/X11R6/lib/X11/doc/README.SiS
 debian/tmp/usr/X11R6/lib/X11/doc/README.XKB-Config
 debian/tmp/usr/X11R6/lib/X11/doc/README.XKB-Enhancing
-debian/tmp/usr/X11R6/lib/X11/doc/README.apm
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
-debian/tmp/usr/X11R6/lib/X11/doc/README.cyrix
-debian/tmp/usr/X11R6/lib/X11/doc/README.dps
 debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
-debian/tmp/usr/X11R6/lib/X11/doc/README.i740
-debian/tmp/usr/X11R6/lib/X11/doc/README.i810
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
-debian/tmp/usr/X11R6/lib/X11/doc/README.newport
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128
 debian/tmp/usr/X11R6/lib/X11/doc/README.rapidaccess
-debian/tmp/usr/X11R6/lib/X11/doc/README.rendition
 debian/tmp/usr/X11R6/lib/X11/doc/README.s3virge
 debian/tmp/usr/X11R6/lib/X11/doc/Status

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i386
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i3862003-07-04 
00:25:54 UTC (rev 289)
+++ branches/4.3.0/sid/debian/xse

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

2003-07-03 Thread ISHIKAWA Mutsumi
> In <[EMAIL PROTECTED]> 
>   X Strike Force SVN Admin <[EMAIL PROTECTED]> wrote:
>> Author: daniel
>> Date: 2003-07-03 19:43:28 -0500 (Thu, 03 Jul 2003)
>> New Revision: 290

>> Log:
>> xserver-xfree86.docs.*: cleanup - start shipping README.fonts on all
>> architectures, and stop shipping docs that are irrelevant to that 
>> architecture
>> (i.e, the relevant driver isn't even built)

 README.fonts is shipped a part of xfree86-common package.
 Why is it needed to include xserver-xfree86 ?

-- 
ISHIKAWA Mutsumi
 <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>



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

2003-07-03 Thread X Strike Force SVN Admin
Author: daniel
Date: 2003-07-03 21:45:17 -0500 (Thu, 03 Jul 2003)
New Revision: 291

Modified:
   branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha
   branches/4.3.0/sid/debian/xserver-xfree86.docs.arm
   branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa
   branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i386
   branches/4.3.0/sid/debian/xserver-xfree86.docs.i386
   branches/4.3.0/sid/debian/xserver-xfree86.docs.mips
   branches/4.3.0/sid/debian/xserver-xfree86.docs.mipsel
   branches/4.3.0/sid/debian/xserver-xfree86.docs.powerpc
   branches/4.3.0/sid/debian/xserver-xfree86.docs.sparc
Log:
xserver-xfree86.docs.*: stop shipping README.fonts; xfree86-common already ships
it. i'm stupid.


Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha2003-07-04 
00:43:28 UTC (rev 290)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.alpha2003-07-04 
02:45:17 UTC (rev 291)
@@ -2,7 +2,6 @@
 debian/tmp/usr/X11R6/lib/X11/doc/README.DECtga
 debian/tmp/usr/X11R6/lib/X11/doc/README.DGA
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128
 debian/tmp/usr/X11R6/lib/X11/doc/README.rapidaccess

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.arm
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.arm  2003-07-04 00:43:28 UTC 
(rev 290)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.arm  2003-07-04 02:45:17 UTC 
(rev 291)
@@ -3,7 +3,6 @@
 debian/tmp/usr/X11R6/lib/X11/doc/README.SiS
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128
 debian/tmp/usr/X11R6/lib/X11/doc/README.rapidaccess

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa 2003-07-04 00:43:28 UTC 
(rev 290)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.hppa 2003-07-04 02:45:17 UTC 
(rev 291)
@@ -5,7 +5,6 @@
 debian/tmp/usr/X11R6/lib/X11/doc/README.XKB-Enhancing
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128
 debian/tmp/usr/X11R6/lib/X11/doc/README.rapidaccess

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i386
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i3862003-07-04 
00:43:28 UTC (rev 290)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.hurd-i3862003-07-04 
02:45:17 UTC (rev 291)
@@ -6,7 +6,6 @@
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
 debian/tmp/usr/X11R6/lib/X11/doc/README.cyrix
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.i740
 debian/tmp/usr/X11R6/lib/X11/doc/README.i810
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.i386
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.i386 2003-07-04 00:43:28 UTC 
(rev 290)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.i386 2003-07-04 02:45:17 UTC 
(rev 291)
@@ -6,7 +6,6 @@
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
 debian/tmp/usr/X11R6/lib/X11/doc/README.cyrix
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.i740
 debian/tmp/usr/X11R6/lib/X11/doc/README.i810
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.mips
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.mips 2003-07-04 00:43:28 UTC 
(rev 290)
+++ branches/4.3.0/sid/debian/xserver-xfree86.docs.mips 2003-07-04 02:45:17 UTC 
(rev 291)
@@ -6,7 +6,6 @@
 debian/tmp/usr/X11R6/lib/X11/doc/README.ati
 debian/tmp/usr/X11R6/lib/X11/doc/README.chips
 debian/tmp/usr/X11R6/lib/X11/doc/README.dps
-debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
 debian/tmp/usr/X11R6/lib/X11/doc/README.mouse
 debian/tmp/usr/X11R6/lib/X11/doc/README.newport
 debian/tmp/usr/X11R6/lib/X11/doc/README.r128

Modified: branches/4.3.0/sid/debian/xserver-xfree86.docs.mipsel
==
--- branches/4.3.0/sid/debian/xserver-xfree86.docs.mipsel   2003-07-04 
00:43:28 UTC (rev 290