Bug#424975: please don't conflict with fglrx-driver

2007-05-19 Thread Thomas Bushnell BSG
On Sat, 2007-05-19 at 00:55 +0200, Julien Cristau wrote:
> On Fri, May 18, 2007 at 10:35:07 -0700, Thomas Bushnell BSG wrote:
> 
> > How can I overcome the problem on my system, since i have an
> > fglrx-driver that does work?
> > 
> rename the fglrx package, or don't upgrade xserver-xorg-core?

Because, um, xserver-xorg-core is updated for no good reason; there is
surely nothing in the new package which anybody could possibly want?!

Or, perhaps, allow fglrx to declare the conflict, since it's fglrx that
has the bug, and not xserver-xorg-core?!

Thomas




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



xserver-xorg-input-synaptics: Changes to 'refs/tags/0.14.7-git20070517-1'

2007-05-19 Thread Mattia Dongili
Tag '0.14.7-git20070517-1' created by Mattia Dongili <[EMAIL PROTECTED]> at 
2007-05-19 16:25 +

debian revision

Changes since rev0.14.6-1:
Christian Thaeter (3):
  merged first trackstick patch
  removed exp_accl
  re-add instant movement detection

Florian Loitsch (2):
  Allow to easily switch between move and scroll.
  Add a timeout to locked drags.

Ingmar Ellenberger (1):
  Implement 2-finger emulation for ALPS touchpads.

Jesper Smith (1):
  Fix to make the driver work on newest xorg GIT.

Matthew Garrett (1):
  On Linux 2.6, the evdev interface provides support for requesting the

Mattia Dongili (14):
  Makes $(PREFIX) configurable on the command line.
  Allow building a modular driver for Xorg 7.0.
  Use -fPIC when building the driver as a shared object.
  In the modular build case, link the driver with -lc.
  prepare -2
  Merge branch 'master' of 
http://web.telia.com/~u89404340/touchpad/synaptics/ into debian
  Merge branch 'upstream' into debian-unstable
  Start working on new synaptics version based on git snapshot.
  Use FHS compliant manpage dirs
  Merge branch 'upstream' into debian-unstable
  set Maintaner to the XSF and me as Uploader
  Various bug closing due to the new version
  Added XS-Vcs-* fields
  Fix build dependencies

