lp:~ubuntu-branches/ubuntu/precise/gnome-desktop3/precise-proposed-201205032246

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/precise-proposed/gnome-desktop3

Ubuntu Development Team: Pending requested 2012-05-03

Diff: 67 lines (+24/-0) (has conflicts)

5 files modified

.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/applied-patches (+4/-0)
debian/changelog (+14/-0)
debian/patches/series (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

45. By Martin Pitt on 2012-03-28

Add 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.
Thanks to James M. Leddy for the initial patch! (LP: #949296)

44. By Martin Pitt on 2012-03-28

02_refuse_to_break_GL_compositors.patch: Add DEP-3 patch header.

43. By Sebastien Bacher on 2012-03-26

New upstream version

42. By Sebastien Bacher on 2012-03-19

New upstream version, dropped git backports,
the changes are in the version

41. By Sebastien Bacher on 2012-03-12

* debian/patches/git_use_rgba_type.patch,
  debian/patches/git_representative_colors.patch:
  - git patches, set a 'representative color' xproperty, should make
    notify-osd and unity color picking easier (lp: #953230)

40. By Sebastien Bacher on 2012-03-05

New upstream version, dropped patches included in the new version
or not required

39. By Sebastien Bacher on 2012-02-27

* debian/control.in:
  - drop the scrollkeeper build-depends, it's not needed
* debian/patches/git_edp_output.patch: "Laptops with eDP panels do not
  suspend when lid closed", thanks Seth Forshee (lp: #933710)

38. By Martin Pitt on 2012-02-22

* New upstream release:
  - Fix crash in gnome_bg_load_from_preferences. (LP: #873761)
* Add 01_fix_rt_linking.patch: Add missing linking with -lrt for
  clock_gettime().

37. By Jeremy Bícha on 2012-02-06

* Sync with Debian. Remaining changes:
* New upstream release.
  - GnomeRR:
    - Use GDK to get work area
    - gnome_rr_screen_new() now creates a singleton for the specified
      GdkScreen
  - GnomePnpIds: Add object to get the vendor name from PNP IDs
* debian/libgnome-desktop-3-2.symbols: Updated for above changes
* debian/patches/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 to fix (LP: #824099)
    at this point. In 12.04 this should be dropped in favour of making Unity
    work properly.
* debian/control.in:
  - Add libgl1-mesa-dev and dh-autoreconf to Build-Depends for above patch.
  - Bump minimum xrandr to 1.3
* debian/libgnome-desktop-3-2.install: Install check_gl_texture_size
* debian/rules:
  - Use dh-autoreconf to regenerate build system to pick up changes from
    patch.
* debian/watch: watch for unstable releases

36. By Didier Roche-Tolomelli on 2011-11-10

Upload to precise