Bug#719853: libdrm-radeon1: unnecessary dependency

2013-08-15 Thread Chris Bannister
Package: libdrm-radeon1
Version: 2.4.46-1
Severity: normal

Dear Maintainer,

I don't have any radeon hardware installed, and yet:

root@tal:~# dpkg --purge libdrm-radeon1
dpkg: dependency problems prevent removal of libdrm-radeon1:i386:
 libgl1-mesa-dri:i386 depends on libdrm-radeon1 (>= 2.4.31).

dpkg: error processing libdrm-radeon1:i386 (--purge):
  dependency problems - not removing
Errors were encountered while processing:
   libdrm-radeon1:i386


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

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

Versions of packages libdrm-radeon1 depends on:
ii  libc6  2.17-92
ii  libdrm22.4.46-1
ii  multiarch-support  2.17-92

libdrm-radeon1 recommends no packages.

libdrm-radeon1 suggests no packages.

-- 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/20130816062912.10402.62022.reportbug@tal



Processed: tagging as pending bugs that are closed by packages in NEW

2013-08-15 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> # Thursday 15 August  20:03:30 UTC 2013
> # Tagging as pending bugs that are closed by packages in NEW
> # http://ftp-master.debian.org/new.html
> #
> # Source package in NEW:  href="http://packages.qa.debian.org/mesa-demos";>mesa-demos
> tags 635764 + pending
Bug #635764 [mesa-utils] please add opengl es demos
Added tag(s) pending.
> # Source package in NEW: swiftsc
> tags 717926 + pending
Bug #717926 [wnpp] ITP: swiftsc -- simple client library of OpenStack Swift
Added tag(s) pending.
> # Source package in NEW: calypso
> tags 683791 + pending
Bug #683791 [wnpp] ITP: calypso -- CalDAV and CardDav server
Added tag(s) pending.
> # Source package in NEW: django-taggit
> tags 719809 + pending
Bug #719809 [wnpp] ITP: python-django-taggit -- simple tagging for Django
Added tag(s) pending.
> # Source package in NEW: morris
> tags 719491 + pending
Bug #719491 [wnpp] ITP: morris -- Nine men's morris game for the gnome desktop
Added tag(s) pending.
> # Source package in NEW: ruby-rack-flash3
> tags 719308 + pending
Bug #719308 [wnpp] ITP: ruby-rack-flash3 -- Flash hash for Ruby Rack 
applications
Added tag(s) pending.
> # Source package in NEW: snakeyaml
> tags 585903 + pending
Bug #585903 [wnpp] ITP: libyaml-snake-java -- YAML parser and emitter for Java
Added tag(s) pending.
> # Source package in NEW:  href="http://packages.qa.debian.org/cddlib";>cddlib
> tags 718179 + pending
Bug #718179 [libcdd-dev] libcdd-dev: arch-dependent files in "Multi-Arch: same" 
package
Added tag(s) pending.
>
End of message, stopping processing here.

Please contact me if you need assistance.
-- 
585903: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585903
635764: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635764
683791: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683791
717926: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=717926
718179: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718179
719308: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719308
719491: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719491
719809: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719809
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.137659705322330.transcr...@bugs.debian.org



Bug#719785: [xserver-xorg-video-nouveau] Brightness not changeable after suspend/hibernate on HP 8530w

2013-08-15 Thread Sven Joachim
On 2013-08-15 12:30 +0200, Marek Straka wrote:

> Upon suspend or hibernation the brigtness is set on minimum and can
> not be changed. Values in
> /sys/class/backlight/acpi_video0/max_brightness can be changed with Fn
> key, but it has no reaction to background illumination.

This is a kernel problem.  Did it work with older kernels, e.g. the one
in Wheezy?

> Exactly same problem is described also here (supposedly solved): 
> https://bugzilla.redhat.com/show_bug.cgi?id=726651

And https://bugs.freedesktop.org/show_bug.cgi?id=39550 is an upstream
bug report on the issue.  You may want to follow up there.

Cheers,
   Sven


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



xserver-xorg-video-ati_7.2.0-1_amd64.changes ACCEPTED into unstable

2013-08-15 Thread Debian FTP Masters
Mapping sid to unstable.

Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Format: 1.8
Date: Thu, 15 Aug 2013 18:26:42 +0200
Source: xserver-xorg-video-ati
Binary: xserver-xorg-video-ati xserver-xorg-video-ati-dbg 
xserver-xorg-video-radeon xserver-xorg-video-radeon-dbg
Architecture: source amd64
Version: 1:7.2.0-1
Distribution: sid
Urgency: low
Maintainer: Debian X Strike Force 
Changed-By: Julien Cristau 
Description: 
 xserver-xorg-video-ati - X.Org X server -- AMD/ATI display driver wrapper
 xserver-xorg-video-ati-dbg - X.Org X server -- AMD/ATI display driver wrapper 
