r35568 - in /desktop/unstable/gnome-shell/debian: ./ patches/
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Sat Aug 4 10:41:54 UTC 2012
Author: bigon
Date: Sat Aug 4 10:41:54 2012
New Revision: 35568
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35568
Log:
* New upstream release.
- Drop patches 24-mirror-evolution-calendar-settings.patch and
26-fix-empathy-popup-regression.patch, applied upstream.
* Add d/p/26-networkAgent-use-absolute-path-if-configured.patch: Fix issue
finding VPN authentication binary, taken from upstream (Closes: #681737)
* d/p/27-nm-libexec-path.patch: Use Debian specific NM VPN helpers paths
Added:
desktop/unstable/gnome-shell/debian/patches/26-networkAgent-use-absolute-path-if-configured.patch
desktop/unstable/gnome-shell/debian/patches/27-nm-libexec-path.patch
Removed:
desktop/unstable/gnome-shell/debian/patches/24-mirror-evolution-calendar-settings.patch
desktop/unstable/gnome-shell/debian/patches/26-fix-empathy-popup-regression.patch
desktop/unstable/gnome-shell/debian/patches/27-notificationDaemon-Fix-copy-paste-typo.patch
desktop/unstable/gnome-shell/debian/patches/28-telepathyClient-decline-dispatch-op-when.patch
desktop/unstable/gnome-shell/debian/patches/29-telepathyClient-ignore-invalidated-channels.patch
desktop/unstable/gnome-shell/debian/patches/30-popupMenu-bypass-changeSignal-callback-if.patch
desktop/unstable/gnome-shell/debian/patches/31-popupMenu-do-not-overflow-the-currentItems.patch
Modified:
desktop/unstable/gnome-shell/debian/changelog
desktop/unstable/gnome-shell/debian/patches/series
Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=35568&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Sat Aug 4 10:41:54 2012
@@ -1,15 +1,12 @@
-gnome-shell (3.4.1-9) UNRELEASED; urgency=low
+gnome-shell (3.4.2-1) UNRELEASED; urgency=low
[ Laurent Bigonville ]
- * debian/patches:
- - 27-notificationDaemon-Fix-copy-paste-typo.patch: Fix typo in hints
- category (Taken from upstream)
- - 28-telepathyClient-decline-dispatch-op-when.patch,
- 29-telepathyClient-ignore-invalidated-channels.patch: ignore invalidated
- telepathy channels (Taken from upstream)
- - 30-popupMenu-bypass-changeSignal-callback-if.patch,
- 31-popupMenu-do-not-overflow-the-currentItems.patch: Fix shell freeze
- when using empathy from GIT (Taken from upstream)
+ * New upstream release.
+ - Drop patches 24-mirror-evolution-calendar-settings.patch and
+ 26-fix-empathy-popup-regression.patch, applied upstream.
+ * Add d/p/26-networkAgent-use-absolute-path-if-configured.patch: Fix issue
+ finding VPN authentication binary, taken from upstream (Closes: #681737)
+ * d/p/27-nm-libexec-path.patch: Use Debian specific NM VPN helpers paths
[ Josselin Mouette ]
* Change epiphany desktop file name to match the change in the
@@ -20,7 +17,7 @@
- 32-enable-the-screen-reader-menu-item.patch: Add Orca to the a11y
menu, to improve accessibility of the Shell-based GDM greeter.
- -- Laurent Bigonville <bigon at debian.org> Fri, 06 Jul 2012 12:17:20 +0200
+ -- Laurent Bigonville <bigon at debian.org> Sat, 28 Jul 2012 00:44:19 +0200
gnome-shell (3.4.1-8) unstable; urgency=low
Added: desktop/unstable/gnome-shell/debian/patches/26-networkAgent-use-absolute-path-if-configured.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/26-networkAgent-use-absolute-path-if-configured.patch?rev=35568&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/26-networkAgent-use-absolute-path-if-configured.patch (added)
+++ desktop/unstable/gnome-shell/debian/patches/26-networkAgent-use-absolute-path-if-configured.patch [utf-8] Sat Aug 4 10:41:54 2012
@@ -1,0 +1,27 @@
+From 8845a2170c01f83ac23b54ef6f6389b94b142f78 Mon Sep 17 00:00:00 2001
+From: Clemens Buchacher <drizzd at aon.at>
+Date: Sun, 01 Jul 2012 16:48:48 +0000
+Subject: networkAgent: use absolute path if configured
+
+Signed-off-by: Clemens Buchacher <drizzd at aon.at>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=679212
+---
+diff --git a/js/ui/networkAgent.js b/js/ui/networkAgent.js
+index cc44fa2..c9473a7 100644
+--- a/js/ui/networkAgent.js
++++ b/js/ui/networkAgent.js
+@@ -683,7 +683,10 @@ const NetworkAgent = new Lang.Class({
+ try {
+ externalUIMode = keyfile.get_boolean('GNOME', 'supports-external-ui-mode');
+ } catch(e) { } // ignore errors if key does not exist
+- let path = GLib.build_filenamev([Config.LIBEXECDIR, binary]);
++ let path = binary;
++ if (!GLib.path_is_absolute(path)) {
++ path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
++ }
+
+ if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))
+ this._vpnBinaries[service] = { fileName: path, externalUIMode: externalUIMode };
+--
+cgit v0.9.0.2
Added: desktop/unstable/gnome-shell/debian/patches/27-nm-libexec-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/27-nm-libexec-path.patch?rev=35568&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/27-nm-libexec-path.patch (added)
+++ desktop/unstable/gnome-shell/debian/patches/27-nm-libexec-path.patch [utf-8] Sat Aug 4 10:41:54 2012
@@ -1,0 +1,15 @@
+Description: Use Debian specific NM VPN helpers paths
+Author: Laurent Bigonville <bigon at debian.org>
+Forwarded: not-needed
+
+--- a/js/ui/networkAgent.js
++++ b/js/ui/networkAgent.js
+@@ -685,7 +685,7 @@ const NetworkAgent = new Lang.Class({
+ } catch(e) { } // ignore errors if key does not exist
+ let path = binary;
+ if (!GLib.path_is_absolute(path)) {
+- path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
++ path = GLib.build_filenamev(['/usr/lib/NetworkManager', path]);
+ }
+
+ if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))
Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=35568&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series [utf-8] Sat Aug 4 10:41:54 2012
@@ -6,12 +6,7 @@
11-no-gettext.patch
14_make-GLX-optional.patch
22-remove-online-accounts-from-user-menu.patch
-24-mirror-evolution-calendar-settings.patch
25-close-the-recorder-instead-of-pausing-it.patch
-26-fix-empathy-popup-regression.patch
-27-notificationDaemon-Fix-copy-paste-typo.patch
-28-telepathyClient-decline-dispatch-op-when.patch
-29-telepathyClient-ignore-invalidated-channels.patch
-30-popupMenu-bypass-changeSignal-callback-if.patch
-31-popupMenu-do-not-overflow-the-currentItems.patch
+26-networkAgent-use-absolute-path-if-configured.patch
+27-nm-libexec-path.patch
32-enable-the-screen-reader-menu-item.patch
More information about the pkg-gnome-commits
mailing list