r24059 - in /packages/unstable/gnome-shell/debian: changelog patches/02_gjs_build_fix.patch patches/series rules source/ source/format

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Apr 27 19:20:57 2010
New Revision: 24059

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24059
Log:
* debian/patches/02_gjs_build_fix.patch:
  - Backport upstream commit to fix the build with recent gjs.
* debian/source/format,
  debian/patches/series,
  debian/rules:
  - Convert to source format 3.0 (quilt).
* debian/rules:
  - Include gnome-get-source.mk.

Added:
    packages/unstable/gnome-shell/debian/patches/02_gjs_build_fix.patch
    packages/unstable/gnome-shell/debian/patches/series
    packages/unstable/gnome-shell/debian/source/
    packages/unstable/gnome-shell/debian/source/format
Modified:
    packages/unstable/gnome-shell/debian/changelog
    packages/unstable/gnome-shell/debian/rules

Modified: packages/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/changelog?rev=24059&op=diff
==============================================================================
--- packages/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-shell/debian/changelog [utf-8] Tue Apr 27 19:20:57 2010
@@ -1,3 +1,16 @@
+gnome-shell (2.29.0-3) UNRELEASED; urgency=low
+
+  * debian/patches/02_gjs_build_fix.patch:
+    - Backport upstream commit to fix the build with recent gjs.
+  * debian/source/format,
+    debian/patches/series,
+    debian/rules:
+    - Convert to source format 3.0 (quilt).
+  * debian/rules:
+    - Include gnome-get-source.mk.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 27 Apr 2010 21:02:20 +0200
+
 gnome-shell (2.29.0-2) unstable; urgency=low
 
   * debian/control:

Added: packages/unstable/gnome-shell/debian/patches/02_gjs_build_fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/patches/02_gjs_build_fix.patch?rev=24059&op=file
==============================================================================
--- packages/unstable/gnome-shell/debian/patches/02_gjs_build_fix.patch (added)
+++ packages/unstable/gnome-shell/debian/patches/02_gjs_build_fix.patch [utf-8] Tue Apr 27 19:20:57 2010
@@ -1,0 +1,48 @@
+From 1f1f4432f6fa9a0ed510caeb87772786b3b6d02c Mon Sep 17 00:00:00 2001
+From: Owen W. Taylor <otaylor at fishsoup.net>
+Date: Tue, 23 Feb 2010 16:52:55 +0000
+Subject: Use gjs_context_get_native_context()
+
+When exported into a public header, gjs_context_get_context() was
+renamed to gjs_context_get_native_context(). Adapt, and remove
+local prototype.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=610845
+---
+diff --git a/src/shell-global.c b/src/shell-global.c
+index 54d4387..e3e1777 100644
+--- a/src/shell-global.c
++++ b/src/shell-global.c
+@@ -593,12 +593,6 @@ shell_global_display_is_grabbed (ShellGlobal *global)
+   return meta_display_get_grab_op (display) != META_GRAB_OP_NONE;
+ }
+ 
+-/* Defining this here for now, see
+- * https://bugzilla.gnome.org/show_bug.cgi?id=604075
+- * for upstreaming status.
+- */
+-JSContext * gjs_context_get_context (GjsContext *context);
+-
+ /**
+  * shell_global_add_extension_importer:
+  * @target_object_script: JavaScript code evaluating to a target object
+@@ -621,7 +615,7 @@ shell_global_add_extension_importer (ShellGlobal *global,
+ {
+   jsval target_object;
+   JSObject *importer;
+-  JSContext *context = gjs_context_get_context (global->js_context);
++  JSContext *context = gjs_context_get_native_context (global->js_context);
+   char *search_path[2] = { 0, 0 };
+ 
+   // This is a bit of a hack; ideally we'd be able to pass our target
+@@ -799,7 +793,7 @@ shell_global_reexec_self (ShellGlobal *global)
+ void
+ shell_global_gc (ShellGlobal *global)
+ {
+-  JSContext *context = gjs_context_get_context (global->js_context);
++  JSContext *context = gjs_context_get_native_context (global->js_context);
+ 
+   JS_GC (context);
+ }
+--
+cgit v0.8.3.1

Added: packages/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/patches/series?rev=24059&op=file
==============================================================================
--- packages/unstable/gnome-shell/debian/patches/series (added)
+++ packages/unstable/gnome-shell/debian/patches/series [utf-8] Tue Apr 27 19:20:57 2010
@@ -1,0 +1,2 @@
+01_favorite_apps.diff
+02_gjs_build_fix.patch

Modified: packages/unstable/gnome-shell/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/rules?rev=24059&op=diff
==============================================================================
--- packages/unstable/gnome-shell/debian/rules [utf-8] (original)
+++ packages/unstable/gnome-shell/debian/rules [utf-8] Tue Apr 27 19:20:57 2010
@@ -2,10 +2,10 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 $(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
 	# Dirty hack to work-around dh_girepository limitation

Added: packages/unstable/gnome-shell/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/source/format?rev=24059&op=file
==============================================================================
--- packages/unstable/gnome-shell/debian/source/format (added)
+++ packages/unstable/gnome-shell/debian/source/format [utf-8] Tue Apr 27 19:20:57 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)