Bug#498823: xfs essentially works, so this is not technically RC

2008-10-10 Thread Thomas Viehmann 
severity 498823 important
tag 498823 + patch
thanks

Hi,

some analysis (Congstar/DTAG needs to fix my DSL line, so I had to work
on stuff I remembered):
1) all of xfs essentially works. Logging via syslog does and so does
   pidfile-management by start-stop-daemon,
2) loggging to a file is still enabled in the config file, contrary to
   the comment there, xfs tries to open that even if syslog logging
   is enabled. Attached patch fixes this.
3) xfs tries to remove the pidfile at shutdown which fails (because the
   pidfile is owned by root and xfs is running as nobody) and causes an
   (irritating, but not pointing at a severe issue) log message to be
   printed. Ways to fix this include
   - make the message sound more harmless (Could not remove pid file,
 hoping that something else does), or
   - make pidfile a configuration option with permitting to disable
 this.

I'd be happy to NMU this if it helps anyone, prepare a patch that
implements either solution to 3), or both, if Julien wants to give me a
shout.

Kind regards

T.
-- 
Thomas Viehmann, http://thomas.viehmann.net/
Hi,

xfs tries to open the logfile even if it uses syslog (as well).
This diables the logfile in the config file, eliminating the
(confusing but not that important) error message.
The other message (xfs not being able to handle the pid file
by itself) remains but is equally harmless: xfs doesn't need
to be concerned with it's pidfile.
If you want, I can look into adding a config option disabling
xfs's attempt to handle the pidfile, too.

Kind regards

T.

