lp://staging/~ubuntu-branches/ubuntu/oneiric/gnome-shell/oneiric-201109221311

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://staging/ubuntu/oneiric/gnome-shell

Ubuntu branches: Pending requested 2011-09-22

Diff: 564 lines (+544/-0) (has conflicts)

2 files modified

data/org.gnome.shell.gschema.xml.in (+4/-0)
js/ui/keyboard.js (+540/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

44. By Martin Pitt on 2011-09-22

releasing version 3.1.92-0ubuntu1

43. By Martin Pitt on 2011-09-22

debian/control.in: Add libjson-glib-dev build dependency as per
configure.ac.

42. By Martin Pitt on 2011-09-22

* New upstream release.
  - Adds browser plugin for installing, enabling, disabling, and
    uninstalling shell extensions. (Note that extensions.gnome.org
    isn't yet in operation.)
  - Lots of bugfixes
* debian/control.in:
  - Depend on caribou libraries
  - Recommend gnome-session-fallback, needed when graphics support
    test fails (LP: #852950)
  - Bump minimum gjs dependency to 1.29.18 and minimum mutter
    to 3.1.92
* debian/patches/01_favorite_apps.patch: Updated
* debian/patches/04_build-without-caribou.patch: Dropped

41. By Jeremy Bícha on 2011-09-09

* debian/control.in
  - Depend on gir1.2-accountsservice-1.0 since if it's missing,
    Shell won't even run (LP: #845791)
  - Also depend on libgudev-1.0-dev

40. By Martin Pitt on 2011-09-09

releasing version 3.1.90.1-0ubuntu3

39. By Martin Pitt on 2011-09-09

debian/control.in: Add Recommends: cups-pk-helper. This isn't necessary
under Unity, as we show/use system-config-printer there, but in the GNOME
session control-center shows the upstream printer applet. This is a
workaround for oneiric to avoid adding cups-pk-helper to main and the
default install after FF. (LP: #844864)

38. By Iain Lane on 2011-09-09

* debian/control.in:
  - Build-depends on libgnome-menu-3-dev, libgnome-keyring-dev,
    libfolks-dev
  - Bumped minimum versions for gobject-introspection and
    libtelepathy-glib-dev build-depends

37. By Jeremy Bícha on 2011-09-07

* New upstream release.
* debian/control: Bump build-depends on new mutter
* debian/patches/01_favorite_apps.patch: Updated
* debian/patches/03_remove-glx-dependency-on-armel.patch: Refreshed
* debian/patches/04_build-without-caribou.patch
  - Build without caribou since Ubuntu uses onboard and our System
    Settings doesn't support choosing a different screen keyboard yet

36. By Rico Tzschichholz on 2011-08-26

* debian/patches/02_rpath-bluetooth-applet.patch:
  - Drop, it isn't needed with libgnome-bluetooth-dev (>= 3.1.0)
* debian/patches/03_remove-glx-dependency-on-armel.patch:
  - Remove GLX dependency on armel
* debian/control.in:
  - Drop Build-dep on mesa-common-dev [armel]

35. By Jeremy Bícha on 2011-08-26

* New upstream release.
* debian/control:
  - Build-depends on mesa-common-dev [armel]
  - Depend on gir1.2-soup-2.4
  - Bump libclutter, libgirepository, libgnome-bluetooth and libnm-glib
    minimum versions
  - Drop some redundant dependencies
* debian/patches/01_favorite_apps.patch: Updated
* debian/patches/03_power_dbus_name_change.patch: Dropped, upstream