(debugging symbo
 xserver-xorg-video-radeon - X.Org X server -- AMD/ATI Radeon display driver
 xserver-xorg-video-radeon-dbg - X.Org X server -- AMD/ATI Radeon display 
driver (debugging symbol
Changes: 
 xserver-xorg-video-ati (1:7.2.0-1) unstable; urgency=low
 .
   [ Maarten Lankhorst ]
   * New upstream release:
 - KMS-only release, only works with linux-any (or recent kbsd) now.
   * Require libdrm 2.4.46
 .
   [ Julien Cristau ]
   * Get rid of modprobe config file, rely on the kernel's default config to
 enable kms.
   * Bump debhelper compat level to 9 to enable dpkg-buildflags.
   * Remove useless override_dh_auto_install rule.
Checksums-Sha1: 
 dc7d3e6d0f4a9055f92436c8089a288c283a1b9a 2602 
xserver-xorg-video-ati_7.2.0-1.dsc
 3cde14302bb7ce97406a39e2c0e5e6391719c111 1022736 
xserver-xorg-video-ati_7.2.0.orig.tar.gz
 8251680449ff7e5d1b56b186bb10f18ca7483891 14766 
xserver-xorg-video-ati_7.2.0-1.diff.gz
 bad3ed12eb433028dd0acec99cf4ad49a71e3d64 294490 
xserver-xorg-video-ati_7.2.0-1_amd64.deb
 8f6fb2d684669fff6bea92cef24f7677aec083a5 298958 
xserver-xorg-video-ati-dbg_7.2.0-1_amd64.deb
 334307cc1d4dfdb22b7a4e78cdb3df7707259d29 399262 
xserver-xorg-video-radeon_7.2.0-1_amd64.deb
 bde5529d39f178cbd38a98452a8e01a684efb8d4 1081248 
xserver-xorg-video-radeon-dbg_7.2.0-1_amd64.deb
Checksums-Sha256: 
 b2972005a397f07506e0d59a28fe46e4978bbe4d0dc21d225a8c846777f30d69 2602 
xserver-xorg-video-ati_7.2.0-1.dsc
 52c4b0d3467bc5493b31d4a392f523d6c1355d9fae3ad9e9778acd1ee52c3fe0 1022736 
xserver-xorg-video-ati_7.2.0.orig.tar.gz
 059a0da91b83c0be2d1cdbff6737cabdab9d1d07a6d72236db87f5be0bdd7347 14766 
xserver-xorg-video-ati_7.2.0-1.diff.gz
 6c040b1bb9eee6e3831653f9435190f49b74435db0d3143b5c7c475ebe72f68f 294490 
xserver-xorg-video-ati_7.2.0-1_amd64.deb
 f5768a67cdef1029a91c8ed3cac72e5680433876a4c3022c3ccfa0aef6574dbc 298958 
xserver-xorg-video-ati-dbg_7.2.0-1_amd64.deb
 e5af552df094c7207c466d4f16de6cb94e667aeb2feb9e6b9b5e13046ead6254 399262 
xserver-xorg-video-radeon_7.2.0-1_amd64.deb
 8af0922d1902b4e30da1e14f8b777f2bc8bbb810c27ead296c374f0d2a82b76c 1081248 
xserver-xorg-video-radeon-dbg_7.2.0-1_amd64.deb
Files: 
 ac44a237d84fcc8be7827dcea15798f3 2602 x11 optional 
xserver-xorg-video-ati_7.2.0-1.dsc
 6af1ca76e089f0280b53cf8149136543 1022736 x11 optional 
xserver-xorg-video-ati_7.2.0.orig.tar.gz
 353ac1f19bbda2911810bc86c2ab556f 14766 x11 optional 
xserver-xorg-video-ati_7.2.0-1.diff.gz
 142948ee8669683903fa82dbc13816cc 294490 x11 optional 
xserver-xorg-video-ati_7.2.0-1_amd64.deb
 96d144ed21f6df56aaa613fe0cba102a 298958 debug extra 
xserver-xorg-video-ati-dbg_7.2.0-1_amd64.deb
 826a1380e52c4ac3d96302a3ae545793 399262 x11 optional 
xserver-xorg-video-radeon_7.2.0-1_amd64.deb
 1ff8c4ed469019670893918bea99e9c3 1081248 debug extra 
xserver-xorg-video-radeon-dbg_7.2.0-1_amd64.deb

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

iQIcBAEBAgAGBQJSDREiAAoJEDEBgAUJBeQM1NQP/jwaIKEiD9iegcolBOh00LFU
FVy9ZhL51ATN9rJBTnp+xX3kP5ba/asHFTYtVebPOUdzqQ/FkXa646t0Vgab6R1e
0kaEHcgJL9hheeJXBgdt0AOGrmWc5AHteIbFSEJs0nBfFPtfTlb9A9aqcf4EvIkX
06BCTh5liZ8AX2KFa4MGSzy+9qY2qwUTOC6eWeFXbAqoyX4pRz1wopYHvr2hKGy5
LgYO+yrCRn41AVcmHSVBFKMaQo6n7Djli5yezy11XUCvM4+d6VmONtJcNbzKlx1p
mNOUNUaMyt8Gr0n2ebZDOUDBCVw+9dov9xuQBv4pGqlBxqhI18hV7xKkHDoxo+i+
lGEFkPL/YZw+xG7P80kBfIRBQKEg8xGhfofcdNEeVNg5vctjRMNQy4J660bo3dxK
w12PJpBbZmuTWNQ4k+LMwOxI/TxSaMT4ds4mtg7bP/+irNZ3xRwI8RibVtf9FAfw
WIQkenJEjcXCxVy0E2/7Ug8OOXMlV8qn51LWiYq0Q8S2/GItcAQ27o+GM2L2is/o
Yc2dLz7wvISW0C3s7ILEfZIC9CZV4VrjtNc/uMTx9TdSqlY+tQZBuPDayeDh2ta/
eL7TapcemxqYAyKX/UKRL3aha2xj1IUl2Q3bvQcx7C+rePsmX9XxciohYQbjgKwF
VVAOBT6mrxoYka7Jug78
=I2OW
-END PGP SIGNATURE-


Thank you for your contribution to Debian.


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



Processing of xserver-xorg-video-ati_7.2.0-1_amd64.changes

2013-08-15 Thread Debian FTP Masters
xserver-xorg-video-ati_7.2.0-1_amd64.changes uploaded successfully to localhost
along with the files:
  xserver-xorg-video-ati_7.2.0-1.dsc
  xserver-xorg-video-ati_7.2.0.orig.tar.gz
  xserver-xorg-video-ati_7.2.0-1.diff.gz
  xserver-xorg-video-ati_7.2.0-1_amd64.deb
  xserver-xorg-video-ati-dbg_7.2.0-1_amd64.deb
  xserver-xorg-video-radeon_7.2.0-1_amd64.deb
  xserver-xorg-video-radeon-dbg_7.2.0-1_amd64.deb

Greetings,

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


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



Processed: [bts-link] source package mesa

2013-08-15 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> #
> # bts-link upstream status pull for source package mesa
> # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html
> #
> user bts-link-upstr...@lists.alioth.debian.org
Setting user to bts-link-upstr...@lists.alioth.debian.org (was 
bts-link-de...@lists.alioth.debian.org).
> # remote status report for #718876 (http://bugs.debian.org/718876)
> # Bug title: libegl1-mesa: Flickering in EGL OpenGL full-screen window with 
> swap interval 1 [Regression]
> #  * https://bugs.freedesktop.org/show_bug.cgi?id=63435
> #  * remote status changed: (?) -> RESOLVED
> #  * remote resolution changed: (?) -> FIXED
> #  * closed upstream
> tags 718876 + fixed-upstream
Bug #718876 [libegl1-mesa] libegl1-mesa: Flickering in EGL OpenGL full-screen 
window with swap interval 1 [Regression]
Added tag(s) fixed-upstream.
> usertags 718876 + status-RESOLVED resolution-FIXED
There were no usertags set.
Usertags are now: status-RESOLVED resolution-FIXED.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
718876: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718876
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.13765890993492.transcr...@bugs.debian.org



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

2013-08-15 Thread Julien Cristau
 ChangeLog| 2062 +
 Makefile.am  |2 
 autogen.sh   |4 
 configure.ac |  211 -
 debian/changelog |   21 
 debian/compat|2 
 debian/control   |8 
 debian/rules |   12 
 debian/xserver-xorg-video-radeon.install |1 
 man/radeon.man   |  547 --
 src/AtomBios/CD_Operations.c |  983 
 src/AtomBios/Decoder.c   |  258 -
 src/AtomBios/hwserv_drv.c|  354 -
 src/AtomBios/includes/CD_Common_Types.h  |  172 
 src/AtomBios/includes/CD_Definitions.h   |   50 
 src/AtomBios/includes/CD_Opcodes.h   |  181 
 src/AtomBios/includes/CD_Structs.h   |  486 --
 src/AtomBios/includes/CD_binding.h   |   46 
 src/AtomBios/includes/CD_hw_services.h   |  318 -
 src/AtomBios/includes/Decoder.h  |  107 
 src/AtomBios/includes/ObjectID.h |  643 ---
 src/AtomBios/includes/atombios.h | 6137 -
 src/AtomBios/includes/regsdef.h  |   25 
 src/Makefile.am  |  101 
 src/ati.c|   65 
 src/ati_pciids_gen.h |  105 
 src/atipcirename.h   |   47 
 src/atombios_crtc.c  | 1541 ---
 src/atombios_output.c| 2775 -
 src/cayman_accel.c   |3 
 src/cayman_shader.c  |  594 +-
 src/compat-api.h |   94 
 src/drmmode_display.c|  377 +
 src/drmmode_display.h|   16 
 src/evergreen_accel.c|   51 
 src/evergreen_exa.c  |  402 +
 src/evergreen_shader.c   |  600 +-
 src/evergreen_state.h|8 
 src/evergreen_textured_videofuncs.c  |   42 
 src/generic_bus.h|   36 
 src/legacy_crtc.c| 1898 -
 src/legacy_output.c  | 2102 -
 src/pcidb/ati_pciids.csv |  153 
 src/pcidb/parse_pci_ids.pl   |4 
 src/r600_exa.c   |  794 ---
 src/r600_state.h |  140 
 src/r600_textured_videofuncs.c   |   98 
 src/r6xx_accel.c |  720 +--
 src/radeon.h | 1309 +-
 src/radeon_accel.c   | 2021 +++--
 src/radeon_accelfuncs.c  | 1385 --
 src/radeon_atombios.c| 3019 --
 src/radeon_atombios.h|  292 -
 src/radeon_atomwrapper.c |  102 
 src/radeon_atomwrapper.h |   31 
 src/radeon_bios.c| 2052 -
 src/radeon_bo_helper.c   |  253 +
 src/radeon_bo_helper.h   |   38 
 src/radeon_chipinfo_gen.h|  153 
 src/radeon_chipset_gen.h |  107 
 src/radeon_commonfuncs.c | 1037 
 src/radeon_crtc.c| 1128 -
 src/radeon_cursor.c  |  449 --
 src/radeon_dri.c | 2347 ---
 src/radeon_dri.h |   91 
 src/radeon_dri2.c|  883 ++--
 src/radeon_dri2.h|   48 
 src/radeon_driver.c  | 6520 ---
 src/radeon_dummy_bufmgr.h|   62 
 src/radeon_exa.c |  584 --
 src/radeon_exa_funcs.c   |  539 --
 src/radeon_exa_render.c  |  657 +--
 src/radeon_exa_shared.c  |  108 
 src/radeon_exa_shared.h  |2 
 src/radeon_glamor.c  |  351 +
 src/radeon_glamor.h  |   93 
 src/radeon_kms.c |  614 ++
 src/radeon_legacy_memory.c   |  143 
 src/radeon_macros.h  |  209 
 src/radeon_mm_i2c.c  |  642 ---
 src/radeon_modes.c   |  542 --
 src/radeon_output.c  | 3193 ---
 src/radeon_pci_chipset_gen.h |  107 
 src/radeon_pci_device_match_gen.h|  105 
 src/radeon_pm.c  |  886 
 src/radeon_probe.c   |  229 -
 src/radeon_probe.h   |  674 ---
 src/radeon_render.c  | 1060 -
 src/radeon_textured_video.c  |  390 -
 src/radeon_textured_videofuncs.c | 1866 +++-
 src/radeon_tv.c  | 1283 --
 src/radeon_tv.h  |   62 
 src/radeon_vbo.c |3 
 src/radeon_vbo.h |   10 
 src/radeon_version.h  

xserver-xorg-video-ati: Changes to 'refs/tags/xserver-xorg-video-ati-1_7.2.0-1'

2013-08-15 Thread Julien Cristau
Tag 'xserver-xorg-video-ati-1_7.2.0-1' created by Julien Cristau 
 at 2013-08-15 17:33 +

Tagging upload of xserver-xorg-video-ati 1:7.2.0-1 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJSDRDyAAoJEDEBgAUJBeQM7wAQAMSbalKEapRUvvtmDxPG+mw3
Bpr6qMFvdlo6Xdur9jhLMQ0DtNqYWpDpE0Z05hZRbCrsLQHlqzbqDBRy+0njn2K6
Gadgj3XKIqaZaLIsm9I5DimHLqYZJ5Y/aTLKqmvqJmDPunTtuAtFf5q42KlRB/xb
1ZyhmAkMTtLWRnuMz8UVEumXQC8MFm9GZySE4QVlUdf07JFlHWeDOmBDURVN6RjV
ruOFOUOhyqySavOuzW7Jc1DDD2ckD5gppptWkTMjRX6wB9gkFIINBqPjzsaiPuYj
lJaA0k7NJ3WX92k4dSrawPd3BBGWVDMxvzaB8QAmbexDoNXA+ukO5ZCW+WQLW8Aw
PDhMAfPGGHZ+llmZtGNx15fswLKAq1QMxmqzuCJt6mIL6VbbXfdT3ygcl4jJUlKw
VwzQYIP0ez171/e42YLQFllW0cDduZz/6gYqpXFjh6H855QIkf8GfiBHeNYg8QhJ
sY5ZdyClP6svLrQ2i41StI7dHumYfnayfByAAiWwJPVdnVBnyuSJqCTLuEkVNKFV
d/k4xIcuDX147vEFF6lGoIcbKzll4SXObKuMBYaS69cwwV8FcaY7qz+FHplzg0HZ
nlhSYp8J9ACVfwuzf1xype2aZ1XCX4wSXLd/LYG30gzn6bfwXp6ftjcse3V86HvZ
W3fAuhKe85X6VFYqnI7s
=D2f8
-END PGP SIGNATURE-

Changes since xserver-xorg-video-ati-1_6.14.4-8:
Adam Jackson (3):
  Don't bother to include vbe.h
  Implement ->driverFunc
  Remove mibstore.h

Alex Deucher (31):
  radeon: add new PCI ids
  configure: bump libdrm_radeon requirement
  configure: bump for release
  configure: bump version post release
  radeon: add some new SI pci ids
  radeon: add new pci ids for SI
  man: update man pages for trinity (ARUBA)
  Revert "radeon/radeon_platform_probe: fix Zaphod mode breakage"
  man: note that 2D tiling requires Mesa 9.0 or newer
  radeon: bump version for release
  bump verion post release
  radeon: add new SI pci id
  radeon: fix ring count in R300PrepareTexturedVideo
  exa/Xv: fix coordinate limits on AVIVO IGPs
  radeon/r200: program RE_WIDTH_HEIGHT properly
  radeon: add oland chip family
  radeon/kms: add oland pci ids
  radeon: mark trinity APUs with IGP flag
  radeon: add Richland pci ids
  radeon: add new SI pci ids
  radeon: add new richland pci ids
  radeon: add hainan chip family
  radeon: add Hainan pci ids
  man: fix up previous commit
  radeon: add family ids for CIK
  radeon: update cursor handling for CIK
  radeon/kms: add bonaire pci ids
  radeon/kms: add kabini pci ids
  radeon: bump libdrm requirement to 2.4.46 for CIK support
  radeon: fix naming clashes with multiple GPUs (v3)
  drmmode: add support for multi-screen reverse optimus

Andreas Boll (1):
  radeon/man: ColorTiling2D is by default on for r6xx-cayman

Colin Walters (1):
  autogen.sh: Implement GNOME Build API

Cyril Brulebois (2):
  Build against Xserver 1.12 RC1.
  Upload to experimental.

Dave Airlie (62):
  radeon/xaa: drop scrnIndex parameter to some functions
  radeon: add compat-api.h
  ati: convert to new screen conversion APIs
  compat for new server API
  radeon/generic_bus: stop passing scrnIndex
  radeon/atombios: rewrite atombios parser code to not use xf86Screens.
  radeon: fix a few more RHDAtomBiosFunc uses
  radeon/xvmc: fix build with new API.
  radeon: update compat-api.h for block handler + enable/disable fb.
  radeon: move include down further
  drmmode: drop flags arg to adjust frame.
  radeon: fix compat api for newest planned API.
  radeon: fix smooth startup with tiling enabled.
  radeon: improve smooth startup fallbacks.
  radeon: drop all UMS/DRI1/XAA/overlay support.
  drop RING_LOCALS/ACCEL_PREAMBLE
  make pci chipsets static
  radeon: misc cleanups.
  radeon: drop radeon_commonfuncs.
  radeon: drop FUNC_NAME macro and ONCE_ONLY stuff
  radeon: make exa copy funcs static.
  radeon: further macro cleanups.
  radeon: drop more wrapper macros.
  radeon: move macros into radeon.h
  radeon: drop offset member of r600 accel object
  radeon: drop vb_mc_addr, not needed anymore
  radeon: drop unused txoffset vars.
  radeon: drop legacy memory, merge into radeon video
  radeon: move more functions into texture video
  radeon: drop radeonGetPixmapOffset
  radeon: drop cardType shouldn't matter to userspace.
  radeon: more unused stuff
  radeon: drop another unused struct member.
  radeon: drop some more unused macros/inlines
  radeon: avoid including large static struct twice.
  radeon: migrate remainder of radeon_driver.c to rest of driver
  radeon: fix RADEONChipsets
  radeon: fix radeonchipsets properly
  radeon: dixPrivateKeyRegistered is only in server 1.9
  radeon: require libdrm 2.4.36 for KMS support.
  configure: bump version number to 6.14.6 pre-release
  configure: bump version after release.
  Merge remote-tracking branch 'origin/kms-only'
  configure: bump to 6.99.99
  radeon: fix conflict with fix in master.
  ati: fix stub driver loader to load all drivers properly
  radeon: damage ful

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

2013-08-15 Thread Julien Cristau
 Makefile.am |2 
 autogen.sh  |4 
 configure.ac|  211 -
 man/radeon.man  |  545 --
 src/AtomBios/CD_Operations.c|  983 
 src/AtomBios/Decoder.c  |  258 -
 src/AtomBios/hwserv_drv.c   |  354 -
 src/AtomBios/includes/CD_Common_Types.h |  172 
 src/AtomBios/includes/CD_Definitions.h  |   50 
 src/AtomBios/includes/CD_Opcodes.h  |  181 
 src/AtomBios/includes/CD_Structs.h  |  486 --
 src/AtomBios/includes/CD_binding.h  |   46 
 src/AtomBios/includes/CD_hw_services.h  |  318 -
 src/AtomBios/includes/Decoder.h |  107 
 src/AtomBios/includes/ObjectID.h|  643 ---
 src/AtomBios/includes/atombios.h| 6137 --
 src/AtomBios/includes/regsdef.h |   25 
 src/Makefile.am |  101 
 src/ati.c   |   65 
 src/ati_pciids_gen.h|  128 
 src/atipcirename.h  |   47 
 src/atombios_crtc.c | 1541 ---
 src/atombios_output.c   | 2775 -
 src/cayman_accel.c  |3 
 src/cayman_shader.c |  630 +--
 src/compat-api.h|   94 
 src/drmmode_display.c   |  440 +-
 src/drmmode_display.h   |   17 
 src/evergreen_accel.c   |   51 
 src/evergreen_exa.c |  521 +-
 src/evergreen_shader.c  |  636 +--
 src/evergreen_state.h   |8 
 src/evergreen_textured_videofuncs.c |   93 
 src/generic_bus.h   |   36 
 src/legacy_crtc.c   | 1898 -
 src/legacy_output.c | 2102 --
 src/pcidb/ati_pciids.csv|  140 
 src/pcidb/parse_pci_ids.pl  |4 
 src/r600_exa.c  |  940 +---
 src/r600_shader.c   |   34 
 src/r600_state.h|  140 
 src/r600_textured_videofuncs.c  |  139 
 src/r6xx_accel.c|  720 +--
 src/radeon.h| 1308 +-
 src/radeon_accel.c  | 2026 +++--
 src/radeon_accelfuncs.c | 1385 --
 src/radeon_atombios.c   | 3019 --
 src/radeon_atombios.h   |  292 -
 src/radeon_atomwrapper.c|  102 
 src/radeon_atomwrapper.h|   31 
 src/radeon_bios.c   | 2052 --
 src/radeon_bo_helper.c  |  253 +
 src/radeon_bo_helper.h  |   38 
 src/radeon_chipinfo_gen.h   |  140 
 src/radeon_chipset_gen.h|  130 
 src/radeon_commonfuncs.c| 1037 -
 src/radeon_crtc.c   | 1128 -
 src/radeon_cursor.c |  449 --
 src/radeon_dri.c| 2347 ---
 src/radeon_dri.h|   91 
 src/radeon_dri2.c   |  884 ++--
 src/radeon_dri2.h   |   48 
 src/radeon_driver.c | 6520 
 src/radeon_dummy_bufmgr.h   |   62 
 src/radeon_exa.c|  577 --
 src/radeon_exa_funcs.c  |  539 --
 src/radeon_exa_render.c |  930 ++--
 src/radeon_exa_shared.c |   78 
 src/radeon_exa_shared.h |3 
 src/radeon_glamor.c |  351 +
 src/radeon_glamor.h |   93 
 src/radeon_kms.c|  637 ++-
 src/radeon_legacy_memory.c  |  143 
 src/radeon_macros.h |  209 -
 src/radeon_mm_i2c.c |  642 ---
 src/radeon_modes.c  |  542 --
 src/radeon_output.c | 3135 ---
 src/radeon_pci_chipset_gen.h|  130 
 src/radeon_pci_device_match_gen.h   |  128 
 src/radeon_pm.c |  886 
 src/radeon_probe.c  |  229 -
 src/radeon_probe.h  |  674 ---
 src/radeon_render.c | 1060 -
 src/radeon_textured_video.c |  390 -
 src/radeon_textured_videofuncs.c| 1866 +++--
 src/radeon_tv.c | 1283 --
 src/radeon_tv.h |   62 
 src/radeon_vbo.c|3 
 src/radeon_vbo.h|   10 
 src/radeon_version.h|1 
 src/radeon_video.c  | 3918 ---
 src/radeon_video.h  |   88 
 src/radeon_vip.c|  362 -
 src/radeon_xvmc.c   |5 
 src/theatre.c   | 2211 --
 src/theatre.h   |   

Bug#696272: xserver-xorg-core: BadImplementation error with XIAllDevices or XIAllMasterDevices deviceid used in libxi XISelectEvents eventmask

2013-08-15 Thread André Saunite
Hi,

I think it has to do with the Intel video card.

I was getting the same problem with evolution mail in a machine with an
integrated intel card and a nvidia card, with nvidia evolution starts
normally, but after I upgraded the kernel and logged in using the intel
card I had this problem, after switching back to nvidia it worked normally
again.

BR
André Saunite


xorg-server_1.14.2.901-2_ia64.changes ACCEPTED into experimental

2013-08-15 Thread Debian FTP Masters


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Format: 1.8
Date: Sat, 03 Aug 2013 18:17:30 +0200
Source: xorg-server
Binary: xserver-xorg-core xserver-xorg-core-udeb xserver-xorg-dev xdmx 
xdmx-tools xnest xvfb xserver-xephyr xserver-xfbdev xserver-xorg-core-dbg 
xserver-common
Architecture: ia64
Version: 2:1.14.2.901-2
Distribution: experimental
Urgency: low
Maintainer: Debian X Strike Force 
Changed-By: Julien Cristau 
Description: 
 xdmx   - distributed multihead X server
 xdmx-tools - Distributed Multihead X tools
 xnest  - Nested X server
 xserver-common - common files used by various X servers
 xserver-xephyr - nested X server
 xserver-xfbdev - Linux framebuffer device tiny X server
 xserver-xorg-core - Xorg X server - core server
 xserver-xorg-core-dbg - Xorg - the X.Org X server (debugging symbols)
 xserver-xorg-core-udeb - Xorg X server - core server (udeb)
 xserver-xorg-dev - Xorg X server - development files
 xvfb   - Virtual Framebuffer 'fake' X server
Changes: 
 xorg-server (2:1.14.2.901-2) experimental; urgency=low
 .
   * Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
 Require dpkg-dev 1.16.1.
   * Also improve POSIX_SAVED_IDS check to work on kbsd.
   * Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).
   * Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64).
