diff -u gnome-shell-2.28.1~git20091125/debian/control.in gnome-shell-2.28.1~git20091125/debian/control.in
--- gnome-shell-2.28.1~git20091125/debian/control.in
+++ gnome-shell-2.28.1~git20091125/debian/control.in
@@ -1,7 +1,8 @@
 Source: gnome-shell
 Section: gnome
 Priority: extra
-Maintainer: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
                debhelper (>= 7),
@@ -45,7 +46,7 @@
          ${misc:Depends},
          mutter,
          python,
-         pkg-config,
+         xulrunner-1.9.2,
          mesa-utils
 Recommends: xserver-xephyr
 Description: graphical shell for the GNOME desktop
diff -u gnome-shell-2.28.1~git20091125/debian/changelog gnome-shell-2.28.1~git20091125/debian/changelog
--- gnome-shell-2.28.1~git20091125/debian/changelog
+++ gnome-shell-2.28.1~git20091125/debian/changelog
@@ -1,3 +1,16 @@
+gnome-shell (2.28.1~git20091125-1ubuntu0.1) lucid-proposed; urgency=low
+
+  * Fix gnome-shell to set LD_LIBRARY_PATH so that libmozjs can be found;
+    Don't use pkg-config, use xulrunner-1.9.2 to figure out the path to
+    libmozjs (LP: #576991) 
+    - update src/gnome-shell.in
+  * Drop binary depends on pkg-config and replace with xulrunner-1.9.2;
+    xulrunner-1.9.2 is already pulled in by the depends in any case, but
+    now it's needed directly by gnome-shell
+    - update debian/control.in
+
+ -- Micah Gersten <micahg@ubuntu.com>  Sun, 12 Sep 2010 22:36:27 -0500
+
 gnome-shell (2.28.1~git20091125-1) unstable; urgency=low
 
   * New upstream snapshot
diff -u gnome-shell-2.28.1~git20091125/debian/control gnome-shell-2.28.1~git20091125/debian/control
--- gnome-shell-2.28.1~git20091125/debian/control
+++ gnome-shell-2.28.1~git20091125/debian/control
@@ -6,7 +6,8 @@
 Source: gnome-shell
 Section: gnome
 Priority: extra
-Maintainer: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Build-Depends: cdbs,
                debhelper (>= 7),
@@ -50,7 +51,7 @@
          ${misc:Depends},
          mutter,
          python,
-         pkg-config,
+         xulrunner-1.9.2,
          mesa-utils
 Recommends: xserver-xephyr
 Description: graphical shell for the GNOME desktop
only in patch2:
unchanged:
--- gnome-shell-2.28.1~git20091125.orig/src/gnome-shell.in
+++ gnome-shell-2.28.1~git20091125/src/gnome-shell.in
@@ -106,12 +106,11 @@
 
     # Work around Ubuntu xulrunner bug,
     # http://bugzilla.gnome.org/show_bug.cgi?id=573413
-    pkgconfig = subprocess.Popen(['pkg-config', '--variable=sdkdir', 'mozilla-js'],
+    xul_ver = subprocess.Popen(['xulrunner-1.9.2', '--gre-version'],
                                  stdout=subprocess.PIPE)
-    mozjs_sdkdir = pkgconfig.communicate()[0].strip()
-    pkgconfig.wait()
-    if pkgconfig.returncode == 0:
-        mozjs_libdir = re.sub('-(sdk|devel)', '', mozjs_sdkdir)
+    xul_ver.wait()
+    if xul_ver.returncode == 0:
+        mozjs_libdir = '/usr/lib/xulrunner-' + xul_ver.communicate()[0].strip() 
         if os.path.exists(mozjs_libdir + '/libmozjs.so'):
             env['LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '') + ':' + mozjs_libdir