diff -u xfs-1.0.8/debian/changelog xfs-1.0.8/debian/changelog
--- xfs-1.0.8/debian/changelog
+++ xfs-1.0.8/debian/changelog
@@ -1,3 +1,12 @@
+xfs (1:1.0.8-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Adjust config file to disable logging to file (Closes: #...).
+We log to syslog, but with this parameter, xfs tries to open
+the logfile which fails because we run as nobody.
+
+ -- Thomas Viehmann [EMAIL PROTECTED]  Thu, 09 Oct 2008 22:32:45 +0200
+
 xfs (1:1.0.8-2) unstable; urgency=low
 
   * Add $syslog dependency to the xfs init.d script (closes: #489232).
diff -u xfs-1.0.8/debian/patches/02_debian_setup.diff xfs-1.0.8/debian/patches/02_debian_setup.diff
--- xfs-1.0.8/debian/patches/02_debian_setup.diff
+++ xfs-1.0.8/debian/patches/02_debian_setup.diff
@@ -8,7 +8,7 @@
 ===
 --- a/config.cpp.orig	2006-03-07 22:09:01.0 -0500
 +++ b/config.cpp	2006-03-07 22:13:53.0 -0500
-@@ -1,15 +1,19 @@
+@@ -1,15 +1,20 @@
  XCOMM font server configuration file
  XCOMM $Xorg: config.cpp,v 1.3 2000/08/17 19:54:19 cpqbld Exp $
  
@@ -18,8 +18,10 @@
  clone-self = on
 -use-syslog = off
 -catalogue = DEFAULTFONTPATH
-+XCOMM log messages to FSERRORS (if syslog is not used)
- error-file = FSERRORS
++XCOMM log messages to FSERRORS
++XCOMM (Debian xfs uses syslog by default to run as nobody)
+-error-file = FSERRORS
++XCOMM error-file = FSERRORS
 +XCOMM log errors using syslog
 +use-syslog = on
 +XCOMM turn off TCP port listening (Unix domain connections are still permitted)

Processed: xfs essentially works, so this is not technically RC

2008-10-10 Thread Debian Bug Tracking System 
Processing commands for [EMAIL PROTECTED]:

 severity 498823 important
Bug#498823: xfs: recent change from 'root' to 'nobody' perhaps requires more 
thought
Severity set to `important' from `serious'

 tag 498823 + patch
Bug#498823: xfs: recent change from 'root' to 'nobody' perhaps requires more 
thought
There were no tags set.
Tags added: patch

 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]

Processed: retitle 498823 to xfs shows scary log messages

2008-10-10 Thread Debian Bug Tracking System 
Processing commands for [EMAIL PROTECTED]:

 retitle 498823 xfs shows scary log messages
Bug#498823: xfs: recent change from 'root' to 'nobody' perhaps requires more 
thought
Changed Bug title to `xfs shows scary log messages' from `xfs: recent change 
from 'root' to 'nobody' perhaps requires more thought'.


End of message, 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]

xorg-server: Changes to 'ubuntu'

2008-10-10 Thread Timo Aaltonen 
 debian/changelog |5 ++
 debian/control   |1 
 debian/patches/137_add_device_property_support.patch |   37 +--
 debian/serverminver  |2 -
 4 files changed, 25 insertions(+), 20 deletions(-)

New commits:
commit 607306b3d744e14f74147c984d5ad27fcdda248c
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Thu Oct 9 14:19:13 2008 +0300

Add Breaks for synaptics, evdev and bump serverminver.

diff --git a/debian/changelog b/debian/changelog
index 63be19c..89ee923 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ xorg-server (2:1.5.1-1ubuntu3) UNRELEASED; urgency=low
 match the current version in master (final API for XI 1.5).
 (LP: #274728)
   * Bump the build-dep on x11proto-input-dev and libxi-dev.
+  * Bump the serverminver because of newer properties API.
+  * Add Breaks against current synaptics and evdev, since they use the old
+API and need to be updated with the server.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Mon, 29 Sep 2008 09:30:04 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED]  Thu, 09 Oct 2008 14:18:23 +0300
 
 xorg-server (2:1.5.1-1ubuntu2) intrepid; urgency=low
 
diff --git a/debian/control b/debian/control
index c1f1346..70bdf14 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,7 @@ Conflicts: xserver-xorg ( 6.8.2-38), xserver-xfree86 ( 
1:7.0.0),
  xserver-xorg-video-2, xserver-xorg-input-2
 Replaces: xserver-xorg ( 6.8.2-38), xserver-xfree86 ( 1:7.0.0),
  xserver-common
+Breaks: xserver-xorg-input-synaptics (= 0.15.2-0ubuntu3), 
xserver-xorg-input-evdev (= 1:2.0.99+git20080912-0ubuntu2)
 Provides: xserver
 Description: Xorg X server - core server
  The Xorg X server is an X server for several architectures and operating
diff --git a/debian/serverminver b/debian/serverminver
index 557865f..cf49710 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1 +1 @@
-2:1.4.99.906-2ubuntu2
+2:1.5.1-1ubuntu3

commit b1b567e30678b6515ff3067ed7f1aae5f541c3ae
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Thu Oct 9 13:08:17 2008 +0300

Fix 137 backport, one line missing from XIGetDeviceProperty

..which resulted in an endless loop. Yay.

diff --git a/debian/patches/137_add_device_property_support.patch 
b/debian/patches/137_add_device_property_support.patch
index 56a1701..34dca94 100644
--- a/debian/patches/137_add_device_property_support.patch
+++ b/debian/patches/137_add_device_property_support.patch
@@ -1,7 +1,7 @@
 Index: xorg-server/Xi/Makefile.am
 ===
 xorg-server.orig/Xi/Makefile.am2008-09-27 00:32:44.0 +0300
-+++ xorg-server/Xi/Makefile.am 2008-09-27 00:32:51.0 +0300
+--- xorg-server.orig/Xi/Makefile.am2008-10-09 12:45:05.0 +0300
 xorg-server/Xi/Makefile.am 2008-10-09 12:45:11.0 +0300
 @@ -75,6 +75,8 @@
ungrdevb.c \
ungrdevb.h \
@@ -14,8 +14,8 @@ Index: xorg-server/Xi/Makefile.am
  EXTRA_DIST = stubs.c
 Index: xorg-server/Xi/exglobals.h
 ===
 xorg-server.orig/Xi/exglobals.h2008-09-27 00:32:44.0 +0300
-+++ xorg-server/Xi/exglobals.h 2008-09-27 00:32:51.0 +0300
+--- xorg-server.orig/Xi/exglobals.h2008-10-09 12:45:05.0 +0300
 xorg-server/Xi/exglobals.h 2008-10-09 12:45:11.0 +0300
 @@ -50,6 +50,7 @@
  extern Mask DeviceButtonGrabMask;
  extern Mask DeviceButtonMotionMask;
@@ -34,8 +34,8 @@ Index: xorg-server/Xi/exglobals.h
  
 Index: xorg-server/Xi/extinit.c
 ===
 xorg-server.orig/Xi/extinit.c  2008-09-27 00:32:44.0 +0300
-+++ xorg-server/Xi/extinit.c   2008-09-27 00:32:51.0 +0300
+--- xorg-server.orig/Xi/extinit.c  2008-10-09 12:45:05.0 +0300
 xorg-server/Xi/extinit.c   2008-10-09 12:45:11.0 +0300
 @@ -109,6 +109,8 @@
  #include ungrdev.h
  #include ungrdevb.h
@@ -175,8 +175,8 @@ Index: xorg-server/Xi/extinit.c
 Index: xorg-server/Xi/xiproperty.c
 ===
 --- /dev/null  1970-01-01 00:00:00.0 +
-+++ xorg-server/Xi/xiproperty.c2008-09-27 00:36:39.0 +0300
-@@ -0,0 +1,772 @@
 xorg-server/Xi/xiproperty.c2008-10-09 13:07:10.0 +0300
+@@ -0,0 +1,773 @@
 +/*
 + * Copyright © 2006 Keith Packard
 + * Copyright © 2008 Peter Hutterer
@@ -596,6 +596,7 @@ Index: xorg-server/Xi/xiproperty.c
 +return rc;
 +}
 +}
++  handler = handler-next;
 +}
 +}
 +*value = prop-value;
@@ -952,7 +953,7 @@ Index: xorg-server/Xi/xiproperty.c
 Index: xorg-server/Xi/xiproperty.h
 ===
 --- /dev/null  1970-01-01 00:00:00.0 +
-+++

Re: Bug#501574: warsow: crashes at startup (warsow_bin: shader/slang/slang_emit.c:978 ...)

2008-10-10 Thread Michel Dänzer 
On Thu, 2008-10-09 at 17:26 -0400, Andres Mejia wrote:
 Hello Debian X Strike Force. There's a bug in warsow that according to the 
 Warsow developers, is due to a buggy driver.
 
 I can reproduce this bug with a machine using a mesa driver, but on a machine 
 with the proprietary nvidia drivers, I can't reproduce this bug.

Does it still happen with libgl1-mesa-dri 7.2-1 from experimental? If
so, it would be good to make sure this is reported in upstream bugzilla
(preferably after first confirming it isn't fixed in upstream Git
either).

Maybe it's possible to somehow make warsow not try to use any GLSL
functionality as a workaround?


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


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

Processed: Re: Bug#501718: xserver-xorg-video-radeon: Crash when using minimal ServeryLayout

2008-10-10 Thread Debian Bug Tracking System 
Processing commands for [EMAIL PROTECTED]:

 reassign 501718 xserver-xorg-core
Bug#501718: xserver-xorg-video-radeon: Crash when using minimal ServeryLayout
Bug reassigned from package `xserver-xorg-video-radeon' to `xserver-xorg-core'.

 kthxbye
Stopping processing here.

Please contact me if you need assistance.

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


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

Bug#501718: xserver-xorg-video-radeon: Crash when using minimal ServeryLayout

2008-10-10 Thread Michel Dänzer 
reassign 501718 xserver-xorg-core
kthxbye

On Thu, 2008-10-09 at 21:55 +0200, Jordi Mallach wrote:
 
 Using packages from experimental on PPC, I've experimented a reproducible 
 crash
 with a certain configuration file.
 
 What triggers it is having a minimal ServerLayout with an InputDevice (Generic
 Keyboard) and the Identifier, but also with just the Identifier stanza.

Sounds like a bug in the X server or maybe an input driver, but probably
not the video driver...


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



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

Bug#498823: pid-file part wrong

2008-10-10 Thread Thomas Viehmann 

severity 498823 serious
tag 498823 - patch
thanks

As Julien pointed out, this was wrong w.r.t. the pidfile.
I'll have a new patch tomorrow or so.

Kind regards

T.



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

Processed: pid-file part wrong

2008-10-10 Thread Debian Bug Tracking System 
Processing commands for [EMAIL PROTECTED]:

 severity 498823 serious
Bug#498823: xfs shows scary log messages
Severity set to `serious' from `important'

 tag 498823 - patch
Bug#498823: xfs shows scary log messages
Tags were: patch
Tags removed: patch

 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]

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

2008-10-10 Thread Timo Aaltonen 
 debian/changelog|9 ++
 debian/control  |2 
 debian/patches/101_no_horizscroll.patch |6 -
 debian/patches/102_dont_check_abi.diff  |   18 ++--
 src/properties.c|  118 ++--
 src/synaptics.c |4 -
 6 files changed, 64 insertions(+), 93 deletions(-)

New commits:
commit d425f03828e984d4e519f2f4782cdf17f8e054ec
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Thu Oct 9 15:28:26 2008 +0300

Bump the build-dep on xserver-xorg-dev too, add a bug closer.

diff --git a/debian/changelog b/debian/changelog
index 9b502b7..ba641a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xfree86-driver-synaptics (0.15.2-0ubuntu4) intrepid; urgency=low
 
   * Cherry-picked commit 355e845, Adjust to new property API.
+(LP: #274728)
   * Refresh patches 101  102.
-  * Bump the build-dep on libxi-dev.
+  * Bump the build-dep on libxi-dev and xserver-xorg-dev.
 
  -- Timo Aaltonen [EMAIL PROTECTED]  Mon, 29 Sep 2008 10:23:16 +0300
 
diff --git a/debian/control b/debian/control
index c482867..b7a649a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core Developers [EMAIL PROTECTED]
 XSBC-Original-Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Mattia Dongili [EMAIL PROTECTED]
-Build-Depends: debhelper (= 4.0.0), libx11-dev, libxext-dev, libxi-dev (= 
2:1.1.3-1ubuntu3), x11proto-core-dev, xserver-xorg-dev (= 2:1.4.99.905), 
pkg-config, quilt, automake, libtool, xutils-dev
+Build-Depends: debhelper (= 4.0.0), libx11-dev, libxext-dev, libxi-dev (= 
2:1.1.3-1ubuntu3), x11proto-core-dev, xserver-xorg-dev (= 2:1.5.1-1ubuntu3), 
pkg-config, quilt, automake, libtool, xutils-dev
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git

commit 18ad9e41b04dda0bfc7b0298082083439e442107
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Mon Sep 29 10:23:54 2008 +0300

Refresh patches, bump the build-dep on libxi-dev.

diff --git a/debian/changelog b/debian/changelog
index beb6088..9b502b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xfree86-driver-synaptics (0.15.2-0ubuntu4) intrepid; urgency=low
+
+  * Cherry-picked commit 355e845, Adjust to new property API.
+  * Refresh patches 101  102.
+  * Bump the build-dep on libxi-dev.
+
+ -- Timo Aaltonen [EMAIL PROTECTED]  Mon, 29 Sep 2008 10:23:16 +0300
+
 xfree86-driver-synaptics (0.15.2-0ubuntu3) intrepid; urgency=low
 
   * Also build for lpia; LP: #275158.
diff --git a/debian/control b/debian/control
index 1a4384b..c482867 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core Developers [EMAIL PROTECTED]
 XSBC-Original-Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Mattia Dongili [EMAIL PROTECTED]
-Build-Depends: debhelper (= 4.0.0), libx11-dev, libxext-dev, libxi-dev, 
x11proto-core-dev, xserver-xorg-dev (= 2:1.4.99.905), pkg-config, quilt, 
automake, libtool, xutils-dev
+Build-Depends: debhelper (= 4.0.0), libx11-dev, libxext-dev, libxi-dev (= 
2:1.1.3-1ubuntu3), x11proto-core-dev, xserver-xorg-dev (= 2:1.4.99.905), 
pkg-config, quilt, automake, libtool, xutils-dev
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
diff --git a/debian/patches/101_no_horizscroll.patch 
b/debian/patches/101_no_horizscroll.patch
index ce9db96..8ff26af 100644
--- a/debian/patches/101_no_horizscroll.patch
+++ b/debian/patches/101_no_horizscroll.patch
@@ -1,8 +1,8 @@
 Index: xserver-xorg-input-synaptics/src/synaptics.c
 ===
 xserver-xorg-input-synaptics.orig/src/synaptics.c  2008-09-09 
12:42:53.0 +0300
-+++ xserver-xorg-input-synaptics/src/synaptics.c   2008-09-09 
12:43:15.0 +0300
-@@ -447,7 +447,7 @@
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c  2008-09-29 
10:08:18.0 +0300
 xserver-xorg-input-synaptics/src/synaptics.c   2008-09-29 
10:11:06.0 +0300
+@@ -451,7 +449,7 @@
  pars-scroll_dist_horiz = xf86SetIntOption(opts, HorizScrollDelta, 
vertScrollDelta);
  pars-scroll_edge_vert = xf86SetBoolOption(opts, VertEdgeScroll, TRUE);
  pars-special_scroll_area_right  = xf86SetBoolOption(opts, 
SpecialScrollAreaRight, TRUE);
diff --git a/debian/patches/102_dont_check_abi.diff 
b/debian/patches/102_dont_check_abi.diff
index 6449478..b8a17cc 100644
--- a/debian/patches/102_dont_check_abi.diff
+++ b/debian/patches/102_dont_check_abi.diff
@@ -1,7 +1,7 @@
 Index: xserver-xorg-input-synaptics/src/properties.c

X generating Alt keypresses by itself?

2008-10-10 Thread Sander Marechal 
Hi all,

I have a problem but I don't know which package to report a bug against.

All my applications are getting KeyPressed and KeyReleased events for
the Alt key a few times a minute, as if I am pressing the Alt key. But I
am not. For most Gnome applications this doesn't matter much, but KDE
applications and OpenOffice.org become pretty much unusable because the
Alt key focuses or opens the file menu.

I have logged the events using xev and evtest. See the output below. xev
sees KeyPress and KeyRelease events coming in. Note the times, the
KeyPress and KeyRelease happen in the same microsecond. evtest sees no
such keypresses on my keyboard so it's not a hardware problem. To
triple-check that I have tested with three different keyboards. To
different Dell USB keyboards and a Logitech PS/2 keyboard. I get ghost
Alt keypresses on all of them.

Can you help me debug this issue?

Below is the output of both xev and evtest at the same time. I have
placed comments inside then, prefixed by a #. As you can see, xev sees
keypresses from my Alt key, but evtest sees no such keypresses on my
keyboard.

Output from evtest:
# This is the return key I pressed at the end of the evtest command
Event: time 1223560917.470807, type 4 (Misc), code 4 (ScanCode), value 70028
Event: time 1223560917.470822, type 1 (Key), code 28 (Enter), value 0
Event: time 1223560917.470827, -- Report Sync 

# Here I press the return key after the xev command
Event: time 1223560925.727112, type 4 (Misc), code 4 (ScanCode), value 70028
Event: time 1223560925.727128, type 1 (Key), code 28 (Enter), value 1
Event: time 1223560925.727131, -- Report Sync 

# Here I release the Return key
Event: time 1223560925.791107, type 4 (Misc), code 4 (ScanCode), value 70028
Event: time 1223560925.791117, type 1 (Key), code 28 (Enter), value 0
Event: time 1223560925.791120, -- Report Sync 

# Here I press the Alt key manually
Event: time 1223560933.551375, type 4 (Misc), code 4 (ScanCode), value 700e2
Event: time 1223560933.551390, type 1 (Key), code 56 (LeftAlt), value 1
Event: time 1223560933.551396, -- Report Sync 

# And I release it again
Event: time 1223560933.591374, type 4 (Misc), code 4 (ScanCode), value 700e2
Event: time 1223560933.591390, type 1 (Key), code 56 (LeftAlt), value 0
Event: time 1223560933.591395, -- Report Sync 

# These two events are Ctrl+C to stop evtest
Event: time 1223560994.921512, type 4 (Misc), code 4 (ScanCode), value 700e0
Event: time 1223560995.601624, type 1 (Key), code 29 (LeftControl), value 2
Event: time 1223560995.601630, -- Report Sync 
Event: time 1223560995.617513, type 4 (Misc), code 4 (ScanCode), value 70006
Event: time 1223560995.617522, type 1 (Key), code 46 (C), value 1
Event: time 1223560995.617525, -- Report Sync 


Below is the output from xev, at the exact same time as the evtest was run:

# I manually press Alt
KeyPress event, serial 31, synthetic NO, window 0x3e1,
root 0x7f, subw 0x0, time 23255142, (829,-42), root:(839,23),
state 0x10, keycode 64 (keysym 0xffe9, Alt_L), same_screen YES,
XLookupString gives 0 bytes:
XmbLookupString gives 0 bytes:
XFilterEvent returns: False

# I release Alt again
KeyRelease event, serial 34, synthetic NO, window 0x3e1,
root 0x7f, subw 0x0, time 23255195, (829,-42), root:(839,23),
state 0x18, keycode 64 (keysym 0xffe9, Alt_L), same_screen YES,
XLookupString gives 0 bytes:
XFilterEvent returns: False

# This is a ghost Alt keypress. I didn't press anything
KeyPress event, serial 34, synthetic NO, window 0x3e1,
root 0x7f, subw 0x0, time 23270460, (829,-42), root:(839,23),
state 0x10, keycode 113 (keysym 0xffea, Alt_R), same_screen YES,
XLookupString gives 0 bytes:
XmbLookupString gives 0 bytes:
XFilterEvent returns: False

# Here the ghost Alt is released. Note the time. The keypress and
# key release are instantaneously
KeyRelease event, serial 34, synthetic NO, window 0x3e1,
root 0x7f, subw 0x0, time 23270460, (829,-42), root:(839,23),
state 0x18, keycode 113 (keysym 0xffea, Alt_R), same_screen YES,
XLookupString gives 0 bytes:
XFilterEvent returns: False

# Here is another ghost Alt keypress and release
KeyPress event, serial 34, synthetic NO, window 0x3e1,
root 0x7f, subw 0x0, time 23300464, (829,-42), root:(839,23),
state 0x10, keycode 64 (keysym 0xffe9, Alt_L), same_screen YES,
XLookupString gives 0 bytes:
XmbLookupString gives 0 bytes:
XFilterEvent returns: False

KeyRelease event, serial 34, synthetic NO, window 0x3e1,
root 0x7f, subw 0x0, time 23300464, (829,-42), root:(839,23),
state 0x18, keycode 64 (keysym 0xffe9, Alt_L), same_screen YES,
XLookupString gives 0 bytes:
XFilterEvent returns: False

# These events are when I click my mouse on the (X) to stop xev

Re: Bug#501574: warsow: crashes at startup (warsow_bin: shader/slang/slang_emit.c:978 ...)

2008-10-10 Thread hangy 
--- hangy [EMAIL PROTECTED] schrieb am Fr, 10.10.2008:

 A user could simply disable GLSL completely in config.cfg:
 seta gl_ext_GLSL 1

Sorry, setting it to 1 obviously enables GLSL functionality,
setting it to 0 disables it.

-hangy





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

xserver-xorg-input-evdev: Changes to 'ubuntu'

2008-10-10 Thread Timo Aaltonen 
New branch 'ubuntu' available with the following commits:
commit 4e18c7d609be15cfb52fa456ea2dac980a35d967
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed Oct 8 12:01:27 2008 +0300

fix x11proto-input-dev build-dep

commit b5627ecff2d3ffe8af687761615ed673636c7c0e
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed Oct 8 11:58:44 2008 +0300

Bump the build-dep on xserver-xorg-dev and x11proto-input-dev.

commit 24ac9ef94c58d7034d75e92560a9b12c24fd319b
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed Oct 8 11:54:48 2008 +0300

Update the changelog

include the previous upload too.

commit 9bb4b9e9d96b8aec3321d1c6cbf4d89e9401fbc7
Merge: bd2767f778973459be4774ae1946ba75a75e6d73 
84a0e39c0dd8bcc80d4f6912562260c1771f311f
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed Oct 8 11:52:23 2008 +0300

Merge commit '84a0e39' into ubuntu

commit bd2767f778973459be4774ae1946ba75a75e6d73
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Thu Oct 2 10:56:04 2008 +0930

Close fd on DEVICE_OFF. (LP #276887)

Leaving the fd open means we still get keyboard events after VT switching
away. Coming back, some of these events are replayed on the application that
has the current focus.

Reproduceable:
1. open terminal, focus.
2. VT switch away
3. type something, preferably a password
4. VT switch back, trigger a mouse event
5. Observe the X server guessing your password.

Closing the fd on DEVICE_OFF fixes this. Reopen is handled by the reopen
code introduced with

commit 9930477cbeb4acfd070ae70894d13ffabfc347b8
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Tue Aug 26 14:33:40 2008 +0930

Attempt to re-open devices on read errors.

Launchpad Bug 276887
https://bugs.edge.launchpad.net/ubuntu/+source/xorg-server/+bug/276887

commit 165d452aff8d2f99dbad053e7915a3293e3bd4dd
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed Oct 8 11:45:27 2008 +0300

Don't check for *.patch in .gitignore

commit 84a0e39c0dd8bcc80d4f6912562260c1771f311f
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Thu Sep 18 16:44:27 2008 +0930

Use new property API (no ConfigureDP, less args to ChangeDP)

Return appropriate status codes from property handlers.
Make properties non-deletable.

commit 73869372212f7afc18e02184f347bcd94ce19d04
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Thu Sep 18 16:47:35 2008 +0930

draglock: Shut up compiler warning.

commit fcf8375f2b960993686bd08fd4d0e2d8623b4680
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Fri Sep 26 12:53:29 2008 +0930

Don't require randrproto.

commit a99ecbb0cc21b0a232024d6de9c842716b382ae2
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Fri Sep 12 16:15:28 2008 +0300

Update changelog for release.

commit fafc5d32d196a0fde9715734ee48176b871f487e
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Fri Sep 12 16:08:35 2008 +0300

100_dont_check_abi.patch:

Don't check for XINPUT_VERSION = 3, since the ubuntu xserver  libXi
has those bits backported.

commit d98e09a5716de6ad5c72ae350167fd583472cfb2
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Fri Sep 12 15:47:41 2008 +0300

Update the changelogs.

re-add upstream changelog, generated by running
 'git-log upstream/master  ChangeLog'

commit 63547be5d4564829276804c609a840f567c59a36
Merge: 872677edb4ba316813eb4761e35e737da937f4c7 
9930477cbeb4acfd070ae70894d13ffabfc347b8
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Fri Sep 12 15:01:41 2008 +0300

Merge commit 'upstream/master' into ubuntu

Conflicts:

ChangeLog
configure.ac
src/evdev.c

commit 872677edb4ba316813eb4761e35e737da937f4c7
Merge: dc6e3f863baf79025ee0e4cb206a237a7257391e 
dd74edd87a5f7925b2dc19b44b60c8f5aea68b5d
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Fri Sep 12 14:56:04 2008 +0300

Merge branch 'debian-experimental' into ubuntu

Conflicts:

debian/changelog

commit dc6e3f863baf79025ee0e4cb206a237a7257391e
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Tue Sep 9 18:37:14 2008 +0300

Change the maintainer address.

commit 345e5da2c58c181fc2b751646e520a987da4e8d2
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Tue Sep 9 18:36:18 2008 +0300

Pull 36d702006d, Force rules, not model, to be evdev.

commit 2b9d02ee08b5bf875487eea2c8ff3547e1a89c51
Author: Daniel Stone [EMAIL PROTECTED]
Date:   Sat Aug 16 15:33:23 2008 +0300

Force rules, not model, to be evdev

xkeyboard-config recently changed to a separate ruleset for the evdev
driver, so match that by only forcing the ruleset, not the model, to be
evdev.

commit 9930477cbeb4acfd070ae70894d13ffabfc347b8
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Tue Aug 26 14:33:40 2008 +0930

Attempt to re-open devices on read errors.

Coming back from resume may leave us with a file descriptor that can be 
opened
but fails on the

Bug#362997: dual head on PCI G450 fails

2008-10-10 Thread Alan BRASLAU 
I just upgraded my (old) computer with its G450
to unstable and am unable to get a dual head
configuration to work.
The driver available under unstable is 1:1.4.9.dfsg-1
and in experimental 1:1.4.9.dfsg-2
(1.19.100.dfsg.1-1 for kfreebsd architectures).

I will try a more recent version if it could be uploaded
to experimental

(I have RandR 1.2 dual head working on another computer
with xserver-xorg-video-radeon.)

Thank you
Alan

On Mon, Sep 17, 2007 at 12:49:36AM +0200, Brice Goglin wrote:
 Hi,
 
 I just uploaded xserver-xorg-video-mga 1.9.99.dfsg.1-1 to experimental.
 It brings RandR 1.2 support, which improves mode detection and dynamic
 configuration. Could you test it and see whether it helps for your
 dual-head problem on G450. Note that you might need to update your
 xorg.conf, see the pointers I inserted in
 http://bgoglin.livejournal.com/12835.html




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

Re: Bug#501574: warsow: crashes at startup (warsow_bin: shader/slang/slang_emit.c:978 ...)

2008-10-10 Thread hangy 
--- Michel Dänzer [EMAIL PROTECTED] schrieb am Fr, 10.10.2008:

 Does it still happen with libgl1-mesa-dri 7.2-1 from
 experimental? If so, it would be good to make sure this
 is reported in upstream bugzilla (preferably after first
 confirming it isn't fixed in upstream Git either).

I got word from Torben Hohn who said this bug does not happen
with latest mesa git (which he follows quite closely)
or with 7.2 any more. So this particular GLSL bug seems to
be fixed in upstream already.

 Maybe it's possible to somehow make warsow not try to
 use any GLSL functionality as a workaround?

A user could simply disable GLSL completely in config.cfg:
seta gl_ext_GLSL 1

-hangy






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

xserver-xorg-input-evdev: Changes to 'ubuntu'

2008-10-10 Thread Timo Aaltonen 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8fb8d6f447d788bc50cb2c7a325962851fe53f67
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Fri Oct 10 12:24:07 2008 +0300

Prepare the changelog for release.

diff --git a/debian/changelog b/debian/changelog
index 9032a22..69f54fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-input-evdev (1:2.0.99+git20080912-0ubuntu3) UNRELEASED; 
urgency=low
+xserver-xorg-input-evdev (1:2.0.99+git20080912-0ubuntu3) intrepid; urgency=low
 
   * Merged with upstream master, commit 84a0e39c0dd, Use new property API
   * Drop patch 101, cherry-picked the commit.
   * Bump the build-dep on xserver-xorg-dev and x11proto-input-dev.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 08 Oct 2008 11:58:14 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED]  Fri, 10 Oct 2008 12:24:00 +0300
 
 xserver-xorg-input-evdev (1:2.0.99+git20080912-0ubuntu2) intrepid; urgency=low
 


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

Processed: xfs: diff for NMU version 1:1.0.8-2.1

2008-10-10 Thread Debian Bug Tracking System 
Processing commands for [EMAIL PROTECTED]:

 tags 498823 + patch
Bug#498823: xfs shows scary log messages
There were no tags set.
Tags added: patch

 thanks
Stopping processing here.

Please contact me if you need assistance.

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


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

Bug#498823: xfs: diff for NMU version 1:1.0.8-2.1

2008-10-10 Thread Thomas Viehmann 
tags 498823 + patch
thanks

Dear xfs-maintaining XSF,

here is a patch moving xfs to the user debian-xfs and disabling
logging to file.
If it helps any, I'd be happy to NMU this, but not before you had
a chance to protest over obvious errors that might be in the
patch.
On a minor note, I have the impression that the reload-magic (using
--name for start-stop-deaemon) does not work correctly. This seems
unrelated to the issue at hand.

Kind regards

T.


diff -u xfs-1.0.8/debian/changelog xfs-1.0.8/debian/changelog
--- xfs-1.0.8/debian/changelog
+++ xfs-1.0.8/debian/changelog
@@ -1,3 +1,19 @@
+xfs (1:1.0.8-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix fallout from switching to non-privileged user:
+- Adjust config file to disable logging to file.
+  We log to syslog, but with this parameter, xfs tries to open
+  the logfile which fails because we run as nobody.
+- postinst: create user debian-xfs for pidfile,
+- init: create pidfile dir if necessary, change pifile location,
+  deal with two possible pidfile locations for stop et al,
+- postrm: delete pid directory and user,
+- add patch to change pid directory.
+Closes: #498823.
+
+ -- Thomas Viehmann [EMAIL PROTECTED]  Thu, 09 Oct 2008 22:32:45 +0200
+
 xfs (1:1.0.8-2) unstable; urgency=low
 
   * Add $syslog dependency to the xfs init.d script (closes: #489232).
diff -u xfs-1.0.8/debian/control xfs-1.0.8/debian/control
--- xfs-1.0.8/debian/control
+++ xfs-1.0.8/debian/control
@@ -10,7 +10,7 @@
 
 Package: xfs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
 Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-base, xfonts-scalable
 Description: X font server
  xfs is a daemon that listens on a network port and serves X fonts to X
diff -u xfs-1.0.8/debian/xfs.init xfs-1.0.8/debian/xfs.init
--- xfs-1.0.8/debian/xfs.init
+++ xfs-1.0.8/debian/xfs.init
@@ -36,7 +36,9 @@
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 DAEMON=/usr/bin/xfs
-PIDFILE=/var/run/xfs.pid
+PIDDIR=/var/run/xfs
+PIDFILE=$PIDDIR/xfs.pid
+OLDPIDFILE=/var/run/xfs.pid
 UPGRADEFILE=/var/run/xfs.daemon-not-stopped
 SOCKET_DIR=/tmp/.font-unix
 
@@ -61,6 +63,13 @@
   echo done.
 }
 
+set_up_pid_dir () {
+  if [ ! -d $PIDDIR ] ; then
+mkdir $PIDDIR
+chown debian-xfs $PIDDIR
+  fi
+}
+
 stillrunning () {
   if expr $(cat /proc/$DAEMONPID/cmdline 2/dev/null) : $DAEMON /dev/null 
\
 21; then
@@ -74,6 +83,14 @@
   fi
 }
 
+
+# If there is only an old pidfile, use that. note that restart calls the start
+# initscript, so that can will the new pidfile
+if [ $1 = restart ] || [ $1 = reload ] || [ $1 = stop ]   \
+   [ ! -e $PIDFILE ]  [ -e $OLDPIDFILE ] ; then
+   PIDFILE=$OLDPIDFILE
+fi
+
 # If we have upgraded the daemon since we last started it, we can't use the
 # --exec argument to start-stop-daemon, because the daemon's inode will have
 # changed.  The risk here is that in a situation where the daemon died, its
@@ -91,8 +108,9 @@
 case $1 in
   start)
 set_up_socket_dir
+set_up_pid_dir
 echo -n Starting X font server: xfs
-start-stop-daemon --start --quiet $SSD_START_ARGS -- -daemon -user nobody 
-droppriv \
+start-stop-daemon --start --quiet $SSD_START_ARGS -- -daemon -user 
debian-xfs -droppriv \
   || echo -n  already running
 echo .
   ;;
diff -u xfs-1.0.8/debian/xfs.postinst.in xfs-1.0.8/debian/xfs.postinst.in
--- xfs-1.0.8/debian/xfs.postinst.in
+++ xfs-1.0.8/debian/xfs.postinst.in
@@ -15,6 +15,12 @@
 THIS_PACKAGE=xfs
 THIS_SCRIPT=postinst
 
+if ! getent passwd debian-$THIS_PACKAGE  /dev/null ; then
+   adduser --quiet --system --disabled-password \
+   --home /nonexistant --no-create-home \
+   --shell /bin/false --group debian-$THIS_PACKAGE
+fi
+
 #INCLUDE_SHELL_LIB#
 
 # Registering the init scripts or starting the daemon may cause output to
diff -u xfs-1.0.8/debian/xfs.postrm.in xfs-1.0.8/debian/xfs.postrm.in
--- xfs-1.0.8/debian/xfs.postrm.in
+++ xfs-1.0.8/debian/xfs.postrm.in
@@ -25,6 +25,15 @@
   if [ -d /etc/X11/fs ]; then
 rm -r /etc/X11/fs
   fi
+  if [ -d /var/run/xfs ]; then
+rm -r /var/run/xfs
+  fi
+  # Remove the user if we are relatively certain that we created it
+  u_home=$(getent passwd debian-$THIS_PACKAGE | cut -d : -f 6)
+  u_shell=$(getent passwd debian-$THIS_PACKAGE | cut -d : -f 7)
+  if [ $u_home = /nonexistant ]  [ $u_shell = /bin/false ]  [ -x 
/usr/sbin/deluser ] ; then
+deluser --system --quiet debian-$THIS_PACKAGE
+  fi
 fi
 
 if [ $1 = abort-upgrade ]; then
diff -u xfs-1.0.8/debian/patches/02_debian_setup.diff 
xfs-1.0.8/debian/patches/02_debian_setup.diff
--- xfs-1.0.8/debian/patches/02_debian_setup.diff
+++ xfs-1.0.8/debian/patches/02_debian_setup.diff
@@ -8,7 +8,7 @@
 ===
 --- a/config.cpp.orig  2006-03-07 22:09:01.0 -0500
 +++ b/config.cpp   2006-03-07 22:13:53.0 -0500
-@@ -1,15 +1,19 @@

Processed: retitle 498823 to pid files not removed, scary log messages

2008-10-10 Thread Debian Bug Tracking System 
Processing commands for [EMAIL PROTECTED]:

 retitle 498823 pid files not removed, scary log messages
Bug#498823: xfs shows scary log messages
Changed Bug title to `pid files not removed, scary log messages' from `xfs 
shows scary log messages'.


End of message, 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]

xorg: Changes to 'ubuntu'

2008-10-10 Thread Loïc Minier 
 debian/changelog |9 +
 debian/scripts/vars.lpia |2 --
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 386473ff0251ff894aac11201bff521c24c8b5b5
Author: Loïc Minier [EMAIL PROTECTED]
Date:   Fri Oct 10 20:53:08 2008 +0200

Drop xserver-xorg-video-openchrome | xserver-xorg-video-via and 
xserver-xorg-video-geode from video-all on lpia as they don't exist on lpia; 
they would build, but it's not clear whether anyone is interested in using lpia 
on devices with this video hardware.

diff --git a/debian/changelog b/debian/changelog
index 6a72546..c37bf78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.4~2ubuntu7) intrepid; urgency=low
+
+  * Drop xserver-xorg-video-openchrome | xserver-xorg-video-via and
+xserver-xorg-video-geode from video-all on lpia as they don't exist on
+lpia; they would build, but it's not clear whether anyone is interested in
+using lpia on devices with this video hardware.
+
+ -- Loic Minier [EMAIL PROTECTED]  Fri, 10 Oct 2008 20:51:47 +0200
+
 xorg (1:7.4~2ubuntu6) intrepid; urgency=low
 
   [ Bryce Harrington ]
diff --git a/debian/scripts/vars.lpia b/debian/scripts/vars.lpia
index b32d94e..f1c844b 100755
--- a/debian/scripts/vars.lpia
+++ b/debian/scripts/vars.lpia
@@ -9,7 +9,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-geode, \
xserver-xorg-video-i128, \
xserver-xorg-video-i740, \
xserver-xorg-video-intel | xserver-xorg-video-i810, \
@@ -29,7 +28,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-trident, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
-   xserver-xorg-video-openchrome | xserver-xorg-video-via, \
xserver-xorg-video-voodoo, \
xserver-xorg-video-vmware, \
xserver-xorg-video-v4l


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

Processing of xfs_1.0.8-2.1_amd64.changes

2008-10-10 Thread Archive Administrator 
xfs_1.0.8-2.1_amd64.changes uploaded successfully to localhost
along with the files:
  xfs_1.0.8-2.1.dsc
  xfs_1.0.8-2.1.diff.gz
  xfs_1.0.8-2.1_amd64.deb

Greetings,

Your Debian queue daemon


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

Bug#498823: xfs: final diff for NMU version 1:1.0.8-2.1

2008-10-10 Thread Thomas Viehmann 
Hi Julien, XSF*,

here is the final NMUdiff fixing a typo in an initscript comment and
moving the Makefile.in patch to the diff.gz as discussed on IRC.
Thanks for maintaining X.

Kind regards

T.

diff -u xfs-1.0.8/Makefile.in xfs-1.0.8/Makefile.in
--- xfs-1.0.8/Makefile.in
+++ xfs-1.0.8/Makefile.in
@@ -234,7 +234,7 @@
 top_srcdir = @top_srcdir@
 configdir = $(sysconfdir)/X11/fs
 FONT_FLAGS = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO
-AM_CPPFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\/var/run\ \
+AM_CPPFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include 
-DXFSPIDDIR=\/var/run/xfs\ \
$(FONT_FLAGS) -D_BSD_SOURCE -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN
 
 LDADD = $(XFS_LIBS)
diff -u xfs-1.0.8/debian/changelog xfs-1.0.8/debian/changelog
--- xfs-1.0.8/debian/changelog
+++ xfs-1.0.8/debian/changelog
@@ -1,3 +1,19 @@
+xfs (1:1.0.8-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix fallout from switching to non-privileged user:
+- Adjust config file to disable logging to file.
+  We log to syslog, but with this parameter, xfs tries to open
+  the logfile which fails because we run as nobody.
+- postinst: create user debian-xfs for pidfile,
+- init: create pidfile dir if necessary, change pifile location,
+  deal with two possible pidfile locations for stop et al,
+- postrm: delete pid directory and user,
+- add patch to change pid directory.
+Closes: #498823.
+
+ -- Thomas Viehmann [EMAIL PROTECTED]  Thu, 09 Oct 2008 22:32:45 +0200
+
 xfs (1:1.0.8-2) unstable; urgency=low
 
   * Add $syslog dependency to the xfs init.d script (closes: #489232).
diff -u xfs-1.0.8/debian/control xfs-1.0.8/debian/control
--- xfs-1.0.8/debian/control
+++ xfs-1.0.8/debian/control
@@ -10,7 +10,7 @@
 
 Package: xfs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
 Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-base, xfonts-scalable
 Description: X font server
  xfs is a daemon that listens on a network port and serves X fonts to X
diff -u xfs-1.0.8/debian/xfs.init xfs-1.0.8/debian/xfs.init
--- xfs-1.0.8/debian/xfs.init
+++ xfs-1.0.8/debian/xfs.init
@@ -36,7 +36,9 @@
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 DAEMON=/usr/bin/xfs
-PIDFILE=/var/run/xfs.pid
+PIDDIR=/var/run/xfs
+PIDFILE=$PIDDIR/xfs.pid
+OLDPIDFILE=/var/run/xfs.pid
 UPGRADEFILE=/var/run/xfs.daemon-not-stopped
 SOCKET_DIR=/tmp/.font-unix
 
@@ -61,6 +63,13 @@
   echo done.
 }
 
+set_up_pid_dir () {
+  if [ ! -d $PIDDIR ] ; then
+mkdir $PIDDIR
+chown debian-xfs $PIDDIR
+  fi
+}
+
 stillrunning () {
   if expr $(cat /proc/$DAEMONPID/cmdline 2/dev/null) : $DAEMON /dev/null 
\
 21; then
@@ -74,6 +83,14 @@
   fi
 }
 
+
+# If there is only an old pidfile, use that. note that restart calls the start
+# initscript, so that will use the new pidfile for the new xfs process
+if [ $1 = restart ] || [ $1 = reload ] || [ $1 = stop ]   \
+   [ ! -e $PIDFILE ]  [ -e $OLDPIDFILE ] ; then
+   PIDFILE=$OLDPIDFILE
+fi
+
 # If we have upgraded the daemon since we last started it, we can't use the
 # --exec argument to start-stop-daemon, because the daemon's inode will have
 # changed.  The risk here is that in a situation where the daemon died, its
@@ -91,8 +108,9 @@
 case $1 in
   start)
 set_up_socket_dir
+set_up_pid_dir
 echo -n Starting X font server: xfs
-start-stop-daemon --start --quiet $SSD_START_ARGS -- -daemon -user nobody 
-droppriv \
+start-stop-daemon --start --quiet $SSD_START_ARGS -- -daemon -user 
debian-xfs -droppriv \
   || echo -n  already running
 echo .
   ;;
diff -u xfs-1.0.8/debian/xfs.postinst.in xfs-1.0.8/debian/xfs.postinst.in
--- xfs-1.0.8/debian/xfs.postinst.in
+++ xfs-1.0.8/debian/xfs.postinst.in
@@ -15,6 +15,12 @@
 THIS_PACKAGE=xfs
 THIS_SCRIPT=postinst
 
+if ! getent passwd debian-$THIS_PACKAGE  /dev/null ; then
+   adduser --quiet --system --disabled-password \
+   --home /nonexistant --no-create-home \
+   --shell /bin/false --group debian-$THIS_PACKAGE
+fi
+
 #INCLUDE_SHELL_LIB#
 
 # Registering the init scripts or starting the daemon may cause output to
diff -u xfs-1.0.8/debian/xfs.postrm.in xfs-1.0.8/debian/xfs.postrm.in
--- xfs-1.0.8/debian/xfs.postrm.in
+++ xfs-1.0.8/debian/xfs.postrm.in
@@ -25,6 +25,15 @@
   if [ -d /etc/X11/fs ]; then
 rm -r /etc/X11/fs
   fi
+  if [ -d /var/run/xfs ]; then
+rm -r /var/run/xfs
+  fi
+  # Remove the user if we are relatively certain that we created it
+  u_home=$(getent passwd debian-$THIS_PACKAGE | cut -d : -f 6)
+  u_shell=$(getent passwd debian-$THIS_PACKAGE | cut -d : -f 7)
+  if [ $u_home = /nonexistant ]  [ $u_shell = /bin/false ]  [ -x 
/usr/sbin/deluser ] ; then
+deluser --system --quiet debian-$THIS_PACKAGE
+  fi
 fi
 
 if [ $1 = abort-upgrade ]; then
diff -u xfs-1.0.8/debian/patches/02_debian_setup.diff 
xfs-1.0.8/debian/patches/02_debian_setup.diff
--- xfs-1.0.8/debian/patches/02_debian_setup.diff
+++

xfs: Changes to 'debian-unstable'

2008-10-10 Thread Julien Cristau 
 Makefile.in  |2 +-
 debian/changelog |   16 
 debian/control   |2 +-
 debian/patches/02_debian_setup.diff  |8 +---
 debian/patches/03_debian_piddir.diff |   13 +
 debian/patches/series|1 +
 debian/xfs.init  |   22 --
 debian/xfs.postinst.in   |6 ++
 debian/xfs.postrm.in |9 +
 9 files changed, 72 insertions(+), 7 deletions(-)

New commits:
commit 0e573557e7835915ff0cd4e77e9004287e9e1706
Author: Thomas Viehmann [EMAIL PROTECTED]
Date:   Fri Oct 10 22:09:30 2008 +0200

Fix fallout from switching to non-privileged user

- Adjust config file to disable logging to file.
  We log to syslog, but with this parameter, xfs tries to open
  the logfile which fails because we run as nobody.
- postinst: create user debian-xfs for pidfile,
- init: create pidfile dir if necessary, change pifile location,
  deal with two possible pidfile locations for stop et al,
- postrm: delete pid directory and user,
- add patch to change pid directory.
Closes: #498823.

diff --git a/Makefile.in b/Makefile.in
index db3abd2..f453242 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -234,7 +234,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 configdir = $(sysconfdir)/X11/fs
 FONT_FLAGS = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO
-AM_CPPFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\/var/run\ \
+AM_CPPFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include 
-DXFSPIDDIR=\/var/run/xfs\ \
$(FONT_FLAGS) -D_BSD_SOURCE -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN
 
 LDADD = $(XFS_LIBS)
diff --git a/debian/changelog b/debian/changelog
index bfa0f79..34e3422 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+xfs (1:1.0.8-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix fallout from switching to non-privileged user:
+- Adjust config file to disable logging to file.
+  We log to syslog, but with this parameter, xfs tries to open
+  the logfile which fails because we run as nobody.
+- postinst: create user debian-xfs for pidfile,
+- init: create pidfile dir if necessary, change pifile location,
+  deal with two possible pidfile locations for stop et al,
+- postrm: delete pid directory and user,
+- add patch to change pid directory.
+Closes: #498823.
+
+ -- Thomas Viehmann [EMAIL PROTECTED]  Thu, 09 Oct 2008 22:32:45 +0200
+
 xfs (1:1.0.8-2) unstable; urgency=low
 
   * Add $syslog dependency to the xfs init.d script (closes: #489232).
diff --git a/debian/control b/debian/control
index 0e05b64..800da9a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xfs.git
 
 Package: xfs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
 Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-base, xfonts-scalable
 Description: X font server
  xfs is a daemon that listens on a network port and serves X fonts to X
diff --git a/debian/patches/02_debian_setup.diff 
b/debian/patches/02_debian_setup.diff
index 4e60667..f3958b9 100644
--- a/debian/patches/02_debian_setup.diff
+++ b/debian/patches/02_debian_setup.diff
@@ -8,7 +8,7 @@ Index: a/config.cpp
 ===
 --- a/config.cpp.orig  2006-03-07 22:09:01.0 -0500
 +++ b/config.cpp   2006-03-07 22:13:53.0 -0500
-@@ -1,15 +1,19 @@
+@@ -1,15 +1,20 @@
  XCOMM font server configuration file
  XCOMM $Xorg: config.cpp,v 1.3 2000/08/17 19:54:19 cpqbld Exp $
  
@@ -18,8 +18,10 @@ Index: a/config.cpp
  clone-self = on
 -use-syslog = off
 -catalogue = DEFAULTFONTPATH
-+XCOMM log messages to FSERRORS (if syslog is not used)
- error-file = FSERRORS
++XCOMM log messages to FSERRORS
++XCOMM (Debian xfs uses syslog by default to run as nobody)
+-error-file = FSERRORS
++XCOMM error-file = FSERRORS
 +XCOMM log errors using syslog
 +use-syslog = on
 +XCOMM turn off TCP port listening (Unix domain connections are still 
permitted)
diff --git a/debian/patches/03_debian_piddir.diff 
b/debian/patches/03_debian_piddir.diff
new file mode 100644
index 000..3178f1d
--- /dev/null
+++ b/debian/patches/03_debian_piddir.diff
@@ -0,0 +1,13 @@
+diff -u xfs-1.0.8~/Makefile.am xfs-1.0.8/Makefile.am
+--- xfs-1.0.8~/Makefile.am 2008-05-16 20:23:17.0 +0200
 xfs-1.0.8/Makefile.am  2008-10-10 20:10:12.0 +0200
+@@ -25,7 +25,7 @@
+ 
+ FONT_FLAGS = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO
+ 
+-AM_CPPFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\/var/run\ \
++AM_CPPFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include 
-DXFSPIDDIR=\/var/run/xfs\ \
+   $(FONT_FLAGS) -D_BSD_SOURCE -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN
+ 
+ LDADD = $(XFS_LIBS)
+diff -u xfs-1.0.8~/Makefile.in

xfs_1.0.8-2.1_amd64.changes ACCEPTED

2008-10-10 Thread Debian Installer 

Accepted:
xfs_1.0.8-2.1.diff.gz
  to pool/main/x/xfs/xfs_1.0.8-2.1.diff.gz
xfs_1.0.8-2.1.dsc
  to pool/main/x/xfs/xfs_1.0.8-2.1.dsc
xfs_1.0.8-2.1_amd64.deb
  to pool/main/x/xfs/xfs_1.0.8-2.1_amd64.deb


Override entries for your package:
xfs_1.0.8-2.1.dsc - source x11
xfs_1.0.8-2.1_amd64.deb - optional x11

Announcing to [EMAIL PROTECTED]
Closing bugs: 498823 


Thank you for your contribution to Debian.


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

Bug#498823: marked as done (pid files not removed, scary log messages)

2008-10-10 Thread Debian Bug Tracking System 

Your message dated Fri, 10 Oct 2008 21:17:13 +
with message-id [EMAIL PROTECTED]
and subject line Bug#498823: fixed in xfs 1:1.0.8-2.1
has caused the Debian Bug report #498823,
regarding pid files not removed, scary log messages
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 this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)


-- 
498823: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=498823
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
---BeginMessage---
Package: xfs
Version: 1:1.0.8-2
Severity: normal


xfs still tries to access /var/log/xfs.log and /var/run/xfs.pid (as 'nobody')
and reports these errors:
==
Sep 12 23:03:05 shota xfs[3307]: terminating 
Sep 12 23:03:05 shota xfs[3307]: cannot remove process ID file 
/var/run/xfs.pid: Permission denied
Sep 13 09:45:24 shota xfs[3281]: can't open error file /var/log/xfs.log
==

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

Kernel: Linux 2.6.26-1-686 (SMP w/1 CPU core)
Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages xfs depends on:
ii  libc6 2.7-13 GNU C Library: Shared libraries
ii  libfs62:1.0.1-1  X11 Font Services library
ii  libxfont1 1:1.3.3-1  X11 font rasterisation library

xfs recommends no packages.

Versions of packages xfs suggests:
ii  xfonts-100dpi 1:1.0.0-4  100 dpi fonts for X
ii  xfonts-75dpi  1:1.0.0-4  75 dpi fonts for X
ii  xfonts-base   1:1.0.0-5  standard fonts for X
pn  xfonts-scalable   none (no description available)

-- no debconf information


---End Message---
---BeginMessage---
Source: xfs
Source-Version: 1:1.0.8-2.1

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

xfs_1.0.8-2.1.diff.gz
  to pool/main/x/xfs/xfs_1.0.8-2.1.diff.gz
xfs_1.0.8-2.1.dsc
  to pool/main/x/xfs/xfs_1.0.8-2.1.dsc
xfs_1.0.8-2.1_amd64.deb
  to pool/main/x/xfs/xfs_1.0.8-2.1_amd64.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.
Thomas Viehmann [EMAIL PROTECTED] (supplier of updated xfs 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.8
Date: Thu, 09 Oct 2008 22:32:45 +0200
Source: xfs
Binary: xfs
Architecture: source amd64
Version: 1:1.0.8-2.1
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force debian-x@lists.debian.org
Changed-By: Thomas Viehmann [EMAIL PROTECTED]
Description: 
 xfs- X font server
Closes: 498823
Changes: 
 xfs (1:1.0.8-2.1) unstable; urgency=low
 .
   * Non-maintainer upload.
   * Fix fallout from switching to non-privileged user:
 - Adjust config file to disable logging to file.
   We log to syslog, but with this parameter, xfs tries to open
   the logfile which fails because we run as nobody.
 - postinst: create user debian-xfs for pidfile,
 - init: create pidfile dir if necessary, change pifile location,
   deal with two possible pidfile locations for stop et al,
 - postrm: delete pid directory and user,
 - add patch to change pid directory.
 Closes: #498823.
Checksums-Sha1: 
 27a043b25c825973b6b79c4c355573f0b0124c67 1233 xfs_1.0.8-2.1.dsc
 2108f504d9f354a8249a1b0ce87505c793b0b2fc 38600 xfs_1.0.8-2.1.diff.gz
 6457c553d13335f27a66f97fec587fb11f60aca8 105598 xfs_1.0.8-2.1_amd64.deb
Checksums-Sha256: 
 06062db2d281498e0e4c6d8cf029dec5e82d130d5ac4d4c2975d708a62ebe1c2 1233 
xfs_1.0.8-2.1.dsc
 a7d9a270febf6b8644c78fab8d83c29c177ae6a8bca5e2157dd7890b8c81b57f 38600 
xfs_1.0.8-2.1.diff.gz
 6f5f60dbe0d04ff3e217323eff191a24928bf850b44e4cfad52ad7b57c535dc3 105598 
xfs_1.0.8-2.1_amd64.deb
Files: 
 51fef9190c83fc5d2ef08841537bee01 1233 x11 optional xfs_1.0.8-2.1.dsc
 d755fd3ddc7d21150f0af98d34cf06a2 38600 x11 optional xfs_1.0.8-2.1.diff.gz
 a3a9df44763600584b0d01cf2248a697 105598 x11 optional

Processed: reassign 456997 to xbase-clients, forcibly merging 456997 500895

2008-10-10 Thread Debian Bug Tracking System 
Processing commands for [EMAIL PROTECTED]:

 # Automatically generated email from bts, devscripts version 2.10.35
 reassign 456997 xbase-clients
Bug#456997: /usr/bin/xon missing
Bug reassigned from package `xutils' to `xbase-clients'.

 forcemerge 456997 500895
Bug#456997: /usr/bin/xon missing
Bug#500895: xbase-clients: xon missing
Forcibly Merged 456997 500895.


End of message, 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]

reassign 456997 to xbase-clients, forcibly merging 456997 500895

2008-10-10 Thread Brice Goglin 
# Automatically generated email from bts, devscripts version 2.10.35
reassign 456997 xbase-clients 
forcemerge 456997 500895


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

Processed: tagging 496101

2008-10-10 Thread Debian Bug Tracking System 
Processing commands for [EMAIL PROTECTED]:

 # fixed in commit 847eac826286e6202f42b9a2ccc160a232a710a3
 tags 496101 upstream fixed-upstream
Bug#496101: xserver-xorg-input-all: Logitech MX510: Grab failed (Bad file 
descriptor)
There were no tags set.
Tags added: upstream, fixed-upstream


End of message, 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]

xorg: Changes to 'refs/tags/xorg-1_7.4-4'

2008-10-10 Thread Julien Cristau 
Tag 'xorg-1_7.4-4' created by Julien Cristau [EMAIL PROTECTED] at 2008-10-11 
00:27 +

Tagging upload of xorg 1:7.4~4 to experimental.

Changes since xorg-1_7.4-3:
Christian Perrier (1):
  Wolof translation completed

Julien Cristau (5):
  Add bug closer
  Version the Replaces/Conflicts on xserver-common
  Prepare changelog for upload
  Merge tag 'xorg-1_7.3+18' into debian-experimental
  Prepare changelog for upload

Loïc Minier (4):
  Rename VT_MAJOR_DEV to more accurate TTY_MAJOR_DEV
  Add ALT_TTY_MAJOR_DEV (alternate TTY devices)
  Allow consider alternate tty devices as consoles
  Merge branch 'dev-console-support' into debian-experimental

---
 debian/changelog   |   21 +
 debian/control |8 
 debian/local/xserver-wrapper.c |   10 
 debian/po/wo.po|  571 -
 4 files changed, 40 insertions(+), 570 deletions(-)
---


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

xorg: Changes to 'debian-experimental'

2008-10-10 Thread Julien Cristau 
 debian/changelog |   19 +
 debian/control   |8 
 debian/po/wo.po  |  571 ---
 3 files changed, 29 insertions(+), 569 deletions(-)

New commits:
commit 2cf64909556e8427b1c4a04cd8e67c4000e8bb6d
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Oct 11 02:25:27 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 25d02e5..024c2f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.4~4) UNRELEASED; urgency=low
+xorg (1:7.4~4) experimental; urgency=low
 
   [ Loic Minier ]
   * Allow alternate tty devices as consoles; fixes usage of startx in upstart.
@@ -6,7 +6,7 @@ xorg (1:7.4~4) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Merge changes from 1:7.3+18.
 
- -- Loic Minier [EMAIL PROTECTED]  Wed, 24 Sep 2008 18:24:58 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Sat, 11 Oct 2008 02:24:19 +0200
 
 xorg (1:7.4~3) experimental; urgency=low
 

commit 36a1514e636c8b96d30d638b958927601ee1bd03
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Oct 5 20:26:14 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index bfc6ecc..9875bbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.3+18) UNRELEASED; urgency=low
+xorg (1:7.3+18) unstable; urgency=low
 
   [ Debconf translations ]
   * Wolof. Closes: #500669
@@ -7,7 +7,7 @@ xorg (1:7.3+18) UNRELEASED; urgency=low
   * Version the Replaces/Conflicts on xserver-common, so we can reintroduce it
 later if needed.
 
- -- Christian Perrier [EMAIL PROTECTED]  Tue, 30 Sep 2008 20:24:47 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Sun, 05 Oct 2008 20:26:08 +0200
 
 xorg (1:7.3+17) unstable; urgency=low
 

commit 99224fac737261ac394c4d9fdbce8d12bf0670d2
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Oct 5 20:25:07 2008 +0200

Version the Replaces/Conflicts on xserver-common

This should make it easier to reintroduce it later if needed.

diff --git a/debian/changelog b/debian/changelog
index 64ec66d..bfc6ecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ xorg (1:7.3+18) UNRELEASED; urgency=low
   [ Debconf translations ]
   * Wolof. Closes: #500669
 
+  [ Julien Cristau ]
+  * Version the Replaces/Conflicts on xserver-common, so we can reintroduce it
+later if needed.
+
  -- Christian Perrier [EMAIL PROTECTED]  Tue, 30 Sep 2008 20:24:47 +0200
 
 xorg (1:7.3+17) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b448a78..c49fc75 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Package: x11-common
 Architecture: all
 Depends: ${misc:Depends}, debianutils (= 1.13), lsb-base (= 1.3-9ubuntu2)
 Pre-Depends: debconf | debconf-2.0
-Conflicts: xfree86-common, xorg-common, xserver-common, x-common,
+Conflicts: xfree86-common, xorg-common, xserver-common ( 7), x-common,
  xserver-xorg ( 1:7.3+11), xserver-xfree86 ( 1:7.0),
  libxft-dev (= 2.1.8.2-5),  aee (= 2.2.15b-1), ascd (= 0.13.2-3),
  bibview (= 2.2-8), fvwm1 (= 1.24r-46), grace (= 1:5.1.18-1),
@@ -64,7 +64,7 @@ Conflicts: xfree86-common, xorg-common, xserver-common, 
x-common,
  ucbmpeg-play ( 2.3p-13), netscape-base-4, communicator-smotif-477, epan,
  navigator-smotif-477, stella ( 2.2-1), xfractint ( 20.3.01-1), xgobi,
  xpostitplus, xisp, vide (= 1.21-3)
-Replaces: xfree86-common, xorg-common, xserver-common, x-common
+Replaces: xfree86-common, xorg-common, xserver-common ( 7), x-common
 Description: X Window System (X.Org) infrastructure
  x11-common contains the filesystem infrastructure required for further
  installation of the X Window System in any configuration; it does not
@@ -79,8 +79,8 @@ Description: X Window System (X.Org) infrastructure
 
 Package: xserver-xorg
 Architecture: any
-Conflicts: xserver-xfree86 ( 6.8.2.dfsg.1-1), xserver-common, x11-common ( 
1:7.3+11)
-Replaces: xserver-common, x11-common ( 1:7.3+11)
+Conflicts: xserver-xfree86 ( 6.8.2.dfsg.1-1), xserver-common ( 7), 
x11-common ( 1:7.3+11)
+Replaces: xserver-common ( 7), x11-common ( 1:7.3+11)
 Depends: xserver-xorg-core (= 2:1.4-3), xserver-xorg-video-all | 
xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2, 
${shlibs:Depends}, ${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
 Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}
 Description: the X.Org X server

commit 31dd4cbc45e9e25fe3066a67a098429299a0cb6c
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Oct 1 17:11:38 2008 +0200

Add bug closer

diff --git a/debian/changelog b/debian/changelog
index 660cfe1..64ec66d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 xorg (1:7.3+18) UNRELEASED; urgency=low
 
   [ Debconf translations ]
-  * Wolof (sent directly by translator)
+  * Wolof. Closes: #500669
 
  -- Christian Perrier [EMAIL PROTECTED]  Tue, 30 Sep 2008 20:24:47 +0200
 

commit 726245ee26544ee38fe042de38087f0c0b75d39a

Processing of xorg_7.4~4_i386.changes

2008-10-10 Thread Archive Administrator 
xorg_7.4~4_i386.changes uploaded successfully to ftp.upload.debian.org
along with the files:
  xorg_7.4~4.dsc
  xorg_7.4~4.tar.gz
  x11-common_7.4~4_all.deb
  xorg-dev_7.4~4_all.deb
  xlibmesa-gl_7.4~4_all.deb
  xlibmesa-gl-dev_7.4~4_all.deb
  xlibmesa-glu_7.4~4_all.deb
  libglu1-xorg_7.4~4_all.deb
  libglu1-xorg-dev_7.4~4_all.deb
  xbase-clients_7.4~4_all.deb
  xutils_7.4~4_all.deb
  xserver-xorg_7.4~4_i386.deb
  xserver-xorg-video-all_7.4~4_i386.deb
  xserver-xorg-input-all_7.4~4_i386.deb
  xorg_7.4~4_i386.deb

Greetings,

Your Debian queue daemon


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

Processing of xorg_7.4~4_i386.changes

2008-10-10 Thread Archive Administrator 
xorg_7.4~4_i386.changes uploaded successfully to localhost
along with the files:
  xorg_7.4~4.dsc
  xorg_7.4~4.tar.gz
  x11-common_7.4~4_all.deb
  xorg-dev_7.4~4_all.deb
  xlibmesa-gl_7.4~4_all.deb
  xlibmesa-gl-dev_7.4~4_all.deb
  xlibmesa-glu_7.4~4_all.deb
  libglu1-xorg_7.4~4_all.deb
  libglu1-xorg-dev_7.4~4_all.deb
  xbase-clients_7.4~4_all.deb
  xutils_7.4~4_all.deb
  xserver-xorg_7.4~4_i386.deb
  xserver-xorg-video-all_7.4~4_i386.deb
  xserver-xorg-input-all_7.4~4_i386.deb
  xorg_7.4~4_i386.deb

Greetings,

Your Debian queue daemon


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

xorg_7.4~4_i386.changes ACCEPTED

2008-10-10 Thread Debian Installer 

Accepted:
libglu1-xorg-dev_7.4~4_all.deb
  to pool/main/x/xorg/libglu1-xorg-dev_7.4~4_all.deb
libglu1-xorg_7.4~4_all.deb
  to pool/main/x/xorg/libglu1-xorg_7.4~4_all.deb
x11-common_7.4~4_all.deb
  to pool/main/x/xorg/x11-common_7.4~4_all.deb
xbase-clients_7.4~4_all.deb
  to pool/main/x/xorg/xbase-clients_7.4~4_all.deb
xlibmesa-gl-dev_7.4~4_all.deb
  to pool/main/x/xorg/xlibmesa-gl-dev_7.4~4_all.deb
xlibmesa-gl_7.4~4_all.deb
  to pool/main/x/xorg/xlibmesa-gl_7.4~4_all.deb
xlibmesa-glu_7.4~4_all.deb
  to pool/main/x/xorg/xlibmesa-glu_7.4~4_all.deb
xorg-dev_7.4~4_all.deb
  to pool/main/x/xorg/xorg-dev_7.4~4_all.deb
xorg_7.4~4.dsc
  to pool/main/x/xorg/xorg_7.4~4.dsc
xorg_7.4~4.tar.gz
  to pool/main/x/xorg/xorg_7.4~4.tar.gz
xorg_7.4~4_i386.deb
  to pool/main/x/xorg/xorg_7.4~4_i386.deb
xserver-xorg-input-all_7.4~4_i386.deb
  to pool/main/x/xorg/xserver-xorg-input-all_7.4~4_i386.deb
xserver-xorg-video-all_7.4~4_i386.deb
  to pool/main/x/xorg/xserver-xorg-video-all_7.4~4_i386.deb
xserver-xorg_7.4~4_i386.deb
  to pool/main/x/xorg/xserver-xorg_7.4~4_i386.deb
xutils_7.4~4_all.deb
  to pool/main/x/xorg/xutils_7.4~4_all.deb


Override entries for your package:
libglu1-xorg-dev_7.4~4_all.deb - optional libdevel
libglu1-xorg_7.4~4_all.deb - optional libs
x11-common_7.4~4_all.deb - optional x11
xbase-clients_7.4~4_all.deb - optional x11
xlibmesa-gl-dev_7.4~4_all.deb - optional libdevel
xlibmesa-gl_7.4~4_all.deb - optional libs
xlibmesa-glu_7.4~4_all.deb - optional libdevel
xorg-dev_7.4~4_all.deb - optional x11
xorg_7.4~4.dsc - source x11
xorg_7.4~4_i386.deb - optional x11
xserver-xorg-input-all_7.4~4_i386.deb - optional x11
xserver-xorg-video-all_7.4~4_i386.deb - optional x11
xserver-xorg_7.4~4_i386.deb - optional x11
xutils_7.4~4_all.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]

xorg-server: Changes to 'upstream-experimental'

2008-10-10 Thread Julien Cristau 
 configure.ac|4 +--
 dix/getevents.c |6 ++---
 glx/Makefile.am |6 -
 hw/xfree86/ddc/interpret_edid.c |   41 
 hw/xfree86/dixmods/extmod/xf86dga.c |7 --
 hw/xfree86/int10/helper_exec.c  |   15 +
 hw/xfree86/modes/xf86Crtc.c |3 +-
 mfb/mfbscrinit.c|1 
 xkb/XKBMisc.c   |   13 ---
 xkb/xkb.c   |   17 --
 xkb/xkbUtils.c  |   39 +-
 11 files changed, 109 insertions(+), 43 deletions(-)

New commits:
commit 6dcfa994b0777bf0cabeb71672f13e650b340817
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Fri Oct 10 15:26:32 2008 -0400

xserver 1.5.2

diff --git a/configure.ac b/configure.ac
index ef276cc..88749a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.5.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=23 September 2008
+AC_INIT([xorg-server], 1.5.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=10 October 2008
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit 75504517a30f1bdd593c2a32af81084b59b398a5
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Fri Oct 10 13:41:50 2008 -0400

EDID: Catch monitors that encode aspect ratio for physical size.

This is not legal in either EDID 1.3 or 1.4, but hey, when did a little
thing like legality stop anyone.
(cherry picked from commit 0660dd9d7009147c395b9ea904539f76f55b9a7f)

diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index 21391dd..958247c 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -85,6 +85,47 @@ handle_edid_quirks(xf86MonPtr m)
}
}
 }
+
+/*
+ * some monitors encode the aspect ratio instead of the physical size.
+ * try to find the largest detailed timing that matches that aspect
+ * ratio and use that to fill in the feature section.
+ */
+if ((m-features.hsize == 16  m-features.vsize == 9) ||
+   (m-features.hsize == 16  m-features.vsize == 10) ||
+   (m-features.hsize == 4  m-features.vsize == 3) ||
+   (m-features.hsize == 5  m-features.vsize == 4)) {
+   int real_hsize = 0, real_vsize = 0;
+   float target_aspect, timing_aspect;
+   
+   target_aspect = (float)m-features.hsize / (float)m-features.vsize;
+   for (i = 0; i  4; i++) {
+   if (m-det_mon[i].type == DT) {
+   struct detailed_timings *timing;
+   timing = m-det_mon[i].section.d_timings;
+
+   if (!timing-v_size)
+   continue;
+
+   timing_aspect = (float)timing-h_size / (float)timing-v_size;
+   if (fabs(1 - (timing_aspect / target_aspect))  0.05) {
+   real_hsize = max(real_hsize, timing-h_size);
+   real_vsize = max(real_vsize, timing-v_size);
+   }
+   }
+   }
+
+   if (real_hsize  real_vsize) {
+   /* convert mm to cm */
+   m-features.hsize = (real_hsize + 5) / 10;
+   m-features.vsize = (real_vsize + 5) / 10;
+   } else {
+   m-features.hsize = m-features.vsize = 0;
+   }
+   
+   xf86Msg(X_INFO, Quirked EDID physical size to %dx%d cm\n,
+   m-features.hsize, m-features.vsize);
+}
 }
 
 xf86MonPtr

