-
Committer:
Package Import Robot
-
Author(s):
Martin Pitt
-
Date:
2012-05-03 14:49:20 UTC
-
mfrom:
(22.1.3 sid)
-
Revision ID:
package-import@ubuntu.com-20120503144920-di4ozmb6izj1zb71
Tags: 3.4.1-2ubuntu1
* Merge with Debian unstable. Remaining Ubuntu changes:
- tweak_color_computation.patch: Patch from Gord, no patch header, no bug
link.
- 02_refuse_to_break_GL_compositors.patch: Check whether Unity is running
and if so refuse to configure a multi-head setup larger than
GL_MAX_TEXTURE_SIZE. Works around breakage when using Unity on such a
setup, which is as much as we can do at this point. Add libgl1-mesa-dev
and dh-autoreconf build dependencies for this. Install the helper in
debian/libgnome-desktop-3-2.install. (LP #824099)
- 03_default_display_is_internal.patch: Treat a display named "default" as
internal. This happens with the proprietary NVidia driver which does not
do proper XRandR. We cannot detect external vs. internal display there,
so err on the side of "internal" to make suspend on lid close work.
(LP #949296)
- 04_compute_average_color.patch: Compute the avergage color in
gnome-desktop itself, not in unity to fix some races (LP #963140)
- debian/watch: Look for development versions.
* debian/control.in: Add epoch to gnome-desktop3-data's Breaks/Replaces, as
our old gnome-desktop source package introduced an epoch. This needs to be
kept until after 14.04 LTS.