-
Committer:
Bazaar Package Importer
-
Author(s):
Christopher James Halse Rogers, Timo Aaltonen, Christopher James Halse Rogers
-
Date:
2011-06-02 18:27:35 UTC
-
mfrom:
(1.5.20 sid)
-
Revision ID:
james.westby@ubuntu.com-20110602182735-ettcix23ikesyg79
Tags: 2:2.15.0-3ubuntu1
[ Timo Aaltonen ]
* Merge from Debian unstable, remaining changes:
- 101_copy-fb.patch
+ Plymouth integration patch
- 120_check_privates.patch
+ Check for null privates pointer on render_dest_picture.
- 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.
* Dropped patches:
102_gen6_invalidate_texture_cache.patch
107_solid_nullptr_check.patch
108_undo_dmg_trans_before_append.patch
109_dont_reconstruct_glyph_cache_on_rotate.patch
111_fix_clipped_window_plane_offset.patch
112_fix_error_in_4c4ad555.patch
113_remove_broken_max_base_addresses.patch
114_warnings_cleanup_part_2.patch
115_quell_vblank_counter_failed.patch
117_946gz_isreally_965g.patch
119_disable_relaxed_fencing.path
- all upstream.
[ Christopher James Halse Rogers ]
* debian/patches/101_copy-fb.patch
- Refresh for new upstream.