r36801 - in /desktop/experimental/gnome-shell/debian: changelog control control.in patches/14_make-GLX-optional.patch patches/git_fix_too_short_apps_view.patch patches/revert-suspend-break.patch patches/series rules source_gnome-shell.py
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Mon Feb 25 10:52:41 UTC 2013
Author: sjoerd
Date: Mon Feb 25 10:52:41 2013
New Revision: 36801
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36801
Log:
* Sync from Ubuntu
* d/p/ubuntu-lightdm-user-switching.patch:
d/p/ubuntu_lock_on_suspend.patch:
+ Dropped, Ubuntu specifc
* d/p/14_make-GLX-optional.patch: Fixed upstream
* New upstream alpha release
* debian/control.in:
- Drop obsolete libedataserverui-dev dependency
- Depend on gir1.2-nmgtk-1.0
- Build-depend on caribou and gnome-desktop3
* debian/watch: Watch for unstable releases
* ubuntu-lightdm-user-switching.patch: Refreshed
* ubuntu_lock_on_suspend.patch: Disabled
* revert-suspend-break.patch:
- Sure, suspend is currently broken on Ubuntu with GNOME 3.8, but let's
not break it worse than necessary
* git_fix_too_short_apps_view.patch:
- Fix missing text on bottom row of apps view in the overview
* debian/control.in:
- Bump minimum dependencies on gnome-desktop3, libcroco, libpulse,
clutter, gsettings-desktop-schemas, gjs and mutter
- Build-depend on libcanberra-gtk3-dev
- Drop build-depends on gconf and libgnome-desktop3-dev
* debian/rules:
- Add src/gvc to gir list
* Drop patches applied in new version:
- git-set-ally-wm-theme.patch
- git_messagetray_opacity_fix.patch
- git_messagetray_remove_tweens.patch
- git_messagetray_fix_expansion.patch
- telepathyClient-Fix-auto-scroll-to-bottom.patch
- ubuntu_screensaver_fallback.patch
* 10-make-NetworkManager-optional.patch:
- Dropped, this was Debian-specific and they intend to drop it too
* Refreshed patches:
- 14_make-GLX-optional.patch
- ubuntu_lock_on_suspend.patch
* ubuntu-lightdm-user-switching.patch: Disabled as it breaks the user menu
* Upstream bugfix for disappearing notifications (LP: #1088759)
debian/patches/git_messagetray_fix_expansion.patch
* Upstream bugfix for disappearing message tray (LP: #1067265)
debian/patches/git_messagetray_remove_tweens.patch
debian/patches/git_messagetray_opacity_fix.patch
* 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
* 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
* Rebuild against new mutter
* 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.
from extensions.gnome.org
Added:
desktop/experimental/gnome-shell/debian/patches/git_fix_too_short_apps_view.patch
desktop/experimental/gnome-shell/debian/patches/revert-suspend-break.patch
Removed:
desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch
Modified:
desktop/experimental/gnome-shell/debian/changelog
desktop/experimental/gnome-shell/debian/control
desktop/experimental/gnome-shell/debian/control.in
desktop/experimental/gnome-shell/debian/patches/series
desktop/experimental/gnome-shell/debian/rules
desktop/experimental/gnome-shell/debian/source_gnome-shell.py
Modified: desktop/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/changelog?rev=36801&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog [utf-8] Mon Feb 25 10:52:41 2013
@@ -1,44 +1,126 @@
-gnome-shell (3.6.2-2) experimental; urgency=low
-
- [ Josselin Mouette ]
- * Recommend gkbd-capplet for gkbd-keyboard-display. Closes: #691731.
+gnome-shell (3.7.90-1) UNRELEASED; urgency=low
+
+ * Sync from Ubuntu
+ * d/p/ubuntu-lightdm-user-switching.patch:
+ d/p/ubuntu_lock_on_suspend.patch:
+ + Dropped, Ubuntu specifc
+ * d/p/14_make-GLX-optional.patch: Fixed upstream
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 24 Feb 2013 15:09:57 +0100
+
+gnome-shell (3.7.90-0ubuntu1~raring1) raring; urgency=medium
[ Jeremy Bicha ]
- * debian/control.in: Bump minimum mutter & eds depends
-
- [ Sjoerd Simons ]
- * debian/control.in: Build-depend on recent telepathy-logger which contains
- various fixes for gnome-shell usage
- * d/p/40-shell-recorder-src-Set-frame-duration.patch:
- + Added. Correctly set the duration on the frames to create a correct webm
- file (from upstream git, bgo#688487))
- * d/p/50-Block-cancellation-of-the-unlock-dialog-when-draggin.patch:
- + Added. Pressing esc while the mouse is down should not make the curtain
- fall, otherwise a gray screen results. (From upstream git, bgo#686800)
- * d/p/60-MessageTray-fix-reentrancy-when-calling-out-to-the-g.patch
- d/p/61-MessageTray-restore-opacity-when-expanding-a-notific.patch
- d/p/62-MessageTray-remove-all-tweens-when-tweening-for-stat.patch:
- + Added. Various patches to fix the curious case of the disappearing
- message tray (From upstream git, bgo#683986)
-
- -- Sjoerd Simons <sjoerd at debian.org> Fri, 04 Jan 2013 22:12:45 +0100
-
-gnome-shell (3.6.2-1) experimental; urgency=low
+ * New upstream alpha release
+ * debian/control.in:
+ - Drop obsolete libedataserverui-dev dependency
+ - Depend on gir1.2-nmgtk-1.0
+ - Build-depend on caribou and gnome-desktop3
+ * debian/watch: Watch for unstable releases
+ * ubuntu-lightdm-user-switching.patch: Refreshed
+ * ubuntu_lock_on_suspend.patch: Disabled
+ * revert-suspend-break.patch:
+ - Sure, suspend is currently broken on Ubuntu with GNOME 3.8, but let's
+ not break it worse than necessary
+ * git_fix_too_short_apps_view.patch:
+ - Fix missing text on bottom row of apps view in the overview
+
+ [ Rico Tzschichholz ]
+ * debian/control.in:
+ - Bump minimum dependencies on gnome-desktop3, libcroco, libpulse,
+ clutter, gsettings-desktop-schemas, gjs and mutter
+ - Build-depend on libcanberra-gtk3-dev
+ - Drop build-depends on gconf and libgnome-desktop3-dev
+ * debian/rules:
+ - Add src/gvc to gir list
+ * Drop patches applied in new version:
+ - git-set-ally-wm-theme.patch
+ - git_messagetray_opacity_fix.patch
+ - git_messagetray_remove_tweens.patch
+ - git_messagetray_fix_expansion.patch
+ - telepathyClient-Fix-auto-scroll-to-bottom.patch
+ - ubuntu_screensaver_fallback.patch
+ * 10-make-NetworkManager-optional.patch:
+ - Dropped, this was Debian-specific and they intend to drop it too
+ * Refreshed patches:
+ - 14_make-GLX-optional.patch
+ - ubuntu_lock_on_suspend.patch
+ * ubuntu-lightdm-user-switching.patch: Disabled as it breaks the user menu
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Sat, 23 Feb 2013 17:43:44 -0500
+
+gnome-shell (3.6.2-0ubuntu4) raring; urgency=low
+
+ * Upstream bugfix for disappearing notifications (LP: #1088759)
+ debian/patches/git_messagetray_fix_expansion.patch
+
+ -- Tim Lunn <tim at feathertop.org> Mon, 17 Dec 2012 07:55:47 +1100
+
+gnome-shell (3.6.2-0ubuntu3) raring; urgency=low
+
+ * Upstream bugfix for disappearing message tray (LP: #1067265)
+ debian/patches/git_messagetray_remove_tweens.patch
+ debian/patches/git_messagetray_opacity_fix.patch
+
+ -- Tim Lunn <tim at feathertop.org> Tue, 27 Nov 2012 08:27:57 +1100
+
+gnome-shell (3.6.2-0ubuntu2) raring; urgency=low
+
+ * 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
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Sun, 25 Nov 2012 12:51:35 -0500
+
+gnome-shell (3.6.2-0ubuntu1) raring; urgency=low
+
+ * 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
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Mon, 12 Nov 2012 23:11:33 -0500
+
+gnome-shell (3.6.1-3ubuntu2) raring; urgency=low
+
+ * Rebuild against new mutter
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Thu, 08 Nov 2012 10:47:35 -0500
+
+gnome-shell (3.6.1-3ubuntu1) raring; urgency=low
+
+ [ 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 (Closes: #691324)
+ from extensions.gnome.org
* Recommend unzip, also for extensions.gnome.org (Closes: #680978)
- [ Josselin Mouette ]
- * Remove gdm3 dependency. Break versions < 3.5 instead.
-
- [ Sjoerd Simons ]
- * New upstream release (3.6.2)
- * d/p/telepathyClient-Fix-auto-scroll-to-bottom.patch:
- + Removed. Fixed upstream
-
- -- Sjoerd Simons <sjoerd at debian.org> Sat, 17 Nov 2012 13:44:33 +0100
+ -- Jeremy Bicha <jbicha at ubuntu.com> Thu, 08 Nov 2012 09:21:38 -0500
gnome-shell (3.6.1-3) experimental; urgency=low
Modified: desktop/experimental/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control?rev=36801&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control [utf-8] Mon Feb 25 10:52:41 2013
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Jeremy Bicha <jbicha at ubuntu.com>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: autotools-dev,
cdbs,
debhelper (>= 8.1.3~),
@@ -16,44 +16,43 @@
gnome-control-center-dev (>= 3.4),
gnome-pkg-tools (>= 0.11),
gobject-introspection (>= 1.29.15),
- gsettings-desktop-schemas-dev (>= 3.5.4),
+ gsettings-desktop-schemas-dev (>= 3.7.4),
+ gtk-doc-tools,
intltool (>= 0.26),
libatk-bridge2.0-dev,
libcanberra-dev,
- libclutter-1.0-dev (>= 1.11.11),
- libcroco3-dev (>= 0.6),
+ libcanberra-gtk3-dev,
+ libcaribou-dev (>= 0.4.8),
+ libclutter-1.0-dev (>= 1.13.4),
+ libcroco3-dev (>= 0.6.8),
libdbus-glib-1-dev,
libecal1.2-dev (>= 3.5.3),
libedataserver1.2-dev (>= 3.5.3),
- libedataserverui-3.0-dev (>= 3.5.3),
- libgconf2-dev,
libgirepository1.0-dev (>= 1.29.15),
- libgjs-dev (>= 1.33.2),
+ libgjs-dev (>= 1.35.4),
libglib2.0-dev (>= 2.31.6),
libgnome-bluetooth-dev (>= 3.5.5) [linux-any],
- libgnome-desktop-3-dev (>= 3.5.5),
+ libgnome-desktop-3-dev (>= 3.7.90),
libgnome-keyring-dev,
libgnome-menu-3-dev (>= 3.5.3),
libgstreamer1.0-dev (>= 0.11.92),
- libgtk-3-dev (>= 3.3.9),
+ libgtk-3-dev (>= 3.7.9),
libibus-1.0-dev,
- libmutter-dev (>= 3.6.2),
- libnm-glib-dev (>= 0.9) [linux-any],
- libnm-glib-vpn-dev (>= 0.9) [linux-any],
+ libmutter-dev (>= 3.7.90),
+ libnm-glib-dev (>= 0.9.8) [linux-any],
+ libnm-glib-vpn-dev (>= 0.9.8) [linux-any],
+ libnm-gtk-dev (>= 0.9.6),
libnm-util-dev (>= 0.9) [linux-any],
libpolkit-agent-1-dev (>= 0.100),
- libpulse-dev,
+ libpulse-dev (>= 2.0),
libstartup-notification0-dev (>= 0.11),
libtelepathy-glib-dev (>= 0.17.5),
- libtelepathy-logger-dev (>= 0.6.0-2),
+ libtelepathy-logger-dev (>= 0.2.4),
libx11-dev,
libxfixes-dev,
libxml2-dev,
python (>= 2.6),
- libgcr-3-dev (>= 3.3.90),
- xsltproc,
- docbook-xsl,
- libgudev-1.0-dev
+ libgcr-3-dev (>= 3.3.90)
Standards-Version: 3.9.3
Homepage: http://live.gnome.org/GnomeShell
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-shell
@@ -65,6 +64,7 @@
${icon-theme:Depends},
${misc:Depends},
${shlibs:Depends},
+ gdm (>= 3.5.90),
gnome-shell-common (= ${source:Version}),
gir1.2-accountsservice-1.0,
gir1.2-caribou-1.0,
@@ -75,31 +75,31 @@
gir1.2-gkbd-3.0,
gir1.2-glib-2.0 (>= 1.31),
gir1.2-gnomebluetooth-1.0 (>= 3.6.0) [linux-any],
- gir1.2-gnomedesktop-3.0 (>= 3.6.1),
+ gir1.2-gnomedesktop-3.0 (>= 3.7.90),
gir1.2-gtk-3.0,
- gir1.2-ibus-1.0 (>= 1.4.99),
- gir1.2-mutter-3.0 (>= 3.6.2),
+ gir1.2-ibus-1.0 (>= 1.4),
+ gir1.2-mutter-3.0 (>= 3.7.90),
gir1.2-networkmanager-1.0 [linux-any],
+ gir1.2-nmgtk-1.0,
gir1.2-pango-1.0,
gir1.2-polkit-1.0,
gir1.2-soup-2.4 (>= 2.40.1),
gir1.2-telepathyglib-0.12,
gir1.2-telepathylogger-0.2 (>= 0.4.0-2),
gir1.2-upowerglib-1.0,
- gjs (>= 1.33.2),
+ gjs (>= 1.35.4),
gnome-icon-theme-symbolic (>= 2.91),
gnome-settings-daemon (>= 3.4.0),
gnome-themes-standard,
- gsettings-desktop-schemas (>= 3.5.4),
+ gsettings-desktop-schemas (>= 3.7.4),
python (>= 2.6),
telepathy-mission-control-5,
- evolution-data-server (>= 3.6.0),
+ evolution-data-server (>= 3.6.0)
Recommends: gnome-contacts,
gnome-control-center,
gnome-session-fallback,
gnome-user-guide,
- unzip,
- gkbd-capplet
+ unzip
Breaks: fglrx-driver (<< 1:11-10),
gnome-control-center (<< 1:3.0),
gnome-session (<< 3.0),
Modified: desktop/experimental/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control.in?rev=36801&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control.in [utf-8] Mon Feb 25 10:52:41 2013
@@ -11,44 +11,43 @@
gnome-control-center-dev (>= 3.4),
gnome-pkg-tools (>= 0.11),
gobject-introspection (>= 1.29.15),
- gsettings-desktop-schemas-dev (>= 3.5.4),
+ gsettings-desktop-schemas-dev (>= 3.7.4),
+ gtk-doc-tools,
intltool (>= 0.26),
libatk-bridge2.0-dev,
libcanberra-dev,
- libclutter-1.0-dev (>= 1.11.11),
- libcroco3-dev (>= 0.6),
+ libcanberra-gtk3-dev,
+ libcaribou-dev (>= 0.4.8),
+ libclutter-1.0-dev (>= 1.13.4),
+ libcroco3-dev (>= 0.6.8),
libdbus-glib-1-dev,
libecal1.2-dev (>= 3.5.3),
libedataserver1.2-dev (>= 3.5.3),
- libedataserverui-3.0-dev (>= 3.5.3),
- libgconf2-dev,
libgirepository1.0-dev (>= 1.29.15),
- libgjs-dev (>= 1.33.2),
+ libgjs-dev (>= 1.35.4),
libglib2.0-dev (>= 2.31.6),
libgnome-bluetooth-dev (>= 3.5.5) [linux-any],
- libgnome-desktop-3-dev (>= 3.5.5),
+ libgnome-desktop-3-dev (>= 3.7.90),
libgnome-keyring-dev,
libgnome-menu-3-dev (>= 3.5.3),
libgstreamer1.0-dev (>= 0.11.92),
- libgtk-3-dev (>= 3.3.9),
+ libgtk-3-dev (>= 3.7.9),
libibus-1.0-dev,
- libmutter-dev (>= 3.6.2),
- libnm-glib-dev (>= 0.9) [linux-any],
- libnm-glib-vpn-dev (>= 0.9) [linux-any],
+ libmutter-dev (>= 3.7.90),
+ libnm-glib-dev (>= 0.9.8) [linux-any],
+ libnm-glib-vpn-dev (>= 0.9.8) [linux-any],
+ libnm-gtk-dev (>= 0.9.6),
libnm-util-dev (>= 0.9) [linux-any],
libpolkit-agent-1-dev (>= 0.100),
- libpulse-dev,
+ libpulse-dev (>= 2.0),
libstartup-notification0-dev (>= 0.11),
libtelepathy-glib-dev (>= 0.17.5),
- libtelepathy-logger-dev (>= 0.6.0-2),
+ libtelepathy-logger-dev (>= 0.2.4),
libx11-dev,
libxfixes-dev,
libxml2-dev,
python (>= 2.6),
- libgcr-3-dev (>= 3.3.90),
- xsltproc,
- docbook-xsl,
- libgudev-1.0-dev
+ libgcr-3-dev (>= 3.3.90)
Standards-Version: 3.9.3
Homepage: http://live.gnome.org/GnomeShell
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-shell
@@ -60,6 +59,7 @@
${icon-theme:Depends},
${misc:Depends},
${shlibs:Depends},
+ gdm (>= 3.5.90),
gnome-shell-common (= ${source:Version}),
gir1.2-accountsservice-1.0,
gir1.2-caribou-1.0,
@@ -70,31 +70,31 @@
gir1.2-gkbd-3.0,
gir1.2-glib-2.0 (>= 1.31),
gir1.2-gnomebluetooth-1.0 (>= 3.6.0) [linux-any],
- gir1.2-gnomedesktop-3.0 (>= 3.6.1),
+ gir1.2-gnomedesktop-3.0 (>= 3.7.90),
gir1.2-gtk-3.0,
- gir1.2-ibus-1.0 (>= 1.4.99),
- gir1.2-mutter-3.0 (>= 3.6.2),
+ gir1.2-ibus-1.0 (>= 1.4),
+ gir1.2-mutter-3.0 (>= 3.7.90),
gir1.2-networkmanager-1.0 [linux-any],
+ gir1.2-nmgtk-1.0,
gir1.2-pango-1.0,
gir1.2-polkit-1.0,
gir1.2-soup-2.4 (>= 2.40.1),
gir1.2-telepathyglib-0.12,
gir1.2-telepathylogger-0.2 (>= 0.4.0-2),
gir1.2-upowerglib-1.0,
- gjs (>= 1.33.2),
+ gjs (>= 1.35.4),
gnome-icon-theme-symbolic (>= 2.91),
gnome-settings-daemon (>= 3.4.0),
gnome-themes-standard,
- gsettings-desktop-schemas (>= 3.5.4),
+ gsettings-desktop-schemas (>= 3.7.4),
python (>= 2.6),
telepathy-mission-control-5,
- evolution-data-server (>= 3.6.0),
+ evolution-data-server (>= 3.6.0)
Recommends: gnome-contacts,
gnome-control-center,
gnome-session-fallback,
gnome-user-guide,
- unzip,
- gkbd-capplet
+ unzip
Breaks: fglrx-driver (<< 1:11-10),
gnome-control-center (<< 1:3.0),
gnome-session (<< 3.0),
Added: desktop/experimental/gnome-shell/debian/patches/git_fix_too_short_apps_view.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/git_fix_too_short_apps_view.patch?rev=36801&op=file
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/git_fix_too_short_apps_view.patch (added)
+++ desktop/experimental/gnome-shell/debian/patches/git_fix_too_short_apps_view.patch [utf-8] Mon Feb 25 10:52:41 2013
@@ -1,0 +1,41 @@
+From aad5d98b43c33f789e02073998443522254acbe8 Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre at mecheye.net>
+Date: Wed, 20 Feb 2013 02:18:48 +0000
+Subject: iconGrid: Take extra spacing into account for height requests
+
+This fixes the clipped app picker in the overview.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=694234
+---
+diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
+index 98e5761..b3755cb 100644
+--- a/js/ui/iconGrid.js
++++ b/js/ui/iconGrid.js
+@@ -218,11 +218,14 @@ const IconGrid = new Lang.Class({
+
+ _getPreferredHeight: function (grid, forWidth, alloc) {
+ let children = this._getVisibleChildren();
+- let nColumns;
+- if (forWidth < 0)
++ let nColumns, spacing;
++ if (forWidth < 0) {
+ nColumns = children.length;
+- else
+- nColumns = this._computeLayout(forWidth)[0];
++ spacing = this._spacing;
++ } else {
++ [nColumns, , spacing] = this._computeLayout(forWidth);
++ }
++
+ let nRows;
+ if (nColumns > 0)
+ nRows = Math.ceil(children.length / nColumns);
+@@ -230,7 +233,7 @@ const IconGrid = new Lang.Class({
+ nRows = 0;
+ if (this._rowLimit)
+ nRows = Math.min(nRows, this._rowLimit);
+- let totalSpacing = Math.max(0, nRows - 1) * this._spacing;
++ let totalSpacing = Math.max(0, nRows - 1) * spacing;
+ let height = nRows * this._vItemSize + totalSpacing;
+ alloc.min_size = height;
+ alloc.natural_size = height;
Added: desktop/experimental/gnome-shell/debian/patches/revert-suspend-break.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/revert-suspend-break.patch?rev=36801&op=file
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/revert-suspend-break.patch (added)
+++ desktop/experimental/gnome-shell/debian/patches/revert-suspend-break.patch [utf-8] Mon Feb 25 10:52:41 2013
@@ -1,0 +1,55 @@
+From b91d9c2867952520e685d689f75bc019befcaaf3 Mon Sep 17 00:00:00 2001
+From: Florian Müllner <fmuellner at gnome.org>
+Date: Sun, 03 Feb 2013 20:53:33 +0000
+Subject: loginManager: Make suspend() a NOP in the ConsoleKit path
+
+UPower will remove its suspend support eventually, and g-s-d already
+depends on logind for power management.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=693162
+
+Index: gnome-shell-3.7.90/js/misc/loginManager.js
+===================================================================
+--- gnome-shell-3.7.90.orig/js/misc/loginManager.js 2013-02-23 15:17:56.532244380 -0500
++++ gnome-shell-3.7.90/js/misc/loginManager.js 2013-02-23 15:19:29.800240480 -0500
+@@ -5,6 +5,7 @@
+ const Lang = imports.lang;
+ const Mainloop = imports.mainloop;
+ const Shell = imports.gi.Shell;
++const UPowerGlib = imports.gi.UPowerGlib;
+ const Signals = imports.signals;
+
+ const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager'>
+@@ -137,12 +138,10 @@
+ },
+
+ canSuspend: function(asyncCallback) {
+- this._proxy.CanSuspendRemote(function(result, error) {
+- if (error)
+- asyncCallback(false);
+- else
+- asyncCallback(result[0] != 'no');
+- });
++ Mainloop.idle_add(Lang.bind(this, function() {
++ asyncCallback(this._upClient.get_can_suspend());
++ return false;
++ }));
+ },
+
+ listSessions: function(asyncCallback) {
+@@ -199,6 +198,7 @@
+ this._proxy = new ConsoleKitManager(Gio.DBus.system,
+ 'org.freedesktop.ConsoleKit',
+ '/org/freedesktop/ConsoleKit/Manager');
++ this._upClient = new UPowerGlib.Client();
+ },
+
+ // Having this function is a bit of a hack since the Systemd and ConsoleKit
+@@ -252,6 +252,7 @@
+ suspend: function() {
+ this.emit('prepare-for-sleep', true);
+ this.emit('prepare-for-sleep', false);
++ this._upClient.suspend_sync(null);
+ },
+
+ inhibit: function(reason, callback) {
Modified: desktop/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/series?rev=36801&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series [utf-8] Mon Feb 25 10:52:41 2013
@@ -1,11 +1,5 @@
-#10-make-NetworkManager-optional.patch
11-no-gettext.patch
-14_make-GLX-optional.patch
27-nm-libexec-path.patch
-29-Cope-with-clutter-being-built-with-both-new-and-old-.patch
30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
-40-shell-recorder-src-Set-frame-duration.patch
-50-Block-cancellation-of-the-unlock-dialog-when-draggin.patch
-60-MessageTray-fix-reentrancy-when-calling-out-to-the-g.patch
-61-MessageTray-restore-opacity-when-expanding-a-notific.patch
-62-MessageTray-remove-all-tweens-when-tweening-for-stat.patch
+revert-suspend-break.patch
+git_fix_too_short_apps_view.patch
Modified: desktop/experimental/gnome-shell/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/rules?rev=36801&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/rules [utf-8] Mon Feb 25 10:52:41 2013
@@ -13,7 +13,7 @@
endif
$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
- dh_girepository -p$(cdbs_curpkg) -l src -p /usr/lib/mutter \
+ dh_girepository -p$(cdbs_curpkg) -l src:src/gvc -p /usr/lib/mutter \
/usr/lib/gnome-shell
find debian/$(cdbs_curpkg) -name '*.la' -exec rm -f '{}' ';'
Modified: desktop/experimental/gnome-shell/debian/source_gnome-shell.py
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/source_gnome-shell.py?rev=36801&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/source_gnome-shell.py [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/source_gnome-shell.py [utf-8] Mon Feb 25 10:52:41 2013
@@ -1,5 +1,36 @@
from apport.hookutils import *
+import os
+
+def is_process_running(proc):
+ '''
+ Determine if process has a registered process id
+ '''
+ log = command_output(['pidof', proc])
+ if not log or log[:5] == "Error" or len(log)<1:
+ return False
+ return True
def add_info(report):
- attach_gsettings_package(report, 'gnome-shell-common')
- attach_gsettings_schema(report, 'org.gnome.desktop.interface')
+ attach_gsettings_package(report, 'gnome-shell-common')
+ attach_gsettings_schema(report, 'org.gnome.desktop.interface')
+
+ result = ''
+
+ dm_list = apport.hookutils.command_output(['sh', '-c',
+ 'apt-cache search \"display manager\" | cut -d \' \' -f1 | grep dm$'])
+
+ for line in dm_list.split('\n'):
+ if (is_process_running(line)):
+ result = line
+ break
+
+ report['DisplayManager'] = result
+
+ HOME = os.path.expanduser("~")
+ if result == 'gdm':
+ attach_file_if_exists(report, HOME+'/.cache/gdm/session.log',key='gdmSessionLog')
+ else:
+ attach_file_if_exists(report, HOME+'/.xsession-errors',key='XsessionLog')
+
+
+
More information about the pkg-gnome-commits
mailing list