Peter Osterlund (731):
  Added source code for the synaptics touchpad XFree86
  Modifications to make builds on rh73 work. Note that an X
  Added comments to let emacs know about the non-standard tab
  Changed version to 0.10p1.
  Fixed a spelling error.
  * Added z, w, left, right, up and down information to the shared memory
  Fixed bug causing the up/down buttons to be incorrectly
  Fixed compiler warning in synclient.c.
  When doing tap, drag and double tap processing, the buttons
  Implemented fast scrolling, ie generate extra button 4 & 5
  Don't disable the button 4 & 5 repeat timer when scrolling
  Added heuristics for palm detection. There are some
  Implemented edge motion.
  Improved edge motion to avoid the short burst of high speed
  Implemented horizontal scrolling (button 6 & 7 events) when
  Lots of whitespace changes to reduce the diff compared to
  Merged some stuff from version 0.11.3.
  Changed a local variable name to match 0.11.3.
  More merges from 0.11.3.
  Merged handling of UpDownScrolling option from 0.11.3.
  Make double click processing from change
  Made the timeout for middle button emulation configurable.
  Build improvements.
  Fixed removal of old shared memory segment before trying to
  Better state machine for handling middle mouse button
  Made the done variable in change b41f7dda288bb959891d8684c36c56037fbef7ba
  Merged 6 button support from 0.11.3, but only activate it
  Fixed brace placement at beginning of functions.
  Forgot comment in change 3db42d5b33662dbda6f0dde6cdb34748a254884f.
  Remove shared memory segment when the X server terminates.
  Fix use of uninitialized memory in synclient.c.
  Removed some already implemented features from the TODO
  Fill in the probed hardware properties in the shared memory
  Documented parameter HorizScrollDelta.
  Updated the synclient program to make it possible to read
  Fixed incorrect usage text in synclient.
  Removed an implemented feature from the TODO file.
  Made the params[] array in synclient.c static.
  Updated the FEATURES file regarding online configuration
  Merged some #ifdef stuff from 0.11.3. (Not sure what it is
  Removed unnecessary include file.
  Fixed spelling errors.
  Update from the p4 computer.
  Fixed spelling error.
  Abstracted out the code to determine the hardware state
  Fixed initialization failure path so that it doesn't crash
  Moved capability bit handling to the SynapticsGetHwState()
  Added support for kernel input event interface. Not
  Added "Protocol" option to activate the kernel input event
  Changed suggested MaxTapTime value from 20 to 15, to avoid
  When parsing kernel event data, make sure we see a
  Rewrote timer handling so that the driver no longer depends
  Changed version number.
  Fixed documentation error.
  Changed default values to match change
  Workaround for X server bug in the TimerSet() function.
  Fixed spelling error.
  Use packet counting instead of time to decide when to start
  Fixed race condition caused by asynchronous IO (SIGIO). This
  Added include path needed in gentoo linux. Reported by
  Longer timeout in the reset sequence. Experience from the
  Added log level to some messages. (From Hartwig Felger.)
  Made horizontal wheel replacement buttons work. (From
  Improved driver initialisation and finalization. From
  Removed trailing whitespace.
  Reset the touchpad

xserver-xorg-input-synaptics: Changes to 'upstream'

2007-05-19 Thread Mattia Dongili
 COMPATIBILITY|6 
 docs/tapndrag.dia|  318 ---
 eventcomm.c  |   28 
 linux_input.h|   11 +
 manpages/synaptics.5 |8 +
 synaptics.c  |   77 ++--
 synaptics.h  |6 
 synclient.c  |1 
 8 files changed, 369 insertions(+), 86 deletions(-)

New commits:
commit e7f641b8c6d09b11dd5c93086bbc5a0b135296ea
Author: Peter Osterlund <[EMAIL PROTECTED]>
Date:   Thu May 17 13:31:05 2007 +0200

Document the LockedDragTimeout parameter.

diff --git a/manpages/synaptics.5 b/manpages/synaptics.5
index 4954402..0304cf3 100644
--- a/manpages/synaptics.5
+++ b/manpages/synaptics.5
@@ -239,7 +239,13 @@ Switch on/off guest mouse (often a stick).
 \fBLockedDrags\fR (Bool)
 If off, a tap and drag gesture ends when you release the finger.
 .
-If on, the gesture is active until you tap a second time.
+If on, the gesture is active until you tap a second time, or until
+LockedDragTimeout expires.
+.TP
+\fBLockedDragTimeout\fR (Integer)
+This parameter specifies how long it takes (in milliseconds) for the
+LockedDrags mode to be automatically turned off after the finger is
+released from the touchpad.
 .TP
 \fBRTCornerButton\fR (Integer)
 .

commit adf4851a471963702df28522fa50cc9cab09302a
Author: Peter Osterlund <[EMAIL PROTECTED]>
Date:   Thu May 17 13:14:22 2007 +0200

Update the state machine diagram for locked drag timeout.

diff --git a/docs/tapndrag.dia b/docs/tapndrag.dia
index b50acb3..a411572 100644
--- a/docs/tapndrag.dia
+++ b/docs/tapndrag.dia
@@ -79,6 +79,12 @@
   
 
   
+  
+
+  
+  
+
+  
   
 
   
@@ -97,7 +103,7 @@
 
   
   
-
+
   
   
 
@@ -124,6 +130,12 @@
   
 
   
+  
+
+  
+  
+
+  
   
 
   
@@ -142,7 +154,7 @@
 
   
   
-
+
   
   
 
@@ -169,6 +181,12 @@
   
 
   
+  
+
+  
+  
+
+  
   
 
   
@@ -187,7 +205,7 @@
 
   
   
-
+
   
   
 
@@ -214,6 +232,12 @@
   
 
   
+  
+
+  
+  
+
+  
   
 
   
@@ -232,7 +256,7 @@
 
   
   
-
+
   
   
 
@@ -259,6 +283,12 @@
   
 
   
+  
+
+  
+  
+
+  
   
 
   
@@ -277,7 +307,7 @@
 
   
   
-
+
   
   
 
@@ -304,6 +334,12 @@
   
 
   
+  
+
+  
+  
+
+  
   
 
   
@@ -322,7 +358,7 @@
 
   
   
-
+
   
   
 
@@ -571,7 +607,7 @@
 
   
   
-
+
   
   
 
@@ -580,7 +616,13 @@
 
   
   
-
+
+  
+  
+
+  
+  
+
   
   
 
@@ -591,6 +633,7 @@ TO : Tap Timeout
 TO2: Mouse click timeout
 TO3: Double tap timeout
 TO4: Single tap timeout
+TO5: Locked drag timeout
 M  : Finger movement
 [U]: Generate button up event
 [D]: Generate button down event
@@ -604,7 +647,7 @@ F  : Fast taps enabled#
 
   
   
-
+
   
   
 
@@ -615,12 +658,12 @@ F  : Fast taps enabled#
 
   
 
-
+
   
 
   
   
-
+
   
   
 
@@ -644,13 +687,16 @@ F  : Fast taps enabled#
   
 
   
+  
+
+  
 
-
+
   
 
   
   
-
+
   
   
 
@@ -675,13 +721,16 @@ F  : Fast taps enabled#
   
 
   
+  
+
+  
 
-
+
   
 
   
   
-
+
   
   
 
@@ -705,6 +754,9 @@ F  : Fast taps enabled#
   
 
   
+  
+
+  
 
 
   
@@ -734,12 +786,12 @@ F  : Fast taps enabled#
 
   
 
-
+
   
 
   
   
-
+
   
   
 
@@ -764,13 +816,16 @@ F  : Fast taps enabled#
   
 
   
+  
+
+  
 
-
+
   
 
   
   
-
+
   
   
 
@@ -795,13 +850,16 @@ F  : Fast taps enabled#
   
 
   
+  
+
+  
 
-
+
   
 
   
   
-
+
   
   
 
@@ -825,13 +883,16 @@ F  : Fast taps enabled#
   
 
   

xserver-xorg-input-synaptics: Changes to 'debian-unstable'

2007-05-19 Thread Mattia Dongili
 COMPATIBILITY|9 +
 Makefile |2 
 alpscomm.c   |2 
 debian/changelog |   20 +++
 debian/control   |7 -
 docs/tapndrag.dia|  318 ---
 eventcomm.c  |   44 +--
 linux_input.h|   11 +
 manpages/synaptics.5 |   28 
 ps2comm.c|2 
 psmcomm.c|2 
 synaptics.c  |   80 ++--
 synaptics.h  |7 -
 synclient.c  |4 
 synproto.h   |3 
 15 files changed, 437 insertions(+), 102 deletions(-)

New commits:
commit 8996867e9b7336b716260f6795d5b80176ef9e7d
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date:   Sun May 20 01:21:07 2007 +0900

Fix build dependencies

Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>

diff --git a/debian/control b/debian/control
index 1c5e710..053e0cc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Mattia Dongili <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxi-dev, 
x11proto-core-dev
+Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxi-dev, 
x11proto-core-dev, xserver-xorg-dev (>= 2:1.2.99.902), pkg-config
 Standards-Version: 3.7.2
 XS-Vcs-Git: 
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git

commit 736f0d850dd96b744f296bf3a8e13f2c07aab95e
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date:   Sun May 20 00:52:29 2007 +0900

Added XS-Vcs-* fields

Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>

diff --git a/debian/control b/debian/control
index 2f3854f..1c5e710 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,8 @@ Maintainer: Debian X Strike Force 
 Uploaders: Mattia Dongili <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxi-dev, 
x11proto-core-dev
 Standards-Version: 3.7.2
+XS-Vcs-Git: 
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
+XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
 
 Package: xfree86-driver-synaptics
 Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc sparc

commit a822a1a3043e9376e74d46fa6c539a68db79d1f4
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date:   Sun May 20 00:44:45 2007 +0900

Various bug closing due to the new version

Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>

diff --git a/debian/changelog b/debian/changelog
index 359c7c6..91528d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,21 @@
 xfree86-driver-synaptics (0.14.7~git20070517-1) unstable; urgency=low
 
-  * git snapshot of the driver.
- 
+  * git snapshot of the driver:
+- from commit e6595886d7ae3a1730cd0d9f86fd0f305c0743c2
+  "[...] synaptics, alps and appletouch pads all work approximately
+  identically without requiring model-specific configuration"
+  (Closes: #351621) (Closes: #406499)
+- from commit 88211ca60be7cc74015ad4158722e5950884bd78
+  "Don't match wacom tablets in the event device probing."
+  (Closes: #383711)
+- from commit 473912f50ffd2b26bd2f638f9d87f86cf60e2dd6
+  "Add a config option to prevent the driver from grabbing the event
+  device for exclusive use" (Closes: #380705)
+- from commit 2d06ab1d2b3170b6fa44b945376b2ad4cd682af9
+  "Allow to easily switch between move and scroll"
+  (Closes: #411266)
+  * set Maintaner to the XSF and me as Uploader
+
  -- Mattia Dongili <[EMAIL PROTECTED]>  Thu, 17 May 2007 19:34:22 +0900
 
 xfree86-driver-synaptics (0.14.6-2) unstable; urgency=low

commit c688ebfc1a0bed66b2669a9e761778fc95ba6e93
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date:   Sun May 20 00:44:20 2007 +0900

set Maintaner to the XSF and me as Uploader

Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>

diff --git a/debian/control b/debian/control
index bbd0ac2..2f3854f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: xfree86-driver-synaptics
 Section: x11
 Priority: optional
-Maintainer: Mattia Dongili <[EMAIL PROTECTED]>
+Maintainer: Debian X Strike Force 
+Uploaders: Mattia Dongili <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxi-dev, 
x11proto-core-dev
 Standards-Version: 3.7.2
 

commit c5a5961edb65c2ab71d94af770741c85e0b4466d
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date:   Sun May 20 00:17:11 2007 +0900

Use FHS compliant manpage dirs

Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>

diff --git a/Makefile b/Makefile
index 334f012..f953ed8 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ 
VERSION_ID=($(VER_LEVEL_1)*1+$(VER_LEVEL_2)*100+$(VER_LEVEL_3))
 
 PREFIX ?= /usr/local
 BINDIR = $(DESTDIR)$(PREFIX)/bin
-MANDIR = $(DESTDIR)$(PREFIX)/man
+MANDIR = $(DESTDIR)$(PREFIX)/share/ma

xserver-xorg-input-synaptics: Changes to 'master'

2007-05-19 Thread Mattia Dongili
New branch 'master' available with the following commits:


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



xfree86-driver-synaptics_0.14.7~git20070517-1_i386.changes ACCEPTED

2007-05-19 Thread Debian Installer

Accepted:
xfree86-driver-synaptics_0.14.7~git20070517-1.diff.gz
  to 
pool/main/x/xfree86-driver-synaptics/xfree86-driver-synaptics_0.14.7~git20070517-1.diff.gz
xfree86-driver-synaptics_0.14.7~git20070517-1.dsc
  to 
pool/main/x/xfree86-driver-synaptics/xfree86-driver-synaptics_0.14.7~git20070517-1.dsc
xfree86-driver-synaptics_0.14.7~git20070517-1_i386.deb
  to 
pool/main/x/xfree86-driver-synaptics/xfree86-driver-synaptics_0.14.7~git20070517-1_i386.deb
xfree86-driver-synaptics_0.14.7~git20070517.orig.tar.gz
  to 
pool/main/x/xfree86-driver-synaptics/xfree86-driver-synaptics_0.14.7~git20070517.orig.tar.gz
xserver-xorg-input-synaptics_0.14.7~git20070517-1_i386.deb
  to 
pool/main/x/xfree86-driver-synaptics/xserver-xorg-input-synaptics_0.14.7~git20070517-1_i386.deb


Override entries for your package:
xfree86-driver-synaptics_0.14.7~git20070517-1.dsc - source x11
xfree86-driver-synaptics_0.14.7~git20070517-1_i386.deb - optional x11
xserver-xorg-input-synaptics_0.14.7~git20070517-1_i386.deb - optional x11

Announcing to [EMAIL PROTECTED]
Closing bugs: 351621 380705 383711 406499 411266 


Thank you for your contribution to Debian.


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



Processing of xfree86-driver-synaptics_0.14.7~git20070517-1_i386.changes

2007-05-19 Thread Archive Administrator
xfree86-driver-synaptics_0.14.7~git20070517-1_i386.changes uploaded 
successfully to localhost
along with the files:
  xfree86-driver-synaptics_0.14.7~git20070517-1.dsc
  xfree86-driver-synaptics_0.14.7~git20070517.orig.tar.gz
  xfree86-driver-synaptics_0.14.7~git20070517-1.diff.gz
  xfree86-driver-synaptics_0.14.7~git20070517-1_i386.deb
  xserver-xorg-input-synaptics_0.14.7~git20070517-1_i386.deb

Greetings,

Your Debian queue daemon


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



Re: Bug#411012: Here, here!

2007-05-19 Thread Julien Cristau
On Sun, May 13, 2007 at 16:40:43 +0200, Thierry Reding wrote:

> As a matter of fact, the git repository currently contains compiz 0.5.0,
> which I guess could go right into unstable. Just waiting for someone to do
> the honors.
> 
I have it ready, but as the i386 buildd is MIA the build-deps are
uninstallable, so compiz will have to wait a little longer...

Cheers,
Julien


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



Bug#425095: I think the problem was kpdf

2007-05-19 Thread Douglas Allan Tutty
On Sat, May 19, 2007 at 10:51:16AM -0400, Douglas Allan Tutty wrote:
> I tried with non-K* apps and all is well.  It seems that the problem was
> kpdf on titan causing X on rocky to store pixmaps.
> 

Is there some way to limit such pixmaps or is the X server at the mercy
of the remote app?  I like kpdf over xpdf; one example being the file
chooser being easier to use.  

Doug.



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



Bug#425095: I think the problem was kpdf

2007-05-19 Thread Douglas Allan Tutty
I tried with non-K* apps and all is well.  It seems that the problem was
kpdf on titan causing X on rocky to store pixmaps.

Thanks,

Doug.



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



xserver-xorg-video-suncg6_1.1.0-4_sparc.changes ACCEPTED

2007-05-19 Thread Debian Installer

Accepted:
xserver-xorg-video-suncg6_1.1.0-4.diff.gz
  to 
pool/main/x/xserver-xorg-video-suncg6/xserver-xorg-video-suncg6_1.1.0-4.diff.gz
xserver-xorg-video-suncg6_1.1.0-4.dsc
  to pool/main/x/xserver-xorg-video-suncg6/xserver-xorg-video-suncg6_1.1.0-4.dsc
xserver-xorg-video-suncg6_1.1.0-4_sparc.deb
  to 
pool/main/x/xserver-xorg-video-suncg6/xserver-xorg-video-suncg6_1.1.0-4_sparc.deb


Override entries for your package:
xserver-xorg-video-suncg6_1.1.0-4.dsc - source x11
xserver-xorg-video-suncg6_1.1.0-4_sparc.deb - optional x11

Announcing to [EMAIL PROTECTED]


Thank you for your contribution to Debian.


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



Re: [patch] xutil-dev Add Conflicts/Replaces/Provides

2007-05-19 Thread Julien Cristau
On Thu, May 17, 2007 at 16:49:21 -0700, Bryce Harrington wrote:

> (The -mga, -suncg6, and -via drivers also have some differences with
> their conflicts/replaces line - jcristau already knows about this.)
> 
I've uploaded -mga and -suncg6.  The -via package in sid already has the
C/R changes from Timo, is there anything else missing for that package?

Cheers,
Julien


signature.asc
Description: Digital signature


Processing of xserver-xorg-video-suncg6_1.1.0-4_sparc.changes

2007-05-19 Thread Archive Administrator
xserver-xorg-video-suncg6_1.1.0-4_sparc.changes uploaded successfully to 
localhost
along with the files:
  xserver-xorg-video-suncg6_1.1.0-4.dsc
  xserver-xorg-video-suncg6_1.1.0-4.diff.gz
  xserver-xorg-video-suncg6_1.1.0-4_sparc.deb

Greetings,

Your Debian queue daemon


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



xserver-xorg-video-suncg6: Changes to 'debian-unstable'

2007-05-19 Thread Julien Cristau
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e29397e8205ab8bb041a1cd5e07d2020b022a8fe
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat May 19 16:28:43 2007 +0200

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 94c1351..be41f8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-suncg6 (1:1.1.0-4) UNRELEASED; urgency=low
+xserver-xorg-video-suncg6 (1:1.1.0-4) unstable; urgency=low
 
   [ David Nusinow ]
   * Generate server dependencies automatically from the ABI
@@ -16,7 +16,7 @@ xserver-xorg-video-suncg6 (1:1.1.0-4) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * Replaces/Conflicts: xserver-xorg-driver-suncg6.
 
- -- Timo Aaltonen <[EMAIL PROTECTED]>  Fri,  4 May 2007 18:09:50 +0300
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sat, 19 May 2007 16:27:26 +0200
 
 xserver-xorg-video-suncg6 (1:1.1.0-3) unstable; urgency=high
 


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



xserver-xorg-video-suncg6: Changes to 'refs/tags/xserver-xorg-video-suncg6-1_1.1.0-4'

2007-05-19 Thread Julien Cristau
Tag 'xserver-xorg-video-suncg6-1_1.1.0-4' created by Julien Cristau <[EMAIL 
PROTECTED]> at 2007-05-19 14:37 +

Tagging upload of xserver-xorg-video-suncg6 1:1.1.0-4 to unstable.

Changes since xserver-xorg-video-suncg6-1_1.1.0-3:
Adam Jackson (6):
  Bug #3626: _X_EXPORT tags for video and input drivers.
  Prep for modular builds by adding guarded #include "config.h" everywhere.
  More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
  Only build dlloader modules by default.
  Stub COPYING files
  Unlibcwrap. Bump server version requirement. Bump to 1.1.0.

Alan Coopersmith (4):
  Use sed & cpp to substitute variables in driver man pages
  Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
  Change *mandir targets to use new *_MAN_DIR variables set by 
xorg-macros.m4
  Replace references to XFree86/XF86Config in man page

Branden Robinson (1):
  Test for existence of debian/patches directory before creating a symlink 
to it.

Brice Goglin (6):
  Merge debian-experimental branch into debian-unstable
  Merge ../../../xsfbs/xsfbs into debian-unstable
  Miscellaneous fixed in debian/control and debian/rules.
  Merge branch 'upstream-unstable' into debian-unstable
  Pull upstream manpage fix 62f44115b3c7d2c558731135c1354eba81060b2d
  autoreconf

Daniel Stone (2):
  Fix includes right throughout the Xserver tree:
  Update autogen.sh to one that does objdir != srcdir.

David Nusinow (12):
  Prepare drivers for use with xserver 1.2, which has a new ABI (version 
1.1)
  Merge branch 'upstream-experimental' into debian-experimental
  Merge branch 'xsfbs' into debian-experimental
  Merge branch 'xsfbs-unstable' into debian-experimental
  Generate server dependencies automatically from the ABI
  Update serverabi generation to also account for driver Provides
  Generate Provides line automatically
  Merge branch 'debian-unstable' of git+ssh://[EMAIL 
PROTECTED]/git/pkg-xorg/xsfbs into debian-experimental
  Fix name of serverminver
  Add support for X server input ABI versioning
  Fix typo that prevented the input abi versioning from working.
  Fix one missed bit from the serverabiver -> serverminver rename

Egbert Eich (5):
  Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
  readding XFree86's cvs IDs
  Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
  Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
  Merging XORG-CURRENT into trunk

Eric Anholt (2):
  DRI XFree86-4_3_99_12-merge import
  Add .cvsignores for drivers.

Julien Cristau (3):
  Add new "serverabi" rule to generate drivers dependency on the server.
  Fix copy/paste typo in the input driver provides.
  Prepare changelog for upload.

Kaleb Keithley (3):
  Initial revision
  XFree86 4.3.0.1
  XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks

Kevin E Martin (9):
  Various changes preparing packages for RC0:
  Update package version number for RC1 release.
  Update pkgcheck depedencies to work with separate build roots.
  Update package version number for X11R7 RC2 release.
  Remove extraneous AC_MSG_RESULT.
  Update package version number for X11R7 RC3 release.
  Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
  Update package version number for final X11R7 release candidate.
  Update package version for X11R7 release.

Søren Sandmann Pedersen (1):
  Build system for suncg6

Timo Aaltonen (1):
  Replaces/Conflicts: xserver-xorg-driver-suncg6.

---
 .cvsignore|   19 
 ChangeLog |  218 +
 Makefile.in   |   12 
 aclocal.m4|  379 +-
 autogen.sh|   12 
 config.guess  |  685 ++--
 config.h.in   |9 
 config.sub|  240 +
 configure | 7799 ++
 debian/changelog  |   20 
 debian/control|   17 
 debian/rules  |4 
 debian/xsfbs/xsfbs.mk |   28 
 ltmain.sh |   12 
 man/.cvsignore|3 
 man/Makefile.am   |2 
 man/Makefile.in   |   14 
 man/suncg6.man|4 
 src/.cvsignore|6 
 src/Makefile.in   |   12 
 src/cg6_regs.h|2 
 21 files changed, 5284 insertions(+), 4213 deletions(-)
---


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



Bug#425095: Etch Xorg memory leak?

2007-05-19 Thread Julien Cristau
On Sat, May 19, 2007 at 09:09:20 -0400, Douglas Allan Tutty wrote:

> On Sat, May 19, 2007 at 12:32:08PM +0200, Michel D?nzer wrote:
> > Quite possibly, and likely on behalf of the client, i.e. kpdf in this
> > case. Please rule out first that kpdf is keeping pixmaps around, be it
> > on purpose or by accident.
> 
> Since I don't really know how remote X apps work, I thought that they
> just told the X server what to display; I didn't realize that they could
> compell it to keep pixmaps around.
> 
> I'll try with xpdf and report back.
> 
The xrestop utility might be useful to figure out which apps have a lot
of pixmaps allocated in the server.

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#392874: marked as done (xserver-xorg-video-mga: FTBFS on hurd-i386: Unsatisfiable Build-Depends libdrm-dev)

2007-05-19 Thread Debian Bug Tracking System
Your message dated Sat, 19 May 2007 14:17:04 +
with message-id <[EMAIL PROTECTED]>
and subject line Bug#392874: fixed in xserver-xorg-video-mga 1:1.4.6.1.dfsg.1-3
has caused the attached Bug report to be marked as done.

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

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

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

--- Begin Message ---
Package: xserver-xorg-video-mga
Severity: important

This package needs a [!hurd-i386] for libdrm-dev in Build-Depends.


Michael

--- End Message ---
--- Begin Message ---
Source: xserver-xorg-video-mga
Source-Version: 1:1.4.6.1.dfsg.1-3

We believe that the bug you reported is fixed in the latest version of
xserver-xorg-video-mga, which is due to be installed in the Debian FTP archive:

xserver-xorg-video-mga_1.4.6.1.dfsg.1-3.diff.gz
  to 
pool/main/x/xserver-xorg-video-mga/xserver-xorg-video-mga_1.4.6.1.dfsg.1-3.diff.gz
xserver-xorg-video-mga_1.4.6.1.dfsg.1-3.dsc
  to 
pool/main/x/xserver-xorg-video-mga/xserver-xorg-video-mga_1.4.6.1.dfsg.1-3.dsc
xserver-xorg-video-mga_1.4.6.1.dfsg.1-3_i386.deb
  to 
pool/main/x/xserver-xorg-video-mga/xserver-xorg-video-mga_1.4.6.1.dfsg.1-3_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Julien Cristau <[EMAIL PROTECTED]> (supplier of updated xserver-xorg-video-mga 
package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Format: 1.7
Date: Sat, 19 May 2007 15:55:47 +0200
Source: xserver-xorg-video-mga
Binary: xserver-xorg-video-mga
Architecture: source i386
Version: 1:1.4.6.1.dfsg.1-3
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force 
Changed-By: Julien Cristau <[EMAIL PROTECTED]>
Description: 
 xserver-xorg-video-mga - X.Org X server -- MGA display driver
Closes: 392874
Changes: 
 xserver-xorg-video-mga (1:1.4.6.1.dfsg.1-3) unstable; urgency=low
 .
   [ Timo Aaltonen ]
   * Replaces/Conflicts: xserver-xorg-driver-mga.
 .
   [ Brice Goglin ]
   * Don't build-dep on libdrm-dev on hurd-i386, thanks Michael Banck
 (closes: #392874).
   * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
 (needed to let xsfbs get access to serverminver).
   * Add a link to www.X.org and a reference to the xf86-video-mga
 module in the long description.
Files: 
 fcbb7117533bd4cc923a944cb16990e1 1186 x11 optional 
xserver-xorg-video-mga_1.4.6.1.dfsg.1-3.dsc
 be00a45acda6c65ffeb860d1fd1bcb78 117151 x11 optional 
xserver-xorg-video-mga_1.4.6.1.dfsg.1-3.diff.gz
 1c7cd38687396d8d2d7f36bb45c58099 98354 x11 optional 
xserver-xorg-video-mga_1.4.6.1.dfsg.1-3_i386.deb

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

iD8DBQFGTwRKmEvTgKxfcAwRArHRAKCnjTyIWNXwB4zJEd4+j6XeJFZYHACfaTlb
WVvgrJysD0sAEQVAX5LbqJQ=
=P4BJ
-END PGP SIGNATURE-

--- End Message ---


xserver-xorg-video-mga_1.4.6.1.dfsg.1-3_i386.changes ACCEPTED

2007-05-19 Thread Debian Installer

Accepted:
xserver-xorg-video-mga_1.4.6.1.dfsg.1-3.diff.gz
  to 
pool/main/x/xserver-xorg-video-mga/xserver-xorg-video-mga_1.4.6.1.dfsg.1-3.diff.gz
xserver-xorg-video-mga_1.4.6.1.dfsg.1-3.dsc
  to 
pool/main/x/xserver-xorg-video-mga/xserver-xorg-video-mga_1.4.6.1.dfsg.1-3.dsc
xserver-xorg-video-mga_1.4.6.1.dfsg.1-3_i386.deb
  to 
pool/main/x/xserver-xorg-video-mga/xserver-xorg-video-mga_1.4.6.1.dfsg.1-3_i386.deb


Override entries for your package:
xserver-xorg-video-mga_1.4.6.1.dfsg.1-3.dsc - source x11
xserver-xorg-video-mga_1.4.6.1.dfsg.1-3_i386.deb - optional x11

Announcing to [EMAIL PROTECTED]
Closing bugs: 392874 


Thank you for your contribution to Debian.


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



Bug#425095: Etch Xorg memory leak?

2007-05-19 Thread Douglas Allan Tutty
On Sat, May 19, 2007 at 12:32:08PM +0200, Michel D?nzer wrote:
> On Fri, 2007-05-18 at 21:23 -0400, Douglas Allan Tutty wrote:
> > 
> > ssh titan -f /usr/bin/kpdf
> > open a long file
> > view each page in turn
> > 
> > As each new page is viewed, xorg uses more memory, and swap goes up.
> > 
> > Its as if xorg is using memory to hold the image for the new page and
> > isn't releasing the memory used to hold the old page.  I conjuecture
> > that its holding all viewed pages in memory.
> 
> Quite possibly, and likely on behalf of the client, i.e. kpdf in this
> case. Please rule out first that kpdf is keeping pixmaps around, be it
> on purpose or by accident.

Since I don't really know how remote X apps work, I thought that they
just told the X server what to display; I didn't realize that they could
compell it to keep pixmaps around.

I'll try with xpdf and report back.

Thanks,

Doug.



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



Processing of xserver-xorg-video-mga_1.4.6.1.dfsg.1-3_i386.changes

2007-05-19 Thread Archive Administrator
xserver-xorg-video-mga_1.4.6.1.dfsg.1-3_i386.changes uploaded successfully to 
localhost
along with the files:
  xserver-xorg-video-mga_1.4.6.1.dfsg.1-3.dsc
  xserver-xorg-video-mga_1.4.6.1.dfsg.1-3.diff.gz
  xserver-xorg-video-mga_1.4.6.1.dfsg.1-3_i386.deb

Greetings,

Your Debian queue daemon


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



Bug#420164: marked as done (libgl1-mesa-dri: Darwinia only shows black screen)

2007-05-19 Thread Debian Bug Tracking System
Your message dated Sat, 19 May 2007 14:02:15 +
with message-id <[EMAIL PROTECTED]>
and subject line Bug#420164: fixed in mesa 6.5.2-5
has caused the attached Bug report to be marked as done.

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

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

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

--- Begin Message ---
Package: libgl1-mesa-dri
Version: 6.5.2-4
Severity: normal
Tags: patch

With the current mesa 6.5.2, running Darwinia (and possibly other apps)
results in a black screen (the game seems to work, just nothing is
shown). There's a patch in mesa git (also attached, as it is quite
small) that fixes this issue:

http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=6f9b1afc862851532e4820705c412388b497ad58

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (900, 'unstable'), (800, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.19-beyond1 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_GB.utf8)
Shell: /bin/sh linked to /bin/dash

Versions of packages libgl1-mesa-dri depends on:
ii  libc6 2.5-2  GNU C Library: Shared libraries
ii  libdrm2   2.3.0-4Userspace interface to kernel DRM 
ii  libexpat1 1.95.8-3.4 XML parsing C library - runtime li
ii  libgl1-mesa-glx   6.5.2-4A free implementation of the OpenG

libgl1-mesa-dri recommends no packages.

-- no debconf information

-- 
Do not rejoice in his defeat, you men,
For though the world stood up
And stopped the bastard,
The bitch that bore him is in heat again.
-- Bertolt Brecht
From: Michel Dänzer <[EMAIL PROTECTED]>
Date: Tue, 6 Mar 2007 12:22:35 + (+0100)
Subject: r300: Call radeonSetCliprects from radeonMakeCurrent.
X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=6f9b1afc862851532e4820705c412388b497ad58

r300: Call radeonSetCliprects from radeonMakeCurrent.

Based on a patch by Panagiotis Papadakos.

Among other things, this makes sure the framebuffer object associated with the
drawable has the correct size when _mesa_make_current is called, so the default
viewport is set up correctly.

Also update radeon->lastStamp in radeonSetCliprects.
---

--- a/src/mesa/drivers/dri/r300/radeon_context.c
+++ b/src/mesa/drivers/dri/r300/radeon_context.c
@@ -51,6 +51,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
 #include "radeon_macros.h"
 #include "radeon_reg.h"
 
+#include "radeon_state.h"
 #include "r300_state.h"
 
 #include "utils.h"
@@ -279,6 +280,8 @@ GLboolean radeonMakeCurrent(__DRIcontext
 
 			r300UpdateWindow(radeon->glCtx);
 			r300UpdateViewportOffset(radeon->glCtx);
+
+			radeonSetCliprects(radeon);
 		}
 
 		_mesa_make_current(radeon->glCtx,
--- a/src/mesa/drivers/dri/r300/radeon_lock.c
+++ b/src/mesa/drivers/dri/r300/radeon_lock.c
@@ -90,7 +90,6 @@ static void r300RegainedLock(radeonConte
 #else
 		radeonUpdateScissor(radeon->glCtx);
 #endif
-		radeon->lastStamp = drawable->lastStamp;
 	}
 
 	if (sarea->ctx_owner != radeon->dri.hwContext) {
--- a/src/mesa/drivers/dri/r300/radeon_state.c
+++ b/src/mesa/drivers/dri/r300/radeon_state.c
@@ -185,6 +185,8 @@ void radeonSetCliprects(radeonContextPtr
 
 	if (radeon->state.scissor.enabled)
 		radeonRecalcScissorRects(radeon);
+
+	radeon->lastStamp = drawable->lastStamp;
 }
 
 
--- End Message ---
--- Begin Message ---
Source: mesa
Source-Version: 6.5.2-5

We believe that the bug you reported is fixed in the latest version of
mesa, which is due to be installed in the Debian FTP archive:

libgl1-mesa-dev_6.5.2-5_all.deb
  to pool/main/m/mesa/libgl1-mesa-dev_6.5.2-5_all.deb
libgl1-mesa-dri-dbg_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-dri-dbg_6.5.2-5_i386.deb
libgl1-mesa-dri_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-dri_6.5.2-5_i386.deb
libgl1-mesa-glx-dbg_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-glx-dbg_6.5.2-5_i386.deb
libgl1-mesa-glx_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-glx_6.5.2-5_i386.deb
libgl1-mesa-swx11-dbg_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-swx11-dbg_6.5.2-5_i386.deb
libgl1-mesa-swx11-dev_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-swx11-dev_6.5.2-5_i386.deb
libgl1-mesa-swx11-i686_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-swx11-i686_6.5.2-5_i386.deb
libgl1-mesa-swx11_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-swx11_6.5.2-5_i386.deb
libglu1-mesa-dev_6.5.2-5_i386.deb
  to pool/main/m/mesa/libglu1-mesa-dev_6.5.2-5_i386.deb
libglu1-mesa_6.5.2-5_i386.deb
  to pool/main/m/mesa/libglu1-mesa_6.5.2-5_i386.deb
libosmesa6-dev_6.5

xserver-xorg-video-mga: Changes to 'refs/tags/xserver-xorg-video-mga-1_1.4.6.1.dfsg.1-3'

2007-05-19 Thread Julien Cristau
Tag 'xserver-xorg-video-mga-1_1.4.6.1.dfsg.1-3' created by Julien Cristau 
<[EMAIL PROTECTED]> at 2007-05-19 14:05 +

Tagging upload of xserver-xorg-video-mga 1:1.4.6.1.dfsg.1-3 to unstable.

Changes since xserver-xorg-video-mga-1_1.4.6.1.dfsg.1-2:
Brice Goglin (3):
  Miscellaneous fixed in debian/control and debian/rules.
  Missing dot for empty line in the long description
  Add closer for #392874 to the build-dep fix for libdrm-dev on hurd-i386

Julien Cristau (1):
  Prepare changelog for upload.

Timo Aaltonen (1):
  Replaces/Conflicts: xserver-xorg-driver-mga.

---
 debian/changelog |   15 +++
 debian/control   |8 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---


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



xserver-xorg-video-mga: Changes to 'debian-unstable'

2007-05-19 Thread Julien Cristau
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0fd4af3ae423e0ab7f6aa66c7745e88edde221ae
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat May 19 16:05:13 2007 +0200

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 928a4bb..23d9930 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.4.6.1.dfsg.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.4.6.1.dfsg.1-3) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * Replaces/Conflicts: xserver-xorg-driver-mga.
@@ -11,7 +11,7 @@ xserver-xorg-video-mga (1:1.4.6.1.dfsg.1-3) UNRELEASED; 
urgency=low
   * Add a link to www.X.org and a reference to the xf86-video-mga
 module in the long description.
 
- -- Brice Goglin <[EMAIL PROTECTED]>  Sat, 28 Apr 2007 01:16:17 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sat, 19 May 2007 15:55:47 +0200
 
 xserver-xorg-video-mga (1:1.4.6.1.dfsg.1-2) unstable; urgency=low
 


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



mesa_6.5.2-5_i386.changes ACCEPTED

2007-05-19 Thread Debian Installer

Accepted:
libgl1-mesa-dev_6.5.2-5_all.deb
  to pool/main/m/mesa/libgl1-mesa-dev_6.5.2-5_all.deb
libgl1-mesa-dri-dbg_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-dri-dbg_6.5.2-5_i386.deb
libgl1-mesa-dri_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-dri_6.5.2-5_i386.deb
libgl1-mesa-glx-dbg_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-glx-dbg_6.5.2-5_i386.deb
libgl1-mesa-glx_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-glx_6.5.2-5_i386.deb
libgl1-mesa-swx11-dbg_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-swx11-dbg_6.5.2-5_i386.deb
libgl1-mesa-swx11-dev_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-swx11-dev_6.5.2-5_i386.deb
libgl1-mesa-swx11-i686_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-swx11-i686_6.5.2-5_i386.deb
libgl1-mesa-swx11_6.5.2-5_i386.deb
  to pool/main/m/mesa/libgl1-mesa-swx11_6.5.2-5_i386.deb
libglu1-mesa-dev_6.5.2-5_i386.deb
  to pool/main/m/mesa/libglu1-mesa-dev_6.5.2-5_i386.deb
libglu1-mesa_6.5.2-5_i386.deb
  to pool/main/m/mesa/libglu1-mesa_6.5.2-5_i386.deb
libosmesa6-dev_6.5.2-5_i386.deb
  to pool/main/m/mesa/libosmesa6-dev_6.5.2-5_i386.deb
libosmesa6_6.5.2-5_i386.deb
  to pool/main/m/mesa/libosmesa6_6.5.2-5_i386.deb
mesa-common-dev_6.5.2-5_all.deb
  to pool/main/m/mesa/mesa-common-dev_6.5.2-5_all.deb
mesa-swx11-source_6.5.2-5_all.deb
  to pool/main/m/mesa/mesa-swx11-source_6.5.2-5_all.deb
mesa-utils_6.5.2-5_i386.deb
  to pool/main/m/mesa/mesa-utils_6.5.2-5_i386.deb
mesa_6.5.2-5.diff.gz
  to pool/main/m/mesa/mesa_6.5.2-5.diff.gz
mesa_6.5.2-5.dsc
  to pool/main/m/mesa/mesa_6.5.2-5.dsc


Override entries for your package:
libgl1-mesa-dev_6.5.2-5_all.deb - optional libdevel
libgl1-mesa-dri-dbg_6.5.2-5_i386.deb - extra libdevel
libgl1-mesa-dri_6.5.2-5_i386.deb - extra libs
libgl1-mesa-glx-dbg_6.5.2-5_i386.deb - extra libdevel
libgl1-mesa-glx_6.5.2-5_i386.deb - optional libs
libgl1-mesa-swx11-dbg_6.5.2-5_i386.deb - extra libs
libgl1-mesa-swx11-dev_6.5.2-5_i386.deb - optional libdevel
libgl1-mesa-swx11-i686_6.5.2-5_i386.deb - extra libs
libgl1-mesa-swx11_6.5.2-5_i386.deb - optional libs
libglu1-mesa-dev_6.5.2-5_i386.deb - optional libdevel
libglu1-mesa_6.5.2-5_i386.deb - optional libs
libosmesa6-dev_6.5.2-5_i386.deb - optional devel
libosmesa6_6.5.2-5_i386.deb - optional libs
mesa-common-dev_6.5.2-5_all.deb - optional devel
mesa-swx11-source_6.5.2-5_all.deb - optional libdevel
mesa-utils_6.5.2-5_i386.deb - optional x11
mesa_6.5.2-5.dsc - source libs

Announcing to [EMAIL PROTECTED]
Closing bugs: 420164 


Thank you for your contribution to Debian.


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



mesa override disparity

2007-05-19 Thread Debian Installer
There are disparities between your recently accepted upload and the
override file for the following file(s):

libgl1-mesa-dri_6.5.2-5_i386.deb: package says priority is optional, override 
says extra.

Either the package or the override file is incorrect.  If you think
the override is correct and the package wrong please fix the package
so that this disparity is fixed in the next upload.  If you feel the
override is incorrect then please reply to this mail and explain why.

[NB: this is an automatically generated mail; if you replied to one
like it before and have not received a response yet, please ignore
this mail.  Your reply needs to be processed by a human and will be in
due course, but until then the installer will send these automated
mails; sorry.]

--
Debian distribution maintenance software

(This message was generated automatically; if you believe that there
is a problem with it please contact the archive administrators by
mailing [EMAIL PROTECTED])


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



Processing of mesa_6.5.2-5_i386.changes

2007-05-19 Thread Archive Administrator
mesa_6.5.2-5_i386.changes uploaded successfully to localhost
along with the files:
  mesa_6.5.2-5.dsc
  mesa_6.5.2-5.diff.gz
  libgl1-mesa-dev_6.5.2-5_all.deb
  mesa-common-dev_6.5.2-5_all.deb
  mesa-swx11-source_6.5.2-5_all.deb
  libgl1-mesa-swx11_6.5.2-5_i386.deb
  libgl1-mesa-swx11-dbg_6.5.2-5_i386.deb
  libgl1-mesa-swx11-i686_6.5.2-5_i386.deb
  libgl1-mesa-swx11-dev_6.5.2-5_i386.deb
  libgl1-mesa-glx_6.5.2-5_i386.deb
  libgl1-mesa-glx-dbg_6.5.2-5_i386.deb
  libgl1-mesa-dri_6.5.2-5_i386.deb
  libgl1-mesa-dri-dbg_6.5.2-5_i386.deb
  libosmesa6_6.5.2-5_i386.deb
  libosmesa6-dev_6.5.2-5_i386.deb
  libglu1-mesa_6.5.2-5_i386.deb
  libglu1-mesa-dev_6.5.2-5_i386.deb
  mesa-utils_6.5.2-5_i386.deb

Greetings,

Your Debian queue daemon


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



Re: preliminary packaging for xbase-clients split done

2007-05-19 Thread Timo Aaltonen

On Thu, 17 May 2007, Timo Aaltonen wrote:


poke at will!


* http://users.tkk.fi/~tjaalton/xbase-clients-split.txt


The packages are now in a buildable shape, and also upgrades _should_ work 
without issues. I'll test upgrades next week, and after that they could be 
uploaded to experimental.


Please note that the following packages have been dropped from the 
bundles. If they are still needed, please let me know.


# xbase-clients
beforelight
bitmap
ico will be dropped by upstream?
xdbedizzy   will be dropped by upstream?
xf86dga
xgc will be dropped by upstream?

# xutils
scripts (includes xon)



t


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



xterm: Changes to 'debian-unstable'

2007-05-19 Thread Julien Cristau
 debian/changelog |9 +++--
 debian/rules |2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit d080bf4bc97f1bdc365a3763a8721fd8a99c5c43
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat May 19 13:51:19 2007 +0200

Configure with --with-tty-group=tty.

This hardcodes the group used for the tty devices instead of relying on
correct autodetection, which can fail if the build environment doesn't
have a tty group.

diff --git a/debian/changelog b/debian/changelog
index 612a6a6..8f52508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-xterm (225-2) unstable; urgency=low
+xterm (225-2) UNRELEASED; urgency=low
 
+  [ Branden Robinson ]
   * Remove debian/NEWS; the events it attested to (like the "upcoming 7.0
 modularization" are no longer news, and are in the past.
 
- -- Branden Robinson <[EMAIL PROTECTED]>  Sun,  8 Apr 2007 22:37:50 -0400
+  [ Julien Cristau ]
+  * Configure with --with-tty-group=tty, to prevent security problems in case
+of buggy build environment (closes: #349142).
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sat, 19 May 2007 13:33:59 +0200
 
 xterm (225-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 030978c..6ca09ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,7 +86,7 @@ configure: $(STAMP_DIR)/patch $(STAMP_DIR)/configure
 $(STAMP_DIR)/configure: $(STAMP_DIR)/patch
dh_testdir
./configure --enable-logging --enable-wide-chars --enable-luit \
-   --enable-256-color \
+   --with-tty-group=tty --enable-256-color \
--prefix=/usr --exec-prefix=/usr --mandir=/usr/share/man \
--with-app-defaults=/etc/X11/app-defaults \
--disable-imake --enable-narrowproto --enable-exec-xterm \


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



Bug#424975: please don't conflict with fglrx-driver

2007-05-19 Thread Julien Cristau
On Fri, May 18, 2007 at 10:35:07 -0700, Thomas Bushnell BSG wrote:

> How can I overcome the problem on my system, since i have an
> fglrx-driver that does work?
> 
rename the fglrx package, or don't upgrade xserver-xorg-core?

Cheers,
Julien


signature.asc
Description: Digital signature


xsm: Changes to 'debian-unstable'

2007-05-19 Thread Timo Aaltonen
 debian/changelog |6 +++---
 debian/control   |1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 7a56d4384905af01ec3f302a315993cb05a1791b
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 14:17:27 2007 +0300

Remove Conflicts:, which shouldn't be necessary.

diff --git a/debian/changelog b/debian/changelog
index d5e969c..3460947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,9 +9,9 @@ xsm (1:1.0.1-1) UNRELEASED; urgency=low
 - Rename Package and Source.
 - Remove unnecessary Build-Deps.
 - Modify description.
-- Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3),
-  xutils (<=1:7.1.ds.3-1) to make upgrades smoother.
-- C/R: smproxy to work around old Ubuntu packaging.
+- Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<=1:7.1.ds.3-1)
+  to make upgrades smoother.
+- Replaces: smproxy to work around old Ubuntu packaging.
   * debian/copyright: Leave only copyright notices that relate to
 this package. FIXME:*rstart missing*
   * debian/xsm.install, rules: Edit to reflect new packaging.
diff --git a/debian/control b/debian/control
index 6077dcf..b5594f0 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Package: xsm
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (>= 1:7.0.0)
-Conflicts: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1), smproxy
 Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1), smproxy
 Description: X session manager
  This package provides the X session manager and related tools:


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



xinit: Changes to 'debian-unstable'

2007-05-19 Thread Timo Aaltonen
 debian/changelog |3 +--
 debian/control   |1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit e131349a9302c9a1f25d287ccc1f766cd3f594dc
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 14:15:50 2007 +0300

Remove Conflicts:, which shouldn't be necessary.

diff --git a/debian/changelog b/debian/changelog
index 07f0cb3..1f0030c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,7 @@ xinit (1.0.2-1) UNRELEASED; urgency=low
 - Rename Package and Source.
 - Remove unnecessary Build-Deps.
 - Modify description.
-- Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3) to make
-  upgrades smoother.
+- Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades smoother.
   * debian/copyright: Leave only copyright notices that relate to
 this package.
   * debian/xinit.install, rules: Edit to reflect new packaging.
diff --git a/debian/control b/debian/control
index bc04d6f..010ffcc 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Package: xinit
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (>= 1:7.0.0)
-Conflicts: xbase-clients (<= 1:7.2.ds2-3)
 Replaces: xbase-clients (<= 1:7.2.ds2-3)
 Description: X server initialisation tool
  xinit and startx are programs which facilitate starting an X server, and


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



xauth: Changes to 'debian-unstable'

2007-05-19 Thread Timo Aaltonen
 debian/changelog |3 +--
 debian/control   |1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 3d445fddff15ea7e108ba577f44df5b3853976e3
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 14:12:22 2007 +0300

Remove Conflicts:, which shouldn't be necessary.

diff --git a/debian/changelog b/debian/changelog
index 4eea4ba..668413d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,7 @@ xauth (1:1.0.2-1) UNRELEASED; urgency=low
 - Rename Package and Source.
 - Remove unnecessary Build-Deps.
 - Modify description.
-- Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3) to make
-   upgrades smoother.
+- Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades smoother.
   * debian/copyright: Leave only copyright notices that relate to
 this package.
   * debian/xauth.install, rules: Edit to reflect new packaging.
diff --git a/debian/control b/debian/control
index a1d085e..2002144 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Package: xauth
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (>= 1:7.0.0)
-Conflicts: xbase-clients (<= 1:7.2.ds2-3)
 Replaces: xbase-clients (<= 1:7.2.ds2-3)
 Suggests: pdksh
 Description: X authentication utility


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



x11-xserver-utils: Changes to 'debian-unstable'

2007-05-19 Thread Timo Aaltonen
 debian/changelog |7 ---
 debian/control   |3 ---
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 6e1e2a7e1be922bea95398bae71c1329e8a71478
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 14:10:14 2007 +0300

Remove Conflicts:, which shouldn't be necessary.

diff --git a/debian/changelog b/debian/changelog
index 101169e..9284755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,9 +23,10 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
 - Rename Package and Source.
 - Remove unnecessary Build-Deps.
 - Modify description.
-- Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3),
-  xutils (<=1:7.1.ds.3-1) to make upgrades smoother.
-- C/R:  to work around old Ubuntu packaging.
+- Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<=1:7.1.ds.3-1)
+  to make upgrades smoother.
+- Replaces:  to work around old Ubuntu
+  packaging.
   * debian/copyright: Leave only copyright notices that relate to
 this package. FIXME:*rgb, sessreg missing*
   * debian/x11-xserver-utils.install, rules: Edit to reflect new
diff --git a/debian/control b/debian/control
index f5edb7a..6023ee1 100644
--- a/debian/control
+++ b/debian/control
@@ -35,9 +35,6 @@ Package: x11-xserver-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (>= 1:7.0.0)
-Conflicts: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
- iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
- xsetmode, xsetroot, xstdcmap, xtrap, xvidtune
 Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
  iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
  xsetmode, xsetroot, xstdcmap, xtrap, xvidtune


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



x11-xfs-utils: Changes to 'debian-unstable'

2007-05-19 Thread Timo Aaltonen
 debian/changelog |8 
 debian/control   |2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit f0e9da4a6bc97935148e81da9418b918fd15a66e
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 14:07:34 2007 +0300

Remove Conflicts:, which shouldn't be necessary.

diff --git a/debian/changelog b/debian/changelog
index a820bf1..a1e22fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,10 +10,10 @@ x11-xfs-utils (1) UNRELEASED; urgency=low
 - Rename Package and Source.
 - Remove unnecessary Build-Deps.
 - Clean up the description.
-- Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3),
-  xutils (<=1:7.1.ds.3-1) to make upgrades smoother.
-- C/R: fslsfonts, fstobdf, showfont, xfsinfo to work around old Ubuntu
-  packaging.
+- Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<=1:7.1.ds.3-1)
+  to make upgrades smoother.
+- Replaces: fslsfonts, fstobdf, showfont, xfsinfo to work around old
+  Ubuntu packaging.
   * debian/copyright: Add fstobdf.
   * debian/x11-xfs-utils.dirs: Remove.
   * debian/x11-xfs-utils.install, rules: Edit to reflect new packaging.
