Bug#661022: This bug is now fixed

2012-05-06 Thread Eric Valette 

Please close it.



--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/4fa63ba8.80...@free.fr

Bug#661022: marked as done (mesa: Color distorsion with XBMC media player)

2012-05-06 Thread Debian Bug Tracking System 
Your message dated Sun, 6 May 2012 11:08:29 +0200
with message-id 20120506090828.ga17...@mraw.org
and subject line Re: Bug#661022: This bug is now fixed
has caused the Debian Bug report #661022,
regarding mesa: Color distorsion with XBMC media player
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 ow...@bugs.debian.org
immediately.)


-- 
661022: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661022
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
---BeginMessage---
Source: mesa
Severity: important
Tags: patch upstream

See this bug. Its very annoying whenb playing video in XBMC or other media 
player
(Unwatchable I would say).


https://bugs.freedesktop.org/show_bug.cgi?id=44333

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.7 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=fr_FR.UTF8, LC_CTYPE=fr_FR.UTF8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash


---End Message---
---BeginMessage---
Version: 8.0.2-1

Eric Valette eric.vale...@free.fr (06/05/2012):
 Please close it.

Please consider reading some doc and do that yourself next time.

Mraw,
KiBi.


signature.asc
Description: Digital signature
---End Message---

Bug#670570: Another success story with 6bda7ceda645e838723883d133d614def1511d16

2012-05-06 Thread Jukka Ollila 
I was seeing this too on an Acer Ferrari 1000 laptop with UMS. Xterm
worked fine, trying to start chromium would crash X.

Applying 6bda7ceda645e838723883d133d614def1511d16 on top of
xserver-xorg-video-ati 6.14.4-2 fixes the issue.

FWIW, KMS works (worked) fine except for suspend/resume which fails at
resume similarly to https://bugs.freedesktop.org/show_bug.cgi?id=20478
.

-J



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/CAGoecWw75kWhVtchQOX=oqq0txycnqdij0_zgpp_ulk7vz2...@mail.gmail.com

Bug#671747: mesa: Ship drirc

2012-05-06 Thread Kurt Roeckx 
Source: mesa
Version: 8.0.2-2
Severity: wishlist

Hi,

Upstream added a way to set some application specific options (for
broken applications), and added some default values.  It's stored
in the drirc file.  Could you please consider shipping this?
Maybe in an arch all package?


Kurt




-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20120506155309.ga21...@roeckx.be

Bug#671747: mesa: Ship drirc

2012-05-06 Thread Cyril Brulebois 
Kurt Roeckx k...@roeckx.be (06/05/2012):
 Upstream added a way to set some application specific options (for
 broken applications), and added some default values.  It's stored
 in the drirc file.  Could you please consider shipping this?
 Maybe in an arch all package?

I'd rather keep it under /u/s/d, maybe in a examples/ directory;
I'd be happy not to reach the 100th binary package soon…

Mraw,
KiBi.


signature.asc
Description: Digital signature

Bug#658546: Workarounds found

2012-05-06 Thread Jan Harnisch 

Hello again,

in the meantime I have received a mail with two possible workarounds 
(thanks Jeroen Diederen!). He wrote:


--snip

I found a solution for myself, thanks to someone on my forum on
mintppc.org. I can now use nouveau normally, to do this there are two
ways, of which the second one is permanent of course:

1. via a kernel command line (I guess you use Grub, you have to add it
with e (edit) and add:
nouveau.noaccel=1

or

2. Edit (nano) /etc/modprobe.d/nouveau.conf to include:
options nouveau noaccel=1

--snip

I might add that in Jeroens' case the problem occurred although he uses 
only one single monitor, however with a higher number of pixels. So 
maybe the problem is somehow related to a limited amount of graphics memory.
In the meantime I have successfully tried both methods. For method 2. 
the file /etc/modprobe.d/nouveau.conf did not yet exist and had to be 
created. I also ran update-initramfs -u to put the option into the 
initrd (didn´t test whether it also works without that, though).


Best regards

Jan



--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/4fa6b6a9.5070...@bnhof.de

Bug#658546: Workarounds found

2012-05-06 Thread Sven Joachim 
Am 06.05.2012 um 19:36 schrieb Jan Harnisch:

 Hello again,

 in the meantime I have received a mail with two possible workarounds
 (thanks Jeroen Diederen!). He wrote:

 --snip

 I found a solution for myself, thanks to someone on my forum on
 mintppc.org. I can now use nouveau normally, to do this there are two
 ways, of which the second one is permanent of course:

 1. via a kernel command line (I guess you use Grub, you have to add it
 with e (edit) and add:
 nouveau.noaccel=1

 or

 2. Edit (nano) /etc/modprobe.d/nouveau.conf to include:
 options nouveau noaccel=1

 --snip

Disabling acceleration kills performance, so this is really the last
resort.

 I might add that in Jeroens' case the problem occurred although he
 uses only one single monitor, however with a higher number of
 pixels. So maybe the problem is somehow related to a limited amount of
 graphics memory.

Seems unlikely to me, your card seems to have 128 MB memory and Jeroen's
has even 256 if I read his report correctly.

 In the meantime I have successfully tried both methods. For method
 2. the file /etc/modprobe.d/nouveau.conf did not yet exist and had to
 be created. I also ran update-initramfs -u to put the option into the
 initrd (didn´t test whether it also works without that, though).

By default graphics drivers are not included in the initramfs, so that
should not be necessary.

Cheers,
   Sven



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87r4uxfa4l@turtle.gmx.de

Bug#671747: drirc

2012-05-06 Thread Fabio Pedretti 
That file is intended to be installed in /etc/ so that the options just work.

Also I think it should be shipped with libgl1-mesa-dri .



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/28440426.3720331336330177040.JavaMail.defaultUser@defaultHost

Bug#671747: drirc

2012-05-06 Thread Cyril Brulebois 
Fabio Pedretti fabio@libero.it (06/05/2012):
 That file is intended to be installed in /etc/ so that the options
 just work.

AFAICT, it's not like it's needed in the general case:
$ git show upstream/master:src/mesa/drivers/dri/common/drirc|awk -F\ 
'/executable/ {print $2}'
Unigine Sanctuary
Unigine Tropics
Unigine Heaven (32-bit)
Unigine Heaven (64-bit)

 Also I think it should be shipped with libgl1-mesa-dri .

Configuration files in libraries is generally a bad idea. Hence my
suggestion to ship it under /u/s/d. Maybe Julien has another opinion
on that, let's see.

Mraw,
KiBi.


signature.asc
Description: Digital signature

Bug#671800: xserver-xorg-video-savage: segfaults under X.Org X Server 1.12.1

2012-05-06 Thread Stefan Lippers-Hollmann 
Package: xserver-xorg-video-savage
Version: 1:2.3.3-1+b1
Severity: normal

Hi

Starting with xserver-xorg-core 2:1.12.1-1, I'm expieriencing this 
segfault with xserver-xorg-video-savage:


[kdm.log]
X.Org X Server 1.12.1
Release Date: 2012-04-13
X Protocol Version 11, Revision 0
Build Operating System: Linux 2.6.32-5-686-bigmem i686 Debian
Current Operating System: Linux fsc-cy23 3.2.0-2-486 #1 Mon Apr 30 05:10:18 UTC 
2012 i686
Kernel command line: BOOT_IMAGE=/boot/vmlinuz-3.2.0-2-486 
root=UUID=22060915-d947-4635-be76-7c2f557197e3 ro vga=791 quiet
Build Date: 01 May 2012  01:04:39AM
xorg-server 2:1.12.1-1 (Cyril Brulebois k...@debian.org) 
Current version of pixman: 0.24.4
Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
(==) Log file: /var/log/Xorg.0.log, Time: Sun May  6 18:21:07 2012
(==) Using system config directory /usr/share/X11/xorg.conf.d

Backtrace:
0: /usr/bin/X (xorg_backtrace+0x49) [0xb76bb919]
1: /usr/bin/X (0xb7533000+0x18c38a) [0xb76bf38a]
2: (vdso) (__kernel_rt_sigreturn+0x0) [0xb7515410]

Segmentation fault at address (nil)

Fatal server error:
Caught signal 11 (Segmentation fault). Server aborting


Please consult the The X.Org Foundation support 
 at http://wiki.x.org
 for help. 
Please also check the log file at /var/log/Xorg.0.log for additional 
information.

Server terminated with error (1). Closing log file.


this was working fine with xserver-xorg-core 2:1.11.4-1 and 
xserver-xorg-video-savage 1:2.3.3-1+b1. I'm seeing the same symptoms
with kernel 3.3.5-rc1.


This is the last successful kdm.log (unfortunately Xorg.log* was 
already overwritten) excerpt, still using xserver-xorg-core 2:1.11.4-1:


[kdm.log]
X.Org X Server 1.11.4
Release Date: 2012-01-27
X Protocol Version 11, Revision 0
Build Operating System: Linux 2.6.32-5-amd64 i686 Debian
Current Operating System: Linux fsc-cy23 3.3-4.slh.1-aptosid-686 #1 SMP PREEMPT 
Sat Apr 28 00:33:17 UTC 2012 i686
Kernel command line: BOOT_IMAGE=/boot/vmlinuz-3.3-4.slh.1-aptosid-686 
root=UUID=22060915-d947-4635-be76-7c2f557197e3 ro vga=791 quiet
Build Date: 05 March 2012  04:16:09AM
xorg-server 2:1.11.4-1 (Cyril Brulebois k...@debian.org) 
Current version of pixman: 0.24.4
Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
(==) Log file: /var/log/Xorg.0.log, Time: Thu May  3 03:58:28 2012
(==) Using system config directory /usr/share/X11/xorg.conf.d
error setting MTRR (base = 0xf200, size = 0x0500, type = 1) Invalid 
argument (22)
[10e] 320 x 200, 70Hz
[111] 640 x 480, 60Hz, 72Hz, 75Hz, 85Hz
[114] 800 x 600, 60Hz, 72Hz, 75Hz, 85Hz
[117] 1024 x 768, 60Hz, 70Hz, 75Hz, 85Hz
[11a] 1280 x 1024, 60Hz, 75Hz
[11d] 640 x 400, 70Hz
[122] 1600 x 1200, 60Hz
[133] 320 x 240, 72Hz
[13c] 1400 x 1050, 60Hz, 75Hz
[143] 400 x 300, 72Hz
[153] 512 x 384, 70Hz
[173] 720 x 480, 75Hz
[17e] 720 x 576, 75Hz
The XKEYBOARD keymap compiler (xkbcomp) reports:
 Warning:  Type ONE_LEVEL has 1 levels, but RALT has 2 symbols
   Ignoring extra symbols
Errors from xkbcomp are not fatal to the X server
klauncher(1780) kdemain: No DBUS session-bus found. Check if you have started 
the DBUS server. 
kdeinit4: Communication error with launcher. Exiting!
kdmgreet(1772)/kdecore (K*TimeZone*): KSystemTimeZones: ktimezoned initialize() 
D-Bus call failed:  Not connected to D-Bus server 

kdmgreet(1772)/kdecore (K*TimeZone*): No time zone information obtained from 
ktimezoned 
Server terminated successfully (0). Closing log file.


Regards
Stefan Lippers-Hollmann

-- Package-specific info:
X server symlink status:

lrwxrwxrwx 1 root root 13 Nov 22  2006 /etc/X11/X - /usr/bin/Xorg
-rwxr-xr-x 1 root root 2072872 May  1 03:12 /usr/bin/Xorg

VGA-compatible devices on PCI bus:
--
01:00.0 VGA compatible controller [0300]: S3 Inc. 86C380 [ProSavageDDR K4M266] 
[5333:8d01] (rev 02)

/etc/X11/xorg.conf does not exist.

/etc/X11/xorg.conf.d does not exist.

KMS configuration files:

/etc/modprobe.d/i915-kms.conf:
  options i915 modeset=1
/etc/modprobe.d/radeon-kms.conf:
  options radeon modeset=1

Kernel version (/proc/version):
---
Linux version 3.2.0-2-486 (Debian 3.2.16-1) (debian-ker...@lists.debian.org) 
(gcc version 4.6.3 (Debian 4.6.3-4) ) #1 Mon Apr 30 05:10:18 UTC 2012

Xorg X server log files on system:
--
-rw-r--r-- 1

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

2012-05-06 Thread Cyril Brulebois 
Tag 'xserver-xorg-input-synaptics-1.6.0-1' created by Cyril Brulebois 
k...@debian.org at 2012-05-06 23:29 +

Tagging upload of xserver-xorg-input-synaptics 1.6.0-1 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAk+nCT4ACgkQeGfVPHR5Nd07jQCfTph627v/UFWwPTuyB3UC16La
7zYAnjenJy96VYneBUV04BxvMkMtTbIi
=H4AA
-END PGP SIGNATURE-

Changes since xserver-xorg-input-synaptics-1.5.99.904-2:
Cyril Brulebois (3):
  Merge branch 'upstream-unstable' into debian-unstable
  New upstream release.
  Upload to unstable.

Niveditha Rau (1):
  Include a build for solaris

Peter Hutterer (7):
  man: drop mention of shm configuration
  man: fix hyphenation
  Reset all hardware state on DEVICE_OFF (#49161)
  Force SLOTSTATE_EMPTY on DeviceOff
  Fail if no backends can be found
  Fix coasting for negative scroll directions
  synaptics 1.6.0

---
 ChangeLog |   83 ++
 configure.ac  |8 +++--
 debian/changelog  |6 +++
 man/synaptics.man |5 ---
 src/eventcomm.c   |2 -
 src/synaptics.c   |   47 ++
 src/synproto.c|   27 -
 src/synproto.h|3 +
 8 files changed, 165 insertions(+), 16 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srb1s-0006sd...@vasks.debian.org

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

2012-05-06 Thread Cyril Brulebois 
 ChangeLog |   83 ++
 configure.ac  |8 +++--
 debian/changelog  |6 +++
 man/synaptics.man |5 ---
 src/eventcomm.c   |2 -
 src/synaptics.c   |   47 ++
 src/synproto.c|   27 -
 src/synproto.h|3 +
 8 files changed, 165 insertions(+), 16 deletions(-)

New commits:
commit b0c4db73bea1ee1b0292f7d8cd8c6d0bf1fdcfcc
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 7 01:13:11 2012 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 2083b25..121024a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-synaptics (1.6.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.6.0-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Cyril Brulebois k...@debian.org  Mon, 07 May 2012 01:12:35 +0200
+ -- Cyril Brulebois k...@debian.org  Mon, 07 May 2012 01:13:08 +0200
 
 xserver-xorg-input-synaptics (1.5.99.904-2) unstable; urgency=low
 

commit afeef0e5f8b966e9a017b51e2824fdc3e69ca3aa
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 7 01:12:45 2012 +0200

New upstream release.

diff --git a/ChangeLog b/ChangeLog
index b178b50..45c61db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,86 @@
+commit a1162f80324c379bc7581e53275e8ff6d569f8b0
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Thu May 3 08:06:32 2012 +1000
+
+synaptics 1.6.0
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 52e194b76c9598e0fbf556e3aa97168ed4f0e2b6
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed May 2 10:16:30 2012 +1000
+
+Fix coasting for negative scroll directions
+
+1874094f0e99d8db319f6cf769ce5a25c9bc490c introduced negative scroll
+directions. Coasting assumed always-positive increments and triggered an
+endless scrolling loop.
+
+Reported-by: Matthias Clasen mcla...@redhat.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+
+commit 6f086b86e4bd3c720289e91fdbb933bf3e559e72
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed May 2 09:16:27 2012 +1000
+
+Fail if no backends can be found
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+
+commit 655d3100fc3f06e714ec4aa01607d86509952e4b
+Author: Niveditha Rau niveditha@oracle.com
+Date:   Mon Apr 30 14:51:07 2012 -0700
+
+Include a build for solaris
+
+Signed-off-by: Niveditha Rau niveditha@oracle.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit d13e83b921a398b9472b07874cf5061c8a0ea6a6
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Apr 30 11:39:49 2012 +1000
+
+Force SLOTSTATE_EMPTY on DeviceOff
+
+SLOTSTATE_OPEN_EMPTY on resume leads to erroneously detected touches.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+
+commit cc595bd323aab2b0ef7b41fded2f0b5571cf0a8e
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Apr 30 10:47:14 2012 +1000
+
+Reset all hardware state on DEVICE_OFF (#49161)
+
+Reset all state on DeviceOff to avoid stuck buttons on resume.
+
+X.Org Bug 49161 http://bugs.freedesktop.org/show_bug.cgi?id=49161
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+
+commit e19fff64f76200291c22d6b822bb4e8b06816745
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Apr 30 09:30:53 2012 +1000
+
+man: fix hyphenation
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 3cc828b4764c101f9acd0db9ee3638036ec7a948
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Apr 30 09:28:39 2012 +1000
+
+man: drop mention of shm configuration
+
+SHM is for debugging only now, not configuration.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
 commit 085662e9fe13d46b9633f1b7b9e8f95bacdec30c
 Author: Peter Hutterer peter.hutte...@who-t.net
 Date:   Fri Apr 27 09:20:56 2012 +1000
diff --git a/debian/changelog b/debian/changelog
index 0030204..2083b25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.6.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Cyril Brulebois k...@debian.org  Mon, 07 May 2012 01:12:35 +0200
+
 xserver-xorg-input-synaptics (1.5.99.904-2) unstable; urgency=low
 
   * Add a build-dep on libmtdev-dev now that X server 1.12 is in sid,

commit a1162f80324c379bc7581e53275e8ff6d569f8b0
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu May 3 08:06:32 2012 +1000

synaptics 1.6.0

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff

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

2012-05-06 Thread Cyril Brulebois 
 configure.ac  |8 ++--
 man/synaptics.man |5 +
 src/eventcomm.c   |2 +-
 src/synaptics.c   |   47 +--
 src/synproto.c|   27 +--
 src/synproto.h|3 ++-
 6 files changed, 76 insertions(+), 16 deletions(-)

New commits:
commit a1162f80324c379bc7581e53275e8ff6d569f8b0
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu May 3 08:06:32 2012 +1000

synaptics 1.6.0

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 3238e32..e5b92f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-synaptics],
-[1.5.99.904],
+[1.6.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-synaptics])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 52e194b76c9598e0fbf556e3aa97168ed4f0e2b6
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed May 2 10:16:30 2012 +1000

Fix coasting for negative scroll directions

1874094f0e99d8db319f6cf769ce5a25c9bc490c introduced negative scroll
directions. Coasting assumed always-positive increments and triggered an
endless scrolling loop.

Reported-by: Matthias Clasen mcla...@redhat.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Chase Douglas chase.doug...@canonical.com

diff --git a/src/synaptics.c b/src/synaptics.c
index 6dc8004..77eb5be 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -2625,7 +2625,8 @@ HandleScrolling(SynapticsPrivate *priv, struct 
SynapticsHwState *hw,
 
 if (priv-scroll.coast_speed_y) {
double dtime = (hw-millis - priv-scroll.last_millis) / 1000.0;
-   double ddy = para-coasting_friction * dtime * para-scroll_dist_vert;
+   double ddy = para-coasting_friction * dtime * 
abs(para-scroll_dist_vert);
+
priv-scroll.delta_y += priv-scroll.coast_speed_y * dtime;
delay = MIN(delay, POLL_MS);
if (abs(priv-scroll.coast_speed_y)  ddy) {
@@ -2638,7 +2639,7 @@ HandleScrolling(SynapticsPrivate *priv, struct 
SynapticsHwState *hw,
 
 if (priv-scroll.coast_speed_x) {
double dtime = (hw-millis - priv-scroll.last_millis) / 1000.0;
-   double ddx = para-coasting_friction * dtime * para-scroll_dist_horiz;
+   double ddx = para-coasting_friction * dtime * 
abs(para-scroll_dist_horiz);
priv-scroll.delta_x += priv-scroll.coast_speed_x * dtime;
delay = MIN(delay, POLL_MS);
if (abs(priv-scroll.coast_speed_x)  ddx) {

commit 6f086b86e4bd3c720289e91fdbb933bf3e559e72
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed May 2 09:16:27 2012 +1000

Fail if no backends can be found

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
Reviewed-by: Chase Douglas chase.doug...@canonical.com

diff --git a/configure.ac b/configure.ac
index dbf3fec..3238e32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,7 @@ case ${host} in
BUILD_PS2COMM=yes
;;
 *)
-   AC_MSG_RESULT([none])
+   AC_MSG_ERROR([Cannot find suitable backends for this platform.])
;;
 esac
 if test x$BUILD_EVENTCOMM = xyes; then

commit 655d3100fc3f06e714ec4aa01607d86509952e4b
Author: Niveditha Rau niveditha@oracle.com
Date:   Mon Apr 30 14:51:07 2012 -0700

Include a build for solaris

Signed-off-by: Niveditha Rau niveditha@oracle.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index eaa1c98..dbf3fec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,6 +115,10 @@ case ${host} in
BUILD_PS2COMM=yes
BUILD_PSMCOMM=yes
;;
+*solaris*)
+   AC_MSG_RESULT([ps2comm alpscomm])
+   BUILD_PS2COMM=yes
+   ;;
 *)
AC_MSG_RESULT([none])
;;

commit d13e83b921a398b9472b07874cf5061c8a0ea6a6
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Apr 30 11:39:49 2012 +1000

Force SLOTSTATE_EMPTY on DeviceOff

SLOTSTATE_OPEN_EMPTY on resume leads to erroneously detected touches.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Chase Douglas chase.doug...@canonical.com

diff --git a/src/eventcomm.c b/src/eventcomm.c
index 741f988..4ef8ad6 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -662,7 +662,7 @@ EventReadHwState(InputInfoPtr pInfo,
 SynapticsParameters *para = priv-synpara;
 struct eventcomm_proto_data *proto_data = priv-proto_data;
 
-SynapticsResetTouchHwState(hw);
+SynapticsResetTouchHwState(hw, FALSE);
 
 /* Reset cumulative values if buttons were not previously pressed */
 if (!hw-left  !hw-right  !hw-middle)
diff --git a/src/synaptics.c b/src/synaptics.c
index 935650d..6dc8004 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -1619,7 +1619,7 @@ timerFunc(OsTimerPtr timer,

Processing of xserver-xorg-input-synaptics_1.6.0-1_amd64.changes

2012-05-06 Thread Debian FTP Masters 
xserver-xorg-input-synaptics_1.6.0-1_amd64.changes uploaded successfully to 
localhost
along with the files:
  xserver-xorg-input-synaptics_1.6.0-1.dsc
  xserver-xorg-input-synaptics_1.6.0.orig.tar.gz
  xserver-xorg-input-synaptics_1.6.0-1.diff.gz
  xserver-xorg-input-synaptics_1.6.0-1_amd64.deb
  xserver-xorg-input-synaptics-dev_1.6.0-1_all.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srb69-0006jj...@franck.debian.org

Bug#671800: xserver-xorg-video-savage: segfaults under X.Org X Server 1.12.1

2012-05-06 Thread Cyril Brulebois 
Hi Stefan,

Stefan Lippers-Hollmann s@gmx.de (07/05/2012):
 Backtrace:
 0: /usr/bin/X (xorg_backtrace+0x49) [0xb76bb919]
 1: /usr/bin/X (0xb7533000+0x18c38a) [0xb76bf38a]
 2: (vdso) (__kernel_rt_sigreturn+0x0) [0xb7515410]
 
 Segmentation fault at address (nil)

hmm, doesn't look too helpful. Does gdb help? Starters' doc available at:
  http://x.debian.net/howto/use-gdb.html

FWIW, new xorg-server should fly to unstable in a few minutes; you may
want to try and reproduce with that one.

Mraw,
KiBi.


signature.asc
Description: Digital signature

xserver-xorg-input-synaptics_1.6.0-1_amd64.changes ACCEPTED into unstable

2012-05-06 Thread Debian FTP Masters 



Accepted:
xserver-xorg-input-synaptics-dev_1.6.0-1_all.deb
  to 
main/x/xserver-xorg-input-synaptics/xserver-xorg-input-synaptics-dev_1.6.0-1_all.deb
xserver-xorg-input-synaptics_1.6.0-1.diff.gz
  to 
main/x/xserver-xorg-input-synaptics/xserver-xorg-input-synaptics_1.6.0-1.diff.gz
xserver-xorg-input-synaptics_1.6.0-1.dsc
  to 
main/x/xserver-xorg-input-synaptics/xserver-xorg-input-synaptics_1.6.0-1.dsc
xserver-xorg-input-synaptics_1.6.0-1_amd64.deb
  to 
main/x/xserver-xorg-input-synaptics/xserver-xorg-input-synaptics_1.6.0-1_amd64.deb
xserver-xorg-input-synaptics_1.6.0.orig.tar.gz
  to 
main/x/xserver-xorg-input-synaptics/xserver-xorg-input-synaptics_1.6.0.orig.tar.gz


Changes:
xserver-xorg-input-synaptics (1.6.0-1) unstable; urgency=low
 .
  * New upstream release.


Override entries for your package:
xserver-xorg-input-synaptics-dev_1.6.0-1_all.deb - optional libdevel
xserver-xorg-input-synaptics_1.6.0-1.dsc - source x11
xserver-xorg-input-synaptics_1.6.0-1_amd64.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srbdv-0001ek...@franck.debian.org

xorg-server: Changes to 'refs/tags/xorg-server-2_1.12.1-2'

2012-05-06 Thread Cyril Brulebois 
Tag 'xorg-server-2_1.12.1-2' created by Cyril Brulebois k...@debian.org at 
2012-05-07 00:17 +

Tagging upload of xorg-server 2:1.12.1-2 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAk+nFI0ACgkQeGfVPHR5Nd2/DQCgzO3XXTiyM0x/pTjMppiPORi0
kPkAn3FSqP90DSgghF0wHRCZbW0/dgYg
=ttv8
-END PGP SIGNATURE-

Changes since xorg-server-2_1.12.1-1:
Andreas Wettstein (1):
  XKB: Redirect actions defunct with Gtk3 (XInput?)

Chase Douglas (22):
  Don't update listener after deactivating implicit pointer grab
  Update event type when delivering end event to a pointer listener
  Ensure sequential touches are pointer emulated sequentially
  Use touch state when querying pointer through core protocol
  Check core event mask properly for pointer emulated touch events
  Only set XI2 mask if pointer emulation is for XI2 client
  Split out helper function TouchListenerAcceptReject()
  Accept touch sequence for pointer listener after second event delivery
  When deactivating an explicit pointer grab, reject all grabs on touches
  Fix copy/paste error from before git history in UpdateCurrentTimeIf()
  On touch accept, only process end event for owner if it has seen the end
  End a pointer emulated touch event only on a real end event
  Don't deactivate implicit pointer grab on fake touch end event
  When activating an explicit grab, update owning listener
  Rename TouchEnsureSprite to TouchBuildSprite and event type checks
  Create a new dix touch record for an emulated touch with no listeners
  Ensure touch is ended when last listener is rejected
  Check other clients' core masks properly when adding touch listener
  Update device state including when touch record does not exist
  Update currentTime in dispatch loop
  Replay original touch begin event instead of generated begin event
  TouchListenerAcceptReject: Warn and return early on bad listener index

Cyril Brulebois (3):
  Merge branch 'upstream-unstable' into debian-unstable
  Bump changelogs.
  Upload to unstable.

Jeremy Huddleston (7):
  XQuartz: Fix a deadlock in pre-dispatch code
  XQuartz: Correct calculation of the size of our file descriptor array in 
console_redirect
  XQuartz: Separate out tablet and mouse event delivery into separate 
functions
  XQuartz: Use screenInfo.{width,height} instead of grabbing it from the 
first screen
  XQuartz: Add a hack to better handle clicky wheel scroll mice
  XQuartz: darwinPointer now sends both absolute and relative motion
  XQuartz: Make sure we tell startx the correct server binary to use in our 
fallback path

Jonas Maebe (1):
  glapi: Correct size of allocated _glapi_table struct

Michal Suchanek (1):
  xfree86: workaround crash on close

Peter Hutterer (4):
  dix: IsFloating() on master devices is always false
  os: make timers signal-safe
  dix: don't emulate scroll events for non-existing axes (#47281)
  dix: when disabling a device, release all buttons and keys

---
 ChangeLog |  565 ++
 Xi/exevents.c |  174 +-
 debian/changelog  |9 
 dix/devices.c |2 
 dix/dispatch.c|5 
 dix/events.c  |   60 ++-
 dix/getevents.c   |3 
 dix/touch.c   |  122 ---
 glx/glapi_gentable.c  |2 
 hw/xfree86/modes/xf86Rotate.c |   11 
 hw/xquartz/X11Application.m   |  154 -
 hw/xquartz/console_redirect.c |2 
 hw/xquartz/darwin.c   |   57 +--
 hw/xquartz/darwinEvents.c |  210 +---
 hw/xquartz/darwinEvents.h |   13 
 hw/xquartz/mach-startup/bundle-main.c |2 
 hw/xquartz/xpr/xprFrame.c |2 
 include/input.h   |6 
 os/WaitFor.c  |   18 -
 xkb/xkbActions.c  |   26 +
 20 files changed, 1168 insertions(+), 275 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srbe3-0002g8...@vasks.debian.org

xorg-server: Changes to 'upstream-unstable'

2012-05-06 Thread Cyril Brulebois 
 Xi/exevents.c |  174 
 dix/devices.c |2 
 dix/dispatch.c|5 
 dix/events.c  |   60 +++--
 dix/getevents.c   |3 
 dix/touch.c   |  122 +++
 glx/glapi_gentable.c  |2 
 hw/xfree86/modes/xf86Rotate.c |   11 +
 hw/xquartz/X11Application.m   |  154 +---
 hw/xquartz/console_redirect.c |2 
 hw/xquartz/darwin.c   |   57 +
 hw/xquartz/darwinEvents.c |  210 ++
 hw/xquartz/darwinEvents.h |   13 --
 hw/xquartz/mach-startup/bundle-main.c |2 
 hw/xquartz/xpr/xprFrame.c |2 
 include/input.h   |6 
 os/WaitFor.c  |   18 ++
 xkb/xkbActions.c  |   26 +++-
 18 files changed, 594 insertions(+), 275 deletions(-)

New commits:
commit 22a1953c4a2747d637bb926034f11134809b8d06
Author: Jeremy Huddleston jerem...@apple.com
Date:   Thu Apr 26 21:17:54 2012 -0700

XQuartz: Make sure we tell startx the correct server binary to use in our 
fallback path

With multiple servers installed, we can't be certain if X is Xorg or Xquartz

Signed-off-by: Jeremy Huddleston jerem...@apple.com
(cherry picked from commit 93d6ba5b711cbd3f502d83e54c9739856d2e6f2a)

diff --git a/hw/xquartz/mach-startup/bundle-main.c 
b/hw/xquartz/mach-startup/bundle-main.c
index d1ad6f7..cabdf1e 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -78,7 +78,7 @@ FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2) 
_X_NORETURN;
 extern int noPanoramiXExtension;
 
 #define DEFAULT_CLIENT X11BINDIR /xterm
-#define DEFAULT_STARTX X11BINDIR /startx
+#define DEFAULT_STARTX X11BINDIR /startx --  X11BINDIR /Xquartz
 #define DEFAULT_SHELL  /bin/sh
 
 #ifndef BUILD_DATE

commit 90299556db24543bb7365e8c2897deca3aa219e7
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Apr 30 10:01:48 2012 +1000

dix: when disabling a device, release all buttons and keys

A suspend-induced device disable may happen before the device gets to see
the button release event. On resume, the server's internal state still has
some buttons pressed, causing inconsistent behaviour.

Force the release and the matching events to be sent to the client.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Chase Douglas chase.doug...@canonical.com
(cherry picked from commit f3410b97cf9b48a47bee3d15d232f8a88e75f4ef)

Conflicts:

dix/devices.c

diff --git a/dix/devices.c b/dix/devices.c
index 0125504..d0e99bd 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -432,6 +432,8 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
 if (*prev != dev)
 return FALSE;
 
+ReleaseButtonsAndKeys(dev);
+
 /* float attached devices */
 if (IsMaster(dev)) {
 for (other = inputInfo.devices; other; other = other-next) {

commit b53cdf4c53f0787ed41281278877e0405fcb2674
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Apr 27 16:31:17 2012 +1000

dix: don't emulate scroll events for non-existing axes (#47281)

Test case:
- create a device with REL_HWHEEL and ABS_X and ABS_Y. evdev 2.7.0 will set
  that up as device with 1 relative axis
- move pointer to VGA1
- xrandr --output VGA1 --off

Warps the pointer to the new spot and calls GPE with the x/y mask bits set.
When running through the loop to check for scroll event, this overruns the
axes and may try to emulate scroll events based on random garbage in the
memory. If that memory contained non-zero for the scroll type but near-zero
for the increment field, the server would hang in an infinite loop.

This was the trigger for this suggested, never-merged, patch here:
http://patchwork.freedesktop.org/patch/9543/

X.Org Bug 47281 http://bugs.freedesktop.org/show_bug.cgi?id=47281

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Chase Douglas chase.doug...@canonical.com
(cherry picked from commit af88b43f9e604157b74270d609c08bdfa256a792)

diff --git a/dix/getevents.c b/dix/getevents.c
index fa85fe7..4e0af45 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -1574,6 +1574,9 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr 
pDev, int type,
 /* Now turn the smooth-scrolling axes back into emulated button presses
  * for legacy clients, based on the integer delta between before and now */
 for (i = 0; i  valuator_mask_size(mask); i++) {
+if (i = pDev-valuator-numAxes)
+break;
+
 if (!valuator_mask_isset(mask, i))
 continue;
 

commit 9ddf9e2388f9ac5f4c325304ab0c59c1fd5e2024
Author: Peter Hutterer

xorg-server: Changes to 'debian-unstable'

2012-05-06 Thread Cyril Brulebois 
 ChangeLog |  565 ++
 Xi/exevents.c |  174 +-
 debian/changelog  |9 
 dix/devices.c |2 
 dix/dispatch.c|5 
 dix/events.c  |   60 ++-
 dix/getevents.c   |3 
 dix/touch.c   |  122 ---
 glx/glapi_gentable.c  |2 
 hw/xfree86/modes/xf86Rotate.c |   11 
 hw/xquartz/X11Application.m   |  154 -
 hw/xquartz/console_redirect.c |2 
 hw/xquartz/darwin.c   |   57 +--
 hw/xquartz/darwinEvents.c |  210 +---
 hw/xquartz/darwinEvents.h |   13 
 hw/xquartz/mach-startup/bundle-main.c |2 
 hw/xquartz/xpr/xprFrame.c |2 
 include/input.h   |6 
 os/WaitFor.c  |   18 -
 xkb/xkbActions.c  |   26 +
 20 files changed, 1168 insertions(+), 275 deletions(-)

New commits:
commit 8a8eba1530cbc391c43e4a285ab5976c46d83851
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 7 01:46:19 2012 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 0315861..8c2963a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg-server (2:1.12.1-2) UNRELEASED; urgency=low
+xorg-server (2:1.12.1-2) unstable; urgency=low
 
   * Merge from server-1.12-branch up to 22a1953c4a to get:
 - many XI 2.2 fixes.
 - “os: make timers signal-safe”; fixing infinite loops with the
   synaptics tap handling code.
 
- -- Cyril Brulebois k...@debian.org  Mon, 07 May 2012 01:43:38 +0200
+ -- Cyril Brulebois k...@debian.org  Mon, 07 May 2012 01:46:16 +0200
 
 xorg-server (2:1.12.1-1) unstable; urgency=low
 

commit 1c88bc476de6a7ffa4b9e2335976388c3adcb21d
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 7 01:46:13 2012 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 1c66cf3..3d7e7d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,568 @@
+commit 22a1953c4a2747d637bb926034f11134809b8d06
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Thu Apr 26 21:17:54 2012 -0700
+
+XQuartz: Make sure we tell startx the correct server binary to use in our 
fallback path
+
+With multiple servers installed, we can't be certain if X is Xorg or 
Xquartz
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+(cherry picked from commit 93d6ba5b711cbd3f502d83e54c9739856d2e6f2a)
+
+commit 90299556db24543bb7365e8c2897deca3aa219e7
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Apr 30 10:01:48 2012 +1000
+
+dix: when disabling a device, release all buttons and keys
+
+A suspend-induced device disable may happen before the device gets to see
+the button release event. On resume, the server's internal state still has
+some buttons pressed, causing inconsistent behaviour.
+
+Force the release and the matching events to be sent to the client.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+(cherry picked from commit f3410b97cf9b48a47bee3d15d232f8a88e75f4ef)
+
+Conflicts:
+
+   dix/devices.c
+
+commit b53cdf4c53f0787ed41281278877e0405fcb2674
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Apr 27 16:31:17 2012 +1000
+
+dix: don't emulate scroll events for non-existing axes (#47281)
+
+Test case:
+- create a device with REL_HWHEEL and ABS_X and ABS_Y. evdev 2.7.0 will set
+  that up as device with 1 relative axis
+- move pointer to VGA1
+- xrandr --output VGA1 --off
+
+Warps the pointer to the new spot and calls GPE with the x/y mask bits set.
+When running through the loop to check for scroll event, this overruns the
+axes and may try to emulate scroll events based on random garbage in the
+memory. If that memory contained non-zero for the scroll type but near-zero
+for the increment field, the server would hang in an infinite loop.
+
+This was the trigger for this suggested, never-merged, patch here:
+http://patchwork.freedesktop.org/patch/9543/
+
+X.Org Bug 47281 http://bugs.freedesktop.org/show_bug.cgi?id=47281
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+(cherry picked from commit af88b43f9e604157b74270d609c08bdfa256a792)
+
+commit 9ddf9e2388f9ac5f4c325304ab0c59c1fd5e2024
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Apr 27 10:52:39 2012 +1000
+
+os: make timers signal-safe
+
+If TimerSet() is called from a signal handler (synaptics tap handling code)
+may result in list corruption if we're currently inside TimerSet().
+
+See backtrace in
+https://bugzilla.redhat.com/show_bug.cgi?id=814869
+

Processing of xorg-server_1.12.1-2_amd64.changes

2012-05-06 Thread Debian FTP Masters 
xorg-server_1.12.1-2_amd64.changes uploaded successfully to localhost
along with the files:
  xorg-server_1.12.1-2.dsc
  xorg-server_1.12.1-2.diff.gz
  xserver-common_1.12.1-2_all.deb
  xserver-xorg-core_1.12.1-2_amd64.deb
  xserver-xorg-core-udeb_1.12.1-2_amd64.udeb
  xserver-xorg-dev_1.12.1-2_amd64.deb
  xdmx_1.12.1-2_amd64.deb
  xdmx-tools_1.12.1-2_amd64.deb
  xnest_1.12.1-2_amd64.deb
  xvfb_1.12.1-2_amd64.deb
  xserver-xephyr_1.12.1-2_amd64.deb
  xserver-xfbdev_1.12.1-2_amd64.deb
  xserver-xorg-core-dbg_1.12.1-2_amd64.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srbj9-0003zn...@franck.debian.org

xorg-server_1.12.1-2_amd64.changes ACCEPTED into unstable

2012-05-06 Thread Debian FTP Masters 



Accepted:
xdmx-tools_1.12.1-2_amd64.deb
  to main/x/xorg-server/xdmx-tools_1.12.1-2_amd64.deb
xdmx_1.12.1-2_amd64.deb
  to main/x/xorg-server/xdmx_1.12.1-2_amd64.deb
xnest_1.12.1-2_amd64.deb
  to main/x/xorg-server/xnest_1.12.1-2_amd64.deb
xorg-server_1.12.1-2.diff.gz
  to main/x/xorg-server/xorg-server_1.12.1-2.diff.gz
xorg-server_1.12.1-2.dsc
  to main/x/xorg-server/xorg-server_1.12.1-2.dsc
xserver-common_1.12.1-2_all.deb
  to main/x/xorg-server/xserver-common_1.12.1-2_all.deb
xserver-xephyr_1.12.1-2_amd64.deb
  to main/x/xorg-server/xserver-xephyr_1.12.1-2_amd64.deb
xserver-xfbdev_1.12.1-2_amd64.deb
  to main/x/xorg-server/xserver-xfbdev_1.12.1-2_amd64.deb
xserver-xorg-core-dbg_1.12.1-2_amd64.deb
  to main/x/xorg-server/xserver-xorg-core-dbg_1.12.1-2_amd64.deb
xserver-xorg-core-udeb_1.12.1-2_amd64.udeb
  to main/x/xorg-server/xserver-xorg-core-udeb_1.12.1-2_amd64.udeb
xserver-xorg-core_1.12.1-2_amd64.deb
  to main/x/xorg-server/xserver-xorg-core_1.12.1-2_amd64.deb
xserver-xorg-dev_1.12.1-2_amd64.deb
  to main/x/xorg-server/xserver-xorg-dev_1.12.1-2_amd64.deb
xvfb_1.12.1-2_amd64.deb
  to main/x/xorg-server/xvfb_1.12.1-2_amd64.deb


Changes:
xorg-server (2:1.12.1-2) unstable; urgency=low
 .
  * Merge from server-1.12-branch up to 22a1953c4a to get:
- many XI 2.2 fixes.
- “os: make timers signal-safe”; fixing infinite loops with the
  synaptics tap handling code.


Override entries for your package:
xdmx-tools_1.12.1-2_amd64.deb - optional x11
xdmx_1.12.1-2_amd64.deb - optional x11
xnest_1.12.1-2_amd64.deb - optional x11
xorg-server_1.12.1-2.dsc - source x11
xserver-common_1.12.1-2_all.deb - optional x11
xserver-xephyr_1.12.1-2_amd64.deb - optional x11
xserver-xfbdev_1.12.1-2_amd64.deb - optional x11
xserver-xorg-core-dbg_1.12.1-2_amd64.deb - extra debug
xserver-xorg-core-udeb_1.12.1-2_amd64.udeb - optional debian-installer
xserver-xorg-core_1.12.1-2_amd64.deb - optional x11
xserver-xorg-dev_1.12.1-2_amd64.deb - optional x11
xvfb_1.12.1-2_amd64.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srbty-0004ze...@franck.debian.org

xserver-xorg-video-tdfx: Changes to 'refs/tags/xserver-xorg-video-tdfx-1_1.4.4-1'

2012-05-06 Thread Cyril Brulebois 
Tag 'xserver-xorg-video-tdfx-1_1.4.4-1' created by Cyril Brulebois 
k...@debian.org at 2012-05-07 01:00 +

Tagging upload of xserver-xorg-video-tdfx 1:1.4.4-1 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAk+nHrYACgkQeGfVPHR5Nd0wCQCeIlS7GXfzMjJIreXpuwguYi76
aUYAn2olP+8sGzY5UShR5TAcSCMV/pU2
=XpVS
-END PGP SIGNATURE-

Changes since xserver-xorg-video-tdfx-1_1.4.3-4:
Adam Jackson (5):
  Adapt to missing PIOOffset in vgahw
  Check ABI major not encoded ABI
  Make failure to XAA non-fatal
  Fix for new vgaHW ABI
  Stop uselessly including xf86Priv.h

Alan Coopersmith (2):
  Update Sun license notices to current X.Org standard form
  xf86-video-tdfx 1.4.4

Cyril Brulebois (3):
  Merge branch 'upstream-unstable' into debian-unstable
  Bump changelogs.
  Upload to unstable.

Gaetan Nadon (19):
  .gitignore: use common defaults with custom section # 24239
  .gitignore: use common defaults with custom section # 24239
  Several driver modules do not have a ChangeLog target in Makefile.am 
#23814
  INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
  INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
  Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
  configure.ac: use backticks rather than $() for cmd subs
  COPYING: replace stub file with actual Copyright notices.
  config: upgrade to util-macros 1.8 for additional man page support
  config: update AC_PREREQ statement to 2.60
  config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
  config: remove unrequired AC_HEADER_STDC
  config: remove unrequired AC_SUBST([XORG_CFLAGS])
  config: remove unrequired AC_SUBST([DRI_CFLAGS])
  config: complete AC_INIT m4 quoting
  config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
  config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
  config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
  config: add comments for main statements

Jeremy Huddleston (4):
  Use malloc/calloc/realloc/free directly
  gettimeofday is in sys/time.h
  Fix compiler warnings about signedness
  Use unsigned long rather than deprecated IOADDRESS

Jesse Adkins (1):
  Purge cvs tags.

Peter Hutterer (1):
  Untangle XF86DRI from the driver-specific DRI define

Stefan Dirsch (1):
  Fix RPMLINT warning 64bit-portability-issue.

---
 .gitignore|   70 ++-
 COPYING   |   27 +++-
 ChangeLog |  337 ++
 Makefile.am   |   11 +
 configure.ac  |   55 
 debian/changelog  |7 +
 man/.gitignore|2 
 man/Makefile.am   |   59 +++--
 man/tdfx.man  |1 
 src/.gitignore|6 
 src/tdfx.h|   12 +
 src/tdfx_accel.c  |8 -
 src/tdfx_dga.c|4 
 src/tdfx_dri.c|   39 +++---
 src/tdfx_driver.c |   63 +-
 src/tdfx_priv.c   |8 -
 src/tdfx_sli.c|5 
 src/tdfx_video.c  |   28 ++--
 18 files changed, 572 insertions(+), 170 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srcjt-0004cr...@vasks.debian.org

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

2012-05-06 Thread Cyril Brulebois 
 .gitignore|   70 ++-
 COPYING   |   27 +++-
 ChangeLog |  337 ++
 Makefile.am   |   11 +
 configure.ac  |   55 
 debian/changelog  |7 +
 man/.gitignore|2 
 man/Makefile.am   |   59 +++--
 man/tdfx.man  |1 
 src/.gitignore|6 
 src/tdfx.h|   12 +
 src/tdfx_accel.c  |8 -
 src/tdfx_dga.c|4 
 src/tdfx_dri.c|   39 +++---
 src/tdfx_driver.c |   63 +-
 src/tdfx_priv.c   |8 -
 src/tdfx_sli.c|5 
 src/tdfx_video.c  |   28 ++--
 18 files changed, 572 insertions(+), 170 deletions(-)

New commits:
commit b0667759652c2c9af82c404741be600b44575687
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 7 02:57:27 2012 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 7ec2b31..ead8fb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-tdfx (1:1.4.4-1) UNRELEASED; urgency=low
+xserver-xorg-video-tdfx (1:1.4.4-1) unstable; urgency=low
 
   * New upstream release:
 - Fix FTBFS with X server 1.12.
 
- -- Cyril Brulebois k...@debian.org  Mon, 07 May 2012 02:53:55 +0200
+ -- Cyril Brulebois k...@debian.org  Mon, 07 May 2012 02:57:09 +0200
 
 xserver-xorg-video-tdfx (1:1.4.3-4) unstable; urgency=low
 

commit 00258f9187fc4cba3f1b4a42297dffdbb8cd934f
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 7 02:55:07 2012 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 832e811..6105da4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,340 @@
+commit 98d24dd99052322c71d1676e6d66c2c724f6066a
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Mar 23 19:59:33 2012 -0700
+
+xf86-video-tdfx 1.4.4
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit a985b54c8559d7ff8f5481004d54989ed7499237
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Jan 4 14:57:56 2012 +1000
+
+Untangle XF86DRI from the driver-specific DRI define
+
+XF86DRI is defined by xorg-server.h, so --disable-dri in the driver
+itself does exactly nothing other than not fill in the CFLAGS and thus stop
+the driver from compiling.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 4d56f3a6a69717b04f46f3e22c3a0834050c1a46
+Author: Stefan Dirsch sndir...@novell.com
+Date:   Thu Jul 30 11:28:28 2009 +0200
+
+Fix RPMLINT warning 64bit-portability-issue.
+
+Signed-off-by: Johannes Obermayr johannesoberm...@gmx.de
+Reviewed-by: Tormod Volden debian.tor...@gmail.com
+
+commit fe60f0ed2a0647937cc46a45d497bdf7da4061a4
+Author: Adam Jackson a...@redhat.com
+Date:   Mon Dec 19 17:33:17 2011 -0500
+
+Stop uselessly including xf86Priv.h
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 5b5d3c8b23865724d4f6d71610760e80e4b032e6
+Author: Adam Jackson a...@redhat.com
+Date:   Mon Dec 19 17:32:27 2011 -0500
+
+Fix for new vgaHW ABI
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 92cb819839a2f37c3e3db4831aa45e5bb9b00651
+Author: Adam Jackson a...@redhat.com
+Date:   Mon Dec 19 17:31:45 2011 -0500
+
+Make failure to XAA non-fatal
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 4ea96c222ad0900ad53f506e485588e2a49a22f4
+Author: Adam Jackson a...@redhat.com
+Date:   Thu Nov 17 15:54:27 2011 -0500
+
+Check ABI major not encoded ABI
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 32cd2dfa1214ed3260bf2e40bad06927b18f7f7b
+Author: Adam Jackson a...@redhat.com
+Date:   Wed Nov 16 14:44:02 2011 -0500
+
+Adapt to missing PIOOffset in vgahw
+
+This is actually pretty lame, and I should probably extend vgahw to make
+it easier to do this kind of trick.
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit d7be4a953859f12083c1743c73712f9f510d7fda
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Wed Oct 19 00:41:56 2011 -0700
+
+Use unsigned long rather than deprecated IOADDRESS
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 3a97ecb50f326dbe0e1a3b3656806a8a2d2a1c3d
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sun Oct 9 18:46:10 2011 -0700
+
+Fix compiler warnings about signedness
+
+tdfx_sli.c:23:7: warning: pointer targets in passing argument 2 of 
‘pci_device_cfg_read_u32’ differ in signedness
+/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ 
but argument is of type ‘int *’
+tdfx_sli.c:31:7: warning: pointer targets in passing argument 2 of 
‘pci_device_cfg_read_u32’ differ in signedness
+/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ 
but argument is of type ‘int *’
+tdfx_sli.c:40:7: warning: pointer targets in passing argument 2 of 
‘pci_device_cfg_read_u32’ differ in signedness
+/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ 
but argument is of type ‘int *’
+

xserver-xorg-video-tdfx: Changes to 'upstream-unstable'

2012-05-06 Thread Cyril Brulebois 
 .gitignore|   70 +
 COPYING   |   27 +--
 ChangeLog |   76 --
 Makefile.am   |   11 +++
 configure.ac  |   55 +++
 man/.gitignore|2 -
 man/Makefile.am   |   59 ++---
 man/tdfx.man  |1 
 src/.gitignore|6 
 src/tdfx.h|   12 +---
 src/tdfx_accel.c  |8 ++---
 src/tdfx_dga.c|4 +-
 src/tdfx_dri.c|   39 +--
 src/tdfx_driver.c |   63 ++--
 src/tdfx_priv.c   |8 +++--
 src/tdfx_sli.c|5 ++-
 src/tdfx_video.c  |   28 +--
 17 files changed, 228 insertions(+), 246 deletions(-)

New commits:
commit 98d24dd99052322c71d1676e6d66c2c724f6066a
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date:   Fri Mar 23 19:59:33 2012 -0700

xf86-video-tdfx 1.4.4

Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com

diff --git a/configure.ac b/configure.ac
index 9245b41..3ccb489 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-tdfx],
-[1.4.3],
+[1.4.4],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-tdfx])
 AC_CONFIG_SRCDIR([Makefile.am])

commit a985b54c8559d7ff8f5481004d54989ed7499237
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed Jan 4 14:57:56 2012 +1000

Untangle XF86DRI from the driver-specific DRI define

XF86DRI is defined by xorg-server.h, so --disable-dri in the driver
itself does exactly nothing other than not fill in the CFLAGS and thus stop
the driver from compiling.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 33ed17c..9245b41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,8 +100,8 @@ AC_MSG_RESULT([$DRI])
 AM_CONDITIONAL(DRI, test x$DRI = xyes)
 if test $DRI = yes; then
 PKG_CHECK_MODULES(DRI, [libdrm = 2.0 xf86driproto])
-AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
-AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
+AC_DEFINE(TDFXDRI,1,[Enable DRI driver support])
+AC_DEFINE(TDFXDRI_DEVEL,1,[Enable developmental DRI driver support])
 fi
 
 if test x$XSERVER_LIBPCIACCESS = xyes; then
diff --git a/src/tdfx.h b/src/tdfx.h
index dbdf4c6..2e00fde 100644
--- a/src/tdfx.h
+++ b/src/tdfx.h
@@ -18,7 +18,11 @@
 #include xf86xv.h
 #include tdfxdefs.h
 
-#ifdef XF86DRI
+#ifndef XF86DRI
+#undef TDFXDRI
+#endif
+
+#ifdef TDFXDRI
 #include xf86drm.h
 #include sarea.h
 #define _XF86DRI_SERVER_
@@ -78,7 +82,7 @@ extern void TDFXLostContext(ScreenPtr pScreen);
 extern Bool TDFXSetupSLI(ScrnInfoPtr pScrn, Bool sliEnable, int aaSamples);
 extern Bool TDFXDisableSLI(TDFXPtr pTDFX);
 
-#ifdef XF86DRI
+#ifdef TDFXDRI
 extern void FillPrivateDRI(TDFXPtr pTDFX, TDFXDRIPtr pTDFXDRI);
 #endif
 
@@ -250,7 +254,7 @@ typedef struct _TDFXRec {
   int scanlineWidth;
   unsigned char *scanlineColorExpandBuffers[2];
   PROPDATA
-#ifdef XF86DRI
+#ifdef TDFXDRI
   Bool directRenderingEnabled;
   DRIInfoPtr pDRIInfo;
   int drmSubFD;
diff --git a/src/tdfx_accel.c b/src/tdfx_accel.c
index c7aea8c..12472f3 100644
--- a/src/tdfx_accel.c
+++ b/src/tdfx_accel.c
@@ -89,7 +89,7 @@ TDFXFirstSync(ScrnInfoPtr pScrn) {
   TDFXPtr pTDFX = TDFXPTR(pScrn);
 
   if (!pTDFX-syncDone) {
-#ifdef XF86DRI
+#ifdef TDFXDRI
 if (pTDFX-directRenderingEnabled) {
   DRILock(screenInfo.screens[pScrn-scrnIndex], 0);
   TDFXSwapContextFifo(screenInfo.screens[pScrn-scrnIndex]);
@@ -107,7 +107,7 @@ TDFXCheckSync(ScrnInfoPtr pScrn) {
   if (pTDFX-syncDone) {
 pTDFX-sync(pScrn);
 pTDFX-syncDone=FALSE;
-#ifdef XF86DRI
+#ifdef TDFXDRI
 if (pTDFX-directRenderingEnabled) {
   DRIUnlock(screenInfo.screens[pScrn-scrnIndex]);
 }
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index 0b3d904..94cce04 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -99,7 +99,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include xf86xv.h
 #include X11/extensions/Xv.h
 
-#ifdef XF86DRI
+#ifdef TDFXDRI
 #include dri.h
 #endif
 
@@ -1230,7 +1230,7 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
   pTDFX-writeLong(pTDFX, MISCINIT0, pTDFX-ModeReg.miscinit0);
 #endif
 
-#ifdef XF86DRI
+#ifdef TDFXDRI
   /* Load the dri module if requested. */
   if (xf86ReturnOptValBool(pTDFX-Options, OPTION_DRI, FALSE)) {
 xf86LoadSubModule(pScrn, dri);
@@ -1908,14 +1908,14 @@ TDFXModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 mode-CrtcHSkew=hskew;
   }
 
-#ifdef XF86DRI
+#ifdef TDFXDRI
   if (pTDFX-directRenderingEnabled) {
 DRILock(screenInfo.screens[pScrn-scrnIndex], 0);
 TDFXSwapContextFifo(screenInfo.screens[pScrn-scrnIndex]);
   }
 #endif
   DoRestore(pScrn,

Processing of xserver-xorg-video-tdfx_1.4.4-1_amd64.changes

2012-05-06 Thread Debian FTP Masters 
xserver-xorg-video-tdfx_1.4.4-1_amd64.changes uploaded successfully to localhost
along with the files:
  xserver-xorg-video-tdfx_1.4.4-1.dsc
  xserver-xorg-video-tdfx_1.4.4.orig.tar.gz
  xserver-xorg-video-tdfx_1.4.4-1.diff.gz
  xserver-xorg-video-tdfx_1.4.4-1_amd64.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srcqn-0006n5...@franck.debian.org

xserver-xorg-video-s3virge: Changes to 'refs/tags/xserver-xorg-video-s3virge-1_1.10.4-5'

2012-05-06 Thread Cyril Brulebois 
Tag 'xserver-xorg-video-s3virge-1_1.10.4-5' created by Cyril Brulebois 
k...@debian.org at 2012-05-07 01:16 +

Tagging upload of xserver-xorg-video-s3virge 1:1.10.4-5 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAk+nImkACgkQeGfVPHR5Nd06zwCgjCDJL6BNBv/9vbiIZu2J7LbL
hd4An2ef6OHTZklaZUL6siqffQC/9iwj
=f/fM
-END PGP SIGNATURE-

Changes since xserver-xorg-video-s3virge-1_1.10.4-4:
Adam Jackson (4):
  Adapt to missing PIOOffset in videoabi 12
  Check ABI major not encoded ABI
  Fall back to shadowfb if XAA is unavailable
  Fix for new vgahw ABI

Alan Coopersmith (1):
  Update Sun license notices to current X.Org standard form

Cyril Brulebois (4):
  Merge branch 'upstream-unstable' into debian-unstable
  Bump changelogs.
  Update debian/copyright from upstream COPYING.
  Upload to unstable.

Gaetan Nadon (21):
  xf86-video-s3virge: Remove unused .cvsignore file #23776
  .gitignore: use common defaults with custom section # 24239
  Several driver modules do not have a ChangeLog target in Makefile.am 
#23814
  INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
  INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
  Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
  configure.ac: remove unused sdkdir=$(pkg-config...) statement
  config: rename TODO_NOTES and remove from EXTRA_DIST
  COPYING: update file with Copyright notices from source code.
  README: fix linuxdoc content
  README: keep the text version of README, discard the sgml version
  config: upgrade to util-macros 1.8 for additional man page support
  config: update AC_PREREQ statement to 2.60
  config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
  config: remove unrequired AC_HEADER_STDC
  config: remove unrequired AC_SUBST([XORG_CFLAGS])
  config: complete AC_INIT m4 quoting
  config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
  config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
  config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
  config: add comments for main statements

Tiago Vignatti (1):
  Remove superfluous commentary

Tormod Volden (3):
  Add missing VERBLEV argument to xf86DrvMsgVerb()
  Replace deprecated x(c/re)alloc/xfree with m/c/realloc/free
  Do not use deprecated xf86PciInfo.h

---
 .gitignore   |   70 ++-
 COPYING  |   64 +-
 ChangeLog|  289 
 Makefile.am  |   17 +-
 README   |  200 ++---
 README.sgml  |   61 --
 TODO |  326 +++
 TODO_NOTES   |  326 ---
 configure.ac |   49 +++-
 debian/changelog |8 +
 debian/copyright |   37 ++
 man/.cvsignore   |2 
 man/Makefile.am  |   59 +++--
 src/.cvsignore   |6 -
 src/s3v.h|3 
 src/s3v_accel.c  |2 
 src/s3v_dga.c|7 -
 src/s3v_driver.c |   57 +
 src/s3v_hwcurs.c |1 
 src/s3v_i2c.c|1 
 src/s3v_pciids.h |   18 +++
 src/s3v_shadow.c |1 
 src/s3v_xv.c |   13 +-
 23 files changed, 988 insertions(+), 629 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srcz8-0003fv...@vasks.debian.org

xserver-xorg-video-s3virge: Changes to 'upstream-unstable'

2012-05-06 Thread Cyril Brulebois 
 .gitignore   |   70 ++-
 COPYING  |   64 +-
 ChangeLog|   69 ---
 Makefile.am  |   17 +-
 README   |  200 ++---
 README.sgml  |   61 --
 TODO |  326 +++
 TODO_NOTES   |  326 ---
 configure.ac |   49 +++-
 man/.cvsignore   |2 
 man/Makefile.am  |   59 +++--
 src/.cvsignore   |6 -
 src/s3v.h|3 
 src/s3v_accel.c  |2 
 src/s3v_dga.c|7 -
 src/s3v_driver.c |   57 +
 src/s3v_hwcurs.c |1 
 src/s3v_i2c.c|1 
 src/s3v_pciids.h |   18 +++
 src/s3v_shadow.c |1 
 src/s3v_xv.c |   13 +-
 21 files changed, 654 insertions(+), 698 deletions(-)

New commits:
commit 1a17d10a4130e7ccff1d9ae07c44200d0520445c
Author: Tormod Volden debian.tor...@gmail.com
Date:   Sun Jan 8 11:34:35 2012 +0100

Do not use deprecated xf86PciInfo.h

Signed-off-by: Tormod Volden debian.tor...@gmail.com
Reviewed-by: Cyril Brulebois k...@debian.org

diff --git a/src/s3v.h b/src/s3v.h
index 42b1f83..f4976ca 100644
--- a/src/s3v.h
+++ b/src/s3v.h
@@ -40,9 +40,6 @@ in this Software without prior written authorization from the 
XFree86 Project.
 /* Everything using inb/outb, etc needs compiler.h */
 #include compiler.h
 
-/* Drivers for PCI hardware need this */
-#include xf86PciInfo.h
-
 /* Drivers that need to access the PCI config space directly need this */
 #include xf86Pci.h
 
diff --git a/src/s3v_accel.c b/src/s3v_accel.c
index 2e6d798..7837e4a 100644
--- a/src/s3v_accel.c
+++ b/src/s3v_accel.c
@@ -30,6 +30,7 @@ in this Software without prior written authorization from the 
XFree86 Project.
 
 #include unistd.h
 #include s3v.h
+#include s3v_pciids.h
 
 #include miline.h
/* fb includes are in s3v.h */
diff --git a/src/s3v_dga.c b/src/s3v_dga.c
index 57d05ef..ecf8571 100644
--- a/src/s3v_dga.c
+++ b/src/s3v_dga.c
@@ -62,7 +62,6 @@ in this Software without prior written authorization from the 
XFree86 Project.
 #include xf86.h
 #include xf86_OSproc.h
 #include xf86Pci.h
-#include xf86PciInfo.h
 #include xaa.h
 #include xaalocal.h
 #include s3v.h
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 5f64be1..7064b1e 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -57,8 +57,9 @@ in this Software without prior written authorization from the 
XFree86 Project.
  */
 
 
-   /* Most xf86 commons are already in s3v.h */
-#include   s3v.h
+/* Most xf86 commons are already in s3v.h */
+#include s3v.h
+#include s3v_pciids.h

 
 #include globals.h
diff --git a/src/s3v_hwcurs.c b/src/s3v_hwcurs.c
index 53c539f..58e8fd9 100644
--- a/src/s3v_hwcurs.c
+++ b/src/s3v_hwcurs.c
@@ -39,6 +39,7 @@ in this Software without prior written authorization from the 
XFree86 Project.
 
 
 #include s3v.h
+#include s3v_pciids.h
 
 /* protos */
 
diff --git a/src/s3v_i2c.c b/src/s3v_i2c.c
index cbac21f..6bbfd1e 100644
--- a/src/s3v_i2c.c
+++ b/src/s3v_i2c.c
@@ -58,7 +58,6 @@ in this Software without prior written authorization from the 
XFree86 Project.
 #include compiler.h
 
 #include xf86Pci.h
-#include xf86PciInfo.h
 
 #include vgaHW.h
 
diff --git a/src/s3v_pciids.h b/src/s3v_pciids.h
new file mode 100644
index 000..5d11333
--- /dev/null
+++ b/src/s3v_pciids.h
@@ -0,0 +1,18 @@
+#ifndef S3V_PCIIDS_H
+#define S3V_PCIIDS_H
+
+#define PCI_VENDOR_S3  0x5333
+#define PCI_CHIP_VIRGE 0x5631
+#define PCI_CHIP_TRIO  0x8811
+#define PCI_CHIP_TRIO64UVP 0x8814
+#define PCI_CHIP_VIRGE_VX  0x883D
+#define PCI_CHIP_TRIO64V2_DXGX 0x8901
+#define PCI_CHIP_Trio3D0x8904
+#define PCI_CHIP_VIRGE_DXGX0x8A01
+#define PCI_CHIP_VIRGE_GX2 0x8A10
+#define PCI_CHIP_Trio3D_2X 0x8A13
+#define PCI_CHIP_VIRGE_MX  0x8C01
+#define PCI_CHIP_VIRGE_MXPLUS  0x8C02
+#define PCI_CHIP_VIRGE_MXP 0x8C03
+
+#endif /* S3V_PCIIDS_H */
diff --git a/src/s3v_shadow.c b/src/s3v_shadow.c
index e2e1269..82b763f 100644
--- a/src/s3v_shadow.c
+++ b/src/s3v_shadow.c
@@ -60,7 +60,6 @@ in this Software without prior written authorization from the 
XFree86 Project.
 
 #include xf86.h
 #include xf86_OSproc.h
-#include xf86PciInfo.h
 #include xf86Pci.h
 #include shadowfb.h
 #include servermd.h
diff --git a/src/s3v_xv.c b/src/s3v_xv.c
index cc836d4..2466789 100644
--- a/src/s3v_xv.c
+++ b/src/s3v_xv.c
@@ -40,8 +40,9 @@ in this Software without prior written authorization from the 
XFree86 Project.
 #include config.h
 #endif
 
-   /* Most xf86 commons are already in s3v.h */
-#include   s3v.h
+/* Most xf86 commons are already in s3v.h */
+#include s3v.h
+#include s3v_pciids.h
 
 #if 0
 #define OFF_DELAY  250  /* milliseconds */

commit 5f0d2a32a81895ba0bf565de096cbdc8bca46c9e
Author: Tormod Volden

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

2012-05-06 Thread Cyril Brulebois 
 .gitignore   |   70 ++-
 COPYING  |   64 +-
 ChangeLog|  289 
 Makefile.am  |   17 +-
 README   |  200 ++---
 README.sgml  |   61 --
 TODO |  326 +++
 TODO_NOTES   |  326 ---
 configure.ac |   49 +++-
 debian/changelog |8 +
 debian/copyright |   37 ++
 man/.cvsignore   |2 
 man/Makefile.am  |   59 +++--
 src/.cvsignore   |6 -
 src/s3v.h|3 
 src/s3v_accel.c  |2 
 src/s3v_dga.c|7 -
 src/s3v_driver.c |   57 +
 src/s3v_hwcurs.c |1 
 src/s3v_i2c.c|1 
 src/s3v_pciids.h |   18 +++
 src/s3v_shadow.c |1 
 src/s3v_xv.c |   13 +-
 23 files changed, 988 insertions(+), 629 deletions(-)

New commits:
commit a6d5f33bd9223aadedf3527d6c10b17cc2df7377
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 7 03:11:21 2012 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index bc12893..43cd2a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-s3virge (1:1.10.4-5) UNRELEASED; urgency=low
+xserver-xorg-video-s3virge (1:1.10.4-5) unstable; urgency=low
 
   * Merge upstream master branch up to 1a17d10a41 to fix the FTBFS
 against X server 1.12.
   * Update debian/copyright from upstream COPYING.
 
- -- Cyril Brulebois k...@debian.org  Mon, 07 May 2012 03:07:41 +0200
+ -- Cyril Brulebois k...@debian.org  Mon, 07 May 2012 03:11:18 +0200
 
 xserver-xorg-video-s3virge (1:1.10.4-4) unstable; urgency=low
 

commit 70e1adb2a89b26bd1bcda40706dcd985d20aecee
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 7 03:09:25 2012 +0200

Update debian/copyright from upstream COPYING.

diff --git a/debian/changelog b/debian/changelog
index 32d7811..bc12893 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-s3virge (1:1.10.4-5) UNRELEASED; urgency=low
 
   * Merge upstream master branch up to 1a17d10a41 to fix the FTBFS
 against X server 1.12.
+  * Update debian/copyright from upstream COPYING.
 
  -- Cyril Brulebois k...@debian.org  Mon, 07 May 2012 03:07:41 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 23c2aea..3898f30 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,3 +23,40 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.
 Except as contained in this notice, the name of the XFree86 Project shall not
 be used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from the XFree86 Project.
+
+Written by Jake Richter Copyright (c) 1989, 1990 Panacea Inc., Londonderry,
+NH - All Rights Reserved
+
+This code may be freely incorporated in any program without royalty, as long
+as the copyright notice stays intact.
+
+Additions by Kevin E. Martin (mar...@cs.unc.edu)
+
+KEVIN E. MARTIN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEVIN E. MARTIN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 2007 George Sapountzis
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the Software),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

commit b15bc43e10c2bb2ff6d78ea1d69553cdefe01be1
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 7 03:08:26 2012 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 1b95335..6899a3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,292 @@
+commit 1a17d10a4130e7ccff1d9ae07c44200d0520445c
+Author: Tormod Volden debian.tor...@gmail.com
+Date:   Sun Jan 8

Processing of xserver-xorg-video-s3virge_1.10.4-5_amd64.changes

2012-05-06 Thread Debian FTP Masters 
xserver-xorg-video-s3virge_1.10.4-5_amd64.changes uploaded successfully to 
localhost
along with the files:
  xserver-xorg-video-s3virge_1.10.4-5.dsc
  xserver-xorg-video-s3virge_1.10.4-5.diff.gz
  xserver-xorg-video-s3virge_1.10.4-5_amd64.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srcax-00082m...@franck.debian.org

xserver-xorg-video-tdfx_1.4.4-1_amd64.changes ACCEPTED into unstable

2012-05-06 Thread Debian FTP Masters 



Accepted:
xserver-xorg-video-tdfx_1.4.4-1.diff.gz
  to main/x/xserver-xorg-video-tdfx/xserver-xorg-video-tdfx_1.4.4-1.diff.gz
xserver-xorg-video-tdfx_1.4.4-1.dsc
  to main/x/xserver-xorg-video-tdfx/xserver-xorg-video-tdfx_1.4.4-1.dsc
xserver-xorg-video-tdfx_1.4.4-1_amd64.deb
  to main/x/xserver-xorg-video-tdfx/xserver-xorg-video-tdfx_1.4.4-1_amd64.deb
xserver-xorg-video-tdfx_1.4.4.orig.tar.gz
  to main/x/xserver-xorg-video-tdfx/xserver-xorg-video-tdfx_1.4.4.orig.tar.gz


Changes:
xserver-xorg-video-tdfx (1:1.4.4-1) unstable; urgency=low
 .
  * New upstream release:
- Fix FTBFS with X server 1.12.


Override entries for your package:
xserver-xorg-video-tdfx_1.4.4-1.dsc - source x11
xserver-xorg-video-tdfx_1.4.4-1_amd64.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srccx-0008df...@franck.debian.org

xserver-xorg-video-s3virge_1.10.4-5_amd64.changes ACCEPTED into unstable

2012-05-06 Thread Debian FTP Masters 



Accepted:
xserver-xorg-video-s3virge_1.10.4-5.diff.gz
  to 
main/x/xserver-xorg-video-s3virge/xserver-xorg-video-s3virge_1.10.4-5.diff.gz
xserver-xorg-video-s3virge_1.10.4-5.dsc
  to main/x/xserver-xorg-video-s3virge/xserver-xorg-video-s3virge_1.10.4-5.dsc
xserver-xorg-video-s3virge_1.10.4-5_amd64.deb
  to 
main/x/xserver-xorg-video-s3virge/xserver-xorg-video-s3virge_1.10.4-5_amd64.deb


Changes:
xserver-xorg-video-s3virge (1:1.10.4-5) unstable; urgency=low
 .
  * Merge upstream master branch up to 1a17d10a41 to fix the FTBFS
against X server 1.12.
  * Update debian/copyright from upstream COPYING.


Override entries for your package:
xserver-xorg-video-s3virge_1.10.4-5.dsc - source x11
xserver-xorg-video-s3virge_1.10.4-5_amd64.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srcqs-hw...@franck.debian.org