r32361 - in /desktop/unstable/gjs/debian: changelog control control.in rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Jan  9 06:57:21 2012
New Revision: 32361

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32361
Log:
Build against libmozjs185. The libmozjs version built from iceweasel
proved to be too much of a moving target. Closes: #653051

Modified:
    desktop/unstable/gjs/debian/changelog
    desktop/unstable/gjs/debian/control
    desktop/unstable/gjs/debian/control.in
    desktop/unstable/gjs/debian/rules

Modified: desktop/unstable/gjs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/changelog?rev=32361&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gjs/debian/changelog [utf-8] Mon Jan  9 06:57:21 2012
@@ -5,6 +5,8 @@
 
   [ Michael Biebl ]
   * debian/watch: Track .xz tarballs.
+  * Build against libmozjs185. The libmozjs version built from iceweasel
+    proved to be too much of a moving target. Closes: #653051
 
  -- Michael Biebl <biebl at debian.org>  Mon, 09 Jan 2012 07:43:37 +0100
 

Modified: desktop/unstable/gjs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/control?rev=32361&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/control [utf-8] (original)
+++ desktop/unstable/gjs/debian/control [utf-8] Mon Jan  9 06:57:21 2012
@@ -7,7 +7,7 @@
 Section: interpreters
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Frederic Peters <fpeters at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Frederic Peters <fpeters at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 8),
                cdbs,
                gnome-pkg-tools,
@@ -20,7 +20,7 @@
                gobject-introspection (>= 1.29.16),
                gir1.2-glib-2.0,
                gir1.2-freedesktop,
-               xulrunner-dev (>= 1.9.2),
+               libmozjs185-dev,
                dbus-x11,
                uuid-runtime,
                libcairo2-dev
@@ -59,7 +59,7 @@
 Depends: libgjs0b (= ${binary:Version}),
          ${misc:Depends},
          libgirepository1.0-dev,
-         xulrunner-dev (>= 1.9.2),
+         libmozjs185-dev,
          libdbus-1-dev
 Description: Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform

Modified: desktop/unstable/gjs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/control.in?rev=32361&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/control.in [utf-8] (original)
+++ desktop/unstable/gjs/debian/control.in [utf-8] Mon Jan  9 06:57:21 2012
@@ -15,7 +15,7 @@
                gobject-introspection (>= 1.29.16),
                gir1.2-glib-2.0,
                gir1.2-freedesktop,
-               xulrunner-dev (>= 1.9.2),
+               libmozjs185-dev,
                dbus-x11,
                uuid-runtime,
                libcairo2-dev
@@ -54,7 +54,7 @@
 Depends: libgjs0b (= ${binary:Version}),
          ${misc:Depends},
          libgirepository1.0-dev,
-         xulrunner-dev (>= 1.9.2),
+         libmozjs185-dev,
          libdbus-1-dev
 Description: Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform

Modified: desktop/unstable/gjs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/rules?rev=32361&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/rules [utf-8] (original)
+++ desktop/unstable/gjs/debian/rules [utf-8] Mon Jan  9 06:57:21 2012
@@ -8,7 +8,7 @@
 
 # Use recursive variables since this variable must not be expanded until 
 # files have been installed.
-LIBMOZJS = $(shell objdump -p debian/tmp/usr/bin/gjs | awk '$$1=="NEEDED" && $$2~/^libmozjs/ { print $$2 }' | sed s/\\.so\\.// )
+LIBMOZJS = $(shell objdump -p debian/tmp/usr/bin/gjs | awk '$$1=="NEEDED" && $$2~/^libmozjs/ { print $$2 }' | sed s/\\.so\\./-/ )
 DEB_DH_MAKESHLIBS_ARGS_libgjs0b = -Xusr/lib/gjs-1.0/ -V'libgjs0b (>= $(DEB_UPSTREAM_VERSION)), libgjs0-$(LIBMOZJS)' -- -c4
 
 DEB_MAKE_CHECK_TARGET := check || true