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

2012-09-26 Thread Timo Aaltonen
 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 712458b836c1894a7317191b2fe157059ba1f46c
Author: Timo Aaltonen Timo Aaltonen tjaal...@cc.hut.fi
Date:   Wed Sep 26 11:08:21 2012 +0300

uploaded to quantal

diff --git a/debian/changelog b/debian/changelog
index ca43f6b..0a79113 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-mga (1:1.6.0-0ubuntu1) quantal-proposed; urgency=low
+
+  * Sync from unreleased debian git.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 01 Aug 2012 18:37:52 +0300
+
 xserver-xorg-video-mga (1:1.6.0-1) UNRELEASED; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index d833c29..c1ae3fc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: xserver-xorg-video-mga
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force debian-x@lists.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders:
  Cyril Brulebois k...@debian.org,
  Tormod Volden debian.tor...@gmail.com


-- 
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/e1tgmgu-0001zw...@vasks.debian.org



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

2012-09-26 Thread Timo Aaltonen
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7924cd3004ef2f28b5fe97c7175c2581b72ab105
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Sep 26 11:24:10 2012 +0300

fix the version

diff --git a/debian/changelog b/debian/changelog
index ca43f6b..81bb0dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.6.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.6.1-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Bump Standards-Version to 3.9.3 (no changes needed).


-- 
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/e1tgn5k-0001h5...@vasks.debian.org



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

2012-09-26 Thread Timo Aaltonen
 debian/changelog   |   19 +++
 debian/patches/fix-driver-loading.diff |   30 ++
 debian/patches/series  |1 +
 3 files changed, 38 insertions(+), 12 deletions(-)

New commits:
commit 7924cd3004ef2f28b5fe97c7175c2581b72ab105
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Sep 26 11:24:10 2012 +0300

fix the version

diff --git a/debian/changelog b/debian/changelog
index ca43f6b..81bb0dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.6.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.6.1-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Bump Standards-Version to 3.9.3 (no changes needed).

commit d0452b4474f997e4081f7ebf6c41a0a81507f8f7
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Sep 26 11:15:44 2012 +0300

release to quantal