Checksums-Sha1: 
 46eab06a2f3b54637b12f66c2a159d15170f83aa 1641818 
xserver-xorg-core_1.14.2.901-2_ia64.deb
 4560533c5fd156da17cc26aafd25793b0ab4d5a4 1186362 
xserver-xorg-core-udeb_1.14.2.901-2_ia64.udeb
 47334c7d774d01e8b261feb9b26654c4cd7c762e 238560 
xserver-xorg-dev_1.14.2.901-2_ia64.deb
 a0d9e4aa9fd03ed526680f9aae9f086288c76c75 1032924 xdmx_1.14.2.901-2_ia64.deb
 ee8671c42f3592851539342d54c29b863851ab99 102084 
xdmx-tools_1.14.2.901-2_ia64.deb
 5c180ecd8abc636322f5b265bdfe4350682ce5fc 830462 xnest_1.14.2.901-2_ia64.deb
 8e3eb375e518ff0025b1f06a44fb8bd12b94db72 1033990 xvfb_1.14.2.901-2_ia64.deb
 dab1cc9634388ae89c45da8ca17b82250f98890f 1129266 
xserver-xephyr_1.14.2.901-2_ia64.deb
 dce7c127da0b6bcb340e87142806c6e534f06d62 967060 
xserver-xfbdev_1.14.2.901-2_ia64.deb
 493d28d0bdb83d9b91d639579b72c171f5552e01 3577898 