diff --git a/debian/control b/debian/control
index e9adf3c..89752f3 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,6 @@ Package: x11-xfs-utils
 Architecture: any
 Pre-Depends: x11-common (>= 1:7.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}, xfonts-utils, xutils-dev
-Conflicts: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
- fslsfonts, fstobdf, showfont, xfsinfo
 Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
  fslsfonts, fstobdf, showfont, xfsinfo
 Description: X font server utilities


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



x11-xkb-utils: Changes to 'debian-unstable'

2007-05-19 Thread Timo Aaltonen
 debian/changelog |6 +++---
 debian/control   |1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 9019e9079b7f2ec6cd1c8e17eb82003afa892799
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 14:08:52 2007 +0300

Remove Conflicts:, which shouldn't be necessary.

diff --git a/debian/changelog b/debian/changelog
index 4599ff7..e963c29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,9 @@ x11-xkb-utils (1) UNRELEASED; urgency=low
 - Rename Package and Source.
 - Remove unnecessary Build-Deps.
 - Copy description from Ubuntu xkbutils-package.
-- Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades
-  smoother.
-- C/R:  to work around old Ubuntu packaging.
+- Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades smoother.
+- Replaces:  to work around old Ubuntu
+  packaging.
   * debian/copyright: Leave only copyright notices that relate to
 this package.
   * debian/x11-xkb-utils.{dirs,install}, rules: Edit to reflect new
