Bug#600490: debian-installer: If you choose JP106 key layout, you'll be asked keyboard layout again

2010-10-18 Thread Christian PERRIER
Quoting Samuel Thibault (sthiba...@debian.org):

 Yes, it seems Sergey V. Udaltsov s...@gnome.org dropped the abnt2,
 jp106 and kr106 models last year, he didn't say why.  Sergey, could you
 detail a bit why you dropped the models?  It seems people still expect
 to be able to select jp106.


And certainly ABNT2 for Brazilian users if I consider the various bug
reports we had in the past in cosole-data about this layout.




signature.asc
Description: Digital signature


Bug#600575: xserver-xorg-video-intel: Intermittent black screen on resume from suspend on 945GM

2010-10-18 Thread trutter
Package: xserver-xorg-video-intel
Version: 2:2.9.1-4
Severity: important


On Acer Timeline/Aspire 1810TZ which has 945GM graphics, the screen remains
black, with backlight on, when resuming from suspend.

The problem happens probably 80% of the time; resuming _sometimes_ works but it
usually doesn't.

When it resumes, the screen is black but X appears to be running and to have
successfully resumed apart from the black screen.  Pressing caps lock toggles
the caps lock light successfully.  Wifi comes on and connects.  Key
combinations appear to have some effect.  Pressing CTRL+ALT+F[1-7] does not
have any visible effect.  Xorg and pm logs indicate nothing out of the
ordinary.

Result of lspci -v:
http://pastebin.com/SScN2gZn

Xorg.0.log.old (covers the time where the problem happened):
http://pastebin.com/36uYQs7n

dmesg from same time (note that I suspended at 20:34:48)
http://pastebin.com/LJ0uT5Sh




-- Package-specific info:
/var/lib/x11/X.roster does not exist.

/var/lib/x11/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx 1 root root 13 Jan 17  2010 /etc/X11/X - /usr/bin/Xorg
-rwxr-xr-x 1 root root 1881152 Sep 21 04:21 /usr/bin/Xorg

/var/lib/x11/xorg.conf.roster does not exist.

VGA-compatible devices on PCI bus:
00:02.0 VGA compatible controller: Intel Corporation Mobile 4 Series Chipset 
Integrated Graphics Controller (rev 07)

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

Kernel version (/proc/version):
Linux version 2.6.32-5-amd64 (Debian 2.6.32-25) (da...@debian.org) (gcc version 
4.3.5 (Debian 4.3.5-4) ) #1 SMP Fri Oct 15 00:56:30 UTC 2010

Xorg X server log files on system:
-rw-r--r-- 1 root root 29615 Oct  6 00:21 /var/log/Xorg.1.log
-rw-r--r-- 1 root root 28950 Oct 15 21:55 /var/log/Xorg.21.log
-rw-r--r-- 1 root root 28950 Oct 17 17:28 /var/log/Xorg.20.log
-rw-r--r-- 1 root root 29346 Oct 18 20:36 /var/log/Xorg.0.log

Contents of most recent Xorg X server log file
/var/log/Xorg.0.log:

X.Org X Server 1.7.7
Release Date: 2010-05-04
X Protocol Version 11, Revision 0
Build Operating System: Linux 2.6.32.21-dsa-amd64 x86_64 Debian
Current Operating System: Linux pack 2.6.32-5-amd64 #1 SMP Fri Oct 15 00:56:30 
UTC 2010 x86_64
Kernel command line: BOOT_IMAGE=/vmlinuz-2.6.32-5-amd64 
root=/dev/mapper/pack--cryptgroup-pack--root ro quiet splash
Build Date: 20 September 2010  06:14:18PM
xorg-server 2:1.7.7-7 (Julien Cristau jcris...@debian.org) 
Current version of pixman: 0.16.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: Mon Oct 18 20:35:47 2010
(==) Using system config directory /usr/share/X11/xorg.conf.d
(==) No Layout section.  Using the first Screen section.
(==) No screen section available. Using defaults.
(**) |--Screen Default Screen Section (0)
(**) |   |--Monitor default monitor
(==) No monitor specified for screen Default Screen Section.
Using a default monitor configuration.
(==) Automatically adding devices
(==) Automatically enabling devices
(WW) The directory /usr/share/fonts/X11/cyrillic does not exist.
Entry deleted from font path.
(==) FontPath set to:
/usr/share/fonts/X11/misc,
/usr/share/fonts/X11/100dpi/:unscaled,
/usr/share/fonts/X11/75dpi/:unscaled,
/usr/share/fonts/X11/Type1,
/usr/share/fonts/X11/100dpi,
/usr/share/fonts/X11/75dpi,
/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType,
built-ins
(==) ModulePath set to /usr/lib/xorg/modules
(II) The server relies on udev to provide the list of input devices.
If no devices become available, reconfigure udev or disable 
AutoAddDevices.
(II) Loader magic: 0x7c5480
(II) Module ABI versions:
X.Org ANSI C Emulation: 0.4
X.Org Video Driver: 6.0
X.Org XInput driver : 7.0
X.Org Server Extension : 2.0
(++) using VT number 7

(--) PCI:*(0:0:2:0) 8086:2a42:1025:029b Intel Corporation Mobile 4 Series 
Chipset Integrated Graphics Controller rev 7, Mem @ 0x9000/4194304, 
0x8000/268435456, I/O @ 0x30d0/8
(--) PCI: (0:0:2:1) 8086:2a43:1025:029b Intel Corporation Mobile 4 Series 
Chipset Integrated Graphics Controller rev 7, Mem @ 0x9240/1048576
(II) Open ACPI successful (/var/run/acpid.socket)
(II) LoadModule: extmod
(II) Loading /usr/lib/xorg/modules/extensions/libextmod.so
(II) Module extmod: vendor=X.Org Foundation
compiled for 1.7.7, module version = 1.0.0
Module class: X.Org Server Extension
ABI class: X.Org Server Extension, version 2.0
(II) Loading extension SELinux
(II) Loading extension MIT-SCREEN-SAVER
(II) Loading extension XFree86-VidModeExtension
(II) Loading extension XFree86-DGA
(II) Loading extension DPMS
(II) Loading extension XVideo
(II) Loading extension 

Bug#600575: xserver-xorg-video-intel: Intermittent black screen on resume from suspend on 945GM

2010-10-18 Thread Cyril Brulebois
Hi,

trutter m...@eatmorespuds.com (18/10/2010):
 Package: xserver-xorg-video-intel
 Version: 2:2.9.1-4
 Severity: important

please try with 2.12 from sid or 2.13 from experimental.

 On Acer Timeline/Aspire 1810TZ which has 945GM graphics, the screen
 remains black, with backlight on, when resuming from suspend.

Got the very same machine, works fine with 2.12/2.13.

 Result of lspci -v:
 http://pastebin.com/SScN2gZn
 
 Xorg.0.log.old (covers the time where the problem happened):
 http://pastebin.com/36uYQs7n
 
 dmesg from same time (note that I suspended at 20:34:48)
 http://pastebin.com/LJ0uT5Sh
 

In the future, please attach logs instead of linking to online
resources. Two reasons for that:
 - You don't have a grip on whether or when they're going to
   expire/disappear.
 - That makes searching for a particular pattern/string difficult in
   the BTS / mail archives.

Mraw,
KiBi.


signature.asc
Description: Digital signature


Bug#600575: xserver-xorg-video-intel: Intermittent black screen on resume from suspend on 945GM

2010-10-18 Thread trutter

Thanks KiBi,

On 18/10/10 21:21, Cyril Brulebois wrote:
 please try with 2.12 from sid or 2.13 from experimental.

Unfortunately, problem persists in both 2.12 (from unstable) and 2.13 
(from experimental) for me.


2.12: failed 3/3 times
2.13: failed 2/3 times

 Got the very same machine, works fine with 2.12/2.13.

This was with KMS on.

I've tried a number of things to fix it:

- KMS on and off
- BIOS upgrade (running latest now)
- GDM3 instead of GDM

Have been following squeeze (amd64) for 6 months and not been able to 
get resume from suspend working during this time.


Is there any logfile I can look in or troubleshooting method I haven't 
thought of?


Cheers,
Thomas



--
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/4cbc2c94.6090...@eatmorespuds.com



Bug#600575: xserver-xorg-video-intel: Intermittent black screen on resume from suspend on 945GM

2010-10-18 Thread trutter
On further investigation it appears that I can press CTRL+ALT+F1, and 
though nothing appears to happen, I can type the commands to login and 
reboot from there.




--
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/4cbc42c3.5070...@eatmorespuds.com



Bug#570466: it's been a month, is this still a problem?

2010-10-18 Thread Alex Deucher
On Wed, Oct 13, 2010 at 3:28 PM, Rémi Letot hob...@poukram.net wrote:
 Le 13/10/10 20:14, Andres Cimmarusti a écrit :

 Have you tried kernel 2.6.35 in experimental?

 yes, and now I'm on 2.6.36rc6 from experimental. The blackouts tend to be
 less frequent, but still there.

 Also, try dri2 packages were recently upgraded in squeeze. However,
 you may also try the ones in experimental.

 I'm using all from sid or experimental:

 - mesa 7.8.2-2
 - radeon 1:6.13.1-2
 - drm 2.4.22-1

 Hope the issue is solved

 I have tried every new possibly involved package when they are published in
 sid or experimental. But the issue is not solved.


Does booting with radeon.new_pll=0 help?  Alternatively, you can try
Dave's drm-radeon-testing tree as it has some pll patches:
http://git.kernel.org/?p=linux/kernel/git/airlied/drm-2.6.git;a=shortlog;h=refs/heads/drm-radeon-testing

Alex

 HTH,
 --
 Rémi



 ___
 xorg-driver-ati mailing list
 xorg-driver-...@lists.x.org
 http://lists.x.org/mailman/listinfo/xorg-driver-ati




--
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/aanlktik3pjtk4xpdbzvdfbnb8ln2flrn+ewsd=mee...@mail.gmail.com



Bug#600402: no longer respects *VT100.font setting

2010-10-18 Thread Francesco Paolo Lovergine
Package: xterm
Severity: normal

I can confirm this annoying problem with X font resource and (u)xterm 264-1.


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

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

Versions of packages xterm depends on:
ii  libc6 2.11.2-6   Embedded GNU C Library: Shared lib
ii  libfontconfig12.8.0-2.1  generic font configuration library
ii  libice6   2:1.0.6-1  X11 Inter-Client Exchange library
ii  libncurses5   5.7+20100313-4 shared libraries for terminal hand
ii  libutempter0  1.1.5-3A privileged helper for utmp/wtmp 
ii  libx11-6  2:1.3.3-3  X11 client-side library
ii  libxaw7   2:1.0.7-1  X11 Athena Widget library
ii  libxft2   2.1.14-2   FreeType-based font drawing librar
ii  libxmu6   2:1.0.5-2  X11 miscellaneous utility library
ii  libxt61:1.0.7-1  X11 toolkit intrinsics library
ii  xbitmaps  1.1.0-1Base X bitmaps

Versions of packages xterm recommends:
ii  x11-utils 7.5+4  X11 utilities
ii  xutils1:7.5+8X Window System utility programs m

Versions of packages xterm suggests:
pn  xfonts-cyrillic   none (no description available)

-- no debconf information



-- 
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/20101018155451.27806.19879.report...@blegrez.ba.issia.cnr.it



Processed: severity of 600402 is important

2010-10-18 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

 severity 600402 important
Bug #600402 [xterm] xterm: no longer respects *VT100.font setting
Severity set to 'important' from 'normal'

 thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
600402: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=600402
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


-- 
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/handler.s.c.128742153019719.transcr...@bugs.debian.org



Bug#579425: marked as done (xserver-xorg-video-nouveau: Nouveau can't find any screen)

2010-10-18 Thread Debian Bug Tracking System
Your message dated Mon, 18 Oct 2010 13:23:38 -0400
with message-id jwvfww3v2j4.fsf-monnier+in...@gnu.org
and subject line Re: Bug#579425: Still no dice, but a segfault instead
has caused the Debian Bug report #579425,
regarding xserver-xorg-video-nouveau: Nouveau can't find any screen
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.)


-- 
579425: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579425
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
---BeginMessage---
Package: xserver-xorg-video-nouveau
Version: 1:0.0.15+git20100329+7858345-3
Severity: important

I'm using Debian testing (but with unstable and experimental in my sources as
well, and using the 2.6.33-2 kernel from experimental). I have just installed
aptitude install xserver-xorg-video-nouveau which worked well (it only needed
libdrm-nouveau1 as extra dependency). But when I tried xinit for testing,
with an empty xorg.conf:  Section Device Identifier
NV44 with nouveau driver Driver  nouveau
EndSection  the Xserver returned almost immediately saying:  (++) Using
config file: /etc/X11/xorg.conf.nouveau (EE) [drm] Could not set DRM
device bus ID. (EE) NOUVEAU(0): [drm] error opening the drm
(EE) NOUVEAU(0): 619:  (EE) Screen(s) found, but none have a usable
configuration.  Fatal server error: no screens found
I'm using the nv driver for now, but am looking forward to nouveau so I can
connect my monitor over DVI (nv is not able to give me more than 1280x1024
over DVI).  It has been a long wait, but it appers that it is finally very
close to being a reality.


-- Package-specific info:
/var/lib/x11/X.roster does not exist.

/var/lib/x11/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx 1 root root 13 Jul  5  2006 /etc/X11/X - /usr/bin/Xorg
-rwxr-xr-x 1 root root 1722172 Apr  5 13:16 /usr/bin/Xorg

/var/lib/x11/xorg.conf.roster does not exist.

VGA-compatible devices on PCI bus:
01:00.0 VGA compatible controller: nVidia Corporation NV44 [GeForce 6200 
TurboCache(TM)] (rev a1)

/var/lib/x11/xorg.conf.md5sum does not exist.

Xorg X server configuration file status:
lrwxrwxrwx 1 root root 12 Aug  7  2007 /etc/X11/xorg.conf - xorg.conf.nv

Contents of /etc/X11/xorg.conf:
# xorg.conf (Xorg X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
# Edit this file with caution, and see the xorg.conf manual page.
# (Type man xorg.conf at the shell prompt.)
#
# This file is automatically updated on xserver-xorg package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xorg
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following commands as root:
#
#   cp /etc/X11/xorg.conf /etc/X11/xorg.conf.custom
#   md5sum /etc/X11/xorg.conf /var/lib/xfree86/xorg.conf.md5sum
#   dpkg-reconfigure xserver-xorg

Section Files
FontPathunix/:7100# local font server
# if the local font server has problems, we can fall back on these
FontPath/usr/share/fonts/X11/misc
FontPath/usr/share/fonts/X11/cyrillic
FontPath/usr/share/fonts/X11/100dpi/:unscaled
FontPath/usr/share/fonts/X11/75dpi/:unscaled
FontPath/usr/share/fonts/X11/Type1
FontPath/usr/share/fonts/X11/CID
FontPath/usr/share/fonts/X11/100dpi
FontPath/usr/share/fonts/X11/75dpi
EndSection

Section Module
Loadbitmap
Loaddbe
Loadddc
#   Loaddri
Loadevdev
Loadextmod
Loadfreetype
Loadglx
Loadint10
Loadrecord
Loadtype1
Loadvbe
EndSection