commit b595b65e54b1e15fbce872fe3719da14cfae5b92
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Thu Oct 9 14:53:29 2008 -0400

Revert Array-index based devPrivates implementation.

This reverts commit 8ef37c194fa08d3911095299413a42a01162b078.

diff --git a/dix/privates.c b/dix/privates.c
index ca03317..efb3204 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -40,8 +40,9 @@ from The Open Group.
 #include inputstr.h
 
 struct _Private {
-int state;
-pointer value;
+DevPrivateKey  key;
+pointervalue;
+struct _Private*next;
 };
 
 typedef struct _PrivateDesc {
@@ -49,36 +50,22 @@ typedef struct _PrivateDesc {
 unsigned size;
 CallbackListPtr initfuncs;
 CallbackListPtr deletefuncs;
+struct _PrivateDesc *next;
 } PrivateDescRec;
 
-#define PRIV_MAX 256
-#define PRIV_STEP 16
-
 /* list of all allocated privates */
-static PrivateDescRec items[PRIV_MAX];
-static int nextPriv;
+static PrivateDescRec *items = NULL;
 
-static PrivateDescRec *
+static _X_INLINE PrivateDescRec *
 findItem(const DevPrivateKey key)
 {
-if (!*key) {
-   if (nextPriv = PRIV_MAX)
-   return NULL;
-
-   items[nextPriv].key = key;
-   *key = nextPriv;
-   nextPriv++;
+PrivateDescRec *item = items;
+while (item) {
+

xorg-server: Changes to 'debian-experimental'

2008-10-10 Thread Julien Cristau 
 ChangeLog|  152 +++
 configure.ac |4 
 debian/changelog |   10 ++
 debian/control   |   23 +++--
 debian/rules |   11 +-
 debian/xserver-common.install|2 
 debian/xserver-xorg-core.install |1 
 debian/xserver-xorg-core.postinst.in |   22 +
 debian/xserver-xorg-core.postrm.in   |   13 ++
 debian/xserver-xorg-core.preinst.in  |   21 
 dix/getevents.c  |6 -
 glx/Makefile.am  |6 +
 hw/xfree86/ddc/interpret_edid.c  |   41 +
 hw/xfree86/dixmods/extmod/xf86dga.c  |7 +
 hw/xfree86/int10/helper_exec.c   |   15 ---
 hw/xfree86/modes/xf86Crtc.c  |3 
 mfb/mfbscrinit.c |1 
 xkb/XKBMisc.c|   13 ++
 xkb/xkb.c|   17 +--
 xkb/xkbUtils.c   |   39 +++-
 20 files changed, 349 insertions(+), 58 deletions(-)

New commits:
commit 67dcdfd59390d8f4c49eed0224c5a5c8684bec05
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Oct 11 03:49:19 2008 +0200

Also remove /etc/X11/xserver if it's empty

diff --git a/debian/xserver-xorg-core.postinst.in 
b/debian/xserver-xorg-core.postinst.in
index fca5608..d047bb1 100644
--- a/debian/xserver-xorg-core.postinst.in
+++ b/debian/xserver-xorg-core.postinst.in
@@ -11,6 +11,7 @@ case $1 in
   configure)
   if dpkg --compare-versions $2 lt-nl 2:1.5.2-1; then
 remove_conffile_commit /etc/X11/xserver/SecurityPolicy
+rmdir /etc/X11/xserver || true
   fi
 esac
 

commit 6e9638e4566b041975f6a2a209c0bd8bd9064add
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Oct 11 03:30:51 2008 +0200

Remove obsolete conffile /etc/X11/xserver/SecurityPolicy on upgrades.

diff --git a/debian/changelog b/debian/changelog
index 868a763..8f99cb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xorg-server (2:1.5.2-1) UNRELEASED; urgency=low
 /usr/lib/xorg/protocol.txt and the Xserver(1) manpage for now.
   * debian/rules: Use filter instead of findstring for noopt in
 DEB_BUILD_OPTIONS.
+  * Remove obsolete conffile /etc/X11/xserver/SecurityPolicy on upgrades.
 
  -- Julien Cristau [EMAIL PROTECTED]  Thu, 25 Sep 2008 18:50:19 +0200
 
diff --git a/debian/xserver-xorg-core.postinst.in 
b/debian/xserver-xorg-core.postinst.in
new file mode 100644
index 000..fca5608
--- /dev/null
+++ b/debian/xserver-xorg-core.postinst.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=xserver-xorg-core
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+case $1 in
+  configure)
+  if dpkg --compare-versions $2 lt-nl 2:1.5.2-1; then
+remove_conffile_commit /etc/X11/xserver/SecurityPolicy
+  fi
+esac
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sw=2 ts=2 tw=80:
diff --git a/debian/xserver-xorg-core.postrm.in 
b/debian/xserver-xorg-core.postrm.in
index 7d4be1b..19bec1e 100644
--- a/debian/xserver-xorg-core.postrm.in
+++ b/debian/xserver-xorg-core.postrm.in
@@ -7,9 +7,18 @@ THIS_SCRIPT=postrm
 
 #INCLUDE_SHELL_LIB#
 
-if [ $1 = purge ]; then
+case $1 in
+abort-install|abort-upgrade)
+  if dpkg --compare-versions $2 lt-nl 2:1.5.2-1; then
+remove_conffile_rollback /etc/X11/xserver/SecurityPolicy
+  fi
+  ;;
+purge)
   rm /var/log/Xorg.*.log || true
   rm /var/log/Xorg.*.log.old || true