diff --git a/debian/changelog b/debian/changelog
index 3728717..a69f9a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.6.0-0ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.6.0-0ubuntu2) quantal; urgency=low
 
   * Added fix-driver-load.diff, fixes loading the driver when the
 xserver it was built against has no support for XAA anymore. (LP:

commit 1c06b2dddca780f4925134862053ba0dbb36e1ee
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Sep 26 11:15:07 2012 +0300

Added fix-driver-load.diff, fixes loading the driver when the xserver it 
was built against has no support for XAA anymore. (LP: #1044797)

diff --git a/debian/changelog b/debian/changelog
index bfb5329..3728717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-mga (1:1.6.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * Added fix-driver-load.diff, fixes loading the driver when the
+xserver it was built against has no support for XAA anymore. (LP:
+#1044797)
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 26 Sep 2012 11:14:51 +0300
+
 xserver-xorg-video-mga (1:1.6.0-0ubuntu1) quantal-proposed; urgency=low
 
   * Sync from unreleased debian git.
diff --git a/debian/patches/fix-driver-loading.diff 
b/debian/patches/fix-driver-loading.diff
new file mode 100644
index 000..b1e1004
--- /dev/null
+++ b/debian/patches/fix-driver-loading.diff
@@ -0,0 +1,30 @@
+commit e777a2845bfeefad386db35d694e4b1cd74a0dd5
+Author: Dave Airlie airl...@redhat.com
+Date:   Wed Sep 26 15:18:44 2012 +1000
+
+mga: add stub storm functions if not using XAA
+
+If we aren't using XAA just add stub storm init/sync functions.
+
+This lets the driver load yay.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+diff --git a/src/mga_driver.c b/src/mga_driver.c
+index f4f54a1..3db3a74 100644
+--- a/src/mga_driver.c
 b/src/mga_driver.c
+@@ -4185,3 +4185,13 @@ MGAG100BlackMagic(ScrnInfoPtr pScrn)
+ usleep(10);
+ }
+ 
++#ifndef HAVE_XAA_H
++void MGAStormEngineInit( ScrnInfoPtr pScrn )
++{
++}
++
++void
++MGAStormSync(ScrnInfoPtr pScrn)
++{
++}
++#endif
diff --git a/debian/patches/series b/debian/patches/series
index 7b69d6a..6abb0c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_no_nonfree.diff
 02_tentatively_unbreak_dual_head.diff
+fix-driver-loading.diff


-- 
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/e1tgn5k-0001hj...@vasks.debian.org



Bug#418324: #418324 xterm: baffling weirdness with 9x15 font and some Unicode glyphs

2012-09-26 Thread Thomas Dickey
given that the explanation was complete, suggesting a workaround and that
no further reply was given, this can be closed.

-- 
Thomas E. Dickey dic...@invisible-island.net
http://invisible-island.net
ftp://invisible-island.net


signature.asc
Description: Digital signature


Bug#418324: marked as done (xterm: baffling weirdness with 9x15 font and some Unicode glyphs)

2012-09-26 Thread Debian Bug Tracking System
Your message dated Wed, 26 Sep 2012 06:43:40 -0400
with message-id 20120926104340.ga7...@aerie.jexium-island.net
and subject line Re: #418324 xterm: baffling weirdness with 9x15 font and some 
Unicode glyphs
has caused the Debian Bug report #418324,
regarding xterm: baffling weirdness with 9x15 font and some Unicode glyphs
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.)


-- 
418324: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=418324
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
---BeginMessage---
Package: xterm
Version: 222-3
Severity: normal
Tags: upstream

This is an upstream issue, I'll wager.

The root of my complaint is that the Unicode glyphs LEFT-POINTING ANGLE
BRACKET (U+2329) and RIGHT-POINTING ANGLE BRACKET (U+232A) don't render
when I size my xterms up to the Large font.  This was brought to my
attention because GNU roff renders URLs between these glyphs in UTF-8
environments.  (On a Debian system, an example of a manpage that uses the
.URL macro is update-fonts-alias, but there are many others.)

At first I thought this was just an oversight in the 9x15 font, as those
glyphs render fine.  So fired up gbdfed to have a look, intending to draw
my own glyphs and submit a patch.

Imagine my surprise when I found that the font does define glyphs there.
Next I thought, well, maybe the bounding box is wrong, or it's declared as
a normal-width character but is really double-width.  Those guesses appear
to be wrong, too:

STARTCHAR angleleft
ENCODING 9001
SWIDTH 576 0
DWIDTH 9 0
BBX 9 15 0 -3
BITMAP


0400
0400
0800
0800
1000
1000
0800
0800
0400
0400



ENDCHAR
STARTCHAR angleright
ENCODING 9002
SWIDTH 576 0
DWIDTH 9 0
BBX 9 15 0 -3
BITMAP


1000
1000
0800
0800
0400
0400
0800
0800
1000
1000



ENDCHAR

I'm not really clear on what SWIDTH and DWIDTH are, but they (and the
bounding box BBOX) are the same as glyph 9000 (U+2328 KEYBOARD), which
renders fine.

So then I thought maybe it's a bug in xterm.  After floundering a bit,
because konsole doesn't want to play with bitmap fonts and fails to
install them when its convoluted dialogs offer to, and gnome-terminal
wanted to install a few dozen megs of dependencies, including Epiphrany and
dvd+rw-tools (?!), I settled on rxvt-unicode-ml.

I was in for another surprise.  urxvt displays the glyphs correctly -- but
then so does xterm, when I launch it manually!  (Usually I just let the
session manager start all the xterms I use.)  What's more, both urxvt and
xterm suddenly forget how to render U+2328 and U+232B (ERASE TO THE
LEFT), which my usual xterms that can't render angle brackets handle just
fine!

There is one difference between urxvt and xterm -- the angle bracket glyphs
I *do* get look right on urxvt, but xterm is showing me some ugly stuff
that reminds me of the semigraphics characters on the TRS-80 Model I.

I've worked with X for a long time but this has me stumped.

What on earth is going on?

Here's my $HOME/.Xresources; as you can see, I don't change XTerm's fonts:

! Personal Xresources file

XClipboard*Form*Text*font:  fixed

XConsole.verbose:   true
XConsole*iconic:false
XConsole*geometry:  1272x89+0-58
XConsole*saveLines: 1000
XConsole*font:  6x10

XTerm*autoWrap: true
XTerm*curses:   true
XTerm*loginShell:   true
XTerm*reverseWrap:  true
XTerm*scrollBar:true
XTerm*saveLines:5000
XTerm*scrollTtyOutput:  false
XTerm*trimSelection:true
XTerm*visualBell:   true
XTerm*activeIcon:   true
XTerm.VT100.background: gray30
XTerm.VT100.foreground: gray90
XTerm.VT100.geometry:   200x67-0+0
XTerm.VT100.color4: DodgerBlue1
XTerm.VT100.color8: gray50
XTerm.VT100.color12:SteelBlue1
XTerm.VT100.scrollbar.background:   white
XTerm.VT100.scrollbar.foreground:   blue

UXTerm*autoWrap:true
UXTerm*curses:  true
UXTerm*loginShell:  true
UXTerm*reverseWrap: true
UXTerm*scrollBar:   true
UXTerm*saveLines:   5000
UXTerm*scrollTtyOutput: false
UXTerm*trimSelection:   true
UXTerm*visualBell:  true
UXTerm*activeIcon:  true
UXTerm.VT100.background:gray30
UXTerm.VT100.foreground:gray90
UXTerm.VT100.geometry:  200x67-0+0
UXTerm.VT100.color4:DodgerBlue1
UXTerm.VT100.color8:gray50
UXTerm.VT100.color12:   SteelBlue1
UXTerm.VT100.scrollbar.background:   white
UXTerm.VT100.scrollbar.foreground:  blue

XCalc*IconName: xcalc

XLock.star.delay: 2

Bug#683942: #683942 xterm: alternate screen scrolling

2012-09-26 Thread Thomas Dickey
I've applied a change for this which will appear in the #282 updates.

-- 
Thomas E. Dickey dic...@invisible-island.net
http://invisible-island.net
ftp://invisible-island.net


signature.asc
Description: Digital signature


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

2012-09-26 Thread Maarten Lankhorst
 debian/changelog  |7 +++
 debian/patches/100-vblank-on.diff |   13 +
 debian/patches/series |4 
 3 files changed, 24 insertions(+)

New commits:
commit 382b9a46d8beb6b7832a16d5fc43f7524e9e2603
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Sep 26 10:23:02 2012 +0200

Try to enable vblank if available

  Add 100-vblank-on.diff

diff --git a/debian/changelog b/debian/changelog
index 5f74cc6..7895209 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nouveau (1:1.0.2-0ubuntu2) UNRELEASED; urgency=low
+
+  * Try to enable vblank if available (LP: #1019131)
+- 100-vblank-on.diff
+
+ -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 26 Sep 2012 
10:20:36 +0200
+
 xserver-xorg-video-nouveau (1:1.0.2-0ubuntu1) quantal; urgency=low
 
   * Sync from unreleased debian git.
diff --git a/debian/patches/100-vblank-on.diff 
b/debian/patches/100-vblank-on.diff
new file mode 100644
index 000..46b18eb
--- /dev/null
+++ b/debian/patches/100-vblank-on.diff
@@ -0,0 +1,13 @@
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 271f641..0b92025 100644
+--- a/src/nv_driver.c
 b/src/nv_driver.c
+@@ -932,6 +932,8 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+   if (xf86GetOptValBool(pNv-Options, OPTION_GLX_VBLANK,
+ pNv-glx_vblank))
+   from = X_CONFIG;
++  else
++  pNv-glx_vblank = TRUE;
+ 
+   xf86DrvMsg(pScrn-scrnIndex, from, GLX sync to VBlank %s.\n,
+  pNv-glx_vblank ? enabled : disabled);
diff --git a/debian/patches/series b/debian/patches/series
index d6892cf..e8e209c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,5 @@
 01-set-NV_DRIVER_DATE-from-ChangeLog.diff
+
+# Ubuntu patches
+
+100-vblank-on.diff


-- 
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/e1tgpjs-n2...@vasks.debian.org



Bug#688860: xserver-xorg-input-evdev: mouse cursor jumping with absolute input device

2012-09-26 Thread Sam Morris
Package: xserver-xorg-input-evdev
Version: 1:2.7.0-1
Severity: important
Forwarded: https://bugs.freedesktop.org/show_bug.cgi?id=54353

When running inside a VirtualBox virtual machine with mouse integration
enabled, the mouse cursor will randomly jump to the top and/or left of
the screen.

A workaround is described in
https://bugs.freedesktop.org/show_bug.cgi?id=54353#c4, and it works
for me, though I can not say what other side effects are caused by not
resetting the valuator mask after motion events are posted.

(Would have been forwarded to https://www.virtualbox.org/ticket/10853
before I knew this was an Xorg bug.)

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

lrwxrwxrwx 1 root root 13 Feb  8  2010 /etc/X11/X - /usr/bin/Xorg
-rwxr-xr-x 1 root root 2044664 Aug 21 20:55 /usr/bin/Xorg

VGA-compatible devices on PCI bus:
--
00:02.0 VGA compatible controller [0300]: InnoTek Systemberatung GmbH 
VirtualBox Graphics Adapter [80ee:beef]

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

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

/etc/modprobe.d contains no KMS configuration files.

Kernel version (/proc/version):
---
Linux version 3.2.0-3-amd64 (Debian 3.2.23-1) (debian-ker...@lists.debian.org) 
(gcc version 4.6.3 (Debian 4.6.3-8) ) #1 SMP Mon Jul 23 02:45:17 UTC 2012

Xorg X server log files on system:
--
-rw-r--r-- 1 root root 31040 May 30 11:27 /var/log/Xorg.1.log
-rw-r--r-- 1 root root 31226 Sep 26 12:51 /var/log/Xorg.0.log

Contents of most recent Xorg X server log file (/var/log/Xorg.0.log):
-
[2910181.019] 
X.Org X Server 1.12.3.902 (1.12.4 RC 2)
Release Date: 2012-08-19
[2910181.019] X Protocol Version 11, Revision 0
[2910181.019] Build Operating System: Linux 3.2.0-3-amd64 x86_64 Debian
[2910181.019] Current Operating System: Linux leela.office.red-redemption.com 
3.2.0-3-amd64 #1 SMP Mon Jul 23 02:45:17 UTC 2012 x86_64
[2910181.019] Kernel command line: BOOT_IMAGE=/boot/vmlinuz-3.2.0-3-amd64 
root=UUID=10911f8b-c532-4347-b502-3108a6f9feba ro console=ttyS0 console=tty0 
quiet init=/lib/systemd/systemd splash
[2910181.019] Build Date: 21 August 2012  07:36:50PM
[2910181.019] xorg-server 2:1.12.3.902-1 (Julien Cristau jcris...@debian.org) 
[2910181.019] Current version of pixman: 0.26.0
[2910181.019]   Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
[2910181.019] Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
[2910181.019] (==) Log file: /var/log/Xorg.0.log, Time: Wed Sep 26 12:51:22 
2012
[2910181.019] (==) Using system config directory /usr/share/X11/xorg.conf.d
[2910181.019] (==) No Layout section.  Using the first Screen section.
[2910181.019] (==) No screen section available. Using defaults.
[2910181.019] (**) |--Screen Default Screen Section (0)
[2910181.019] (**) |   |--Monitor default monitor
[2910181.020] (==) No monitor specified for screen Default Screen Section.
Using a default monitor configuration.
[2910181.020] (==) Automatically adding devices
[2910181.020] (==) Automatically enabling devices
[2910181.021] (WW) The directory /usr/share/fonts/X11/cyrillic does not exist.
[2910181.021]   Entry deleted from font path.
[2910181.021] (WW) The directory /usr/share/fonts/X11/100dpi/ does not exist.
[2910181.021]   Entry deleted from font path.
[2910181.021] (WW) The directory /usr/share/fonts/X11/75dpi/ does not exist.
[2910181.021]   Entry deleted from font path.
[2910181.021] (WW) The directory /usr/share/fonts/X11/100dpi does not exist.
[2910181.021]   Entry deleted from font path.
[2910181.021] (WW) The directory /usr/share/fonts/X11/75dpi does not exist.
[2910181.021]   Entry deleted from font path.
[2910181.021] (WW) The directory 
/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType does not exist.
[2910181.021]   Entry deleted from font path.
[2910181.021] (==) FontPath set to:
/usr/share/fonts/X11/misc,
/usr/share/fonts/X11/Type1,
built-ins
[2910181.021] (==) ModulePath set to /usr/lib/xorg/modules
[2910181.021] (II) The server relies on udev to provide the list of input 
devices.
If no devices become available, reconfigure udev or disable 
AutoAddDevices.
[2910181.021] (II) Loader magic: 0x7f48e9324ae0
[2910181.021] (II) Module ABI versions:
[2910181.021]   X.Org ANSI C Emulation: 0.4
[2910181.021]   X.Org Video Driver: 12.1
[2910181.021]   X.Org XInput driver : 16.0
[2910181.021]   X.Org Server Extension : 6.0
[2910181.023] (--) PCI:*(0:0:2:0) 80ee:beef:: rev 0, Mem @ 
0xe000/16777216
[2910181.023] (II) Open ACPI successful (/var/run/acpid.socket)
[2910181.023] (II) LoadModule: extmod
[2910181.023] (II) Loading /usr/lib/xorg/modules/extensions/libextmod.so

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

2012-09-26 Thread Timo Aaltonen
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3869517ffdb65361f1fc055c80bcb23ed5d7f5d5
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Sep 26 14:59:40 2012 +0300

release to quantal

diff --git a/debian/changelog b/debian/changelog
index 7895209..7d2f04e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xserver-xorg-video-nouveau (1:1.0.2-0ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:1.0.2-0ubuntu2) quantal; urgency=low
 
+  [ Maarten Lankhorst ]
   * Try to enable vblank if available (LP: #1019131)
 - 100-vblank-on.diff
 
- -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 26 Sep 2012 
10:20:36 +0200
+ -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 26 Sep 2012 14:59:24 +0300
 
 xserver-xorg-video-nouveau (1:1.0.2-0ubuntu1) quantal; urgency=low
 


-- 
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/e1tgqis-0005nb...@vasks.debian.org



Bug#640499: Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package

2012-09-26 Thread Andreas Beckmann
In case anyone is interested in a .dsc:

http://mentors.debian.net/debian/pool/main/libx/libxvmc/libxvmc_1.0.7-1.1.dsc

Andreas


-- 
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/5062facc.8070...@abeckmann.de



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

2012-09-26 Thread Timo Aaltonen
 debian/changelog|8 +++
 debian/patches/dont-run-intel-mode-fini-before-preinit.diff |   27 
 debian/patches/series   |2 
 3 files changed, 36 insertions(+), 1 deletion(-)

New commits:
commit 21ec4ffc475937ca00293e7b88717788634bb1ac
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Sep 26 15:25:43 2012 +0300

release to quantal

diff --git a/debian/changelog b/debian/changelog
index 6134d33..8f2cb69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.20.8-0ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.20.8-0ubuntu2) quantal; urgency=low
 
   * dont-run-intel-mode-fini-before-preinit.diff, don't crash if
 Screen is deleted before the driver has fully initialized.

commit 36a7790f9a5f53d9e0fbb82e15f26653daf25570
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Sep 26 15:25:06 2012 +0300

dont-run-intel-mode-fini-before-preinit.diff

don't crash if Screen is deleted before the driver has fully
initialized. (LP: #1053836)

diff --git a/debian/changelog b/debian/changelog
index e995e19..6134d33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.20.8-0ubuntu2) UNRELEASED; urgency=low
+
+  * dont-run-intel-mode-fini-before-preinit.diff, don't crash if
+Screen is deleted before the driver has fully initialized.
+(LP: #1053836)
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 26 Sep 2012 15:14:07 +0300
+
 xserver-xorg-video-intel (2:2.20.8-0ubuntu1) quantal; urgency=low
 
   * Merge from unreleased debian git.
diff --git a/debian/patches/dont-run-intel-mode-fini-before-preinit.diff 
b/debian/patches/dont-run-intel-mode-fini-before-preinit.diff
new file mode 100644
index 000..f17fc60
--- /dev/null
+++ b/debian/patches/dont-run-intel-mode-fini-before-preinit.diff
@@ -0,0 +1,27 @@
+commit addfa653cf51fa45c7eae49be1fd722aaadf97d6
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Wed Sep 26 08:59:18 2012 +0100
+
+uxa: Prevent attempting to call intel_mode_fini() before PreInit runs
+
+In the Ubuntu xserver it is apparently possible for the Screen to be
+deleted prior to being fully initialised. Make sure we don't crash in
+that situation!
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55346
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/intel_display.c b/src/intel_display.c
+index 2a3a393..60af415 100644
+--- a/src/intel_display.c
 b/src/intel_display.c
+@@ -1770,6 +1770,9 @@ intel_mode_fini(intel_screen_private *intel)
+ {
+   struct intel_mode *mode = intel-modes;
+ 
++  if (mode == NULL)
++  return;
++
+   while(!list_is_empty(mode-crtcs)) {
+   xf86CrtcDestroy(list_first_entry(mode-crtcs,
+struct intel_crtc,
diff --git a/debian/patches/series b/debian/patches/series
index a82d1b4..5028b7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#placeholder
+dont-run-intel-mode-fini-before-preinit.diff


-- 
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/e1tgqxb-000344...@vasks.debian.org



Bug#640499: Fwd: Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package

2012-09-26 Thread Andreas Beckmann
manually forwarding to #640499 as the BTS does not seem to handle
X-DebBugs-Cc: n@b.d.o properly

 Original Message 
Subject: Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a
libxvmc1-i386:i386 package
Resent-Date: Wed, 26 Sep 2012 12:09:06 +
Resent-From: Andreas Beckmann deb...@abeckmann.de
Resent-To: debian-bugs-d...@lists.debian.org
Resent-CC: 640...@bugs.debian.org,
pkg-nvidia-de...@lists.alioth.debian.org, Debian Release Team
debian-rele...@lists.debian.org
Date: Wed, 26 Sep 2012 14:06:33 +0200
From: Andreas Beckmann deb...@abeckmann.de
Reply-To: Andreas Beckmann deb...@abeckmann.de, 688...@bugs.debian.org
To: Debian Bug Tracking System sub...@bugs.debian.org

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please approve the following changes for package libxvmc

As we are not going to get libxvmc turned to multi-arch for wheezy (see
#640499) I'm now trying another approach with minimal changes to the
libxvmc package:

Can we add a new package

Package: libxvmc1-i386
Section: libs
Priority: extra
Architecture: i386
Multi-arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
Description: X11 Video extension library (alternate i386 package)

that ships another copy of the libraries in /usr/lib/i386-linux-gnu/
To avoid installing libxvmc1-i386:i386 and libxvmc1:i386 at the same
time and have two copies of the same library available, I'm adding

Package: libxvmc1
Conflicts: libxvmc1-i386 [i386]

and to avoid picking up a dependency on libxvmc1-i386 by accident, its
shlibs file points to libxvmc1.

I added a lintian-overrides file, but that is not being installed as I
wanted to avoid changing anything in debian/rules.

Note that this new package does not ship the conffile as it is expected
to be only installed along libxvmc1:amd64 which comes with the conffile.
(This dependency can't be expressed by package relationships.)

This will keep the existing non-multiarch libxvmc1 unchanged, the build
system is untouched, nothing will start to use the alternate copy
package accidently. For libgl1-nvidia-glx:i386 to actually pick up this
alternate library, we need to add a shlibs.local file (in
nvidia-graphics-drivers) with

libXvMC 1 libxvmc1 | libxvmc1-i386 [i386]

I chose to add the extra package to the libxvmc source package as that
will avoid forking (and therefore code duplication) and getting libxvmc1
and libxvmc1-i386 out of sync. Even with a second copy in the a binary
package in the archive, there is no overhead in case a security update
for libxvmc should be neccessary.

Judging by the number of bug reports, it is really important for our
users to restore the ability to run 32-bit OpenGL applications on a
amd64 system and get accelleration by the non-free nvidia driver.
That was working in squeeze and will be considered as a serious
regression if this is not getting fixed in some way for wheezy.
See e.g. #685054, #686033, #676723, #688714

I'll be happy to assist getting a proper multi-arch libxvmc into jessie
and to clean up this temporary package that we need for wheezy.


Andreas

diffstat for libxvmc_1.0.7-1 libxvmc_1.0.7-1.1

 debian/libxvmc1-i386.install   |2 ++
 debian/libxvmc1-i386.lintian-overrides |4 
 debian/libxvmc1-i386.shlibs|2 ++
 libxvmc-1.0.7/debian/changelog |   12 
 libxvmc-1.0.7/debian/control   |   26 ++
 5 files changed, 46 insertions(+)

diff -u libxvmc-1.0.7/debian/control libxvmc-1.0.7/debian/control
--- libxvmc-1.0.7/debian/control
+++ libxvmc-1.0.7/debian/control
@@ -22,6 +22,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
+Conflicts: libxvmc1-i386 [i386]
 Description: X11 Video extension library
  libXvMC provides an X Window System client interface to the
  XVideo-MotionCompensation extension to the X protocol.
@@ -37,6 +38,31 @@
  This module can be found at
  git://anongit.freedesktop.org/git/xorg/lib/libXvMC
 
+Package: libxvmc1-i386
+Section: libs
+Priority: extra
+Architecture: i386
+Multi-arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
+Description: X11 Video extension library (alternate i386 package)
+ libXvMC provides an X Window System client interface to the
+ XVideo-MotionCompensation extension to the X protocol.
+ .
+ The XVideo-MotionCompensation extension allows for further accelerated drawing
+ of videos.  Video data may be sent at earlier stages of the decoding pipeline
+ than raw YUV data.  At the moment, driver support for XvMC is poor to
+ non-existent.
+ .
+ More information about X.Org can be found at:
+ URL:http://www.X.org
+ .
+ This module can be found at
+ git://anongit.freedesktop.org/git/xorg/lib/libXvMC
+ .
+ This is a 

Bug#683942: #683942 xterm: alternate screen scrolling

2012-09-26 Thread Andrew Pimlott
 I've applied a change for this which will appear in the #282 updates.

Woo hoo, thanks!

Andrew


-- 
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/1348670930-sup-4...@pimlott.net



Bug#688828: xserver-xorg-video-radeon: brightness controls don't work

2012-09-26 Thread Alex Deucher
On Tue, Sep 25, 2012 at 8:57 PM, Geoff Crompton
geo...@trinity.unimelb.edu.au wrote:
 Package: xserver-xorg-video-radeon
 Version: 1:6.14.4-5
 Severity: normal

 Dear Maintainer,

 The brightness controls on my iMac aren't effective at changing the brightness
 of either of my displays. They do popup the gnome brightness indicator, and
 alter the values of /sys/class/backlight/acpi_video0/brightness.

 But they don't effect the brightness of either the primary display, or the
 secondary display I've got attached (via a thunderbolt to DVI connector).
 Likewise the gnome system settings brightness controls slide around, and do
 alter  /sys/class/backlight/acpi_video0/brightness, but don't change the
 brightness.

 Rebooting into Mac and setting the brightness there seems to maintain that
 brightness setting when I reboot back into Linux. I'm booting with grub-efi.

If apple uses the built in GPU backlight controller, it may work with
the new backlight control patches in my drm-3.7 branch:
http://cgit.freedesktop.org/~agd5f/linux/log/?h=drm-next-3.7-wip

Alex


-- 
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/cadnq5_p+-3n8qrr4fmrncaoqbzwamu2e+pb0wdbvvuum7ba...@mail.gmail.com



Bug#688812: Substitute GMA950 everywhere I said GMA500 in the text

2012-09-26 Thread Alan W. Irwin

Subject line says it all


--
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.1209260933200.31522@ybpnyubfg.ybpnyqbznva



Re: Request to Join Project xorg from Janos Guljas (janos)

2012-09-26 Thread Cyril Brulebois
nore...@alioth.debian.org nore...@alioth.debian.org (23/09/2012):
 Janos Guljas (janos) has requested to join your project. 
 You can approve this request here: 
 https://alioth.debian.org/project/admin/users.php?group_id=31008 
 
 Comments by the user:
 Hi xorg Team Administrators,
 
 I am already in the team with account janos-quest but I've recently
 finished NM process and got a new account on Alioth. I contributed in
 compiz packaging, not that recently, but I am still interested helping
 there. Could you please add me to the project?
 
 Thank you,
 Janos

Welcome (again). ;)

Mraw,
KiBi.


signature.asc
Description: Digital signature


Re: Request to Join Project xorg from Janos Guljas (janos)

2012-09-26 Thread Janos Guljas
On Wed, Sep 26, 2012 at 9:32 PM, Cyril Brulebois k...@debian.org wrote:
 nore...@alioth.debian.org nore...@alioth.debian.org (23/09/2012):
 Janos Guljas (janos) has requested to join your project.
 You can approve this request here: 
 https://alioth.debian.org/project/admin/users.php?group_id=31008

 Comments by the user:
 Hi xorg Team Administrators,

 I am already in the team with account janos-quest but I've recently
 finished NM process and got a new account on Alioth. I contributed in
 compiz packaging, not that recently, but I am still interested helping
 there. Could you please add me to the project?

 Thank you,
 Janos

 Welcome (again). ;)

Thank you Cyril. :)


 Mraw,
 KiBi.

Cheers,
Janos


-- 
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/CAGp=0ym_iamwpm4w9ogmnjrax7v0nraqmrhzmptvbry5uh+...@mail.gmail.com



Bug#688908: xserver-xorg-core 1.12.3.902-1 breaks icewm

2012-09-26 Thread Michael Holzt
Package: xserver-xorg-core
Version: 2:1.12.3.902-1
Severity: normal

Hi there,

upgrading xserver-xorg-core from 2:1.12.3-1 to 2:1.12.3.902-1
breaks the icewm window manager. After the upgrade the title
bars of windows are partly broken and become transparent at
the part where normally the window title would be printed.

For illustration I have uploaded two screenshot (parts),
both showing the correct behaviour with old version and the
broken one with new version. As you can see in the new version
the window actually does not cover the titlebar parts in 
question, but instead letting the content below shine through.

Please see: http://imgur.com/a/5tyiI


Regards, 
Michael


-- 
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/20120926195839.ga19...@fqdn.org



Bug#688908: Acknowledgement (xserver-xorg-core 1.12.3.902-1 breaks icewm)

2012-09-26 Thread Michael Holzt
As asked for by jcristau, here is my xserver log. As you can see, i'm using
the nvidia driver (for reasons) which is also mentioned in the
freedesktop.org Bugreport as exposing this problem.

Regards,
Michael

-- 
It's an insane world, but i'm proud to be a part of it. -- Bill Hicks
[  2624.549] 
X.Org X Server 1.12.3.902 (1.12.4 RC 2)
Release Date: 2012-08-19
[  2624.550] X Protocol Version 11, Revision 0
[  2624.550] Build Operating System: Linux 2.6.32-5-amd64 x86_64 Debian
[  2624.550] Current Operating System: Linux lo 3.2.0-3-amd64 #1 SMP Mon Jul 23 
02:45:17 UTC 2012 x86_64
[  2624.550] Kernel command line: root=/dev/mapper/vg-root ro edd=off 
[  2624.550] Build Date: 26 September 2012  10:24:57PM
[  2624.550] xorg-server 2:1.12.3.902-1.1 (root r...@build.fqdn.org) 
[  2624.550] Current version of pixman: 0.26.0
[  2624.550]Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
[  2624.550] Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
[  2624.550] (==) Log file: /var/log/Xorg.0.log, Time: Wed Sep 26 22:35:23 
2012
[  2624.550] (==) Using config file: /etc/X11/xorg.conf
[  2624.550] (==) Using system config directory /usr/share/X11/xorg.conf.d
[  2624.550] (==) ServerLayout Layout0
[  2624.550] (**) |--Screen Screen0 (0)
[  2624.550] (**) |   |--Monitor Monitor0
[  2624.551] (**) |   |--Device Device0
[  2624.551] (**) |--Screen Screen1 (1)
[  2624.551] (**) |   |--Monitor Monitor1
[  2624.551] (**) |   |--Device Device1
[  2624.551] (**) |--Input Device Keyboard0
[  2624.551] (**) |--Input Device Mouse0
[  2624.551] (**) Option Xinerama 0
[  2624.551] (==) Automatically adding devices
[  2624.551] (==) Automatically enabling devices
[  2624.551] (WW) The directory /usr/share/fonts/X11/cyrillic does not exist.
[  2624.551]Entry deleted from font path.
[  2624.551] (WW) The directory 
/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType does not exist.
[  2624.551]Entry deleted from font path.
[  2624.551] (==) 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,
built-ins
[  2624.551] (==) ModulePath set to /usr/lib/xorg/modules
[  2624.551] (WW) Hotplugging is on, devices using drivers 'kbd', 'mouse' or 
'vmmouse' will be disabled.
[  2624.551] (WW) Disabling Keyboard0
[  2624.551] (WW) Disabling Mouse0
[  2624.551] (II) Loader magic: 0x7f48f6c5cae0
[  2624.551] (II) Module ABI versions:
[  2624.551]X.Org ANSI C Emulation: 0.4
[  2624.551]X.Org Video Driver: 12.1
[  2624.551]X.Org XInput driver : 16.0
[  2624.551]X.Org Server Extension : 6.0
[  2624.552] (--) PCI:*(0:6:0:0) 10de:0161:107d:56c4 rev 161, Mem @ 
0xfd00/16777216, 0xd000/268435456, 0xfc00/16777216, BIOS @ 
0x/131072
[  2624.552] (II) Open ACPI successful (/var/run/acpid.socket)
[  2624.552] (II) LoadModule: extmod
[  2624.553] (II) Loading /usr/lib/xorg/modules/extensions/libextmod.so
[  2624.553] (II) Module extmod: vendor=X.Org Foundation
[  2624.553]compiled for 1.12.3.902, module version = 1.0.0
[  2624.553]Module class: X.Org Server Extension
[  2624.553]ABI class: X.Org Server Extension, version 6.0
[  2624.553] (II) Loading extension SELinux
[  2624.553] (II) Loading extension MIT-SCREEN-SAVER
[  2624.553] (II) Loading extension XFree86-VidModeExtension
[  2624.553] (II) Loading extension XFree86-DGA
[  2624.553] (II) Loading extension DPMS
[  2624.553] (II) Loading extension XVideo
[  2624.553] (II) Loading extension XVideo-MotionCompensation
[  2624.553] (II) Loading extension X-Resource
[  2624.553] (II) LoadModule: dbe
[  2624.553] (II) Loading /usr/lib/xorg/modules/extensions/libdbe.so
[  2624.553] (II) Module dbe: vendor=X.Org Foundation
[  2624.553]compiled for 1.12.3.902, module version = 1.0.0
[  2624.553]Module class: X.Org Server Extension
[  2624.553]ABI class: X.Org Server Extension, version 6.0
[  2624.553] (II) Loading extension DOUBLE-BUFFER
[  2624.553] (II) LoadModule: glx
[  2624.553] (II) Loading /usr/lib/xorg/modules/linux/libglx.so
[  2624.570] (II) Module glx: vendor=NVIDIA Corporation
[  2624.570]compiled for 4.0.2, module version = 1.0.0
[  2624.570]Module class: X.Org Server Extension
[  2624.570] (II) NVIDIA GLX Module  304.48  Sun Sep  9 20:42:38 PDT 2012
[  2624.570] (II) Loading extension GLX
[  2624.570] (II) LoadModule: record
[  2624.570] (II) Loading /usr/lib/xorg/modules/extensions/librecord.so
[  2624.570] (II) Module record: vendor=X.Org Foundation
[  2624.570]compiled for 1.12.3.902, module version = 1.13.0
[  2624.570]Module class: X.Org Server Extension
[  2624.570]ABI class: X.Org Server 

Bug#688908: Acknowledgement (xserver-xorg-core 1.12.3.902-1 breaks icewm)

2012-09-26 Thread Michael Holzt
The problem at hand is caused by commit

3e62f48edf47a59d923ac58b6d4262b02456a556

which has caused similar problems to others as pointed out by jcristau:

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


Reverting the patch and recompiling xserver-xorg 1.12.3.902-1 did fix the
problem. Apparently with the change xserver-xorg has problems reading some
xpm files which are identified by imagemagick as having 16-bit
PseudoClass while working files have 16-bit DirectClass.

If it helps I can send examples of the nonworking XPM files.



Regards,
Michael

-- 
It's an insane world, but i'm proud to be a part of it. -- Bill Hicks


-- 
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/20120926203824.ga21...@fqdn.org