Section InputDevice
Identifier  Generic Keyboard
Driver  keyboard
Option  CoreKeyboard
Option  XkbRules  xorg
Option  XkbModel  pc104
Option  XkbLayout us
Option  XkbOptionsctrl:nocaps
EndSection

Section InputDevice
Identifier  Configured Mouse
Driver  mouse
Option  CorePointer
Option  Device/dev/input/mice
Option  Protocol  ImPS/2
Option  Emulate3Buttons   true
Option  ZAxisMapping  4 5
EndSection

Section InputDevice
   

xserver-xorg-input-evdev: Changes to 'upstream-experimental'

2010-10-18 Thread Robert Hooker
Rebased ref, commits from common ancestor:
commit 990540fa1905b11403d5c25345c428c5bc9ed126
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Aug 23 10:34:36 2010 +1000

evdev 2.5.0

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

diff --git a/configure.ac b/configure.ac
index cf494ca..116fa3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-evdev],
-[2.4.99.901],
+[2.5.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-evdev])
 AC_CONFIG_SRCDIR([Makefile.am])

commit b8945e61eb97265fdccace8411b8b33d3d56be13
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Aug 23 10:27:35 2010 +1000

man: don't reference README.mouse

No real reason to refer to the mouse driver's readme.

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

diff --git a/man/evdev.man b/man/evdev.man
index 9b9a0ef..adb3f8d 100644
--- a/man/evdev.man
+++ b/man/evdev.man
@@ -238,5 +238,4 @@ value.
 .SH AUTHORS
 Kristian Høgsberg, Peter Hutterer
 .SH SEE ALSO
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), 
Xserver(__appmansuffix__), X(__miscmansuffix__),
-README.mouse.
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), 
Xserver(__appmansuffix__), X(__miscmansuffix__)

commit 97dc45b769c9a4dfa61782d7ce491df8ebaed3dc
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu Aug 19 12:50:25 2010 +1000

evdev 2.4.99.901

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

diff --git a/configure.ac b/configure.ac
index 63460b7..cf494ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-evdev],
-[2.4.99],
+[2.4.99.901],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-evdev])
 AC_CONFIG_SRCDIR([Makefile.am])

commit ec6cb31cc47eed3ccba4c906ca6c54b99136e9eb
Author: Bartosz Brachaczek b.brachac...@gmail.com
Date:   Tue Aug 10 22:31:37 2010 +0200

evdev: Initialize valuators array. (#24737)

The array needs to be filled with zeros, otherwise we may end up sending
it with random values if non-zero values aren't in one row (which is the
case for A4Tech X-750F which sends REL_MISC events without a reason).

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

