lp:~ubuntu-branches/ubuntu/lucid/gnome-control-center/lucid-201003081418

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/lucid/gnome-control-center

No reviews requested

Diff: 55 lines (+27/-0) (has conflicts)

3 files modified

debian/changelog (+11/-0)
debian/patches/112_banshee_in_media_dropdown.patch (+15/-0)
debian/patches/series (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

133. By Daniel T Chen on 2010-03-07

Merge lp:~alexlauni/ubuntu/lucid/gnome-control-center/fix-533888

132. By Sebastien Bacher on 2010-03-05

* debian/patches/03_use_libunique.patch:
  - change by Mikkel Kamstrup Erlandsen to let the about-me capplet display
    the running instance when launched twice (lp: #531974)
* debian/patches/99_autoreconf.patch:
  - refreshed for the previous change

131. By Chris Coulson on 2010-03-02

* debian/patches/98_about-me-wid-fix.patch:
  - Widget contents are mapped to EContact fields using widget ID's
    defined in the GtkBuilder UI file. However, the name returned
    by gtk_widget_get_name is no longer the same as the ID in the latest
    Gtk version, so don't depend on the name for mapping the widgets
    to the correct EContact fields (LP: #525520).

130. By Chris Coulson on 2010-03-01

* New upstream version
  - Appearance:
    + Add 'span' as a style for backgrounds
  - Display Properties:
    + Now fits in 640x480 and has a better layout overall
    + Just use "monitors" for wording, not a mixture of "monitor",
      "display", "screen"
    + Make the mouse cursor indicate when you can drag a monitor
* debian/control:
  - Bump libgnome-desktop-dev build-dep to 2.29.4
  - Drop libxrandr-dev and libxrender-dev build-deps
* Refreshed patches:
  - 109_screen_resolution_extra.patch
  - 111_screen_resolution_vendor_fallback.patch
  - 99_autoreconf.patch
* Dropped 92_display_properties_fit_small_screen.patch: this is not
  required with the new capplet layout
* debian/patches/95_desktop-effects-integration.patch:
  - Don't crash when there is no supported WM available (LP: #516189)

129. By Sebastien Bacher on 2010-02-11

* debian/control.in:
  - build-depends on libappindicator-dev

128. By Sebastien Bacher on 2010-02-11

* debian/patches/02_use_application_indicator.patch:
  - use the lucid application indicator, thanks Travis B. Hartwell
    (lp: #497857)
* debian/patches/99_autoreconf.patch:
  - refreshed for the previous change to build

127. By Chris Coulson on 2010-02-10

* New upstream version
  - About-me:
    + Fix hangs when 'passwd' outputs unexpected answers (lp: #338976)
    + Fix list of passwd error strings (lp: #498875)
    + Fix fingerprint name on 2nd page
  - At-properties:
    + Add AutostartCondition to gnome-at-session.desktop
  - Mouse:
    + Fix mnemonics conflicts on touchpad tab
* Dropped patches merged upstream:
  - 02_gnome-at-session_autostart-condition.patch
* Refreshed patches:
  - 99_autoreconf.patch
  - 99_ltmain_as-needed.patch
* Disable 98_password_dialog_launcher.patch - this isn't currently used
  by users-admin
* Drop 17_default_applications_firefox_3-5.patch - no need to rename the
  icon now with the unversioned Firefox package

126. By Sebastien Bacher on 2010-02-02

* debian/patches/95_desktop-effects-integration.patch:
  - cleaned some warnings and errors in the code and fix build
* debian/patches/109_screen_resolution_extra.patch,
  debian/patches/110_screen_resolution_package.patch:
  - cleaned some warnings

125. By Didier Roche-Tolomelli on 2010-02-01

debian/patches/95_desktop-effects-integration.patch:
don't enable switching wm if you run mutter

124. By Martin Pitt on 2010-01-26

* New upstream version:
  - Don't leak file descriptors when checking for colour schemes
  - Disable tapping only for touchpads without a left mouse button
  - use GtkInfoBar rather than a copy of GeditMessageArea
  - Some typo fixes in strings
  - Translation updates.
* 99_autoreconf.patch: Refresh.
* Add 02_gnome-at-session_autostart-condition.patch: The gnome-at-session
  autostart desktop file launches a shell script, which in turn calls
  gconftool-2, just to find out that it's disabled, and exit. This
  wastes unnecessary cycles on starting the desktop. Add an
  AutostartCondition to the .desktop file which only runs when a11y is
  enabled. (submitted to GNOME #608138)