diff --git a/debian/control b/debian/control
index 8f8ad0f..aaa471c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,6 @@ Package: x11-xkb-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (>= 1:7.0.0)
-Conflicts: xbase-clients (<= 1:7.2.ds2-3), setxkbmap, xkbcomp, xkbevd, 
xkbprint, xkbutils
 Replaces: xbase-clients (<= 1:7.2.ds2-3), setxkbmap, xkbcomp, xkbevd, 
xkbprint, xkbutils
 Description: X11 XKB utilities
  xkbutils contains a number of client-side utilities for XKB, the X11


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



x11-utils: Changes to 'debian-unstable'

2007-05-19 Thread Timo Aaltonen
 debian/changelog |7 ---
 debian/control   |3 ---
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit b5f50c8b7ae90974077beafb5d0552a6c00bf52e
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 14:06:23 2007 +0300

Remove Conflicts:, which shouldn't be necessary.

diff --git a/debian/changelog b/debian/changelog
index 2a18106..abcfc2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,9 +24,10 @@ x11-utils (1) UNRELEASED; urgency=low
 - Rename Package and Source.
 - Remove unnecessary Build-Deps.
 - Modify description.
-- Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3),
-  xutils (<=1:7.1.ds.3-1) to make upgrades smoother.
-- C/R:  to work around old Ubuntu packaging.
+- Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<=1:7.1.ds.3-1)
+  to make upgrades smoother.
+- Replaces:  to work around old Ubuntu
+  packaging.
   * debian/copyright: Leave only copyright notices that relate to
 this package. FIXME:*luit missing*
   * debian/x11-utils.install, rules: Edit to reflect new
diff --git a/debian/control b/debian/control
index 0f8fd6f..1832cf4 100644
--- a/debian/control
+++ b/debian/control
@@ -40,9 +40,6 @@ Package: x11-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (>= 1:7.0.0)
-Conflicts: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
- appres, editres, listres, luit, viewres, xdpyinfo, xdriinfo, xev, xfd, 
xfontsel,
- xkill, xlsatoms, xlsclients, xlsfonts, xmessage, xprop, xvinfo, xwininfo
 Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
  appres, editres, listres, luit, viewres, xdpyinfo, xdriinfo, xev, xfd, 
xfontsel,
  xkill, xlsatoms, xlsclients, xlsfonts, xmessage, xprop, xvinfo, xwininfo


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



x11-apps: Changes to 'debian-unstable'

2007-05-19 Thread Timo Aaltonen
 debian/changelog |5 ++---
 debian/control   |3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 13a7a180651337a5ab119f8f90546f962f529903
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 14:02:09 2007 +0300

Remove Conflicts:, which shouldn't be necessary.

diff --git a/debian/changelog b/debian/changelog
index b778d2c..bf93220 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,9 +25,8 @@ x11-apps (1) UNRELEASED; urgency=low
 - Remove unnecessary Build-Deps.
 - Split the Build-Dep line into multiple lines
 - Clean up the description.
-- Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades
-  smoother.
-- C/R:  to work around old Ubuntu packaging.
+- Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades smoother.
+- Replaces:  to work around old Ubuntu 
packaging.
   * debian/copyright: Leave only copyright notices that affect this package.
   * debian/x11-apps.dirs: Remove.
   * debian/x11-apps.install, rules: Edit to reflect new packaging.
diff --git a/debian/control b/debian/control
index 6913d19..87fb751 100644
--- a/debian/control
+++ b/debian/control
@@ -37,9 +37,6 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (>= 1:7.0.0)
 Suggests: mesa-utils
-Conflicts: xbase-clients (<= 1:7.2.ds2-3), oclock, x11perf, xbiff, xcalc, 
xclipboard,
- xclock, xconsole, xcursorgen, xditview, xedit, xeyes, xload, xlogo, xmag, 
xman,
- xmore, xwd, xwud
 Replaces: xbase-clients (<= 1:7.2.ds2-3), oclock, x11perf, xbiff, xcalc, 
xclipboard,
  xclock, xconsole, xcursorgen, xditview, xedit, xeyes, xload, xlogo, xmag, 
xman,
  xmore, xwd, xwud


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



Bug#425095: Etch Xorg memory leak?

2007-05-19 Thread Michel Dänzer
On Fri, 2007-05-18 at 21:23 -0400, Douglas Allan Tutty wrote:
> 
> ssh titan -f /usr/bin/kpdf
> open a long file
> view each page in turn
> 
> As each new page is viewed, xorg uses more memory, and swap goes up.
> 
> Its as if xorg is using memory to hold the image for the new page and
> isn't releasing the memory used to hold the old page.  I conjuecture
> that its holding all viewed pages in memory.

Quite possibly, and likely on behalf of the client, i.e. kpdf in this
case. Please rule out first that kpdf is keeping pixmaps around, be it
on purpose or by accident.


-- 
Earthling Michel Dänzer   |  http://tungstengraphics.com
Libre software enthusiast |  Debian, X and DRI developer



Bug#423739: libgl1-mesa-dri: banding in rendering when using blending for transparency

2007-05-19 Thread Michel Dänzer
On Sat, 2007-05-19 at 00:50 -0400, Dan Torop wrote:
> 
> > Please try verifying the indication that it's a Debian specific issue.
> > E.g., does building the patched Debian source tree the same way as you
> > built the upstream tree produce a working or defect r200_dri.so? Are the
> > same compiler flags used? ...
> 
> If I build from the patched Debian source tree as I would from the upstream 
> tree
> ("make linux-dri-x86") the test program works properly.  If I use a
> debian-specific
> config ("make debian-dri-i386" or debian/rules), the test program fails,
> but in a different way from the failure I reported before (rather than
> seeing banding
> in the output square, I see an non-50%-gray square whose color fluctuates over
> X server restarts, e.g. #98A5AF then #98A57F, etc.).
> 
> The debian-specific config uses -O2 instead of -O.  In fact, it turns
> out that everything
> works fine with the debian-dri-i386 if I compile everything at -O2 except for
> src/mesa/drivers/dri/r200/r200_span.c which must be compiled with the
> -fno-regmove
> flag in order to work properly.

Did you use -fno-strict-aliasing along with -O2? The Mesa codebase is
known not to be strict aliasing safe.


> None of these builds have replicated the banding I saw with the debian 
> binaries.
> 
> Incidentally, I don't actually need to restart the X server to
> differentiate between
> working and defective libraries, the failure seems dependent on the version of
> r200_dri.so loaded when I execute the test program, and not at all
> dependent on the
> version of r200_dri.so loaded on X server startup (even if the two don't 
> match).

Yes, with direct rendering, the *_dri.so is loaded by the application
process.


-- 
Earthling Michel Dänzer   |  http://tungstengraphics.com
Libre software enthusiast |  Debian, X and DRI developer



x11-xfs-utils: Changes to 'debian-unstable'

2007-05-19 Thread Timo Aaltonen
New branch 'debian-unstable' available with the following commits:
commit 2cffe2bc1297ad8d81962ea5dd14680d3be03d62
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 11:51:42 2007 +0300

rename to x11-xfs-utils to minimize the chance of confusion with xfs the 
filesystem.
x11-xfs-utils.install: rename, and modify so that every package gets 
installed.

commit 65386cf6ea1a65e89fba78b32770f1876379f5f1
Merge: d11428820e8c7f9f9d09ef908c6f1208079445b1 
271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 09:31:14 2007 +0300

Merge branch 'debian-unstable' of git://git.debian.org/git/pkg-xorg/xsfbs 
into debian-unstable

commit d11428820e8c7f9f9d09ef908c6f1208079445b1
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 03:06:27 2007 +0300

debian/{rules, xfs-utils.install}: remove old cruft.

commit d70b538077795bec1aaebd2ba87fb163e957ce56
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 03:00:56 2007 +0300

debian/xsfbs: import, xutils didn't have it.

commit aa187529eae4987cfc46ff3824a74a3e05d2acd1
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 02:04:11 2007 +0300

debian/control: add Conflicts/Replaces.

commit 58ff550cfb6af91a016aeb4d93b909fbd98e1143
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 00:38:09 2007 +0300

Split xbase-clients/xutils, new versioning.

commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <[EMAIL PROTECTED](none)>
Date:   Thu Apr 12 23:18:32 2007 -0400

Test for existence of debian/patches directory before creating a symlink to 
it.

This prevents packages that apply no patches from ending up with a broken
symlink in them.

Remove SVN keyword.

Update copyright notice.

commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 2 20:28:15 2007 +0100

Fix copy/paste typo in the input driver provides.

commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Thu Mar 1 22:06:04 2007 -0500

Fix one missed bit from the serverabiver -> serverminver rename

commit 1344bb9deda5ba54215d0ec5b164706999236b0b
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Feb 28 23:08:17 2007 -0500

Fix typo that prevented the input abi versioning from working.
Good catch Julien

commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Feb 27 21:50:20 2007 -0500

Add support for X server input ABI versioning

commit 00fc799ec3107c0c29286b75e780bef82c1fa137
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Feb 21 22:47:30 2007 -0500

Fix name of serverminver

commit dacefd5a6bb9f786c78f35358273e3214c7492e9
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Feb 21 21:37:52 2007 -0500

Update serverabi generation to also account for driver Provides

* Have the drivers use the file serverminver instead of serverabiver in 
order
  to generate the versioned dependency on the server. This is clearer
  naming.
* Use serverabiver to actually store the server's video ABI version. This
  is used to generate the Provides: line for drivers so the server can
  depend on them properly. This goes in to the substvar
  xviddriver:Provides.

commit 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Feb 17 16:01:41 2007 +0100

Add new "serverabi" rule to generate drivers dependency on the server.

commit 502f9412dcaa6abd23b94372d86824c895cea3b8
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Feb 4 20:43:28 2007 -0500

Move the files so they'll be put in debian/xsfbs automatically when pulled
in to our git repos

commit d4027f3605f6f9cea4ec15d71f8388b0d92197e5
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Feb 4 19:07:17 2007 -0500

Add xfsinfo 1.0.1 source which was lost in the conversion

commit 905563e467618b21b4e2edcfae4416cc9f9470c9
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Feb 4 19:06:31 2007 -0500

Add showfont 1.0.1 which was lost in the conversion

commit 5e78ae1336b533c7d4a155c8920fcd0af77ecbfa
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Feb 4 19:05:46 2007 -0500

Add sessreg 1.0.1 source which was lost in the conversion

commit bdf0d4d4ba7c1da6207ff57b07fe0dcb74fcd053
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Feb 4 19:04:44 2007 -0500

Add scripts 1.0.1 source which was lost in the conversion

commit 40413944e68af767126302a9602cb3568d19ddc5
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Feb 4 19:03:45 2007 -0500

Add luit 1.0.1 source which was lost in the conversion

commit 5affac1621f1a12dbb185733eb8a6fbb04ce724b
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Feb 4 19:02:41 2007 -0500

Add fslsfonts 1.0.1 source which was missed in the conversion

commit 017f48457d846193ad64d4eed20e28805f0c3c

xfs-utils: Changes to 'debian-unstable'

2007-05-19 Thread Timo Aaltonen
 debian/changelog |8 
 debian/control   |6 +++---
 debian/rules |2 +-
 debian/x11-xfs-utils.install |2 ++
 debian/xfs-utils.install |6 --
 5 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit 2cffe2bc1297ad8d81962ea5dd14680d3be03d62
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 11:51:42 2007 +0300

rename to x11-xfs-utils to minimize the chance of confusion with xfs the 
filesystem.
x11-xfs-utils.install: rename, and modify so that every package gets 
installed.

diff --git a/debian/changelog b/debian/changelog
index f2ce2c8..a820bf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfs-utils (1) UNRELEASED; urgency=low
+x11-xfs-utils (1) UNRELEASED; urgency=low
 
   * Split xbase-clients/xutils, new versioning.
   * Included packages:
@@ -15,13 +15,13 @@ xfs-utils (1) UNRELEASED; urgency=low
 - C/R: fslsfonts, fstobdf, showfont, xfsinfo to work around old Ubuntu
   packaging.
   * debian/copyright: Add fstobdf.
-  * debian/xfs-utils.dirs: Remove.
-  * debian/xfs-utils.install, rules: Edit to reflect new packaging.
+  * debian/x11-xfs-utils.dirs: Remove.
+  * debian/x11-xfs-utils.install, rules: Edit to reflect new packaging.
   * debian/local/: Remove.
   * debian/patches: Remove.
   * debian/rules: Comment out files from scripts/.
 
- -- Timo Aaltonen <[EMAIL PROTECTED]>  Sat, 19 May 2007 03:04:08 +0300
+ -- Timo Aaltonen <[EMAIL PROTECTED]>  Sat, 19 May 2007 11:48:38 +0300
 
 xutils (1:7.1.ds.3-2) UNRELEASED; urgency=low
 
diff --git a/debian/control b/debian/control
index 6331e97..e9adf3c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: xfs-utils
+Source: x11-xfs-utils
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson 
<[EMAIL PROTECTED]
 Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0), 