xserver-xorg-core-dbg_1.14.2.901-2_ia64.deb
Checksums-Sha256: 
 1e523645df5b3b47463c56924e3555c97854c0528b917022c8a425b31b5cf035 1641818 
xserver-xorg-core_1.14.2.901-2_ia64.deb
 1850ba5c8613ac30a23439994625a1e545dbeba5012fcbcd11a0329e22d547fc 1186362 
xserver-xorg-core-udeb_1.14.2.901-2_ia64.udeb
 c1489287e709dc0a8ec70d4b4bba48b2622556cd36c0a96a7fa47f1f826be8e5 238560 
xserver-xorg-dev_1.14.2.901-2_ia64.deb
 bd59f094e84b35e61395db89f1710152b3b718a922cb6da3a7a9a8a2a1384390 1032924 
xdmx_1.14.2.901-2_ia64.deb
 51666c4f92d44f85b98a521b1385612bbb2cd86e6aaa8badd0b85e36665fd3c3 102084 
xdmx-tools_1.14.2.901-2_ia64.deb
 7b547afcb2928e2e5e5fd51716bf9134d3af0b61782d219b42038e3cffc4bf21 830462 
xnest_1.14.2.901-2_ia64.deb
 fd7c2ff7817e6f69f15eabc68d231a8d95bdade1f00ccb4dd5ea2387423d34ff 1033990 
