lp:~darkxst/gnome-shell/lp1128804

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/raring/gnome-shell

Ubuntu branches: Pending requested 2013-02-19

Diff: 29889 lines (+7272/-12973)

65 files modified

.pc/11-no-gettext.patch/configure.ac (+1/-1)
.pc/14_make-GLX-optional.patch/configure.ac (+1/-1)
.pc/applied-patches (+1/-3)
.pc/git_messagetray_fix_expansion.patch/js/ui/messageTray.js (+22/-7)
.pc/git_messagetray_hideNotification.patch/js/ui/messageTray.js (+0/-2545)
.pc/git_messagetray_opacity_fix.patch/js/ui/messageTray.js (+0/-2550)
.pc/git_messagetray_remove_tweens.patch/js/ui/messageTray.js (+0/-2555)
NEWS (+18/-0)
configure (+16/-32)
configure.ac (+1/-1)
debian/changelog (+17/-0)
debian/control (+1/-1)
debian/control.in (+1/-1)
debian/patches/calendar-remove-strict-check.patch (+19/-0)
debian/patches/series (+1/-3)
docs/reference/shell/Makefile.in (+45/-32)
docs/reference/shell/html/ShellNetworkAgent.html (+20/-0)
docs/reference/shell/html/annotation-glossary.html (+3/-0)
docs/reference/shell/html/api-index-full.html (+4/-0)
docs/reference/shell/html/ch01.html (+1/-1)
docs/reference/shell/html/ch02.html (+1/-1)
docs/reference/shell/html/ch03.html (+1/-1)
docs/reference/shell/html/ch04.html (+1/-1)
docs/reference/shell/html/ch05.html (+1/-1)
docs/reference/shell/html/ch06.html (+1/-1)
docs/reference/shell/html/index.html (+1/-1)
docs/reference/shell/html/index.sgml (+20/-0)
docs/reference/shell/html/shell-ShellApp.html (+20/-0)
docs/reference/shell/html/shell-ShellGlobal.html (+93/-8)
docs/reference/shell/html/shell-shell-mobile-providers.html (+20/-0)
docs/reference/shell/html/shell.devhelp2 (+19/-0)
docs/reference/shell/shell-docs.sgml (+1/-1)
docs/reference/shell/shell-sections.txt (+1/-8)
docs/reference/st/Makefile.in (+45/-32)
docs/reference/st/html/StTextureCache.html (+16/-0)
docs/reference/st/html/index.html (+1/-1)
docs/reference/st/html/index.sgml (+22/-0)
docs/reference/st/html/pt01.html (+1/-1)
docs/reference/st/html/st-st-theme-node.html (+121/-1)
docs/reference/st/html/st.devhelp2 (+22/-0)
docs/reference/st/st-docs.sgml (+1/-1)
gtk-doc.make (+42/-22)
js/misc/config.js (+1/-1)
js/ui/messageTray.js (+12/-0)
js/ui/screenShield.js (+48/-15)
js/ui/unlockDialog.js (+5/-2)
m4/gtk-doc.m4 (+5/-1)
po/as.po (+179/-148)
po/bn_IN.po (+1382/-570)
po/et.po (+25/-15)
po/fr.po (+135/-122)
po/hi.po (+179/-199)
po/hu.po (+145/-127)
po/id.po (+145/-139)
po/ja.po (+5/-486)
po/kn.po (+220/-186)
po/ml.po (+219/-179)
po/mr.po (+134/-124)
po/nl.po (+1030/-867)
po/pt_BR.po (+148/-147)
po/ta.po (+304/-252)
po/te.po (+225/-178)
po/ug.po (+2087/-1400)
src/Makefile-calendar-server.am (+0/-1)
src/shell-recorder-src.c (+16/-0)

api

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1128804: Update mutter/gnome-shell to 3.6.3

Medium

Fix Released

Link a bug report

Related blueprints

71. By Tim Lunn on 2013-02-19

remove dep3 comment from patch

70. By Tim Lunn on 2013-02-19

add missing patch

69. By Tim Lunn on 2013-02-19

* New upstream release. (LP: #1128804)
  - Fixes disappearing messagetray (LP: #1067265)
* debian/patches:
   git_messagetray_hideNotification.patch,
   git_messagetray_opacity_fix.patch,
   git_messagetray_remove_tweens.patch:
     - Dropped, applied in new version
   calendar-remove-strict-check.patch:
     - Added, fixes build failures due to changes in
       deprecation checks for glib symbols
* debian/control.in:
  - Bump standards version -> 3.9.4, no changes required.

68. By Tim Lunn on 2013-01-31

Upstream bugfix for disappearing notifications (LP: #1088759)
debian/patches/git_messagetray_hideNotification_.patch

67. By Tim Lunn on 2012-12-17

Upstream bugfix for disappearing notifications (LP: #1088759)
debian/patches/git_messagetray_fix_expansion.patch

66. By Tim Lunn on 2012-11-27

Upstream bugfix for disappearing message tray (LP: #1067265)
debian/patches/git_messagetray_remove_tweens.patch
debian/patches/git_messagetray_opacity_fix.patch

65. By Jeremy Bícha on 2012-11-25

* debian/control.in:
  - Don't recommend gnome-session-fallback; gnome-shell doesn't need
    fallback mode now that we're using llvmpipe
* debian/git-set-ally-wm-theme.patch:
  - Git patch to set/reset HighContrast window theme too

64. By Jeremy Bícha on 2012-11-12

* New upstream release. (LP: #1078155)
  - Fixes disable-user-list option (LP: #1072838)
* debian/control.in
  - Bump minimum mutter
  - Build-depend on gtk-doc-tools to generate updated man page
* debian/patches/telepathyClient-Fix-auto-scroll-to-bottom.patch
  - Dropped, applied in new version
* debian/patches/ubuntu_screensaver_fallback.patch:
  - Dropped, applied in new version
* debian/patches/ubuntu_lock_on_suspend.patch
  - Refreshed

63. By Jeremy Bícha on 2012-11-08

Rebuild against new mutter

62. By Jeremy Bícha on 2012-11-08

[ Jeremy Bicha ]
* Merge with Debian (LP: #1044408). Remaining changes:
* debian/control.in:
  - Depend on gdm instead of gdm3
  - Don't depend on ibus 1.4.99 yet as it's not in Ubuntu yet
* debian/source_gnome-shell.py:
  - Include session logs and report which display manager is running
* 29-Cope-with-clutter-being-built-with-both-new-and-old-.patch:
  - Dropped, not needed in Ubuntu
* debian/patches/ubuntu-lightdm-user-switching.patch:
  - Fix user switching when running lightdm (LP: #1064269)
* debian/patches/ubuntu_lock_on_suspend.patch
  - fix lock on suspend via user menu
* debian/patches/ubuntu_screensaver_fallback.patch:
  - Explicitly start gnome-screensaver when screenshield loads
    in fallback mode.

[ Simon McVittie ]
* Increase libsoup dependency to 2.40, needed when installing extensions
  from extensions.gnome.org
* Recommend unzip, also for extensions.gnome.org (Closes: #680978)