~ubuntu-branches/ubuntu/vivid/gnome-desktop3/vivid

Viewing all changes in revision 33.

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2014-10-31 07:46:09 UTC
  • mfrom: (1.6.5) (32.1.1 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20141031074609-gb280wdsxsgldc91
Tags: 3.14.1-1ubuntu1
* Merge with Debian, Remaining changes:
  - debian/patches:
    + 04_compute_average_color.patch: Compute the avergage color in
      gnome-desktop itself, not in unity to fix some races (LP #963140)
    + tweak_color_computation.patch, Patch from Gord, no patch header,
      no bug link.
    + git_revert_draw_background.patch
    + ubuntu_language.patch, Ported relevant bits from g-c-c 
      52_region_language.patch, as required for gnome 3.8 region panel
    + ubuntu_language_list_from_SUPPORTED.patch,
      adds api to get list of available languages from SUPPORTED file.
      To be used by gnome 3.8 region panel language installation.
  - debian/libgnome-desktop-3-10.symbols:
    + Add symbols included in Ubuntu patches
  - debian/control.in:
    + Mark gnome-desktop3-data Multi-Arch: foreign

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: