-
Committer:
Bazaar Package Importer
-
Author(s):
Christopher James Halse Rogers
-
Date:
2011-03-02 14:12:35 UTC
-
mfrom:
(1.5.16 sid)
-
Revision ID:
james.westby@ubuntu.com-20110302141235-iyt9pwza5mtt90a3
Tags: 2:2.14.0-4ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
- debian/apport-gpu-error-intel.py:
- debian/control:
- debian/rules:
- debian/xserver-xorg-video-intel.install:
- debian/xserver-xorg-video-intel.udev
+ Add apport hook, triggered on udev GPU error event
- debian/control:
+ Drop [linux-any] qualifier on libudev-dev build-dep to work around
pbuilder bug.
- debian/patches/101_copy-fb.patch:
+ Plymouth integration patch
- debian/patches/107_solid_nullptr_check.patch:
+ Check null return from uxa_acquire_solid()
- debian/patches/109_dont_reconstruct_glyph_cache_on_rotate.patch:
+ Fix font corruption (missing glyphs) on rotated screens.
- debian/patches/110_warnings_cleanup.patch:
- debian/patches/114_warnings_cleanup_part_2.patch:
+ Cherry picks to fix a large number of build warnings.
- debian/patches/111_fix_clipped_window_plane_offset.patch:
- 112_fix_error_in_4c4ad555.patch:
+ Fix issue where vertical green line and strange colors shows up when
playing gstreamer with certain videos, when dragged. (LP 460677)
- debian/patches/113_remove_broken_max_base_addresses.patch:
+ Fixes GPU lockup during login with
"Bad length (4) in MI_DISPLAY_BUFFER_INFO, [3, 3]" error messages
listed in the gpu dump text. (LP 710321)
- debian/patches/115_quell_vblank_counter_failed.patch:
+ Don't fill up Xorg.0.log with
"get vblank counter failed: Invalid argument" warnings.
5 is enough. (LP 710594)
- debian/xserver-xorg-video-intel.preinst.in:
- debian/xserver-xorg-video-intel.postinst.in:
+ Remove obsolete /etc/modprobe.d/i915-kms.conf file on upgrades. KMS
is the kernel default.
* Pull prerequisite commit into
109_dont_reconstruct_glyph_cache_on_rotate.patch. We mostly didn't notice
because the copy-fb codepath initialises the resources itself. Fixes
Pixmap assert on Xserver startup when copy-fb fails, such as on hybrid
graphics systems. (LP: #718620)
* debian/control:
- Dropped Ubuntu change: remove a bunch of Conflicts/Replaces against
packages last seen in Hardy.