xvfb_1.14.2.901-2_ia64.deb
 dde689a294a816d298f5a2fa51cd240e40285bb41cb26a6a4cffd5c09705b927 1129266 
xserver-xephyr_1.14.2.901-2_ia64.deb
 1057ab13195b77e58d90c48c4ec9e5e13276424c305f445d31cc173f507a0d78 967060 
xserver-xfbdev_1.14.2.901-2_ia64.deb
 1d19e86c337a695414297f523b64f87c1ed809b8e1f236e6dcf2575fa8f0a9b5 3577898 
xserver-xorg-core-dbg_1.14.2.901-2_ia64.deb
Files: 
 52ed2e76fee2dc86972304c63c89826f 1641818 x11 optional 
xserver-xorg-core_1.14.2.901-2_ia64.deb
 a1948542e80a328d5b768660a53706af 1186362 debian-installer optional 
xserver-xorg-core-udeb_1.14.2.901-2_ia64.udeb
 f437006df399229c3d9cba54d6a85b71 238560 x11 optional 
xserver-xorg-dev_1.14.2.901-2_ia64.deb
 0987e81268fd0f5b9e402beeb2b8455b 1032924 x11 optional 
xdmx_1.14.2.901-2_ia64.deb
 1aaa47527d78085b622742484f8ddb3c 102084 x11 optional 