libfs-dev (>= 2:1.0.0)
 Standards-Version: 3.7.2.0
 
-Package: xfs-utils
+Package: x11-xfs-utils
 Architecture: any
 Pre-Depends: x11-common (>= 1:7.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}, xfonts-utils, xutils-dev
@@ -15,7 +15,7 @@ Conflicts: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 
1:7.1.ds.3-1),
 Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
  fslsfonts, fstobdf, showfont, xfsinfo
 Description: X font server utilities
- xfs-utils provides a set of utility programs useful on a system that uses
+ x11-xfs-utils provides a set of utility programs useful on a system that uses
  a X font server.
  .
  The programs in this package include:
diff --git a/debian/rules b/debian/rules
index 82fe7ed..3a8faca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@
 #export DH_VERBOSE=1
 
 # set this to the name of the main shlib's binary package
-PACKAGE = xfs-utils
+PACKAGE = x11-xfs-utils
 
 include debian/xsfbs/xsfbs.mk
 
diff --git a/debian/x11-xfs-utils.install b/debian/x11-xfs-utils.install
new file mode 100644
index 000..68671de
--- /dev/null
+++ b/debian/x11-xfs-utils.install
@@ -0,0 +1,2 @@
+usr/bin/*
+usr/share/man/man1/*
diff --git a/debian/xfs-utils.install b/debian/xfs-utils.install
deleted file mode 100644
index 95e52e7..000
--- a/debian/xfs-utils.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/fslsfonts
-usr/bin/showfont
-usr/bin/xfsinfo
-usr/share/man/man1/fslsfonts.1
-usr/share/man/man1/showfont.1
-usr/share/man/man1/xfsinfo.1

commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <[EMAIL PROTECTED](none)>
Date:   Thu Apr 12 23:18:32 2007 -0400

Test for existence of debian/patches directory before creating a symlink to 
it.

This prevents packages that apply no patches from ending up with a broken
symlink in them.

Remove SVN keyword.

Update copyright notice.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
-# $Id$
 
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
 
 # Copyright 1996 Stephen Early
 # Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
 # Copyright 2005 David Nusinow
 #
 # Licensed under the GNU General Public License, version 2.  See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
-   if [ ! -e patches ]; then \
+   if [ -e debian/patches ] && [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
>$@

commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 2 20:28:15 2007 +0100

Fix copy/paste typo in the input driver provides.

di

xsm: Changes to 'debian-unstable'

2007-05-19 Thread Timo Aaltonen
 debian/changelog   |6 +++---
 debian/xsm.install |1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 27de21594cbb14c8871e06231883903f042f44f4
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 11:48:09 2007 +0300

change versioning to match xsm version.
add missing files to xsm.install.

diff --git a/debian/changelog b/debian/changelog
index 3c67c58..d5e969c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-xsm (1) UNRELEASED; urgency=low
+xsm (1:1.0.1-1) UNRELEASED; urgency=low
 
-  * Split xbase-clients, new versioning.
+  * Split xbase-clients, new versioning using the xsm module version.
   * Included packages:
 - rstart 1.0.2
 - smproxy 1.0.2
@@ -19,7 +19,7 @@ xsm (1) UNRELEASED; urgency=low
   * debian/local/: Remove.
   * debian/patches: Delete patches which do not relate to this package.
 
- -- Timo Aaltonen <[EMAIL PROTECTED]>  Sat, 19 May 2007 02:01:15 +0300
+ -- Timo Aaltonen <[EMAIL PROTECTED]>  Sat, 19 May 2007 11:08:44 +0300
 
 xbase-clients (1:7.2.ds2-3) unstable; urgency=low
 
diff --git a/debian/xsm.install b/debian/xsm.install
index bdddeec..7eeaca4 100644
--- a/debian/xsm.install
+++ b/debian/xsm.install
@@ -2,3 +2,4 @@ usr/bin/*
 usr/share/man/man1/*
 usr/lib/X11/xsm/system.xsm
 etc/X11/app-defaults/*
+usr/lib/X11/rstart/*


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



xinit: Changes to 'debian-unstable'

2007-05-19 Thread Timo Aaltonen
 debian/changelog |   11 ++-
 debian/patches/03_debian_startx_manpage.diff |   77 +++
 debian/patches/04_startx_paths.diff  |   50 +
 debian/patches/05_use_bash.diff  |   20 +++
 debian/patches/09_debian_startx_manpage.diff |   77 ---
 debian/patches/12_startx_paths.diff  |   50 -
 debian/patches/series|9 +--
 debian/rules |   14 ++--
 debian/xinit.install |2 
 9 files changed, 168 insertions(+), 142 deletions(-)

New commits:
commit 1781832f7cb5d45830957a91a0fe47c2c2370215
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 11:03:15 2007 +0300

debian/patches: add 05_use_bash.diff (LP: #31241) (Freedesktop: #4449), 
comment out the rest.
debian/rules: install xserverrc here
debian/xinit.install: fix

diff --git a/debian/changelog b/debian/changelog
index 127c3d7..07f0cb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,14 @@ xinit (1.0.2-1) UNRELEASED; urgency=low
 this package.
   * debian/xinit.install, rules: Edit to reflect new packaging.
   * debian/xinit.dirs: Remove.
-  * debian/patches: Delete patches which do not relate to this package.
-
- -- Timo Aaltonen <[EMAIL PROTECTED]>  Sat, 19 May 2007 01:55:32 +0300
+  * debian/patches:
+- Delete patches which do not relate to this package.
+- Comment out those that belong here, they seem to be applied
+  already.
+- 05_use_bash.diff: fix a shell usage error (LP: #31241),
+  (Freedesktop: #4449)
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]>  Sat, 19 May 2007 10:55:03 +0300
 
 xbase-clients (1:7.2.ds2-3) unstable; urgency=low
 
diff --git a/debian/patches/05_use_bash.diff b/debian/patches/05_use_bash.diff
new file mode 100644
index 000..aa4a546
--- /dev/null
+++ b/debian/patches/05_use_bash.diff
@@ -0,0 +1,20 @@
+Index: xinit/startx.cpp
+===
+--- xinit.orig/startx.cpp  2007-05-19 10:14:49.0 +0300
 xinit/startx.cpp   2007-05-19 10:15:15.0 +0300
+@@ -1,4 +1,4 @@
+-XCOMM!SHELL_CMD
++XCOMM!/bin/bash
+ 
+ XCOMM $Xorg: startx.cpp,v 1.3 2000/08/17 19:54:29 cpqbld Exp $
+ XCOMM
+Index: xinit/xinitrc.cpp
+===
+--- xinit.orig/xinitrc.cpp 2007-05-19 10:15:24.0 +0300
 xinit/xinitrc.cpp  2007-05-19 10:15:35.0 +0300
+@@ -1,4 +1,4 @@
+-XCOMM!SHELL_CMD
++XCOMM!/bin/bash
+ XCOMM $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+ 
+ XCOMM /etc/X11/xinit/xinitrc
diff --git a/debian/patches/series b/debian/patches/series
index 0bef68e..391785f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 #02_startx_hostname.diff
 #03_debian_startx_manpage.diff -p0
 #04_startx_paths.diff
+05_use_bash.diff
diff --git a/debian/rules b/debian/rules
index db9f8cc..b1cd566 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,9 @@ install: build
 
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
 
+   install -d debian/tmp/etc/X11/xinit
+   install -m 755 debian/local/xserverrc debian/tmp/etc/X11/xinit
+
 # Build architecture-dependent files here.
 binary-arch: build install
dh_testdir
diff --git a/debian/xinit.install b/debian/xinit.install
index 84acd07..ac0f952 100644
--- a/debian/xinit.install
+++ b/debian/xinit.install
@@ -1,4 +1,4 @@
 usr/bin/*
 usr/share/man/man1/*
-debian/local/xserverrc etc/X11/xinit
 usr/lib/X11/xinit/xinitrc etc/X11/xinit
+etc/X11/xinit/xserverrc

commit 284a8dbcf4f9b70736220960b8363d2ac73b0c49
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Sat May 19 10:26:16 2007 +0300

debian/rules: modify so it works.
debian/patches/*: renumber the patches, comment out from series as they are 
all applied
already.

diff --git a/debian/patches/03_debian_startx_manpage.diff 
b/debian/patches/03_debian_startx_manpage.diff
new file mode 100644
index 000..4039218
--- /dev/null
+++ b/debian/patches/03_debian_startx_manpage.diff
@@ -0,0 +1,77 @@
+$Id: 902_debian_startx_manpage.diff 867 2005-11-13 16:29:11Z dnusinow $
+
+Fix the startx manpage to be more correct for our setup; this patch by Branden
+Robinson.
+
+Index: xinit/startx.man
+===
+--- xinit/startx.man.orig  2005-11-12 16:31:16.0 -0500
 xinit/startx.man   2005-11-13 11:00:34.0 -0500
+@@ -74,6 +74,28 @@
+ .RE
+ #ifdef __SCOMAN__
+ .PP
++Note that in the Debian system, what many people traditionally put in the
++.I .xinitrc
++file should go in
++.I .xsession
++instead; this permits the same X environment to be presented whether
++.IR startx ,
++.IR xdm ,
++or
++.I xinit
++is used to start the X session. All discussion of the
++.I .xinitrc
++file in the
++.IR xinit (1)
++m