r33075 - in /desktop/experimental/gnome-shell/debian: ./ patches/
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Tue Mar 13 00:46:28 UTC 2012
Author: jbicha-guest
Date: Tue Mar 13 00:46:27 2012
New Revision: 33075
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33075
Log:
* New upstream release.
* debian/control.in:
- Add debug package
- Update dependencies
- Recommend gnome-user-guide
- Break gnome-tweak-tool (<< 3.3)
- Bump Standards-Version to 3.9.3
* debian/gnome-shell-common.install:
- No more gconf schemas to install
- Install gtk-docs
* Drop patches that have been applied upstream. Remaining patches:
- 04_remove-glx-dependency-on-armel.patch
- 10-make-NetworkManager-optional.patch (Refreshed)
- 11-no-gettext.patch
Removed:
desktop/experimental/gnome-shell/debian/patches/02_rpath-bluetooth-applet.patch
desktop/experimental/gnome-shell/debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch
desktop/experimental/gnome-shell/debian/patches/08-polkit-Find-the-best-user-to-authenticate-as.patch
desktop/experimental/gnome-shell/debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch
desktop/experimental/gnome-shell/debian/patches/12_Replace-shell_util_icon_from_string.patch
desktop/experimental/gnome-shell/debian/patches/13_bluetooth_fix_undefined_variable.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/gnome-shell-common.install
desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch
desktop/experimental/gnome-shell/debian/patches/series
Modified: desktop/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/changelog?rev=33075&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog [utf-8] Tue Mar 13 00:46:27 2012
@@ -1,3 +1,22 @@
+gnome-shell (3.3.90-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * debian/control.in:
+ - Add debug package
+ - Update dependencies
+ - Recommend gnome-user-guide
+ - Break gnome-tweak-tool (<< 3.3)
+ - Bump Standards-Version to 3.9.3
+ * debian/gnome-shell-common.install:
+ - No more gconf schemas to install
+ - Install gtk-docs
+ * Drop patches that have been applied upstream. Remaining patches:
+ - 04_remove-glx-dependency-on-armel.patch
+ - 10-make-NetworkManager-optional.patch (Refreshed)
+ - 11-no-gettext.patch
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Mon, 12 Mar 2012 19:36:07 -0400
+
gnome-shell (3.2.2.1-2) unstable; urgency=low
* debian/patches/12_Replace-shell_util_icon_from_string.patch
Modified: desktop/experimental/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control?rev=33075&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control [utf-8] Tue Mar 13 00:46:27 2012
@@ -27,27 +27,27 @@
libfolks-dev (>= 0.5.2),
libgconf2-dev,
libgirepository1.0-dev (>= 1.29.15),
- libgjs-dev (>= 1.29.18),
- libglib2.0-dev (>= 2.30.0),
+ libgjs-dev (>= 1.30),
+ libglib2.0-dev (>= 2.31.6),
libgnome-bluetooth-dev (>= 2.90.0) [linux-any],
libgnome-desktop-3-dev (>= 2.90.0),
libgnome-keyring-dev,
libgnome-menu-3-dev,
libgstreamer0.10-dev (>= 0.10.16),
- libgtk-3-dev (>= 3.2.0),
- libmutter-dev (>= 3.2.1),
+ libgtk-3-dev (>= 3.3.9),
+ libmutter-dev (>= 3.3.90),
libnm-glib-dev (>= 0.9) [linux-any],
libnm-util-dev (>= 0.9) [linux-any],
libpolkit-agent-1-dev (>= 0.100),
libpulse-dev,
libstartup-notification0-dev (>= 0.11),
- libtelepathy-glib-dev (>= 0.15.5),
+ libtelepathy-glib-dev (>= 0.17.5),
libtelepathy-logger-dev (>= 0.2.4),
libx11-dev,
libxfixes-dev,
libxml2-dev,
python (>= 2.6)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://live.gnome.org/GnomeShell
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-shell
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell/
@@ -64,11 +64,12 @@
gir1.2-clutter-1.0,
gir1.2-freedesktop,
gir1.2-gconf-2.0,
+ gir1.2-gjs-1.0,
gir1.2-gkbd-3.0,
gir1.2-glib-2.0 (>= 1.31),
gir1.2-gnomebluetooth-1.0 [linux-any],
gir1.2-gtk-3.0,
- gir1.2-mutter-3.0 (>= 3.2),
+ gir1.2-mutter-3.0 (>= 3.3.90),
gir1.2-networkmanager-1.0 [linux-any],
gir1.2-pango-1.0,
gir1.2-polkit-1.0,
@@ -76,20 +77,21 @@
gir1.2-telepathyglib-0.12,
gir1.2-telepathylogger-0.2,
gir1.2-upowerglib-1.0,
- gjs (>= 1.29.18),
+ gjs (>= 1.30),
gnome-icon-theme-symbolic (>= 2.91),
gnome-settings-daemon (>= 2.91.5.1),
- gsettings-desktop-schemas (>= 0.1.7),
+ gsettings-desktop-schemas (>= 3.3.2),
python (>= 2.6),
telepathy-mission-control-5
Recommends: gnome-contacts,
gnome-control-center,
gnome-session-fallback,
- gnome-themes-standard
+ gnome-themes-standard,
+ gnome-user-guide
Breaks: fglrx-driver (<< 1:11-10),
gnome-control-center (<< 1:3.0),
gnome-session (<< 3.0),
- gnome-tweak-tool (<< 3.2)
+ gnome-tweak-tool (<< 3.3)
Description: graphical shell for the GNOME desktop
The GNOME Shell redefines user interactions with the GNOME desktop.
In particular, it offers new paradigms for launching applications,
@@ -106,6 +108,26 @@
Depends: ${misc:Depends}
Replaces: gnome-shell (<< 3.2.1-6)
Breaks: gnome-shell (<< 3.2.1-6),
- gnome-tweak-tool (<< 3.2)
+ gnome-tweak-tool (<< 3.3)
Description: common files for the GNOME graphical shell
This package contains translations and data files for the GNOME shell.
+
+Package: gnome-shell-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: gnome-shell (= ${binary:Version}),
+ ${misc:Depends}
+Recommends: mutter-dbg
+Description: Debugging symbols for GNOME Shell
+ The GNOME Shell redefines user interactions with the GNOME desktop.
+ In particular, it offers new paradigms for launching applications,
+ accessing documents, and organizing open windows in GNOME. Later, it
+ will introduce a new applets eco-system and offer new solutions for
+ other desktop features, such as notifications and contacts
+ management. The GNOME Shell is intended to replace functions handled
+ by the GNOME Panel and by the window manager in previous versions of
+ GNOME. The GNOME Shell has rich visual effects enabled by new
+ graphical technologies.
+ .
+ This package contains detached debugging symbols.
Modified: desktop/experimental/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control.in?rev=33075&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control.in [utf-8] Tue Mar 13 00:46:27 2012
@@ -22,27 +22,27 @@
libfolks-dev (>= 0.5.2),
libgconf2-dev,
libgirepository1.0-dev (>= 1.29.15),
- libgjs-dev (>= 1.29.18),
- libglib2.0-dev (>= 2.30.0),
+ libgjs-dev (>= 1.30),
+ libglib2.0-dev (>= 2.31.6),
libgnome-bluetooth-dev (>= 2.90.0) [linux-any],
libgnome-desktop-3-dev (>= 2.90.0),
libgnome-keyring-dev,
libgnome-menu-3-dev,
libgstreamer0.10-dev (>= 0.10.16),
- libgtk-3-dev (>= 3.2.0),
- libmutter-dev (>= 3.2.1),
+ libgtk-3-dev (>= 3.3.9),
+ libmutter-dev (>= 3.3.90),
libnm-glib-dev (>= 0.9) [linux-any],
libnm-util-dev (>= 0.9) [linux-any],
libpolkit-agent-1-dev (>= 0.100),
libpulse-dev,
libstartup-notification0-dev (>= 0.11),
- libtelepathy-glib-dev (>= 0.15.5),
+ libtelepathy-glib-dev (>= 0.17.5),
libtelepathy-logger-dev (>= 0.2.4),
libx11-dev,
libxfixes-dev,
libxml2-dev,
python (>= 2.6)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://live.gnome.org/GnomeShell
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-shell
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell/
@@ -59,11 +59,12 @@
gir1.2-clutter-1.0,
gir1.2-freedesktop,
gir1.2-gconf-2.0,
+ gir1.2-gjs-1.0,
gir1.2-gkbd-3.0,
gir1.2-glib-2.0 (>= 1.31),
gir1.2-gnomebluetooth-1.0 [linux-any],
gir1.2-gtk-3.0,
- gir1.2-mutter-3.0 (>= 3.2),
+ gir1.2-mutter-3.0 (>= 3.3.90),
gir1.2-networkmanager-1.0 [linux-any],
gir1.2-pango-1.0,
gir1.2-polkit-1.0,
@@ -71,20 +72,21 @@
gir1.2-telepathyglib-0.12,
gir1.2-telepathylogger-0.2,
gir1.2-upowerglib-1.0,
- gjs (>= 1.29.18),
+ gjs (>= 1.30),
gnome-icon-theme-symbolic (>= 2.91),
gnome-settings-daemon (>= 2.91.5.1),
- gsettings-desktop-schemas (>= 0.1.7),
+ gsettings-desktop-schemas (>= 3.3.2),
python (>= 2.6),
telepathy-mission-control-5
Recommends: gnome-contacts,
gnome-control-center,
gnome-session-fallback,
- gnome-themes-standard
+ gnome-themes-standard,
+ gnome-user-guide
Breaks: fglrx-driver (<< 1:11-10),
gnome-control-center (<< 1:3.0),
gnome-session (<< 3.0),
- gnome-tweak-tool (<< 3.2)
+ gnome-tweak-tool (<< 3.3)
Description: graphical shell for the GNOME desktop
The GNOME Shell redefines user interactions with the GNOME desktop.
In particular, it offers new paradigms for launching applications,
@@ -101,6 +103,26 @@
Depends: ${misc:Depends}
Replaces: gnome-shell (<< 3.2.1-6)
Breaks: gnome-shell (<< 3.2.1-6),
- gnome-tweak-tool (<< 3.2)
+ gnome-tweak-tool (<< 3.3)
Description: common files for the GNOME graphical shell
This package contains translations and data files for the GNOME shell.
+
+Package: gnome-shell-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: gnome-shell (= ${binary:Version}),
+ ${misc:Depends}
+Recommends: mutter-dbg
+Description: Debugging symbols for GNOME Shell
+ The GNOME Shell redefines user interactions with the GNOME desktop.
+ In particular, it offers new paradigms for launching applications,
+ accessing documents, and organizing open windows in GNOME. Later, it
+ will introduce a new applets eco-system and offer new solutions for
+ other desktop features, such as notifications and contacts
+ management. The GNOME Shell is intended to replace functions handled
+ by the GNOME Panel and by the window manager in previous versions of
+ GNOME. The GNOME Shell has rich visual effects enabled by new
+ graphical technologies.
+ .
+ This package contains detached debugging symbols.
Modified: desktop/experimental/gnome-shell/debian/gnome-shell-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/gnome-shell-common.install?rev=33075&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/gnome-shell-common.install [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/gnome-shell-common.install [utf-8] Tue Mar 13 00:46:27 2012
@@ -1,4 +1,4 @@
-etc/gconf
usr/share/glib-2.0
usr/share/gnome-shell
+usr/share/gtk-doc
usr/share/locale
Modified: desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch?rev=33075&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch [utf-8] Tue Mar 13 00:46:27 2012
@@ -20,11 +20,11 @@
src/Makefile.am | 18 +++++++++++++-----
5 files changed, 70 insertions(+), 10 deletions(-)
-Index: gnome-shell-3.2.2.1/configure.ac
-===================================================================
---- gnome-shell-3.2.2.1.orig/configure.ac 2012-01-20 06:16:22.000000000 +0100
-+++ gnome-shell-3.2.2.1/configure.ac 2012-01-25 10:59:36.528626985 +0100
-@@ -95,8 +95,41 @@
+Index: gnome-shell-3.3.90/configure.ac
+===================================================================
+--- gnome-shell-3.3.90.orig/configure.ac 2012-03-12 20:35:52.306547402 -0400
++++ gnome-shell-3.3.90/configure.ac 2012-03-12 20:35:54.830559926 -0400
+@@ -92,8 +92,41 @@
libcanberra
telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
@@ -68,7 +68,7 @@
PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
-@@ -250,3 +283,15 @@
+@@ -282,3 +315,15 @@
man/Makefile
])
AC_OUTPUT
@@ -84,11 +84,11 @@
+ Support for NetworkManager: $have_networkmanager
+ Support for GStreamer recording: $build_recorder
+"
-Index: gnome-shell-3.2.2.1/js/misc/config.js.in
-===================================================================
---- gnome-shell-3.2.2.1.orig/js/misc/config.js.in 2011-10-12 18:50:16.000000000 +0200
-+++ gnome-shell-3.2.2.1/js/misc/config.js.in 2012-01-25 10:59:25.844627363 +0100
-@@ -8,5 +8,7 @@
+Index: gnome-shell-3.3.90/js/misc/config.js.in
+===================================================================
+--- gnome-shell-3.3.90.orig/js/misc/config.js.in 2012-03-12 20:35:52.262547184 -0400
++++ gnome-shell-3.3.90/js/misc/config.js.in 2012-03-12 20:35:54.830559926 -0400
+@@ -8,6 +8,8 @@
const GJS_VERSION = '@GJS_VERSION@';
/* 1 if gnome-bluetooth is available, 0 otherwise */
const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
@@ -96,11 +96,12 @@
+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
/* The system TLS CA list */
const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';
-Index: gnome-shell-3.2.2.1/js/ui/main.js
-===================================================================
---- gnome-shell-3.2.2.1.orig/js/ui/main.js 2012-01-20 06:16:22.000000000 +0100
-+++ gnome-shell-3.2.2.1/js/ui/main.js 2012-01-25 10:59:25.848627363 +0100
-@@ -14,6 +14,7 @@
+ /* gettext package */
+Index: gnome-shell-3.3.90/js/ui/main.js
+===================================================================
+--- gnome-shell-3.3.90.orig/js/ui/main.js 2012-03-12 20:35:52.274547246 -0400
++++ gnome-shell-3.3.90/js/ui/main.js 2012-03-12 20:35:54.830559926 -0400
+@@ -12,6 +12,7 @@
const AutomountManager = imports.ui.automountManager;
const AutorunManager = imports.ui.autorunManager;
@@ -108,7 +109,7 @@
const CtrlAltTab = imports.ui.ctrlAltTab;
const EndSessionDialog = imports.ui.endSessionDialog;
const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
-@@ -27,7 +28,7 @@
+@@ -25,7 +26,7 @@
const RunDialog = imports.ui.runDialog;
const Layout = imports.ui.layout;
const LookingGlass = imports.ui.lookingGlass;
@@ -117,7 +118,7 @@
const NotificationDaemon = imports.ui.notificationDaemon;
const WindowAttentionHandler = imports.ui.windowAttentionHandler;
const Scripting = imports.ui.scripting;
-@@ -84,7 +85,10 @@
+@@ -82,7 +83,10 @@
telepathyClient = new TelepathyClient.Client();
automountManager = new AutomountManager.AutomountManager();
autorunManager = new AutorunManager.AutorunManager();
@@ -129,11 +130,11 @@
}
function _createGDMSession() {
-Index: gnome-shell-3.2.2.1/js/ui/panel.js
-===================================================================
---- gnome-shell-3.2.2.1.orig/js/ui/panel.js 2012-01-20 06:16:22.000000000 +0100
-+++ gnome-shell-3.2.2.1/js/ui/panel.js 2012-01-25 10:59:25.848627363 +0100
-@@ -40,7 +40,8 @@
+Index: gnome-shell-3.3.90/js/ui/panel.js
+===================================================================
+--- gnome-shell-3.3.90.orig/js/ui/panel.js 2012-03-12 20:35:52.290547324 -0400
++++ gnome-shell-3.3.90/js/ui/panel.js 2012-03-12 20:35:54.830559926 -0400
+@@ -42,7 +42,8 @@
STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
try {
@@ -143,11 +144,11 @@
} catch(e) {
log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
}
-Index: gnome-shell-3.2.2.1/src/Makefile.am
-===================================================================
---- gnome-shell-3.2.2.1.orig/src/Makefile.am 2012-01-25 10:59:25.708627368 +0100
-+++ gnome-shell-3.2.2.1/src/Makefile.am 2012-01-25 10:59:25.848627363 +0100
-@@ -108,9 +108,7 @@
+Index: gnome-shell-3.3.90/src/Makefile.am
+===================================================================
+--- gnome-shell-3.3.90.orig/src/Makefile.am 2012-03-12 20:35:52.326547505 -0400
++++ gnome-shell-3.3.90/src/Makefile.am 2012-03-12 20:35:54.834559942 -0400
+@@ -109,9 +109,7 @@
shell-generic-container.h \
shell-gtk-embed.h \
shell-global.h \
@@ -155,11 +156,11 @@
shell-mount-operation.h \
- shell-network-agent.h \
shell-perf-log.h \
- shell-slicer.h \
- shell-stack.h \
-@@ -122,6 +120,11 @@
- shell-wm.h \
- shell-xfixes-cursor.h
+ shell-screenshot.h \
+ shell-screen-grabber.h \
+@@ -133,6 +131,11 @@
+ gactionobserver.h \
+ gactionobserver.c
+if HAVE_NETWORKMANAGER
+shell_public_headers_h += shell-mobile-providers.h shell-network-agent.h
@@ -169,7 +170,7 @@
libgnome_shell_la_SOURCES = \
$(shell_built_sources) \
$(shell_public_headers_h) \
-@@ -145,9 +148,7 @@
+@@ -155,9 +158,7 @@
shell-generic-container.c \
shell-gtk-embed.c \
shell-global.c \
@@ -179,18 +180,18 @@
shell-perf-log.c \
shell-polkit-authentication-agent.h \
shell-polkit-authentication-agent.c \
-@@ -161,6 +162,10 @@
- shell-wm.c \
- shell-xfixes-cursor.c
+@@ -175,6 +176,10 @@
+ $(NULL)
+
+if HAVE_NETWORKMANAGER
+libgnome_shell_la_SOURCES += shell-mobile-providers.c shell-network-agent.c
+endif
+
libgnome_shell_la_gir_sources = \
- $(filter-out %-private.h $(shell_recorder_non_gir_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
-
-@@ -272,7 +277,10 @@
+ $(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
+
+@@ -290,7 +295,10 @@
libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
Shell-0.1.gir: libgnome-shell.la St-1.0.gir
Modified: desktop/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/series?rev=33075&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series [utf-8] Tue Mar 13 00:46:27 2012
@@ -1,9 +1,3 @@
-02_rpath-bluetooth-applet.patch
04_remove-glx-dependency-on-armel.patch
-07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch
-08-polkit-Find-the-best-user-to-authenticate-as.patch
-09-respect-NoDisplay-semantics-for-app-menu.patch
10-make-NetworkManager-optional.patch
11-no-gettext.patch
-12_Replace-shell_util_icon_from_string.patch
-13_bluetooth_fix_undefined_variable.patch
More information about the pkg-gnome-commits
mailing list