xdmx-tools_1.14.2.901-2_ia64.deb
 1ccf7ccda188b207afee5d881289fddd 830462 x11 optional 
xnest_1.14.2.901-2_ia64.deb
 127802092a5b65c247a92afb802646e1 1033990 x11 optional 
xvfb_1.14.2.901-2_ia64.deb
 3fb3924543aa0c5b5f749c8eecd3b505 1129266 x11 optional 
xserver-xephyr_1.14.2.901-2_ia64.deb
 43da6ebdabf4d67e8ce9c13e2e85694b 967060 x11 optional 
xserver-xfbdev_1.14.2.901-2_ia64.deb
 0407a13520912adbd40cb28a10c9785c 3577898 debug extra 
xserver-xorg-core-dbg_1.14.2.901-2_ia64.deb
Package-Type: udeb

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

iQIcBAEBAgAGBQJSDPByAAoJEDEBgAUJBeQMVEEP/At4yCDA8kagMd8g4TVdqdqN
F4WV8mGtvhyOojLsoCBqxfRgIdri1z3MEZ/LQtoyJ4pTrbzH0A/5WZFPHAudlmsg
cBk5FGrPdxwWYaoE5OZbKKLpd15bT2gYNfLXxn8r6jyAojswMoO/1GztfUjMoUF/
cFfXVZo/F4eCSOp4EQQAHxfWLnec1xH2iWXBLCwxAPXUixjs0JOS5GAwtYd8Gi4J
EYT1VBZZ+G6HfRDzHaSJ4bLuH6xZ/OvasB/RZWHfO49LCPeXVgvvRXzdIFkBR4nU
Jo/TIcl1kl22rfOYPWhKYBRnXE+9yUvaKfsZGxtxL8AzfVVOcjXLH1RrOcoxkRkE
5wqz0R1LnUsI0H/RvKO0tYYyBBj17dfJCJJqrtauuK5uFYF/KEiWKXySNLpQakaR
PGZtYMtKO8O5I3RE54b5ahMSxw1iAr2XJwPvZsyjRT3Jb1bXriQOFgGyUsz9PkYB
91zfxFKYrcL8jLKfJ4DSmiZJTrSL6NgUidhTpJW57sAqUcf/M1R4YbW+lCv5P+7D
KLvzN

Processing of xorg-server_1.14.2.901-2_ia64.changes

2013-08-15 Thread Debian FTP Masters
xorg-server_1.14.2.901-2_ia64.changes uploaded successfully to localhost
along with the files:
  xserver-xorg-core_1.14.2.901-2_ia64.deb
  xserver-xorg-core-udeb_1.14.2.901-2_ia64.udeb
  xserver-xorg-dev_1.14.2.901-2_ia64.deb
  xdmx_1.14.2.901-2_ia64.deb
  xdmx-tools_1.14.2.901-2_ia64.deb
  xnest_1.14.2.901-2_ia64.deb
  xvfb_1.14.2.901-2_ia64.deb
  xserver-xephyr_1.14.2.901-2_ia64.deb
  xserver-xfbdev_1.14.2.901-2_ia64.deb
  xserver-xorg-core-dbg_1.14.2.901-2_ia64.deb

Greetings,

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


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



mesa-demos_8.1.0-1_amd64.changes is NEW

2013-08-15 Thread Debian FTP Masters
binary:mesa-utils-extra is NEW.

Your package contains new components which requires manual editing of
the override file.  It is ok otherwise, so please be patient.  New
packages are usually added to the override file about once a week.


-- 
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/e1v9uta-00041r...@franck.debian.org



pixman_0.30.2-1_sparc.changes ACCEPTED into unstable

2013-08-15 Thread Debian FTP Masters
Mapping sid to unstable.

Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Format: 1.8
Date: Tue, 13 Aug 2013 12:08:18 +0200
Source: pixman
Binary: libpixman-1-0 libpixman-1-0-udeb libpixman-1-0-dbg libpixman-1-dev
Architecture: sparc
Version: 0.30.2-1
Distribution: sid
Urgency: low
Maintainer: Debian X Strike Force 
Changed-By: Julien Cristau 
Description: 
 libpixman-1-0 - pixel-manipulation library for X and cairo
 libpixman-1-0-dbg - pixel-manipulation library for X and cairo (debugging 
symbols)
 libpixman-1-0-udeb - pixel-manipulation library for X and cairo (udeb)
 libpixman-1-dev - pixel-manipulation library for X and cairo (development 
files)
Changes: 
 pixman (0.30.2-1) sid; urgency=low
 .
   * New upstream release
 - includes big-endian matrix-test fix
   * Increase alpha-loop test timeout some more.
Checksums-Sha1: 
 3ef47c86dd6e4b4afde338a92a422ac8ba7e74ec 377730 
libpixman-1-0_0.30.2-1_sparc.deb
 bf289f1e63198a4032a10f3f0ea5af4211df1752 122192 
libpixman-1-0-udeb_0.30.2-1_sparc.udeb
 3f8cf487e28ffa0fb37193ae022406afaa55acab 547598 
libpixman-1-0-dbg_0.30.2-1_sparc.deb
 710c848f1dcd762be85c9a81bafe5a38ce16b607 393708 
libpixman-1-dev_0.30.2-1_sparc.deb
Checksums-Sha256: 
 c90fea82cff7b94c0f2a93d836f84e0fa2a1c3bd32996213b4082fe263df0d8b 377730 
libpixman-1-0_0.30.2-1_sparc.deb
 0157e22aaa2f196e86a0af565a74c06e1a9c53e21b5f2fd653040ed466a97299 122192 
libpixman-1-0-udeb_0.30.2-1_sparc.udeb
 053e6fdcc35311da0430fd59adbf1a4762cf7f3d357b471c7b05ff34c0a30c16 547598 
libpixman-1-0-dbg_0.30.2-1_sparc.deb
 8ce61acedc6be6aa485e428f146aff18f2140b17762941ec96cfa1223ca11996 393708 
libpixman-1-dev_0.30.2-1_sparc.deb
Files: 
 b12cde185ca8f50ba677f0b76713d030 377730 libs optional 
libpixman-1-0_0.30.2-1_sparc.deb
 b9b11e56ad3511bfc93ee0a85a3a612a 122192 debian-installer optional 
libpixman-1-0-udeb_0.30.2-1_sparc.udeb
 2ee322fc62bb28f9f77ca19d9a306abc 547598 debug extra 
libpixman-1-0-dbg_0.30.2-1_sparc.deb
 9841859e0c446bed167fc43700f99c8b 393708 libdevel optional 
libpixman-1-dev_0.30.2-1_sparc.deb
Package-Type: udeb

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

iQIcBAEBAgAGBQJSDKvfAAoJEDEBgAUJBeQM9R8QAOOHJ2R+Tmx5z7MvSOJ3PcmF
WQM3VCHTuAMU3cRicSOey+LwCd3Ck/gHQh+Hp6H+ohbze9lN6r3jlq47pptv2TpE
i/9LPXMsA4SQ32i5rtgxWorxnLFPlMZw/BESb6YedUQwM66ghAETKVYSQvBSlnqh
RPIxYaYY+trgHEUviDsT8unvDZC/Wgg7rKECbh7jHASEJl1BGXyHt3PoHvB+yrbq
OpOULav/SzkSDMSayAxgB88Poemi4KkVmi6LY+yOvMeHngSVPq9N0PWj3euZMQW2
yNlSZWtrKiB6SPxAf1ASWYfZSNQttX6vKgxJ1pOAw/1S4NyBGN5yCu2GWfQ4kTYl
laAJNfje1Kczf3teNUITmSwQiyl+RehJef123fwfhsT2uC5+wpZpTeZlsrinVtTf
vnVAZBRgFzX2Zrxzcu17qziUcVb/gmip8ovV3dpHb1PgxL7txTLlAHnzmMHnbz92
YJOMrFBJkQPoiizPpwWASVw7gkTPfQxZYqFEMKjfn5RInoCcXbuqIDDezVhu6Zpu
vhr9X4S7Qjn8FbqvJtEuRQrzBZyedrkGow03OCrb9PuaVW3ydweXZcQvmGzLk0zm
We18dxtA2n+6TLa921n99nSSORgG1k7vsXoTi6dzW4Anc49Jy6cMI3jZv/ASKw7r
ORs2jcP0KXn9of2gs6RZ
=7AIB
-END PGP SIGNATURE-


Thank you for your contribution to Debian.


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



Processing of mesa-demos_8.1.0-1_amd64.changes