Signed-off-by: Bartosz Brachaczek b.brachac...@gmail.com
Tested-by: Bartek Iwaniec has...@gmail.com
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/src/evdev.c b/src/evdev.c
index bdac330..512e957 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -661,7 +661,7 @@ static void
 EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev)
 {
 int num_v = 0, first_v = 0;
-int v[MAX_VALUATORS];
+int v[MAX_VALUATORS] = {};
 EvdevPtr pEvdev = pInfo-private;
 
 EvdevProcessValuators(pInfo, v, num_v, first_v);

commit ed47c7f33e315f163a6aebeb3e1c8947004576fd
Author: Bartosz Brachaczek b.brachac...@gmail.com
Date:   Tue Aug 10 22:31:00 2010 +0200

evdev: Revert Set all valuators for relative motion events (#24737)

It isn't necessary to post zero-deltas to X Server. In order not to post
uninitialized v array we should rather simply initialize it.

This reverts commit c1f16a4f59a584ab4546c2f16e20b06703042057.

Signed-off-by: Bartosz Brachaczek b.brachac...@gmail.com
Tested-by: Bartek Iwaniec has...@gmail.com
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/src/evdev.c b/src/evdev.c
index 5ea230c..bdac330 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -386,7 +386,7 @@ EvdevProcessValuators(InputInfoPtr pInfo, int 
v[MAX_VALUATORS], int *num_v,
 for (i = 0; i  REL_CNT; i++)
 {
 int map = pEvdev-axis_map[i];
-if (map != -1)
+if (pEvdev-delta[i]  map != -1)
 {
 v[map] = pEvdev-delta[i];
 if (map  first)

commit 899218e18120918138f6d7420465763422d5b3b7
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Aug 9 13:01:11 2010 +1000

Don't count BTN_TOUCH as tool. (#29428)

Devices that don't have a tool but BTN_TOUCH simply have the tool always on.
Devices that have a tool other than BTN_TOUCH set this tool before BTN_TOUCH
is emitted anyway.

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

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

diff --git a/src/evdev.c b/src/evdev.c
index cd0fb6c..5ea230c 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -577,7 +577,6 @@ EvdevProcessKeyEvent(InputInfoPtr pInfo, struct input_event 
*ev)
 break;
 
 case BTN_TOUCH:
-pEvdev-tool = 

xserver-xorg-input-aiptek: Changes to 'upstream-experimental'

2010-10-18 Thread Robert Hooker
 .gitignore   |   76 +
 COPYING  |   33 ---
 Makefile.am  |   11 ++-
 configure.ac |   81 ++-
 man/Makefile.am  |   61 ++--
 src/Makefile.am  |4 -
 src/xf86Aiptek.c |  161 +++
 src/xf86Aiptek.h |6 +-
 8 files changed, 267 insertions(+), 166 deletions(-)

New commits:
commit 799d13a3ac1f15ebca3625183340379840beb2f3
Author: Adam Jackson a...@redhat.com
Date:   Tue Aug 10 10:28:26 2010 -0400

xf86-input-aiptek 1.3.1

Signed-off-by: Adam Jackson a...@redhat.com

diff --git a/configure.ac b/configure.ac
index dfd7f1c..2038c23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-aiptek],
-[1.3.0],
+[1.3.1],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-aiptek])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 209b9147799079981db4abebdbac093dec59d5a5
Author: Gaetan Nadon mems...@videotron.ca
Date:   Thu May 27 19:35:46 2010 -0400

config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS

It depends on util-macros 1.8
The existing statement can now be removed from the configuration file.

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index ca0deb0..dfd7f1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,9 +43,6 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
-# Checks for programs.
-AC_PROG_INSTALL
-
 # Checks for libraries.
 AC_CHECK_LIB([m],[sqrt])
 

commit 7a08e526ad7ebe2702269d5a0a048f62b1bfbca1
Author: Gaetan Nadon mems...@videotron.ca
Date:   Thu May 27 19:34:40 2010 -0400

config: upgrade to util-macros 1.8 for additional man page support

Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.

Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index 8d37120..ca0deb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,8 +39,8 @@ AC_PROG_LIBTOOL
 
 # Initialize X.Org macros
 m4_ifndef([XORG_MACROS_VERSION],
-  [m4_fatal([must install xorg-macros 1.4 or later before running 
autoconf/autogen])])
-XORG_MACROS_VERSION(1.4)
+  [m4_fatal([must install xorg-macros 1.8 or later before running 
autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
 # Checks for programs.
diff --git a/man/Makefile.am b/man/Makefile.am
index c020b58..d10f548 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -32,22 +32,6 @@ EXTRA_DIST = @driver_n...@.man
 
 CLEANFILES = $(driverman_DATA)
 
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-   -e 's|__vendorversion__|$(XORGRELSTRING) $(XORGMANNAME)|' \
-   -e 's|__xorgversion__|$(XORGRELSTRING) $(XORGMANNAME)|' \
-   -e 's|__xservername__|Xorg|g' \
-   -e 's|__xconfigfile__|xorg.conf|g' \
-   -e 's|__projectroot__|$(prefix)|g' \
-   -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-   -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-   -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-   -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-   -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 
 .man.$(DRIVER_MAN_SUFFIX):

commit e4976108867158f0c90cd1023595f858bea1ea56
Author: Gaetan Nadon mems...@videotron.ca
Date:   Sat Apr 17 18:52:54 2010 -0400

man: Use Autoconf provided $(AM_V_GEN)$(SED)

Enables silent rule and use platform appropriate version of sed.

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/man/Makefile.am b/man/Makefile.am
index 29fcf92..c020b58 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -32,8 +32,6 @@ EXTRA_DIST = @driver_n...@.man
 
 CLEANFILES = $(driverman_DATA)
 
-SED = sed
-
 # Strings to replace in man pages
 XORGRELSTRING = @PACKAGE_STRING@
   XORGMANNAME = X Version 11
@@ -53,4 +51,4 @@ MAN_SUBSTS = \
 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 
 .man.$(DRIVER_MAN_SUFFIX):
-   sed $(MAN_SUBSTS)  $  $@
+   $(AM_V_GEN)$(SED) $(MAN_SUBSTS)  $  $@

commit 39f1c78b01fb8f2c0450f02c8f5a6329dff6dd04
Author: Gaetan Nadon mems...@videotron.ca
Date:   Thu Apr 15 10:46:42 2010 -0400

config: fix warnings, m4 quoting and layout

Fix some m4 quoting
Fix some autoconf warnings
Regroup statements per section
Add comments
Upgrade X.Org macros to 1.4 for INSTALL file copying

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index b2ec1e9..8d37120 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,43 +20,31 @@
 #
 # Process this file with autoconf to produce a configure script
 
-AC_PREREQ(2.60)
+AC_PREREQ([2.60])
 

xserver-xorg-input-aiptek: Changes to 'debian-experimental'

2010-10-18 Thread Robert Hooker
 .gitignore   |   76 --
 COPYING  |   33 --
 ChangeLog|  281 +++
 Makefile.am  |   11 +-
 configure.ac |   59 +--
 debian/changelog |7 +
 debian/control   |2 
 man/Makefile.am  |   61 +++
 src/Makefile.am  |4 
 src/xf86Aiptek.c |   68 -
 src/xf86Aiptek.h |6 -
 11 files changed, 486 insertions(+), 122 deletions(-)

New commits:
commit 3537d32f7812ce5618d2a69d97d49a2bbcaa106a
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 13:53:42 2010 -0400

Bump xutils-dev requirement for new util-macros.

diff --git a/debian/changelog b/debian/changelog
index 992c944..c1b88e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xserver-xorg-input-aiptek (1:1.3.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump xutils-dev requirement for new util-macros.
 
- -- Robert Hooker robert.hoo...@canonical.com  Mon, 18 Oct 2010 13:48:45 
-0400
+ -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 13:52:05 -0400
 
 xserver-xorg-input-aiptek (1:1.3.0-3) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index c07d90d..b957f67 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  x11proto-input-dev,
  automake,
  libtool,
- xutils-dev
+ xutils-dev (= 1:7.5+4)
 Standards-Version: 3.8.3
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-aiptek
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-aiptek.git

commit 9c211a91504fe5643f8682972c6279d48cfbd7b3
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 13:49:24 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index 62c59be..4ccb0ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,284 @@
+commit 799d13a3ac1f15ebca3625183340379840beb2f3
+Author: Adam Jackson a...@redhat.com
+Date:   Tue Aug 10 10:28:26 2010 -0400
+
+xf86-input-aiptek 1.3.1
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 209b9147799079981db4abebdbac093dec59d5a5
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu May 27 19:35:46 2010 -0400
+
+config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS
+
+It depends on util-macros 1.8
+The existing statement can now be removed from the configuration file.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 7a08e526ad7ebe2702269d5a0a048f62b1bfbca1
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu May 27 19:34:40 2010 -0400
+
+config: upgrade to util-macros 1.8 for additional man page support
+
+Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+The value of MAN_SUBST is the same for all X.Org packages.
+
+Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit e4976108867158f0c90cd1023595f858bea1ea56
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sat Apr 17 18:52:54 2010 -0400
+
+man: Use Autoconf provided $(AM_V_GEN)$(SED)
+
+Enables silent rule and use platform appropriate version of sed.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 39f1c78b01fb8f2c0450f02c8f5a6329dff6dd04
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Apr 15 10:46:42 2010 -0400
+
+config: fix warnings, m4 quoting and layout
+
+Fix some m4 quoting
+Fix some autoconf warnings
+Regroup statements per section
+Add comments
+Upgrade X.Org macros to 1.4 for INSTALL file copying
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 43cdbc01fb1f7197134434b7db00705e4e6c8d56
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Apr 15 10:24:16 2010 -0400
+
+config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+AC_PROG_C_C99. This sets gcc with -std=gnu99.
+If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit e97e0199a722bdfa30ef0ba070f421e01987ce25
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Apr 15 10:22:35 2010 -0400
+
+config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+Regroup AC statements at the top.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit a4da6aa6996c7030b48b39eafbadeed8e512010e
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Apr 15 10:20:43 2010 -0400
+
+config: update AC_PREREQ statement to 2.60
+
+Unrelated to the previous patches, the new value simply reflects
+the reality that the minimum level for autoconf to configure
+all x.org modules is 2.60 dated June 2006.
+
+ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit c0aa30c9d92617d0febe521780588e095569216a
+Author: Gaetan Nadon mems...@videotron.ca

xserver-xorg-input-elographics: Changes to 'upstream-experimental'

2010-10-18 Thread Robert Hooker
 .gitignore  |3 
 ChangeLog   |   39 --
 Makefile.am |   12 
 README  |   20 +
 configure.ac|   35 -
 man/elographics.man |6 
 src/Makefile.am |2 
 src/xf86Elo.c   |  942 +---
 8 files changed, 220 insertions(+), 839 deletions(-)

New commits:
commit 607aed76023e71509b260dc23da7c150c1eff825
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed Jun 9 12:18:14 2010 +1000

elographics 1.2.4

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

diff --git a/configure.ac b/configure.ac
index d1b776c..c778134 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-elographics],
-1.2.3,
+1.2.4,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-elographics)
 

commit ac31d3e2d16f2b037d1c4e42aef76ddbd2fa1d20
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed Jun 9 12:17:16 2010 +1000

Remove libcwrappers for malloc and free.

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

diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 4077b22..6887a66 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -990,14 +990,14 @@ xf86EloAllocate(InputDriverPtrdrv, IDevPtr dev)
   LocalDevicePtr   local;
   EloPrivatePtrpriv;
 
-  priv = xalloc(sizeof(EloPrivateRec));
+  priv = malloc(sizeof(EloPrivateRec));
   if (!priv)
 return NULL;
 
   local = xf86AllocateInput(drv, 0);
 
   if (!local) {
-xfree(priv);
+free(priv);
 return NULL;
   }
 
@@ -1044,8 +1044,8 @@ xf86EloUninit(InputDriverPtr  drv,
 {
   EloPrivatePtrpriv = (EloPrivatePtr) local-private;
 
-  xfree(priv-input_dev);
-  xfree(priv);
+  free(priv-input_dev);
+  free(priv);
   local-private = NULL;
   xf86DeleteInput(local, 0);
 }
@@ -1090,9 +1090,9 @@ xf86EloInit(InputDriverPtrdrv,
dev-identifier);
 if (priv) {
   if (priv-input_dev) {
-   xfree(priv-input_dev);
+   free(priv-input_dev);
   }
-  xfree(priv);
+  free(priv);
 }
 return local;
   }

commit ac5366d6e1f26e6ceef3d062ab7df301d623cf54
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Dec 18 08:42:26 2009 +1000

Added support for GeneralTouch serial touchscreens.

Signed-off-by: Ivan Afonichev ivan.afonic...@gmail.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index dbe1747..4077b22 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -907,8 +907,7 @@ xf86EloControl(DeviceIntPtr dev,
   xf86EloPrintIdent(reply, priv);
   }
   else {
-  ErrorF(Unable to ask Elographics touchscreen identification\n);
-  goto not_success;
+  DBG(2, ErrorF(Unable to ask Elographics touchscreen 
identification... Maybe it's GeneralTouch touchscreen...\n));
   }
 
   /*
@@ -920,8 +919,7 @@ xf86EloControl(DeviceIntPtr dev,
   req[3] = ELO_TOUCH_MODE | ELO_STREAM_MODE | ELO_UNTOUCH_MODE;
   req[4] = ELO_TRACKING_MODE;
   if (xf86EloSendControl(req, local-fd) != Success) {
-  ErrorF(Unable to change Elographics touchscreen operating 
mode\n);
-  goto not_success;
+  DBG(2, ErrorF(Unable to change Elographics touchscreen 
operating mode... Maybe it's GeneralTouch touchscreen...\n));
   }
 
   /*
@@ -932,12 +930,7 @@ xf86EloControl(DeviceIntPtrdev,
   req[2] = priv-untouch_delay;
   req[3] = priv-report_delay;
   if (xf86EloSendControl(req, local-fd) != Success) {
-  ErrorF(Unable to change Elographics touchscreen reports 
timings\n);
-
-not_success:
-  SYSCALL(close(local-fd));
-  local-fd = -1;
-  return !Success;
+  DBG(2, ErrorF(Unable to change Elographics touchscreen reports 
timings... Maybe it's GeneralTouch touchscreen...\n));
   }
   }
   xf86AddEnabledDevice(local);

commit b9531248d1b5d00b2ba941f576fc160ea5e1444b
Author: Michael Smith msm...@cbnco.com
Date:   Tue Dec 15 15:01:29 2009 -0500

xf86EloReadInput(): fix xserver unresponsiveness during touch

The fix for bug #14109 ensures all bytes are emptied from the OS buffer
by looping until xf86WaitForInput returns 0.  This patch just changes
the timeout from 1 millisecond to 0: we don't want the X server to block
if there's no more serial data.

It also removes the Vmin and Vtime options, which were making the calls
to read() block until a complete 10-byte packet buffer could be filled.
At 9600 bps, this could pause the X server for up to 9 ms. The code can
already handle partial buffers, so all we have to do is get rid of the
Vmin.

Also, if xf86EloGetPacket() returns !Success, we should continue rather
than break so 

xserver-xorg-input-elographics: Changes to 'debian-experimental'

2010-10-18 Thread Robert Hooker
 ChangeLog|   16 
 configure.ac |2 +-
 debian/changelog |6 ++
 src/xf86Elo.c|   12 ++--
 4 files changed, 29 insertions(+), 7 deletions(-)

New commits:
commit 158ea1abdc36e25c0968380dd625ab7ea5c8f5fd
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 13:59:02 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index a5919f9..2d0f513 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+commit 607aed76023e71509b260dc23da7c150c1eff825
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Jun 9 12:18:14 2010 +1000
+
+elographics 1.2.4
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit ac31d3e2d16f2b037d1c4e42aef76ddbd2fa1d20
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Jun 9 12:17:16 2010 +1000
+
+Remove libcwrappers for malloc and free.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
 commit ac5366d6e1f26e6ceef3d062ab7df301d623cf54
 Author: Peter Hutterer peter.hutte...@who-t.net
 Date:   Fri Dec 18 08:42:26 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index 030d704..498ee74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-elographics (1:1.2.4-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 13:58:24 -0400
+
 xserver-xorg-input-elographics (1:1.2.3-5) experimental; urgency=low
 
   * Build against Xserver 1.9.1 rc1.

commit 607aed76023e71509b260dc23da7c150c1eff825
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed Jun 9 12:18:14 2010 +1000

elographics 1.2.4

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

diff --git a/configure.ac b/configure.ac
index d1b776c..c778134 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-elographics],
-1.2.3,
+1.2.4,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-elographics)
 

commit ac31d3e2d16f2b037d1c4e42aef76ddbd2fa1d20
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed Jun 9 12:17:16 2010 +1000

Remove libcwrappers for malloc and free.

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

diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 4077b22..6887a66 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -990,14 +990,14 @@ xf86EloAllocate(InputDriverPtrdrv, IDevPtr dev)
   LocalDevicePtr   local;
   EloPrivatePtrpriv;
 
-  priv = xalloc(sizeof(EloPrivateRec));
+  priv = malloc(sizeof(EloPrivateRec));
   if (!priv)
 return NULL;
 
   local = xf86AllocateInput(drv, 0);
 
   if (!local) {
-xfree(priv);
+free(priv);
 return NULL;
   }
 
@@ -1044,8 +1044,8 @@ xf86EloUninit(InputDriverPtr  drv,
 {
   EloPrivatePtrpriv = (EloPrivatePtr) local-private;
 
-  xfree(priv-input_dev);
-  xfree(priv);
+  free(priv-input_dev);
+  free(priv);
   local-private = NULL;
   xf86DeleteInput(local, 0);
 }
@@ -1090,9 +1090,9 @@ xf86EloInit(InputDriverPtrdrv,
dev-identifier);
 if (priv) {
   if (priv-input_dev) {
-   xfree(priv-input_dev);
+   free(priv-input_dev);
   }
-  xfree(priv);
+  free(priv);
 }
 return local;
   }


-- 
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/e1p7u2f-00032g...@alioth.debian.org



xserver-xorg-input-evdev: Changes to 'debian-experimental'

2010-10-18 Thread Robert Hooker
 src/evdev.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4d26acc4f2d55d7e8fbb68d633b392326156c1e6
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 15:06:42 2010 -0400

Fix up a merge conflict.

This change was lost because of a bad git workflow being used on my part.

diff --git a/src/evdev.c b/src/evdev.c
index 049a688..512e957 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -386,7 +386,7 @@ EvdevProcessValuators(InputInfoPtr pInfo, int 
v[MAX_VALUATORS], int *num_v,
 for (i = 0; i  REL_CNT; i++)
 {
 int map = pEvdev-axis_map[i];
-if (map != -1)
+if (pEvdev-delta[i]  map != -1)
 {
 v[map] = pEvdev-delta[i];
 if (map  first)


-- 
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/e1p7v7z-0004lj...@alioth.debian.org



xserver-xorg-input-mouse: Changes to 'upstream-experimental'

2010-10-18 Thread Robert Hooker
 .gitignore|   70 +++
 COPYING   |   50 +-
 Makefile.am   |   16 
 README|  340 +++-
 README.sgml   | 1125 --
 configure.ac  |   66 +--
 man/.cvsignore|2 
 man/Makefile.am   |   65 +--
 man/mousedrv.man  |3 
 src/.cvsignore|6 
 src/Makefile.am   |2 
 src/hurd_mouse.c  |4 
 src/lnx_mouse.c   |1 
 src/mouse.c   |  227 ++
 src/mouse.h   |3 
 src/pnp.c |3 
 src/sco_mouse.c   |  258 
 src/sun_mouse.c   |  235 +++
 src/xf86OSmouse.h |3 
 19 files changed, 523 insertions(+), 1956 deletions(-)

New commits:
commit 6d6c24768b2b347436a6d35c4aaa129227c7392e
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date:   Wed Sep 8 23:11:19 2010 -0700

xf86-input-mouse 1.6.0

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

diff --git a/configure.ac b/configure.ac
index 48ab33c..8c99ac5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-mouse],
-[1.5.0],
+[1.6.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-mouse])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 4719334800b7eb88479acdcbbc176019ba9c5bd2
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date:   Wed Sep 8 22:58:30 2010 -0700

Bring README a little closer to the current state of reality

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

diff --git a/README b/README
index 984814f..8daf558 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
-  Mouse Support in X11R7.5
-  Kazutaka Yokota
-  17 December 2002
+  Mouse Support in xf86-input-mouse
+  Original version written by Kazutaka Yokota for XFree86 on 17 December 2002
+  Updated by Alan Coopersmith for X.Org releases
   
 
   Table of Contents
@@ -56,8 +56,10 @@
   1.  Introduction
 
 
-  This document describes mouse support in X.Org Foundation's X11R7.5
-  server.
+  This document describes mouse support in the xf86-input-mouse driver
+  for the Xorg X server.   This driver is mainly used on non-Linux
+  operating systems such as BSD  Solaris, as modern Linux systems use
+  the xf86-input-evdev driver instead.
 
   Mouse configuration has often been mysterious task for novice users.
   However, once you learn several basics, it is straightforward to write
@@ -67,13 +69,13 @@
   2.  Supported Hardware
 
 
-  The X.Org Foundation X server supports four classes of mice: serial,
+  The xf86-input-mouse driver supports four classes of mice: serial,
   bus and PS/2 mice, and additional mouse types supported by specific
   operating systems, such as USB mice.
 
 
  Serial mouse
-The serial mouse has been the most popular pointing device for
+The serial mouse was once the most popular pointing device for
 PCs.  There have been numerous serial mouse models from a number
 of manufactures.  Despite the wide range of variations, there
 have been relatively few protocols (data format) with which the
@@ -92,14 +94,15 @@
 integrated I/O cards may also have a bus mouse connector.  Some
 bus mice are known as `InPort mouse'.
 
-Note that some mouse manufactures have sold a package including
+Note that some mouse manufacturers have sold a package including
 a serial mouse and a serial interface card.  Don't confuse this
 type of products with the genuine bus mouse.
 
 
  PS/2 mouse
-They are sometimes called `Mouse-port mouse'.  The PS/2 mouse is
-becoming increasingly common and popular.
+They are sometimes called `Mouse-port mouse'.  The PS/2 mouse was
+common for a generation after serial mice, and most laptops still
+use the PS/2 protocol for built-in pointer devices.
 
 The PS/2 mouse is an intelligent device and may have more than
 three buttons and a wheel or a roller.  The PS/2 mouse is
@@ -115,17 +118,16 @@
 computers. Several devices can be plugged into this bus,
 including mice and keyboards.
 
-The server includes support for USB mice on some systems.
+This driver includes support for USB mice on some systems.
 
   Many mice nowadays can be used both as a serial mouse and as a PS/2
-  mouse.  They has a logic to distinguish which interface it is
-  connected to.  However, the mouse which is not marketed as compatible
-  with both serial and PS/2 mouse interface lacks this logic and cannot
-  be used in such a way, even if you can find an appropriate adapter
-  with which you can connect the PS/2 mouse to a serial port or visa
-  versa.
-
-  X11R7.5 supports the mouse with a wheel, a roller or a knob.  Its
+  mouse, or as both a PS/2 and a USB mouse.  They have logic to distinguish
+  which interface it is 

xserver-xorg-input-mouse: Changes to 'debian-experimental'

2010-10-18 Thread Robert Hooker
 .gitignore|   76 +++
 COPYING   |   50 +-
 ChangeLog |  414 +++
 Makefile.am   |   16 
 README|  340 +++-
 README.sgml   | 1125 --
 configure.ac  |   59 +-
 debian/changelog  |7 
 debian/control|2 
 man/Makefile.am   |   65 +--
 src/Makefile.am   |2 
 src/hurd_mouse.c  |4 
 src/lnx_mouse.c   |1 
 src/mouse.c   |   29 -
 src/pnp.c |3 
 src/sco_mouse.c   |  258 
 src/sun_mouse.c   |  133 --
 src/xf86OSmouse.h |3 
 18 files changed, 831 insertions(+), 1756 deletions(-)

New commits:
commit 74d23755e3a8c18e68f675ce9bb16e56176278e9
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 15:32:44 2010 -0400

Bump xutils-dev requirement for new util-macros.

diff --git a/debian/changelog b/debian/changelog
index 71aa25d..cecd297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-input-mouse (1:1.6.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump xutils-dev requirement for new util-macros.
 
  -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 15:30:30 -0400
 
diff --git a/debian/control b/debian/control
index f517476..f097791 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  dpkg-dev (= 1.14.17),
  automake,
  libtool,
- xutils-dev (= 1:7.5~1)
+ xutils-dev (= 1:7.5+4)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mouse.git

commit 6292397b05cee06924cfdf1e0f3dfcc88192eae7
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 15:31:31 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index d800f1f..27c275a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,417 @@
+commit 6d6c24768b2b347436a6d35c4aaa129227c7392e
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Sep 8 23:11:19 2010 -0700
+
+xf86-input-mouse 1.6.0
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 4719334800b7eb88479acdcbbc176019ba9c5bd2
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Sep 8 22:58:30 2010 -0700
+
+Bring README a little closer to the current state of reality
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit cb11e9ca60e8ca2590c77f844bfd19e5278f518f
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Aug 11 21:30:40 2010 -0700
+
+MouseCtrl doesn't need to save values we never use
+
+Makes it into a no-op, like evdev's PtrCtrl function, now that
+mouse acceleration is completely handled in dix.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Patrick E. Kane pekane52 at gmail.com
+Reviewed-by: Simon Thum simon.t...@gmx.de
+
+commit 374725ef73ca929f8a951061528d11ee796cb069
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Aug 11 20:21:33 2010 -0700
+
+Sun's copyrights belong to Oracle now
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 5b208a2b8d1032489a02c465830150422d1123cc
+Author: Henry Zhao henry.z...@oracle.com
+Date:   Wed Aug 11 20:16:44 2010 -0700
+
+Check for NULL currentMode in vuidMouseSendScreenSize()
+
+Fixes Sun bug 6920647:
+  Core dump in resume when monitor changed in suspend
+  http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6920647
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit b9d6d0309abdec7b384cb1f0958b9bcd60364e60
+Author: Samuel Thibault samuel.thiba...@ens-lyon.org
+Date:   Wed Jul 28 21:23:25 2010 +0200
+
+Do not return the address of a local buffer
+
+Make the const buffer returned by FindDevice a static const buffer, to 
avoid
+letting be on the stack.
+
+Signed-off-by: Samuel Thibault samuel.thiba...@ens-lyon.org
+
+commit 75300d6ae5a5b2324224423c9f976cba50e47547
+Author: Patrick E. Kane pekan...@gmail.com
+Date:   Fri Jul 16 11:13:20 2010 -0500
+
+xf86-input-mouse: Update sun_mouse devPrivates code #29049
+
+Update the sun_mouse devPrivates code to conform to the new API
+(introducted by commit faeebead7bfcc78535757ca7acc1faf7554c03b7)
+that requires the PrivateKey to be registered.
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=29049
+
+Signed-off-by: Patrick E. Kane pekan...@gmail.com
+Reviewed-by: Jamey Sharp ja...@minilop.net
+Signed-off-by: Jamey Sharp ja...@minilop.net
+
+commit 112caa1724e139caeb91c792c394b21d1391b370
+Author: Fernando Carrijo fcarr...@yahoo.com.br
+Date:   Thu Jul 1 07:13:05 2010 -0300
+
+Purge macro NEED_EVENTS
+
+Signed-off-by: Fernando Carrijo fcarr...@yahoo.com.br
+Acked-by: Tiago Vignatti 

xserver-xorg-input-vmmouse: Changes to 'upstream-experimental'

2010-10-18 Thread Robert Hooker
 .gitignore |   73 +++-
 COPYING|   66 ---
 ChangeLog  |   25 
 INSTALL|  231 -
 Makefile.am|   14 ++
 configure.ac   |   76 -
 man/Makefile.am|   55 -
 man/vmmouse.man|2 
 man/vmmouse_detect.1   |   58 --
 man/vmmouse_detect.man |   58 ++
 shared/Makefile.am |4 
 shared/vmmouse_defs.h  |6 +
 shared/vmmouse_proto.h |9 +
 src/Makefile.am|2 
 src/vmmouse.c  |  218 +++---
 tools/.gitignore   |4 
 tools/50-vmmouse.conf  |7 +
 tools/69-xorg-vmmouse.rules.in |1 
 tools/Makefile.am  |   29 -
 tools/hal-probe-vmmouse.in |1 
 tools/vmmouse_detect.c |6 +
 21 files changed, 425 insertions(+), 520 deletions(-)

New commits:
commit adc177e3af9dc5da982ceb7a93e9c5e3bc6aed59
Author: Adam Jackson a...@redhat.com
Date:   Tue Aug 10 10:36:33 2010 -0400

xf86-input-vmmouse 12.6.10

Signed-off-by: Adam Jackson a...@redhat.com

diff --git a/configure.ac b/configure.ac
index 6c29dc2..8c1322c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-vmmouse],
-12.6.9,
+12.6.10,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-vmmouse)
 

commit cc76aec9b712403c777b7ce1290fa1e7ca62bf8c
Author: Adam Jackson a...@redhat.com
Date:   Tue Aug 10 10:36:21 2010 -0400

Fix distcheck

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 02a721e..77a9731 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -31,7 +31,7 @@ callouts_SCRIPTS = hal-probe-vmmouse
 hal-probe-vmmouse: hal-probe-vmmouse.in
$(AM_V_GEN)$(SED) -e 's|__BIN_PREFIX__|$(bindir)|g' \
-e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \
-hal-probe-vmmouse.in  $@
+$  $@
 
 EXTRA_DIST = hal-probe-vmmouse.in
 
@@ -52,7 +52,8 @@ udev_DATA = 69-xorg-vmmouse.rules
 $(udev_DATA): $(udev_DATA).in
sed -e 's|__BIN_PREFIX__|$(bindir)|g'  $  $@
 
-EXTRA_DIST += $(udev_DATA).in
 CLEANFILES += $(udev_DATA)
 
 endif # HAS_UDEV_RULES_DIR
+
+EXTRA_DIST = $(udev_DATA).in hal-probe-vmmouse.in

commit 61608b87c01ce87bd29869c1554a2ade5998782c
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date:   Fri Jul 9 20:45:53 2010 -0700

Improve Solaris compatibility of hal-probe-vmmouse generation rule

Use $(SED) from AC_PROG_SED to ensure a good version of sed is found
Use explicit input file name instead of $ to workaround Solaris make
issue with $ in explicit rules.

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

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 581ad65..02a721e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -29,9 +29,9 @@ calloutsdir=$(HAL_CALLOUTS_DIR)
 callouts_SCRIPTS = hal-probe-vmmouse
 
 hal-probe-vmmouse: hal-probe-vmmouse.in
-   sed -e 's|__BIN_PREFIX__|$(bindir)|g' \
+   $(AM_V_GEN)$(SED) -e 's|__BIN_PREFIX__|$(bindir)|g' \
-e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \
-$  $@
+hal-probe-vmmouse.in  $@
 
 EXTRA_DIST = hal-probe-vmmouse.in
 

commit d7700bed84f6632913a6590cc9cc9d10b815a08c
Author: Fernando Carrijo fcarr...@yahoo.com.br
Date:   Thu Jul 1 07:14:14 2010 -0300

Purge macro NEED_EVENTS

Signed-off-by: Fernando Carrijo fcarr...@yahoo.com.br
Acked-by: Tiago Vignatti tiago.vigna...@nokia.com
Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com

diff --git a/src/vmmouse.c b/src/vmmouse.c
index 1b08eff..f5ad234 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -48,7 +48,6 @@
 #endif
 
 #include stdio.h
-#define NEED_EVENTS
 #include X11/X.h
 #include X11/Xproto.h
 

commit 4e3bf19d2637cb034e31611ef184348f12677e81
Author: Gaetan Nadon mems...@videotron.ca
Date:   Sat Jun 12 10:09:48 2010 -0400

COPYING: update and refactor Copyright notices

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/COPYING b/COPYING
index 901b59f..ae6cbd9 100644
--- a/COPYING
+++ b/COPYING
@@ -1,23 +1,51 @@
-Copyright (c) 2006 VMware, Inc.
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+Copyright 1993 by David Dawes da...@xfree86.org
+Copyright 2002 by SuSE Linux AG, Author: Egbert Eich
+Copyright 1994-2002 by The XFree86 Project, Inc.
+Copyright 2002 by Paul Elliott
+Copyright 2002-2006 by VMware, Inc.
 
-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 

xserver-xorg-input-vmmouse: Changes to 'debian-experimental'

2010-10-18 Thread Robert Hooker
 COPYING   |   66 ++
 ChangeLog |   44 
 configure.ac  |2 -
 debian/changelog  |6 
 src/vmmouse.c |1 
 tools/Makefile.am |5 ++--
 6 files changed, 101 insertions(+), 23 deletions(-)

New commits:
commit 304b209a63435a53b2e2da1a45d768ed7beb4084
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 15:51:27 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index 5b32f23..bda91b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+commit adc177e3af9dc5da982ceb7a93e9c5e3bc6aed59
+Author: Adam Jackson a...@redhat.com
+Date:   Tue Aug 10 10:36:33 2010 -0400
+
+xf86-input-vmmouse 12.6.10
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit cc76aec9b712403c777b7ce1290fa1e7ca62bf8c
+Author: Adam Jackson a...@redhat.com
+Date:   Tue Aug 10 10:36:21 2010 -0400
+
+Fix distcheck
+
+commit 61608b87c01ce87bd29869c1554a2ade5998782c
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jul 9 20:45:53 2010 -0700
+
+Improve Solaris compatibility of hal-probe-vmmouse generation rule
+
+Use $(SED) from AC_PROG_SED to ensure a good version of sed is found
+Use explicit input file name instead of $ to workaround Solaris make
+issue with $ in explicit rules.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit d7700bed84f6632913a6590cc9cc9d10b815a08c
+Author: Fernando Carrijo fcarr...@yahoo.com.br
+Date:   Thu Jul 1 07:14:14 2010 -0300
+
+Purge macro NEED_EVENTS
+
+Signed-off-by: Fernando Carrijo fcarr...@yahoo.com.br
+Acked-by: Tiago Vignatti tiago.vigna...@nokia.com
+Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 4e3bf19d2637cb034e31611ef184348f12677e81
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sat Jun 12 10:09:48 2010 -0400
+
+COPYING: update and refactor Copyright notices
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
 commit 833698b3b9857fda176c91a0dbb128275a174624
 Author: Gaetan Nadon mems...@videotron.ca
 Date:   Sun Apr 25 19:36:19 2010 -0400
diff --git a/debian/changelog b/debian/changelog
index f251dad..97bba86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-vmmouse (1:12.6.10-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 15:50:48 -0400
+
 xserver-xorg-input-vmmouse (1:12.6.9-4) experimental; urgency=low
 
   * Merge xsfbs to get unversioned Provides.

commit adc177e3af9dc5da982ceb7a93e9c5e3bc6aed59
Author: Adam Jackson a...@redhat.com
Date:   Tue Aug 10 10:36:33 2010 -0400

xf86-input-vmmouse 12.6.10

Signed-off-by: Adam Jackson a...@redhat.com

diff --git a/configure.ac b/configure.ac
index 6c29dc2..8c1322c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-vmmouse],
-12.6.9,
+12.6.10,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-vmmouse)
 

commit cc76aec9b712403c777b7ce1290fa1e7ca62bf8c
Author: Adam Jackson a...@redhat.com
Date:   Tue Aug 10 10:36:21 2010 -0400

Fix distcheck

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 02a721e..77a9731 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -31,7 +31,7 @@ callouts_SCRIPTS = hal-probe-vmmouse
 hal-probe-vmmouse: hal-probe-vmmouse.in
$(AM_V_GEN)$(SED) -e 's|__BIN_PREFIX__|$(bindir)|g' \
-e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \
-hal-probe-vmmouse.in  $@
+$  $@
 
 EXTRA_DIST = hal-probe-vmmouse.in
 
@@ -52,7 +52,8 @@ udev_DATA = 69-xorg-vmmouse.rules
 $(udev_DATA): $(udev_DATA).in
sed -e 's|__BIN_PREFIX__|$(bindir)|g'  $  $@
 
-EXTRA_DIST += $(udev_DATA).in
 CLEANFILES += $(udev_DATA)
 
 endif # HAS_UDEV_RULES_DIR
+
+EXTRA_DIST = $(udev_DATA).in hal-probe-vmmouse.in

commit 61608b87c01ce87bd29869c1554a2ade5998782c
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date:   Fri Jul 9 20:45:53 2010 -0700

Improve Solaris compatibility of hal-probe-vmmouse generation rule

Use $(SED) from AC_PROG_SED to ensure a good version of sed is found
Use explicit input file name instead of $ to workaround Solaris make
issue with $ in explicit rules.

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

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 581ad65..02a721e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -29,9 +29,9 @@ calloutsdir=$(HAL_CALLOUTS_DIR)
 callouts_SCRIPTS = hal-probe-vmmouse
 
 hal-probe-vmmouse: hal-probe-vmmouse.in
-   sed -e 's|__BIN_PREFIX__|$(bindir)|g' \
+   $(AM_V_GEN)$(SED) -e 's|__BIN_PREFIX__|$(bindir)|g' \
-e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \
-$  $@
+hal-probe-vmmouse.in  $@
 
 EXTRA_DIST = hal-probe-vmmouse.in
 

commit 

xserver-xorg-video-ark: Changes to 'upstream-experimental'

2010-10-18 Thread Robert Hooker
 .gitignore   |   70 ++-
 COPYING  |   26 ++--
 ChangeLog|   48 -
 Makefile.am  |   11 +++-
 README   |   20 +++
 configure.ac |   50 ---
 src/.gitignore   |6 
 src/Makefile.am  |3 ++
 src/ark_driver.c |   55 ++-
 9 files changed, 144 insertions(+), 145 deletions(-)

New commits:
commit 5013a760db93d08b0bb87b6ad2537b1073cedf36
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date:   Fri Jul 23 14:35:43 2010 -0700

xf86-video-ark 0.7.3

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

diff --git a/configure.ac b/configure.ac
index f9744d7..2142ab6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-ark],
-[0.7.2],
+[0.7.3],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-ark])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 47dd182461728dbe18d7f59be1e3cbbe56b2ca72
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 16:49:04 2010 -0400

config: add comments for main statements

diff --git a/configure.ac b/configure.ac
index d52fa88..f9744d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,18 +20,18 @@
 #
 # Process this file with autoconf to produce a configure script
 
+# Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-ark],
 [0.7.2],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-ark])
-
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
 
+# Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
 AM_MAINTAINER_MODE
 
 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@@ -40,24 +40,24 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
-# Checks for programs.
+# Initialize libtool
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
 AH_TOP([#include xorg-server.h])
 
+# Define a configure option for an alternate module directory
 AC_ARG_WITH(xorg-module-dir, [  --with-xorg-module-dir=DIR ],
  [ moduledir=$withval ],
  [ moduledir=$libdir/xorg/modules ])
 AC_SUBST(moduledir)
 
-
-# Checks for extensions
+# Store the list of server defined optional extensions in REQUIRED_MODULES
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
 PKG_CHECK_MODULES(XORG, [xorg-server = 1.0.99.901] xproto fontsproto 
$REQUIRED_MODULES)
 
 # Checks for libraries.
@@ -68,7 +68,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
   [#include xorg-server.h])
 CPPFLAGS=$SAVE_CPPFLAGS
 
-
 if test x$XSERVER_LIBPCIACCESS = xyes; then
 PKG_CHECK_MODULES([PCIACCESS], [pciaccess = 0.8.0])
 fi

commit 92590886eb667e8a3eb7f3e7bc52d435b51a2cb2
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 16:07:00 2010 -0400

config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index 2723e29..d52fa88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,8 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test 
x$XSERVER_LIBPCIACCESS = xyes)
 DRIVER_NAME=ark
 AC_SUBST([DRIVER_NAME])
 
-AC_OUTPUT([
-   Makefile
-   src/Makefile
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
 ])
+AC_OUTPUT

commit 334926f424f1d1755086fcd3d3dad1a8b3b35f22
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 14:05:22 2010 -0400

config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index 4f57b42..2723e29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([xf86-video-ark],
 [xf86-video-ark])
 
 AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
 
 AM_INIT_AUTOMAKE([foreign dist-bzip2])

commit b58a6440f088930a5458c68c1b9fe3bd80b37a0e
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 09:27:42 2010 -0400

config: complete AC_INIT m4 quoting

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index ac992b9..4f57b42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@
 
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-ark],
-0.7.2,
+[0.7.2],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-xf86-video-ark)
+[xf86-video-ark])
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_CONFIG_HEADER([config.h])

commit 

xserver-xorg-video-ark: Changes to 'debian-experimental'

2010-10-18 Thread Robert Hooker
 .gitignore   |   70 +++-
 COPYING  |   26 --
 ChangeLog|  233 +++
 Makefile.am  |   11 ++
 configure.ac |   50 ---
 debian/changelog |7 +
 debian/control   |2 
 src/.gitignore   |6 -
 src/Makefile.am  |3 
 9 files changed, 357 insertions(+), 51 deletions(-)

New commits:
commit bbd2e883e17551a33c7b5d36199777d01da60714
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 16:07:21 2010 -0400

Bump xutils-dev requirement for new util-macros.

diff --git a/debian/changelog b/debian/changelog
index ed86198..52bc86d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xserver-xorg-video-ark (1:0.7.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump xutils-dev requirement for new util-macros.
 
- -- Robert Hooker sarv...@gmail.com  Mon, 18 Oct 2010 16:04:32 -0400
+ -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 16:04:32 -0400
 
 xserver-xorg-video-ark (1:0.7.2-3) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 5d1e58d..5dd881d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  dpkg-dev (= 1.14.17),
  automake,
  libtool,
- xutils-dev
+ xutils-dev (= 1:7.5+4)
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git

commit 7ab62e8904dbc6d795f56e06f8c3c1d5bea6446f
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 16:05:35 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000..20c5867
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,535 @@
+commit 5013a760db93d08b0bb87b6ad2537b1073cedf36
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jul 23 14:35:43 2010 -0700
+
+xf86-video-ark 0.7.3
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 47dd182461728dbe18d7f59be1e3cbbe56b2ca72
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 16:49:04 2010 -0400
+
+config: add comments for main statements
+
+commit 92590886eb667e8a3eb7f3e7bc52d435b51a2cb2
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 16:07:00 2010 -0400
+
+config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 334926f424f1d1755086fcd3d3dad1a8b3b35f22
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 14:05:22 2010 -0400
+
+config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit b58a6440f088930a5458c68c1b9fe3bd80b37a0e
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 09:27:42 2010 -0400
+
+config: complete AC_INIT m4 quoting
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit c1846ca9e802338dc0b29ddcdb7e71554d5d63a0
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 20:24:42 2010 -0400
+
+config: remove unrequired AC_HEADER_STDC
+
+Autoconf says:
+This macro is obsolescent, as current systems have conforming
+header files. New programs need not use this macro.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit ea755640844290935e115045b7bf06b219123636
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 19:41:30 2010 -0400
+
+config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+AC_PROG_C_C99. This sets gcc with -std=gnu99.
+If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit d39d3e0ec1f0cc0304966d9a96c76c00618196af
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 18:45:18 2010 -0400
+
+config: update AC_PREREQ statement to 2.60
+
+Unrelated to the previous patches, the new value simply reflects
+the reality that the minimum level for autoconf to configure
+all x.org modules is 2.60 dated June 2006.
+
+ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit a1df242dcb15a923856779e544c7394135fb8349
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 16:15:29 2010 -0400
+
+config: upgrade to util-macros 1.8 for additional man page support
+
+Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+The value of MAN_SUBST is the same for all X.Org packages.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 7cf934ad29516215ef81d13acccbee0766f8d729
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sat Jun 12 10:32:57 2010 -0400
+
+COPYING: replace stub file with Copyright notice
+
+Copyright 2000 Ani Joshi
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 

xserver-xorg-video-ati: Changes to 'upstream-experimental'

2010-10-18 Thread Robert Hooker
 COPYING   |  133 +++
 configure.ac  |  111 --
 man/Makefile.am   |   22 
 man/radeon.man|2 
 src/AtomBios/CD_Operations.c  |9 
 src/AtomBios/includes/atombios.h  |   92 ++
 src/Makefile.am   |   32 
 src/ati.c |2 
 src/ati_pciids_gen.h  |   10 
 src/atombios_crtc.c   |  410 +-
 src/atombios_output.c |  361 -
 src/drmmode_display.c |  164 +++-
 src/drmmode_display.h |   16 
 src/legacy_crtc.c |   28 
 src/legacy_output.c   |   11 
 src/local_xf86Rename.h|   23 
 src/pcidb/ati_pciids.csv  |   14 
 src/r600_exa.c| 1435 +++---
 src/r600_shader.c |  862 +++---
 src/r600_shader.h |1 
 src/r600_state.h  |   30 
 src/r600_textured_videofuncs.c|  231 ++
 src/r6xx_accel.c  |  556 +-
 src/radeon.h  |   52 -
 src/radeon_accel.c|   22 
 src/radeon_accelfuncs.c   |2 
 src/radeon_atombios.c |   89 +-
 src/radeon_atombios.h |2 
 src/radeon_bios.c |   19 
 src/radeon_chipinfo_gen.h |   10 
 src/radeon_chipset_gen.h  |   14 
 src/radeon_commonfuncs.c  |   15 
 src/radeon_crtc.c |   67 -
 src/radeon_cursor.c   |   13 
 src/radeon_dri.c  |  135 +--
 src/radeon_dri.h  |4 
 src/radeon_dri2.c |  594 ++-
 src/radeon_dri2.h |6 
 src/radeon_driver.c   |  104 +-
 src/radeon_exa.c  |  147 ++-
 src/radeon_exa_funcs.c|  120 +--
 src/radeon_exa_render.c   |   54 +
 src/radeon_exa_shared.c   |  237 ++
 src/radeon_exa_shared.h   |   80 ++
 src/radeon_kms.c  |  187 
 src/radeon_output.c   |  101 ++
 src/radeon_pci_chipset_gen.h  |   10 
 src/radeon_pci_device_match_gen.h |   10 
 src/radeon_probe.c|8 
 src/radeon_probe.h|9 
 src/radeon_textured_video.c   |6 
 src/radeon_textured_videofuncs.c  |  504 +
 src/radeon_vbo.c  |   12 
 src/radeon_vbo.h  |   13 
 src/radeon_video.c|   54 -
 src/radeon_video.h|2 
 src/radeon_vip.c  |2 
 src/theatre200.c  |   16 
 src/theatre_detect.c  |4 
 59 files changed, 4271 insertions(+), 3008 deletions(-)

New commits:
commit cc5005af61f45a3552f7358dc5aa711e42f5af54
Author: Alex Deucher alexdeuc...@gmail.com
Date:   Mon Sep 27 18:20:53 2010 -0400

bump version for release

diff --git a/configure.ac b/configure.ac
index decc46f..8625709 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-ati],
-[6.13.99],
+[6.13.2],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-ati])
 

commit 7f8820fcec8c90bf2f823170bd08a23e8b4ff7af
Author: Michael Cree mc...@orcon.net.nz
Date:   Mon Sep 27 13:39:12 2010 -0400

Fix some unaligned 32bit accesses in the AtomBios code.

On the Alpha architecture unaligned 32bit accesses incur a software
trap to the kernel and pollute the kernel logs.  Fixed by use of the
ldl_u() interface.

Signed-off-by: Michael Cree mc...@orcon.net.nz

diff --git a/src/AtomBios/CD_Operations.c b/src/AtomBios/CD_Operations.c
index 9d399d5..f8b47e3 100644
--- a/src/AtomBios/CD_Operations.c
+++ b/src/AtomBios/CD_Operations.c
@@ -367,7 +367,7 @@ UINT32 GetParametersPS(PARSER_TEMP_DATA STACK_BASED *   
pParserTempData)
 UINT32 data;
 pParserTempData-Index=*pParserTempData-pWorkingTableData-IP;
 pParserTempData-pWorkingTableData-IP+=sizeof(UINT8);
-data = 
UINT32LE_TO_CPU(*(pParserTempData-pDeviceData-pParameterSpace+pParserTempData-Index));
+data = 
UINT32LE_TO_CPU(ldl_u(pParserTempData-pDeviceData-pParameterSpace+pParserTempData-Index));
 return data;
 }
 
@@ -430,7 +430,7 @@ UINT32 GetParametersIndirect(PARSER_TEMP_DATA STACK_BASED * 
pParserTempData)
 
 pParserTempData-Index=UINT16LE_TO_CPU(ldw_u((uint16_t 
*)pParserTempData-pWorkingTableData-IP));
 pParserTempData-pWorkingTableData-IP+=sizeof(UINT16);
-ret = 
UINT32LE_TO_CPU(*(UINT32*)(RELATIVE_TO_BIOS_IMAGE(pParserTempData-Index)+pParserTempData-CurrentDataBlock));
+ret = 
UINT32LE_TO_CPU(ldl_u((UINT32*)(RELATIVE_TO_BIOS_IMAGE(pParserTempData-Index)+pParserTempData-CurrentDataBlock)));
 return ret;
 }
 
@@ -453,7 +453,7 @@ UINT32 GetParametersDirect16(PARSER_TEMP_DATA STACK_BASED * 
pParserTempData)
 UINT32 

xserver-xorg-video-ati: Changes to 'debian-experimental'

2010-10-18 Thread Robert Hooker
 ChangeLog |  612 +++
 configure.ac  |  108 +---
 debian/changelog  |7 
 debian/control|2 
 man/Makefile.am   |   22 
 src/AtomBios/CD_Operations.c  |9 
 src/AtomBios/includes/atombios.h  |   92 +++-
 src/Makefile.am   |   27 -
 src/ati.c |2 
 src/ati_pciids_gen.h  |3 
 src/atombios_crtc.c   |  426 +-
 src/atombios_output.c |  353 ++-
 src/drmmode_display.c |   12 
 src/legacy_output.c   |5 
 src/local_xf86Rename.h|   23 -
 src/pcidb/ati_pciids.csv  |7 
 src/r600_exa.c|  513 --
 src/r600_shader.c |  860 +++---
 src/r600_shader.h |1 
 src/r600_state.h  |   16 
 src/r600_textured_videofuncs.c|   66 --
 src/r6xx_accel.c  |  185 ++--
 src/radeon.h  |   13 
 src/radeon_atombios.c |   20 
 src/radeon_atombios.h |2 
 src/radeon_chipinfo_gen.h |3 
 src/radeon_chipset_gen.h  |7 
 src/radeon_cursor.c   |9 
 src/radeon_dri2.c |  109 
 src/radeon_exa.c  |   96 ++--
 src/radeon_exa_funcs.c|  118 ++---
 src/radeon_exa_render.c   |8 
 src/radeon_exa_shared.c   |  237 ++
 src/radeon_exa_shared.h   |   80 +++
 src/radeon_kms.c  |  123 -
 src/radeon_output.c   |   16 
 src/radeon_pci_chipset_gen.h  |3 
 src/radeon_pci_device_match_gen.h |3 
 src/radeon_vbo.h  |   13 
 src/radeon_video.c|   12 
 src/theatre200.c  |8 
 src/theatre_detect.c  |4 
 42 files changed, 2587 insertions(+), 1648 deletions(-)

New commits:
commit e19fd526e3ef01001838abeb1fc6ee09b212c324
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 16:22:04 2010 -0400

Bump xutils-dev requirement for new util-macros.

diff --git a/debian/changelog b/debian/changelog
index ceeac22..b88d492 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xserver-xorg-video-ati (1:6.13.2-1) UNRELEASED; urgency=low
 
   * New upstream version.
+  * Bump xutils-dev requirement for new util-macros.
 
- -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 16:18:22 -0400
+ -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 16:19:39 -0400
 
 xserver-xorg-video-ati (1:6.13.1-3) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 56a5282..5b22813 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
  dpkg-dev (= 1.14.17),
  automake,
  libtool,
- xutils-dev
+ xutils-dev (= 1:7.5+4)
 Standards-Version: 3.9.0
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ati
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ati.git

commit f9e11d70def7c436e73debea8c8d03f4a6d8abd0
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 16:19:01 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index e66c79d..5fcd1dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,615 @@
+commit cc5005af61f45a3552f7358dc5aa711e42f5af54
+Author: Alex Deucher alexdeuc...@gmail.com
+Date:   Mon Sep 27 18:20:53 2010 -0400
+
+bump version for release
+
+commit 7f8820fcec8c90bf2f823170bd08a23e8b4ff7af
+Author: Michael Cree mc...@orcon.net.nz
+Date:   Mon Sep 27 13:39:12 2010 -0400
+
+Fix some unaligned 32bit accesses in the AtomBios code.
+
+On the Alpha architecture unaligned 32bit accesses incur a software
+trap to the kernel and pollute the kernel logs.  Fixed by use of the
+ldl_u() interface.
+
+Signed-off-by: Michael Cree mc...@orcon.net.nz
+
+commit c4f834cdfbe96aa47ac5fb039f9dd7aa9730c8a3
+Author: Nicolas Reinecke n...@das-labor.org
+Date:   Mon Sep 27 13:33:55 2010 -0400
+
+radeon: Convert remaining x(c)alloc/xfree to m/calloc/free.
+
+Fixes deprecation warnings missed out by
+f7a91ece264af9f3fd2fc18e99aefcda93ce9f5c
+
+commit f8fb9312d791af1f77020e8c2d35bb30841ed9aa
+Author: Karl Tomlinson kar...@karlt.net
+Date:   Sun Aug 22 22:46:33 2010 +1200
+
+RADEONPrepareAccess_CS: fallback to DFS when pixmap is in VRAM
+
+This avoids costly CPU VRAM reads and lets EXA manage a system memory cache
+of the portions of pixmaps needed for unaccelerated operations.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=27139
+
+commit 35c4ff936601ee083f51510a5192fb97d622a483
+Author: Karl Tomlinson kar...@karlt.net
+Date:   Sun Aug 22 22:28:06 2010 +1200
+
+radeon: complete UTS and DFS even when a scratch BO is not necessary
+
+Turns on the big-endian paths even for 

xserver-xorg-video-neomagic: Changes to 'upstream-experimental'

2010-10-18 Thread Robert Hooker
 .gitignore   |   70 ++
 COPYING  |   99 -
 ChangeLog|   73 --
 Makefile.am  |   13 +
 configure.ac |   14 -
 man/.cvsignore   |2 
 man/Makefile.am  |   41 +--
 man/neomagic.man |2 
 src/.cvsignore   |6 
 src/Makefile.am  |1 
 src/neo.h|8 
 src/neo_2070.c   |2 
 src/neo_2097.c   |2 
 src/neo_2200.c   |2 
 src/neo_bank.c   |   92 
 src/neo_driver.c |  576 ---
 src/neo_shadow.c |1 
 src/neo_video.c  |1 
 18 files changed, 408 insertions(+), 597 deletions(-)

New commits:
commit 77faebed86622b2d3bf5291b1a7f470b1382
Author: Dave Airlie airl...@redhat.com
Date:   Mon Jul 5 14:48:07 2010 +1000

neomagic 1.2.5

diff --git a/configure.ac b/configure.ac
index a19183b..38cba3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-neomagic],
-1.2.4,
+1.2.5,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-neomagic)
 

commit 73bc0507b0b772717356a7fa8a15442022a8c3c7
Author: Jamey Sharp ja...@minilop.net
Date:   Sun Jun 13 17:28:06 2010 -0700

Revert Adding experimental pseudocolor overlay stuff to NeoMagic driver.

ajax removed the key parts of that patch two years ago in commit
dc2a372ad7edf34417d7d7042562b601e4f0041c. This patch reverts the rest of
commit 57cea11892e956f4e6f07005e05d121fa48c3059, aside from whitespace
changes.

Signed-off-by: Jamey Sharp ja...@minilop.net

diff --git a/src/neo.h b/src/neo.h
index 718b8a5..f3f2b4c 100644
--- a/src/neo.h
+++ b/src/neo.h
@@ -48,7 +48,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include xaa.h
 #include xaalocal.h  /* XAA internals as we replace some of XAA */
-#include xaaWrapper.h
 #include xf86Cursor.h
 
 #include shadowfb.h
@@ -268,7 +267,6 @@ typedef struct neoRec
 int overlay_offset;
 int videoKey;
 int interlace;
-SyncFunc accelSync;
 } NEORec, *NEOPtr;
 
 typedef struct {
diff --git a/src/neo_2070.c b/src/neo_2070.c
index 007a304..b3811d6 100644
--- a/src/neo_2070.c
+++ b/src/neo_2070.c
@@ -159,7 +159,7 @@ Neo2070AccelInit(ScreenPtr pScreen)
return FALSE;
 }
 
-return (xaaSetupWrapper(pScreen, infoPtr, pScrn-depth, nPtr-accelSync));
+return(XAAInit(pScreen, infoPtr));
 
 }
 
diff --git a/src/neo_2097.c b/src/neo_2097.c
index ed9014c..7d720df 100644
--- a/src/neo_2097.c
+++ b/src/neo_2097.c
@@ -248,7 +248,7 @@ Neo2097AccelInit(ScreenPtr pScreen)
return FALSE;
 }
 
-return (xaaSetupWrapper(pScreen, infoPtr, pScrn-depth, nPtr-accelSync));
+return(XAAInit(pScreen, infoPtr));
 }
 
 static void
diff --git a/src/neo_2200.c b/src/neo_2200.c
index 78b3367..4b354e7 100644
--- a/src/neo_2200.c
+++ b/src/neo_2200.c
@@ -253,7 +253,7 @@ Neo2200AccelInit(ScreenPtr pScreen)
return FALSE;
 }
 
-return (xaaSetupWrapper(pScreen, infoPtr, pScrn-depth, nPtr-accelSync));
+return(XAAInit(pScreen, infoPtr));
 }
 
 static void
