r32358 - in /desktop/unstable/gnome-shell/debian: changelog patches/12-gnome-shell-extension-tool-Fix-error-after-creating-.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Jan  9 05:45:14 2012
New Revision: 32358

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32358
Log:
d/p/12-gnome-shell-extension-tool-Fix-error-after-creating-.patch:
Cherry-pick patch from upstream Git to fix a crash in
gnome-shell-extension-tool. Closes: #649583

Added:
    desktop/unstable/gnome-shell/debian/patches/12-gnome-shell-extension-tool-Fix-error-after-creating-.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=32358&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Mon Jan  9 05:45:14 2012
@@ -13,7 +13,12 @@
   [ Josselin Mouette ]
   * Update repository URL.
 
- -- Jordi Mallach <jordi at debian.org>  Thu, 29 Dec 2011 11:03:22 +0100
+  [ Michael Biebl ]
+  * d/p/12-gnome-shell-extension-tool-Fix-error-after-creating-.patch:
+    Cherry-pick patch from upstream Git to fix a crash in
+    gnome-shell-extension-tool. Closes: #649583
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 09 Jan 2012 06:43:04 +0100
 
 gnome-shell (3.2.1-8) unstable; urgency=low
 

Added: desktop/unstable/gnome-shell/debian/patches/12-gnome-shell-extension-tool-Fix-error-after-creating-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/12-gnome-shell-extension-tool-Fix-error-after-creating-.patch?rev=32358&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/12-gnome-shell-extension-tool-Fix-error-after-creating-.patch (added)
+++ desktop/unstable/gnome-shell/debian/patches/12-gnome-shell-extension-tool-Fix-error-after-creating-.patch [utf-8] Mon Jan  9 05:45:14 2012
@@ -1,0 +1,29 @@
+From 3697e187e63af65bc9306f6e15fc2837d5f826c3 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre at mecheye.net>
+Date: Thu, 13 Oct 2011 00:46:46 -0400
+Subject: [PATCH] gnome-shell-extension-tool: Fix error after creating
+ extension
+
+Commit 7a8a00c7057d56350d4b5509cefd812a67d4b7d7 cleaned up the code to move all
+files to a dictionary, which accidentally left an undefined "extensionjs_path"
+error. Fix that error.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=661623
+---
+ src/gnome-shell-extension-tool.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/gnome-shell-extension-tool.in b/src/gnome-shell-extension-tool.in
+index e610b46..8ec24fb 100644
+--- a/src/gnome-shell-extension-tool.in
++++ b/src/gnome-shell-extension-tool.in
+@@ -148,5 +148,6 @@ use an extension title clicktofocus at janedoe.example.com.'''
+         f.close()
+ 
+     print "Created extension in %r" % (extension_path, )
++    extensionjs_path = os.path.join(extension_path, 'extension.js')
+     subprocess.Popen(['gnome-open', extensionjs_path])
+     sys.exit(0)
+-- 
+1.7.8.2
+

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=32358&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series [utf-8] Mon Jan  9 05:45:14 2012
@@ -7,3 +7,4 @@
 09-respect-NoDisplay-semantics-for-app-menu.patch
 10-make-NetworkManager-optional.patch
 11-no-gettext.patch
+12-gnome-shell-extension-tool-Fix-error-after-creating-.patch