2013-08-15 Thread Debian FTP Masters
mesa-demos_8.1.0-1_amd64.changes uploaded successfully to localhost
along with the files:
  mesa-demos_8.1.0-1.dsc
  mesa-demos_8.1.0.orig.tar.gz
  mesa-demos_8.1.0-1.diff.gz
  mesa-utils_8.1.0-1_amd64.deb
  mesa-utils-extra_8.1.0-1_amd64.deb

Greetings,

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


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



Processing of pixman_0.30.2-1_sparc.changes

2013-08-15 Thread Debian FTP Masters
pixman_0.30.2-1_sparc.changes uploaded successfully to localhost
along with the files:
  libpixman-1-0_0.30.2-1_sparc.deb
  libpixman-1-0-udeb_0.30.2-1_sparc.udeb
  libpixman-1-0-dbg_0.30.2-1_sparc.deb
  libpixman-1-dev_0.30.2-1_sparc.deb

Greetings,

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


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



Processing of mesa-demos_8.1.0-1_amd64.changes

2013-08-15 Thread Debian FTP Masters
mesa-demos_8.1.0.orig.tar.gz has incorrect size; deleting it
Due to the errors above, the .changes file couldn't be processed.
Please fix the problems for the upload to happen.

Greetings,

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


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



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

2013-08-15 Thread Christopher Halse Rogers
 debian/changelog   |   14 
 debian/patches/fix-preinit-cleanup-paths.patch |   94 +++
 debian/patches/series  |2 
 debian/patches/xmir.patch  |  714 +++--
 4 files changed, 554 insertions(+), 270 deletions(-)

New commits:
commit bfc1b6badcc5010cabfed0509894853895364aa5
Author: Christopher James Halse Rogers 
Date:   Thu Aug 15 11:50:39 2013 +1000

Update XMir patch following ickle's branch

diff --git a/debian/changelog b/debian/changelog
index 6a74bb1..cfbca0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.21.12-1ubuntu3) saucy; urgency=low
+
+  * fix-preinit-cleanup-paths.patch: Upstream cherrypick to fix leaks in
+sna_pre_init failure paths. Prerequisite for new XMir patch.
+  * xmir.patch: Update to follow upstream developments
+
+ -- Christopher James Halse Rogers   Thu, 15 Aug 2013 
11:46:10 +1000
+
 xserver-xorg-video-intel (2:2.21.12-1ubuntu2) saucy; urgency=low
 
   * Fix crash in sna_adjust_frame under XMir (LP: #1212065)
diff --git a/debian/patches/fix-preinit-cleanup-paths.patch 
b/debian/patches/fix-preinit-cleanup-paths.patch
new file mode 100644
index 000..72065a5
--- /dev/null
+++ b/debian/patches/fix-preinit-cleanup-paths.patch
@@ -0,0 +1,94 @@
+commit d7465ece29c9ae665a5a9f5bdac764a19062786e
+Author: Chris Wilson 
+Date:   Mon Jul 29 21:55:29 2013 +0100
+
+sna: Cleanup along all error paths in sna_pre_init()
+
+Only one out of a dozen error paths actually freed the locally allocated
+memory, oops.
+
+Signed-off-by: Chris Wilson 
+
+diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
+index 9c338bb..16dbc91 100644
+--- a/src/sna/sna_driver.c
 b/src/sna/sna_driver.c
+@@ -276,15 +276,6 @@ cleanup_front:
+   return FALSE;
+ }
+ 
+-static void PreInitCleanup(ScrnInfoPtr scrn)
+-{
+-  if (!scrn || !scrn->driverPrivate)
+-  return;
+-
+-  free(scrn->driverPrivate);
+-  scrn->driverPrivate = NULL;
+-}
+-
+ static void sna_selftest(void)
+ {
+   sna_damage_selftest();
+@@ -434,7 +425,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
+   if (fd == -1) {
+   xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+  "Failed to become DRM master.\n");
+-  return FALSE;
++  goto cleanup;
+   }
+ 
+   preferred_depth = sna->info->gen < 030 ? 15 : 24;
+@@ -444,7 +435,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
+   if (!xf86SetDepthBpp(scrn, preferred_depth, 0, 0,
+Support32bppFb |
+SupportConvert24to32 | PreferConvert24to32))
+-  return FALSE;
++  goto cleanup;
+ 
+   switch (scrn->depth) {
+   case 8:
+@@ -458,18 +449,18 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
+   xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+  "Given depth (%d) is not supported by the Intel 
driver and this chipset.\n",
+  scrn->depth);
+-  return FALSE;
++  goto cleanup;
+   }
+   xf86PrintDepthBpp(scrn);
+ 
+   if (!xf86SetWeight(scrn, defaultWeight, defaultWeight))
+-  return FALSE;
++  goto cleanup;
+   if (!xf86SetDefaultVisual(scrn, -1))
+-  return FALSE;
++  goto cleanup;
+ 
+   sna->Options = intel_options_get(scrn);
+   if (sna->Options == NULL)
+-  return FALSE;
++  goto cleanup;
+ 
+   sna_setup_capabilities(scrn, fd);
+ 
+@@ -523,8 +514,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
+   if (!sna_mode_pre_init(scrn, sna)) {
+   xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+  "No outputs and no modes.\n");
+-  PreInitCleanup(scrn);
+-  return FALSE;
++  goto cleanup;
+   }
+   scrn->currentMode = scrn->modes;
+ 
+@@ -536,6 +526,11 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
+   sna->dri_available = !!xf86LoadSubModule(scrn, "dri2");
+ 
+   return TRUE;
++
++cleanup:
++  scrn->driverPrivate = (void *)((uintptr_t)sna->info | 1);
++  free(sna);
++  return FALSE;
+ }
+ 
+ static void
diff --git a/debian/patches/series b/debian/patches/series
index c72571f..765b2c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,6 @@
 sna-note-that-borderClip-region.patch
 sna-fix-typo-in-computing-box.patch
 sna-fall-back-to-proc-cpuinfo.patch
+
+fix-preinit-cleanup-paths.patch
 xmir.patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 467de7b..454882e 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,80 +1,33 @@
-commit ea3344d571ff728f5cb84c6920635e552090ec7c
+commit b6b5c3f009585151eb772dfc2526843c7cee82b3
 Author: Chris Wilson 
-Date:   Wed Jul 24 01:44:30 2