diff --git a/src/neo_driver.c b/src/neo_driver.c
index 9b40943..b12c125 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -1454,22 +1454,11 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int 
argc, char **argv)
 miClearVisualTypes();
 
 /* Setup the visuals we support. */
-#if 0
-if (!miSetVisualTypes(pScrn-depth,
- miGetDefaultVisualMask(pScrn-depth),
- pScrn-rgbBits, pScrn-defaultVisual))
- return FALSE;
-#else
 if (!miSetVisualTypes(pScrn-depth,
  miGetDefaultVisualMask(pScrn-depth),
  pScrn-rgbBits, pScrn-defaultVisual))
  return FALSE;
-if (pScrn-depth  8) {
-   if (!miSetVisualTypes(8, miGetDefaultVisualMask(8), 6,
- pScrn-defaultVisual))
-   return FALSE;
-}
-#endif
+
 if (!miSetPixmapDepths ()) return FALSE;
 
 /*
@@ -1505,8 +1494,7 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, 
char **argv)
 /* Fixup RGB ordering */
 visual = pScreen-visuals + pScreen-numVisuals;
 while (--visual = pScreen-visuals) {
-   if ((visual-class | DynamicClass) == DirectColor
-visual-nplanes  8) {
+   if ((visual-class | DynamicClass) == DirectColor) {
visual-offsetRed = pScrn-offset.red;
visual-offsetGreen = pScrn-offset.green;
visual-offsetBlue = pScrn-offset.blue;
@@ -2605,7 +2593,7 @@ neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
  */
 NeoStd-Attribute[16] = 0x01;
 
-switch (pScrn-depth) { /*...@!@*/
+switch (pScrn-depth) {
 case  8 :
NeoStd-CRTC[0x13] = pScrn-displayWidth  3;
NeoNew-ExtCRTOffset   = pScrn-displayWidth  11;

commit e2234bd3d37239f5ac0182a3a8b3db23ba5ffbac
Author: Gaetan Nadon mems...@videotron.ca
Date:   Sat Jun 12 

xserver-xorg-video-neomagic: Changes to 'debian-experimental'

2010-10-18 Thread Robert Hooker
 COPYING  |   99 ++-
 ChangeLog|   45 +
 Makefile.am  |2 -
 configure.ac |2 -
 debian/changelog |6 +++
 man/Makefile.am  |   41 ++
 src/neo.h|2 -
 src/neo_2070.c   |2 -
 src/neo_2097.c   |2 -
 src/neo_2200.c   |2 -
 src/neo_driver.c |   18 +-
 11 files changed, 169 insertions(+), 52 deletions(-)

New commits:
commit 63a45525053b7c95eb15047fe7f1ecb94c4c2c32
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 16:57:55 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index e1fbbf5..021ac08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+commit 77faebed86622b2d3bf5291b1a7f470b1382
+Author: Dave Airlie airl...@redhat.com
+Date:   Mon Jul 5 14:48:07 2010 +1000
+
+neomagic 1.2.5
+
+commit 73bc0507b0b772717356a7fa8a15442022a8c3c7
+Author: Jamey Sharp ja...@minilop.net
+Date:   Sun Jun 13 17:28:06 2010 -0700
+
+Revert Adding experimental pseudocolor overlay stuff to NeoMagic driver.
+
+ajax removed the key parts of that patch two years ago in commit
+dc2a372ad7edf34417d7d7042562b601e4f0041c. This patch reverts the rest of
+commit 57cea11892e956f4e6f07005e05d121fa48c3059, aside from whitespace
+changes.
+
+Signed-off-by: Jamey Sharp ja...@minilop.net
+
+commit e2234bd3d37239f5ac0182a3a8b3db23ba5ffbac
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sat Jun 12 20:44:46 2010 -0400
+
+COPYING: replace stub file with actual Copyright notices.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit fdfd0902f858d068b8ee100b34249e7a53252d14
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sat Mar 27 09:55:13 2010 -0400
+
+config: remove TODO from EXTRA_DIST
+
+Automake always distribute the TODO file.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 958353fc567f989a2c6c6ef73625f99de896a68d
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Fri Jan 15 15:00:16 2010 -0800
+
+Update Sun license notices to current X.Org standard form
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com
+
 commit dbcbef42e4ea74e20313e4f5437067cc5cfb7024
 Author: Gaetan Nadon mems...@videotron.ca
 Date:   Tue Dec 15 22:01:02 2009 -0500
diff --git a/debian/changelog b/debian/changelog
index c8bd87f..a3da057 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-neomagic (1:1.2.5-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 16:56:57 -0400
+
 xserver-xorg-video-neomagic (1:1.2.4-4) experimental; urgency=low
 
   * Build against Xserver 1.9.1 rc1.

commit 77faebed86622b2d3bf5291b1a7f470b1382
Author: Dave Airlie airl...@redhat.com
Date:   Mon Jul 5 14:48:07 2010 +1000

neomagic 1.2.5

diff --git a/configure.ac b/configure.ac
index a19183b..38cba3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-neomagic],
-1.2.4,
+1.2.5,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-neomagic)
 

commit 73bc0507b0b772717356a7fa8a15442022a8c3c7
Author: Jamey Sharp ja...@minilop.net
Date:   Sun Jun 13 17:28:06 2010 -0700

Revert Adding experimental pseudocolor overlay stuff to NeoMagic driver.

ajax removed the key parts of that patch two years ago in commit
dc2a372ad7edf34417d7d7042562b601e4f0041c. This patch reverts the rest of
commit 57cea11892e956f4e6f07005e05d121fa48c3059, aside from whitespace
changes.

Signed-off-by: Jamey Sharp ja...@minilop.net

diff --git a/src/neo.h b/src/neo.h
index 718b8a5..f3f2b4c 100644
--- a/src/neo.h
+++ b/src/neo.h
@@ -48,7 +48,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include xaa.h
 #include xaalocal.h  /* XAA internals as we replace some of XAA */
-#include xaaWrapper.h
 #include xf86Cursor.h
 
 #include shadowfb.h
@@ -268,7 +267,6 @@ typedef struct neoRec
 int overlay_offset;
 int videoKey;
 int interlace;
-SyncFunc accelSync;
 } NEORec, *NEOPtr;
 
 typedef struct {
diff --git a/src/neo_2070.c b/src/neo_2070.c
index 007a304..b3811d6 100644
--- a/src/neo_2070.c
+++ b/src/neo_2070.c
@@ -159,7 +159,7 @@ Neo2070AccelInit(ScreenPtr pScreen)
return FALSE;
 }
 
-return (xaaSetupWrapper(pScreen, infoPtr, pScrn-depth, nPtr-accelSync));
+return(XAAInit(pScreen, infoPtr));
 
 }
 
diff --git a/src/neo_2097.c b/src/neo_2097.c
index ed9014c..7d720df 100644
--- a/src/neo_2097.c
+++ b/src/neo_2097.c
@@ -248,7 +248,7 @@ Neo2097AccelInit(ScreenPtr pScreen)
return FALSE;
 }
 
-return (xaaSetupWrapper(pScreen, infoPtr, pScrn-depth, nPtr-accelSync));
+return(XAAInit(pScreen, infoPtr));
 }
 
 static void
diff --git a/src/neo_2200.c b/src/neo_2200.c
index 78b3367..4b354e7 100644
--- 

Processed: Re: Bug#599941: /usr/bin/xset: xset dpms etc seems to operate on all screens rather than just those provided such as :0.1, in X zaphod mode

2010-10-18 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

 reopen 599941
Bug #599941 {Done: Julien Cristau jcris...@debian.org} [x11-xserver-utils] 
/usr/bin/xset: xset dpms etc seems to operate on all screens rather than just 
those provided such as :0.1, in X zaphod mode
 thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
599941: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=599941
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


-- 
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/handler.s.c.128743737716720.transcr...@bugs.debian.org



Bug#599941: /usr/bin/xset: xset dpms etc seems to operate on all screens rather than just those provided such as :0.1, in X zaphod mode

2010-10-18 Thread Tim Connors
reopen 599941
thanks

On Tue, 12 Oct 2010, Julien Cristau wrote:

 On Wed, Oct 13, 2010 at 03:13:24 +1100, Tim Connors wrote:

  Package: x11-xserver-utils
  Version: 7.3+5
  Severity: normal
  File: /usr/bin/xset
 
  My xorg.conf is set up to have dpms enabled on one screen (:0.1 -- I'm
  using zaphod mode, so :0.0 is a separate screen to :0.1), but disable
  on another screen (:0.0, a status screen that must always remain on).
 
  This works, as is expected.  However, if I say:
 
  DISPLAY=:0.1 xset dpms 1200 2400 3600
 
  Then it affects :0.0 as well (even though xorg.conf says that screen
  has DPMS disabled!).  It should only affect the asked for display.
  Perhaps it should affect all displays if I was trying to talk to :0
  rather than :0.0.
 
  Those not using zaphod mode, but using xinerama mode instead,
  obviously would have only the one DISPLAY, and thus xset should affect
  them all.
 
 The dpms timeouts are global to the X server, not per screen.
 Similarly, DPMSEnabled is a global boolean flag.  I don't think there's
 a bug here.

Well, it's a regression.

You used to be able to say:

Section ServerFlags
Option Xinerama 0

# no blank because want right hand display to be lit all the time
#Option  BlankTime 60
Option  BlankTime 0
Option  StandbyTime 120
Option  SuspendTime 180
Option  OffTime 240
EndSection

#the aatxth mimic display (not to be DPMS blanked)
Section Monitor
# HorizSync source: edid, VertRefresh source: edid
Identifier Monitor0
...
Option DPMS false
EndSection

#the night assistant's terminal (to be DPMS blanked)
Section Monitor
# HorizSync source: edid, VertRefresh source: edid
Identifier Monitor1
...
Option DPMS true
EndSection

(perhaps combined with
DISPLAY=:0.0 xset s off
in .xsession - at least, that's the setup I ended up with on and old
system here)

And have Monitor1 DPMS blank after 2 hours, and have the Monitor0 stay
on and remain unblank.

The best I can do now with the above xorg.conf is to have Monitor1 DPMS
blank after 2 hours, and Monitor0 to remain DPMS on, but go blank.  (so
dpms isn't global, as it shouldn't be, because it is should be legal to
plug different monitors with different capabilities in at the same time).

So it looks to me that Xorg now blanks all screens when the server reaches
the DPMS timeout.  It should have blanked when it reached the screenblank
timeout, which is disabled here, and shouldn't have blanked when it
reached the dpms timeout, instead disabling the appropriate sync signals
on the appropriately enabled monitors (not a global flag.  Never has
been, never should be).

-- 
TimC
However, my preamp still has a meat-driven knob. -- A. de Boer in ASR



-- 
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/alpine.deb.2.00.1010190815300.30...@dirac.rather.puzzling.org



xserver-xorg-video-mga: Changes to 'upstream-experimental'

2010-10-18 Thread Robert Hooker
Rebased ref, commits from common ancestor:
commit c08b112bfe14fbfe713e4757eb0b704c8ed1f339
Author: Adam Jackson a...@redhat.com
Date:   Tue Aug 10 10:58:41 2010 -0400

xf86-video-mga 1.4.13

Signed-off-by: Adam Jackson a...@redhat.com

diff --git a/configure.ac b/configure.ac
index 900e1fa..540c390 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-mga],
-[1.4.12],
+[1.4.13],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-mga])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 411570523550e1997bbd83815990bdda8cfd129c
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 16:49:04 2010 -0400

config: add comments for main statements

diff --git a/configure.ac b/configure.ac
index dbbb430..900e1fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,13 +20,12 @@
 #
 # Process this file with autoconf to produce a configure script
 
+# Initialize Autoconf
 AC_PREREQ([2.60])
-
 AC_INIT([xf86-video-mga],
 [1.4.12],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-mga])
-
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 
@@ -38,16 +37,17 @@ XORG_DEFAULT_OPTIONS
 
 AC_CONFIG_AUX_DIR(.)
 
+# Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
 AM_MAINTAINER_MODE
 
-# Checks for programs.
+# Initialize libtool
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
 AH_TOP([#include xorg-server.h])
 
+# Define a configure option for an alternate module directory
 AC_ARG_WITH(xorg-module-dir,
 AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory 
[[default=$libdir/xorg/modules]]]),
@@ -64,19 +64,18 @@ AC_ARG_ENABLE(exa,
   [EXA=$enableval],
   [EXA=yes])
 
-# Checks for extensions
+# Store the list of server defined optional extensions in REQUIRED_MODULES
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
 XORG_DRIVER_CHECK_EXT(XV, videoproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
 PKG_CHECK_MODULES(XORG, [xorg-server = 1.1.0 xproto fontsproto 
$REQUIRED_MODULES])
 sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
 
 # Checks for libraries.
 
-
 if test x$DRI != xno; then
 AC_CHECK_FILE([${sdkdir}/dri.h],
   [have_dri_h=yes], [have_dri_h=no])

commit 99892c4f416e9669a62963d29e7dee760382da95
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 16:07:00 2010 -0400

config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index 29a672e..dbbb430 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,9 +171,10 @@ AC_SUBST([moduledir])
 DRIVER_NAME=mga
 AC_SUBST([DRIVER_NAME])
 
-AC_OUTPUT([
-   Makefile
-   src/Makefile
-   man/Makefile
-   util/Makefile
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
+man/Makefile
+util/Makefile
 ])
+AC_OUTPUT

commit 1f78a33e576898a0b7fd542f772064ad2f01e2f9
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 14:37:41 2010 -0400

config: replace deprecated AC_HELP_STRING with AS_HELP_STRING

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index 79ff686..29a672e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,17 +49,17 @@ AC_PROG_LIBTOOL
 AH_TOP([#include xorg-server.h])
 
 AC_ARG_WITH(xorg-module-dir,
-AC_HELP_STRING([--with-xorg-module-dir=DIR],
+AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory 
[[default=$libdir/xorg/modules]]]),
 [moduledir=$withval],
 [moduledir=$libdir/xorg/modules])
 
-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
   [Disable DRI support [[default=auto]]]),
   [DRI=$enableval],
   [DRI=auto])
 AC_ARG_ENABLE(exa,
-  AC_HELP_STRING([--disable-exa],
+  AS_HELP_STRING([--disable-exa],
  [Disable EXA support [[default=enabled]]]),
   [EXA=$enableval],
   [EXA=yes])

commit fb311dc7e72a956c5a03e63757ec96b6626afb3a
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 14:05:22 2010 -0400

config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index 0b01855..79ff686 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_INIT([xf86-video-mga],
 [xf86-video-mga])
 
 AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])

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

2010-10-18 Thread Robert Hooker
 .gitignore   |   75 +++---
 ChangeLog|  224 +++
 Makefile.am  |   12 +-
 configure.ac |   61 ++
 debian/changelog |7 +
 debian/control   |2 
 man/Makefile.am  |   59 +-
 src/mga_dacG.c   |   32 ++-
 src/mga_driver.c |   11 --
 util/.gitignore  |2 
 10 files changed, 363 insertions(+), 122 deletions(-)

New commits:
commit d5ee3a90ea792bcc40eba4f53b9faa4656de7573
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 17:17:39 2010 -0400

Bump xutils-dev requirement for new util-macros.

diff --git a/debian/changelog b/debian/changelog
index f633ebd..fe9ca6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-mga (1:1.4.13.dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump xutils-dev requirement for new util-macros.
 
  -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 17:16:04 -0400
 
diff --git a/debian/control b/debian/control
index 808174a..54b4c7a 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  dpkg-dev (= 1.14.17),
  automake,
  libtool,
- xutils-dev
+ xutils-dev (= 1:7.5+4)
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-mga
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-mga.git

commit 77c563cf1120bb0dce327e6b74e947c69c442534
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 17:16:52 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index 5dcfa84..8036354 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,227 @@
+commit c08b112bfe14fbfe713e4757eb0b704c8ed1f339
+Author: Adam Jackson a...@redhat.com
+Date:   Tue Aug 10 10:58:41 2010 -0400
+
+xf86-video-mga 1.4.13
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 411570523550e1997bbd83815990bdda8cfd129c
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 16:49:04 2010 -0400
+
+config: add comments for main statements
+
+commit 99892c4f416e9669a62963d29e7dee760382da95
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 16:07:00 2010 -0400
+
+config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 1f78a33e576898a0b7fd542f772064ad2f01e2f9
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 14:37:41 2010 -0400
+
+config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit fb311dc7e72a956c5a03e63757ec96b6626afb3a
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 14:05:22 2010 -0400
+
+config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit f2c386e5a7b9b5682db40d53e9f7b92e7d41ceba
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 09:27:42 2010 -0400
+
+config: complete AC_INIT m4 quoting
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 01d47165804c6c3a674fda7a9629e2f1d0f8b2db
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 21:54:11 2010 -0400
+
+config: remove unrequired AC_SUBST([DRI_CFLAGS])
+
+This macro is called by PKG_CHECK_MODULES
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit b84e08801f18292b3af73ac250788941fa2685a0
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 21:44:57 2010 -0400
+
+config: remove unrequired AC_SUBST([XORG_CFLAGS])
+
+This macro is called by PKG_CHECK_MODULES
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 9d7ae5d171555c22c654b5ef14840f7c8c3d2124
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 20:24:42 2010 -0400
+
+config: remove unrequired AC_HEADER_STDC
+
+Autoconf says:
+This macro is obsolescent, as current systems have conforming
+header files. New programs need not use this macro.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit ac6e0b60b18173598865a66333e0cfa383a61eec
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 19:41:31 2010 -0400
+
+config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+AC_PROG_C_C99. This sets gcc with -std=gnu99.
+If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit a84d4a8883c5c853396c644cbc6db0f7f838f6bf
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 18:45:19 2010 -0400
+
+config: update AC_PREREQ statement to 2.60
+
+Unrelated to the previous patches, the new value simply reflects
+the reality that the minimum level for autoconf to configure
+all x.org modules is 2.60 dated June 2006.
+
+ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+

xserver-xorg-video-i128: Changes to 'upstream-experimental'

2010-10-18 Thread Robert Hooker
 .gitignore|   70 +++--
 COPYING   |   47 ---
 ChangeLog |   45 --
 Makefile.am   |   15 +++---
 README|   76 
 README.sgml   |   98 -
 configure.ac  |   51 ++---
 man/.cvsignore|2 
 man/Makefile.am   |   59 
 man/i128.man  |2 
 src/.cvsignore|6 --
 src/i128.h|2 
 src/i128IBMDAC.c  |   84 +--
 src/i128_driver.c |  128 +++---
 src/i128accel.c   |4 +
 src/i128exa.c |6 ++
 src/i128init.c|   15 +-
 17 files changed, 243 insertions(+), 467 deletions(-)

New commits:
commit d7c1073cf42e3486b49f5a55f2c5f2929b18417f
Author: Adam Jackson a...@redhat.com
Date:   Tue Aug 10 10:51:59 2010 -0400

xf86-video-i128 1.3.4

Signed-off-by: Adam Jackson a...@redhat.com

diff --git a/configure.ac b/configure.ac
index 6fa235f..5ae48b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-i128],
-[1.3.3],
+[1.3.4],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-i128])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 94cdca24c2035245b191e2d1c453fc02c2fbecac
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 16:49:04 2010 -0400

config: add comments for main statements

diff --git a/configure.ac b/configure.ac
index eee8e2f..6fa235f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,18 +20,18 @@
 #
 # Process this file with autoconf to produce a configure script
 
+# Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-i128],
 [1.3.3],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-i128])
-
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
 
+# Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
 AM_MAINTAINER_MODE
 
 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@@ -40,25 +40,26 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
-# Checks for programs.
+# Initialize libtool
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
 AH_TOP([#include xorg-server.h])
 
+# Define a configure option for an alternate module directory
 AC_ARG_WITH(xorg-module-dir,
 AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory 
[[default=$libdir/xorg/modules]]]),
 [moduledir=$withval],
 [moduledir=$libdir/xorg/modules])
 
-# Checks for extensions
+# Store the list of server defined optional extensions in REQUIRED_MODULES
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
 XORG_DRIVER_CHECK_EXT(XV, videoproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
 PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
 
 # Checks for libraries.

commit 2c9c7070abec4eb3fbf14f380dd1e57d63fdd720
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 16:07:00 2010 -0400

config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index 4780299..eee8e2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,8 +86,9 @@ AC_SUBST([moduledir])
 DRIVER_NAME=i128
 AC_SUBST([DRIVER_NAME])
 
-AC_OUTPUT([
-   Makefile
-   src/Makefile
-   man/Makefile
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
+man/Makefile
 ])
+AC_OUTPUT

commit 68934cda27a0c2c051187f77c0d8faf82b9615f4
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 14:37:41 2010 -0400

config: replace deprecated AC_HELP_STRING with AS_HELP_STRING

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index 073409f..4780299 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ AC_PROG_LIBTOOL
 AH_TOP([#include xorg-server.h])
 
 AC_ARG_WITH(xorg-module-dir,
-AC_HELP_STRING([--with-xorg-module-dir=DIR],
+AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory 
[[default=$libdir/xorg/modules]]]),
 [moduledir=$withval],
 [moduledir=$libdir/xorg/modules])

commit bef6413d558428f439422126f77791814df4453b
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 14:05:22 2010 -0400

config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index d56557e..073409f 100644
--- a/configure.ac
+++ 

xserver-xorg-video-i128: Changes to 'debian-experimental'

2010-10-18 Thread Robert Hooker
 .gitignore   |   70 ++--
 COPYING  |   47 --
 ChangeLog|  240 +++
 Makefile.am  |   15 ++-
 README   |   76 -
 README.sgml  |   98 --
 configure.ac |   48 +--
 debian/changelog |7 +
 debian/control   |2 
 man/.cvsignore   |2 
 man/Makefile.am  |   59 -
 src/.cvsignore   |6 -
 src/i128accel.c  |4 
 src/i128init.c   |   15 +++
 14 files changed, 459 insertions(+), 230 deletions(-)

New commits:
commit 789361153dd0c8883ce4543d789e68819344b071
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 17:23:20 2010 -0400

Bump xutils-dev requirement for new util-macros.

diff --git a/debian/changelog b/debian/changelog
index 1fff49c..a23c1d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-i128 (1:1.3.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump xutils-dev requirement for new util-macros.
 
  -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 17:21:27 -0400
 
diff --git a/debian/control b/debian/control
index 7286420..ddce93b 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  dpkg-dev (= 1.14.17),
  automake,
  libtool,
- xutils-dev
+ xutils-dev (= 1:7.5+4)
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-i128
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-i128.git

commit 89a4252fe0b38393116292569ff3ed1c22594489
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 17:22:31 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index 2237c97..9b61adc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,243 @@
+commit d7c1073cf42e3486b49f5a55f2c5f2929b18417f
+Author: Adam Jackson a...@redhat.com
+Date:   Tue Aug 10 10:51:59 2010 -0400
+
+xf86-video-i128 1.3.4
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 94cdca24c2035245b191e2d1c453fc02c2fbecac
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 16:49:04 2010 -0400
+
+config: add comments for main statements
+
+commit 2c9c7070abec4eb3fbf14f380dd1e57d63fdd720
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 16:07:00 2010 -0400
+
+config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 68934cda27a0c2c051187f77c0d8faf82b9615f4
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 14:37:41 2010 -0400
+
+config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit bef6413d558428f439422126f77791814df4453b
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 14:05:22 2010 -0400
+
+config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 53239cdc70f209b2d509f44319008e5c6397
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 09:27:42 2010 -0400
+
+config: complete AC_INIT m4 quoting
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit b0f3826e110f44e3dd0660b8c6d0dd04cc35d908
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 21:44:57 2010 -0400
+
+config: remove unrequired AC_SUBST([XORG_CFLAGS])
+
+This macro is called by PKG_CHECK_MODULES
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 4b3e0c971fc320bf3d47b56adc0f65ac16d78eb7
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 20:24:42 2010 -0400
+
+config: remove unrequired AC_HEADER_STDC
+
+Autoconf says:
+This macro is obsolescent, as current systems have conforming
+header files. New programs need not use this macro.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit aedc94dd1770317bb41e9341863f371834203373
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 19:41:31 2010 -0400
+
+config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+AC_PROG_C_C99. This sets gcc with -std=gnu99.
+If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 04015a519e52493fcd43f4d940a3a9e55d7c03be
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 18:45:19 2010 -0400
+
+config: update AC_PREREQ statement to 2.60
+
+Unrelated to the previous patches, the new value simply reflects
+the reality that the minimum level for autoconf to configure
+all x.org modules is 2.60 dated June 2006.
+
+ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit eda5280a2acd6b55c9cc29a7d251aca5915ad744
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 16:15:29 

xserver-xorg-video-glint: Changes to 'upstream-experimental'

2010-10-18 Thread Robert Hooker
 .gitignore |   70 ++-
 COPYING|  109 ++--
 ChangeLog  |  101 --
 Makefile.am|   12 ++
 README |   20 
 configure.ac   |   54 ++--
 man/.gitignore |2 
 man/Makefile.am|   59 -
 man/glint.man  |2 
 src/.gitignore |6 -
 src/Makefile.am|2 
 src/glint.h|1 
 src/glint_dga.c|6 -
 src/glint_dri.c|   26 ++---
 src/glint_driver.c |  233 +++--
 src/glint_shadow.c |1 
 src/pm2_video.c|   22 ++---
 src/pm3_accel.c|4 
 src/pm3_dac.c  |4 
 src/pm3_video.c|   22 ++---
 src/pm_accel.c |4 
 src/sx_accel.c |2 
 src/tx_accel.c |4 
 23 files changed, 323 insertions(+), 443 deletions(-)

New commits:
commit 7050a255115b2c5a70083d2d4ad775548ef701f7
Author: Matt Turner matts...@gmail.com
Date:   Sat Sep 11 16:22:23 2010 -0400

xf86-video-glint 1.2.5

diff --git a/configure.ac b/configure.ac
index 5f04bcb..450005b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-glint],
-[1.2.4],
+[1.2.5],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-glint])
 AC_CONFIG_SRCDIR([Makefile.am])

commit a2fa84df74b2c799b4bf992a212fa7c06dfa919f
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 16:49:04 2010 -0400

config: add comments for main statements

diff --git a/configure.ac b/configure.ac
index cb96399..5f04bcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,18 +20,18 @@
 #
 # Process this file with autoconf to produce a configure script
 
+# Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-glint],
 [1.2.4],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-glint])
-
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
 
+# Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
 AM_MAINTAINER_MODE
 
 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@@ -40,12 +40,13 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
-# Checks for programs.
+# Initialize libtool
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
 AH_TOP([#include xorg-server.h])
 
+# Define a configure option for an alternate module directory
 AC_ARG_WITH(xorg-module-dir,
 AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory 
[[default=$libdir/xorg/modules]]]),
@@ -57,14 +58,14 @@ AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
   [DRI=$enableval],
   [DRI=auto])
 
