lp:~ubuntu-branches/ubuntu/oneiric/gnome-shell/oneiric-201109070806

Branch merges

Propose for merging

No branches dependent on this one.

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

Ubuntu branches: Pending requested 2011-09-07

Diff: 26370 lines (+26261/-0) (has conflicts)

17 files modified

.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/01_favorite_apps.patch/data/org.gnome.shell.gschema.xml.in (+143/-0)
.pc/03_remove-glx-dependency-on-armel.patch/configure (+19017/-0)
.pc/03_remove-glx-dependency-on-armel.patch/configure.ac (+221/-0)
.pc/03_remove-glx-dependency-on-armel.patch/src/gnome-shell-plugin.c (+383/-0)
.pc/04_build-without-caribou.patch/data/org.gnome.shell.gschema.xml.in (+143/-0)
.pc/04_build-without-caribou.patch/js/Makefile.am (+76/-0)
.pc/04_build-without-caribou.patch/js/Makefile.in (+580/-0)
.pc/04_build-without-caribou.patch/js/ui/keyboard.js (+532/-0)
.pc/04_build-without-caribou.patch/js/ui/layout.js (+928/-0)
.pc/04_build-without-caribou.patch/js/ui/main.js (+914/-0)
.pc/04_build-without-caribou.patch/js/ui/messageTray.js (+2351/-0)
.pc/04_build-without-caribou.patch/po/POTFILES.in (+45/-0)
.pc/applied-patches (+3/-0)
debian/control (+88/-0)
debian/patches/04_build-without-caribou.patch (+835/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

38. By Martin Pitt on 2011-09-07

releasing version 3.1.90.1-0ubuntu1

37. By Martin Pitt 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

34. By Jeremy Bícha on 2011-08-16

* debian/control.in
  - Bump build-depends on libgjs-dev & libtelepathy-glib-dev
  - Recommend gnome-themes-standard (for Adwaita)

33. By Martin Pitt on 2011-08-16

debian/control.in: Add recommends to gnome-user-guide, so that installing
Shell also pulls in the corresponding help. (LP: #819158)

32. By Bilal Akhtar on 2011-08-11

debian/patches/03_power_dbus_name_change.patch: Backport upstream
commit to fix the disappearing power indicator.

31. By Michael Terry on 2011-07-20

* New upstream release
* debian/control.in:
  - Update dependency versions

30. By Micah Gersten on 2011-07-14

debian/control{,.in}: Change gir1.2-json-glib-1.0 build-dep to
gir1.2-json-1.0 to reflect the binary rename in json-glib
0.13.4-2

29. By Bilal Akhtar on 2011-07-13

No-change rebuild against latest libedataserverui-3.0-1.