-fi
+  ;;
+esac
 
 #DEBHELPER#
+
+# vim:set ai et sts=2 sw=2 tw=0:
diff --git a/debian/xserver-xorg-core.preinst.in 
b/debian/xserver-xorg-core.preinst.in
new file mode 100644
index 000..c1b84a2
--- /dev/null
+++ b/debian/xserver-xorg-core.preinst.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=xserver-xorg-core
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+case $1 in
+upgrade|install)
+  if dpkg --compare-versions $2 lt-nl 2:1.5.2-1; then
+remove_conffile_lookup xserver-xorg-core /etc/X11/xserver/SecurityPolicy
+  fi
+esac
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sw=2 ts=2 tw=80:

commit 2ac3a730aa1ab59e0ef74d2393722268862a0a0c
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Oct 11 02:55:51 2008 +0200

debian/rules: Use filter instead of findstring for noopt in 
DEB_BUILD_OPTIONS.

diff --git a/debian/changelog b/debian/changelog
index be877d1..868a763 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xorg-server (2:1.5.2-1) UNRELEASED; urgency=low
 it for Xprint.
   * Re-introduce the xserver-common package, containing
 /usr/lib/xorg/protocol.txt and the Xserver(1) manpage for now.
+  * debian/rules: Use filter instead of findstring for noopt in
+DEB_BUILD_OPTIONS.
 
  -- Julien Cristau [EMAIL PROTECTED]  Thu, 25 Sep 2008 18:50:19 +0200
 
diff --git a/debian/rules b/debian/rules
index ee13076..0c808dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@
 include debian/xsfbs/xsfbs.mk
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter

Bug#499788: marked as done (xserver-xorg-input-kbd: keyboard frequently gets into weird state)

2008-10-10 Thread Debian Bug Tracking System 

Your message dated Sat, 11 Oct 2008 13:22:22 +0800
with message-id [EMAIL PROTECTED]
and subject line Fw: Re: Bug#499788: Acknowledgement (xserver-xorg-input-kbd: 
keyboard  frequently gets into weird state)
has caused the Debian Bug report #499788,
regarding xserver-xorg-input-kbd: keyboard frequently gets into weird state
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 this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)


-- 
499788: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=499788
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
---BeginMessage---
Package: xserver-xorg-input-kbd
Version: 1:1.3.1-1
Severity: important


On this Thinkpad x24 / KDE / running SCIM, I am frequently finding that 
the keyboard seems to have gotten itself re-mapped in the middle of my 
typing or using the keyboard to navigate (I frequently eschew mouse for 
keyboard navigation) and I don't know what I might have done to cause 
it. The most frequent situation: suddenly PgUp and PgDn start cycling 
between the tabs of my mrxvt terminal window, for instance, rather then 
scrolling in 'less' as they have always done before. The symptoms 
sometimes express themselves in other ways, it is a bit confusing 
because it is not consistent.

Sometimes repeated presses of Ctrl-Shift gets me out of trouble. I seem 
to have had at least one xserver crash a couple days ago, while this was 
happening. (No logs, sorry)

The details are so fuzzy that I hesitate to issue a bug report, but this 
happens *a lot* on this machine, and it started very recently.

-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)

Kernel: Linux 2.6.26-1-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages xserver-xorg-input-kbd depends on:
ii  libc6 2.7-13 GNU C Library: Shared libraries
ii  xserver-xorg-core 2:1.4.2-5  Xorg X server - core server

xserver-xorg-input-kbd recommends no packages.

xserver-xorg-input-kbd suggests no packages.

-- no debconf information


---End Message---
---BeginMessage---
This bug appears to have gone away with a recent xorg upload, though
the package named in this bug report (xserver-xorg-input-keyboard) does
not seem to have changed.

As originator, I am closing it.

---End Message---