-# Checks for extensions
+# Store the list of server defined optional extensions in REQUIRED_MODULES
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
 XORG_DRIVER_CHECK_EXT(XV, videoproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
 
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
 PKG_CHECK_MODULES(XORG, [xorg-server = 1.0.99.901 xproto fontsproto 
$REQUIRED_MODULES])
 PKG_CHECK_MODULES(XEXT, [xextproto = 7.0.99.1],
   HAVE_XEXTPROTO_71=yes; AC_DEFINE(HAVE_XEXTPROTO_71, 1, 
[xextproto 7.1 available]),

commit ebd5eec763716b34f9c5759c9214c068e85c1ed7
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 16:07:00 2010 -0400

config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index f8cd3cc..cb96399 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,8 +122,9 @@ AC_SUBST([moduledir])
 DRIVER_NAME=glint
 AC_SUBST([DRIVER_NAME])
 
-AC_OUTPUT([
-   Makefile
-   src/Makefile
-   man/Makefile
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
+man/Makefile
 ])
+AC_OUTPUT

commit d4af4770f292539395ef9513fa3c7da6264ea90f
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Jul 21 14:37:41 2010 -0400

config: replace deprecated AC_HELP_STRING with AS_HELP_STRING

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index b162b67..f8cd3cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,12 +47,12 @@ AC_PROG_LIBTOOL
 AH_TOP([#include xorg-server.h])
 
 AC_ARG_WITH(xorg-module-dir,
-AC_HELP_STRING([--with-xorg-module-dir=DIR],
+AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory 
[[default=$libdir/xorg/modules]]]),
 [moduledir=$withval],
 [moduledir=$libdir/xorg/modules])
 
-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],

xserver-xorg-video-glint: Changes to 'debian-experimental'

2010-10-18 Thread Robert Hooker
 .gitignore |   70 ++-
 COPYING|  109 ++--
 ChangeLog  |  237 +
 Makefile.am|   12 ++
 configure.ac   |   50 +--
 debian/changelog   |7 +
 debian/control |2 
 man/.gitignore |2 
 man/Makefile.am|   59 -
 src/.gitignore |6 -
 src/glint_dga.c|6 -
 src/glint_dri.c|   26 ++---
 src/glint_driver.c |   23 ++---
 src/pm2_video.c|   22 ++--
 src/pm3_accel.c|4 
 src/pm3_dac.c  |3 
 src/pm3_video.c|   21 ++--
 src/pm_accel.c |4 
 src/sx_accel.c |2 
 src/tx_accel.c |4 
 20 files changed, 518 insertions(+), 151 deletions(-)

New commits:
commit 61cd7dfbc331464259c22545b40b652af03c9eb8
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 17:28:39 2010 -0400

Bump xutils-dev requirement for new util-macros.

diff --git a/debian/changelog b/debian/changelog
index a9a7cae..0bf3a99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-glint (1:1.2.5-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump xutils-dev requirement for new util-macros.
 
  -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 17:27:20 -0400
 
diff --git a/debian/control b/debian/control
index fc0958d..05067a9 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  dpkg-dev (= 1.14.17),
  automake,
  libtool,
- xutils-dev
+ xutils-dev (= 1:7.5+4)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glint
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glint.git

commit 1922952e038adaebf2ff092e352ae864123600f4
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 17:27:57 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index 64068cc..18ff3df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,240 @@
+commit 7050a255115b2c5a70083d2d4ad775548ef701f7
+Author: Matt Turner matts...@gmail.com
+Date:   Sat Sep 11 16:22:23 2010 -0400
+
+xf86-video-glint 1.2.5
+
+commit a2fa84df74b2c799b4bf992a212fa7c06dfa919f
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 16:49:04 2010 -0400
+
+config: add comments for main statements
+
+commit ebd5eec763716b34f9c5759c9214c068e85c1ed7
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 16:07:00 2010 -0400
+
+config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit d4af4770f292539395ef9513fa3c7da6264ea90f
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 14:37:41 2010 -0400
+
+config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 9d2fe6766e9a4e48bbac0e6b2aa394f45859c460
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 14:05:22 2010 -0400
+
+config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 361ff8746407ec90a03e5c5bc43b3ddcd37a5162
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jul 21 09:27:42 2010 -0400
+
+config: complete AC_INIT m4 quoting
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit e98573f1167fd29f1a6ea4a6324eba4bb8c91468
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 21:54:11 2010 -0400
+
+config: remove unrequired AC_SUBST([DRI_CFLAGS])
+
+This macro is called by PKG_CHECK_MODULES
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 819acac0a1613296b3a15176e0061336bd99c120
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 21:44:57 2010 -0400
+
+config: remove unrequired AC_SUBST([XORG_CFLAGS])
+
+This macro is called by PKG_CHECK_MODULES
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 9bdca08b4d3728fb7addf2d7aa4c6288e3ad80f3
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 20:24:42 2010 -0400
+
+config: remove unrequired AC_HEADER_STDC
+
+Autoconf says:
+This macro is obsolescent, as current systems have conforming
+header files. New programs need not use this macro.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 2bfc9d4232fffcef0a61ad55683c0b8f517c281e
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 19:41:30 2010 -0400
+
+config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+AC_PROG_C_C99. This sets gcc with -std=gnu99.
+If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 7706c011e7b46b76ea91467f9446523458e0a8d9
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Jul 20 18:45:19 2010 -0400
+
+config: update AC_PREREQ statement to 2.60

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

2010-10-18 Thread Robert Hooker
New branch 'upstream-experimental' available with the following commits:
commit 1a9495a74c41d956751177807602383ce4549c37
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed Sep 1 09:04:11 2010 +1000

synaptics 1.3.0

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

commit 33632e447b311950729350e5802b5b1ee9616677
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Aug 23 15:12:05 2010 +1000

man: use seconds² instead of seconds per second

Makes it hopefully slightly less confusing. Should have been amended before
the push but ENOTENOUGHCOFFEE.

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

commit 7a741ddedab477baea21f3d8ce6390b7bf72399f
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Aug 23 11:55:45 2010 +1000

synaptics 1.2.99.901

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

commit 59151a548dcbac6f68e4f921b5c47aea4e5bc2a3
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Aug 20 11:09:04 2010 +1000

Enable coasting by default with a value of 20.

The default value for friction coasting makes coasting much more useful now
since it stops coasting after a while. Enable it by default, the man page
already claims a default of 20 anyway.

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

commit 56655fd15f676fea143f3963e23b464b275b2e77
Author: Patrick Curran pjcur...@wisc.edu
Date:   Fri Jul 23 17:28:01 2010 -0500

Added friction physics so coasting can stop on its own.

When you are coasting (but not corner coasting) you might want the
scrolling to slow down and stop on its own.  This also lets you
start coasting while using a two finger scroll.

Signed-off-by: Patrick Curran pjcur...@wisc.edu
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Tested-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

commit a6ca4d2523904b7ce49edc29ba408979bdf0d45e
Author: Chris Bagwell ch...@cnpbagwell.com
Date:   Wed Aug 18 22:09:45 2010 -0500

Reset X/Y hist on multi finger transition to fix jumps

Most modern touchpads track 1st finger during multi-touch.  If first finger
is lifted then a jump will occur as X/Y transition to next finger location.
Resetting X/Y history as each finger is lifted will hide this transition.

Synaptics hw specs claim older hardware report X/Y values that are average
point between multi-fingers which can cause unwanted jump.  Reset X/Y
history during transition to new fingers to hide this as well.

Signed-off-by: Chris Bagwell ch...@cnpbagwell.com
Tested-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

commit b774a1dba2f1f45c94fe898fe8b5ce258cbcddfc
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu Aug 19 14:25:29 2010 +1000

Increase the default acceleration factor.

With 4e0e53fcba6fd99d458df1905d055d63360155c0 the driver got it's own
acceleration mechanism. This slowed down the pointer movement a lot,
especially on ALPS touchpads. Increase the default acceleration factor to
accommodate for this.

The number itself is chosen through guesswork and informal tests.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Tested-by: Magnus Kessler magnus.kess...@gmx.net
Reviewed-by: Magnus Kessler magnus.kess...@gmx.net

commit 4b0003c3d4cee1f5c6675bde5701e2169959932a
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu Aug 19 14:22:03 2010 +1000

Up the precision of MaxSpeed and AccelFactor log output.

MaxSpeed usually has two decimals that matter, AccelFactor doesn't get
intersting until the second decimal, so print 3.

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

commit 7acdbb7cf95299fda29d6bea691af925f5182749
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue Aug 17 11:34:32 2010 +1000

synclient: don't print missing if a property doesn't exist.

Virtually all touchpads still in use have one or more properties missing
anyway. If it's not in the list, then it's missing.

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

commit abb448a253cb0b3003038fbaa1daa9494c396e8f
Author: Chris Bagwell ch...@cnpbagwell.com
Date:   Wed Jul 7 21:35:22 2010 -0500

Align EmulateTwoFinger* docs to current behavior.

This corrects man page to mention EmulateTwoFingerMinW
and EmulateTwoFingerMinZ are considered together.  Old
man page read like driver would emulate two-finger even
if only pressure OR width (but not both) were supported.

Next, add note to align man page with patch that defaults
to enabling two-finger emulation on hardware that does not
support two-finger detection but does support pressure and
width detection.

Signed-off-by: Chris Bagwell ch...@cnpbagwell.com

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

2010-10-18 Thread Robert Hooker
 .gitignore |   76 ++
 COPYING|3 
 ChangeLog  | 1208 -
 INSTALL|  106 ---
 Makefile.am|   11 
 README |   27 
 TODO   |7 
 conf/Makefile.am   |8 
 configure.ac   |  188 +++---
 debian/changelog   |7 
 debian/control |2 
 include/Makefile.am|1 
 include/synaptics-properties.h |2 
 include/synaptics.h|   14 
 man/Makefile.am|   64 --
 man/synaptics.man  |  178 +++---
 man/synclient.man  |   18 
 src/Makefile.am|5 
 src/alpscomm.c |   24 
 src/eventcomm.c|   92 +--
 src/properties.c   |   55 +
 src/ps2comm.c  |  160 -
 src/psmcomm.c  |   15 
 src/psmcomm.h  |   29 
 src/synaptics.c|  898 +-
 src/synapticsstr.h |   19 
 src/synproto.h |6 
 tools/.gitignore   |3 
 tools/Makefile.am  |   18 
 tools/synclient.c  |   28 
 tools/syndaemon.c  |   73 +-
 31 files changed, 2245 insertions(+), 1100 deletions(-)

New commits:
commit 9c0e9ec2e8fca9d43cdc628d4209d6c9f5076fff
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 17:38:56 2010 -0400

Bump xutils-dev requirement for new util-macros.

diff --git a/debian/changelog b/debian/changelog
index 4831b0a..e2b67d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-input-synaptics (1.3.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump xutils-dev requirement for new util-macros.
 
  -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 17:37:32 -0400
 
diff --git a/debian/control b/debian/control
index dde2710..f263813 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  quilt,
  automake,
  libtool,
- xutils-dev,
+ xutils-dev (= 1:7.5+4)
 Standards-Version: 3.8.4
 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 610a8329218cf58c647589970108bb6180b09a9d
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 17:38:16 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index e65ab8b..754167f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,1020 @@
-commit a0d6e90b26044258473d8dae8a53c5adbe2681f1
+commit 1a9495a74c41d956751177807602383ce4549c37
 Author: Peter Hutterer peter.hutte...@who-t.net
-Date:   Fri Mar 26 15:13:40 2010 +1000
+Date:   Wed Sep 1 09:04:11 2010 +1000
 
-synaptics 1.2.2
+synaptics 1.3.0
 
 Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
 
-commit ba0d227a6da35dd21ba48ded65cabff16ef423ce
+commit 33632e447b311950729350e5802b5b1ee9616677
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Aug 23 15:12:05 2010 +1000
+
+man: use seconds² instead of seconds per second
+
+Makes it hopefully slightly less confusing. Should have been amended before
+the push but ENOTENOUGHCOFFEE.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 7a741ddedab477baea21f3d8ce6390b7bf72399f
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Aug 23 11:55:45 2010 +1000
+
+synaptics 1.2.99.901
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 59151a548dcbac6f68e4f921b5c47aea4e5bc2a3
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Aug 20 11:09:04 2010 +1000
+
+Enable coasting by default with a value of 20.
+
+The default value for friction coasting makes coasting much more useful now
+since it stops coasting after a while. Enable it by default, the man page
+already claims a default of 20 anyway.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 56655fd15f676fea143f3963e23b464b275b2e77
+Author: Patrick Curran pjcur...@wisc.edu
+Date:   Fri Jul 23 17:28:01 2010 -0500
+
+Added friction physics so coasting can stop on its own.
+
+When you are coasting (but not corner coasting) you might want the
+scrolling to slow down and stop on its own.  This also lets you
+start coasting while using a two finger scroll.
+
+Signed-off-by: Patrick Curran pjcur...@wisc.edu
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Tested-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit a6ca4d2523904b7ce49edc29ba408979bdf0d45e
+Author: Chris Bagwell ch...@cnpbagwell.com
+Date:   Wed Aug 18 22:09:45 2010 -0500
+
+Reset X/Y hist on multi finger transition to fix jumps
+
+Most modern touchpads track 1st finger 

xserver-xorg-video-intel: Changes to 'ubuntu'

2010-10-18 Thread Christopher Halse Rogers
 uxa/uxa.c |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit bbbdd4607c4d7614d639f9d11f0db2173c5fa6b1
Author: Keith Packard kei...@keithp.com
Date:   Thu Jul 1 09:56:40 2010 -0400

Destroy screen pixmap on screen close.

This avoids a memory leak on server reset.

Signed-off-by: Keith Packard kei...@keithp.com
[ickle: Added comments from Keith that explain the necessity of
destroying the pixmap ourselves and why chaining up in this instance is
not the correct approach.]
Reviewed-by: Chris Wilson ch...@chris-wilson.co.uk
(cherry picked from commit e30f0338fbf894fa3fdab20f4f9a97495cd341da)

diff --git a/uxa/uxa.c b/uxa/uxa.c
index 2321a7f..4a5907e 100644
--- a/uxa/uxa.c
+++ b/uxa/uxa.c
@@ -1,7 +1,7 @@
 /*
- * Copyright � 2001 Keith Packard
+ * Copyright © 2001 Keith Packard
  *
- * Partly based on code that is Copyright � The XFree86 Project Inc.
+ * Partly based on code that is Copyright © The XFree86 Project Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -385,6 +385,13 @@ static Bool uxa_close_screen(int i, ScreenPtr pScreen)
 
uxa_glyphs_fini(pScreen);
 
+   /* Destroy the pixmap created by miScreenInit() *before* chaining up as
+* we finalize ourselves here and so this is the last chance we have of
+* releasing our resources associated with the Pixmap. So do it first.
+*/
+   (void) (*pScreen-DestroyPixmap) (pScreen-devPrivate);
+   pScreen-devPrivate = NULL;
+
pScreen-CreateGC = uxa_screen-SavedCreateGC;
pScreen-CloseScreen = uxa_screen-SavedCloseScreen;
pScreen-GetImage = uxa_screen-SavedGetImage;


-- 
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/e1p7xnd-0005zl...@alioth.debian.org



Bug#600490: debian-installer: If you choose JP106 key layout, you'll be asked keyboard layout again

2010-10-18 Thread Samuel Thibault
reassign 600490 keyboard-configuration
tags 600490 + pending
thanks

Samuel Thibault, le Sun 17 Oct 2010 23:12:09 +0200, a écrit :
 Samuel Thibault, le Sun 17 Oct 2010 23:09:57 +0200, a écrit :
  Sergey, could you detail a bit why you dropped the models?
 
 Or put another way, what are they supposed to choose instead of jp106,
 abnt2 and kr106?

Looking more at this, the extra keys of these keyboards simply got
merged into the base model, thus making these models useless as the base
model now supports the corresponding layouts.

I've made keyboard-configuration not use these models any more, and
simply assume the base model provides the support, which is true since
xkb-data 1.6 (thus version dep bump).

Samuel



--
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/20101018224105.gt6...@const.famille.thibault.fr



Bug#600666: xserver-xorg-video-all: wish there was a xserver-xorg-video-recent package

2010-10-18 Thread Russell Coker
Package: xserver-xorg-video-all
Severity: wishlist

It seems to me that the common cases in driver support where a change of driver
is needed are changes between different relatively new systems and a change
from an old system to a new system.

I would like to have a package with a name such as xserver-xorg-video-recent
which would drag in all the drivers for PCIe cards and other video hardware
that has been released relatively recently.

There is no realistic possibility that I will be installing a Tseng, S3,
or Trident video card in one of my 64bit systems.  But it is quite likely that
I will use a different modern video card at some time.

I am not suggesting removing xserver-xorg-video-all, merely adding a new
package for the convenience of users with modern hardware.



-- 
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/20101018225435.29248.78233.report...@athena.coker.com.au



Bug#600666: xserver-xorg-video-all: wish there was a xserver-xorg-video-recent package

2010-10-18 Thread Cyril Brulebois
Hi.

Russell Coker russ...@coker.com.au (19/10/2010):
 I would like to have a package with a name such as
 xserver-xorg-video-recent which would drag in all the drivers for
 PCIe cards and other video hardware that has been released
 relatively recently.

(I'd be happy to see “relatively recently” defined. Based on recent
threads, that could range from “3 months ago” to “less than 10 years
ago”.)

 There is no realistic possibility that I will be installing a Tseng,
 S3, or Trident video card in one of my 64bit systems.  But it is
 quite likely that I will use a different modern video card at some
 time.

Users are probably either:
 - “end”-users, happy with -all.
 - advanced users, happy to install the appropriate driver.
 - advanced users, unhappy to install the appropriate driver, back to
   square 1.

Mraw,
KiBi.


signature.asc
Description: Digital signature