r34599 - in /desktop/unstable/gjs/debian: changelog rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Apr 26 15:13:45 2012
New Revision: 34599

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34599
Log:
Extract libmozjs soname from libgjs.so, not the gjs binary since the
latter doesn't directly link to libmozjs.

Modified:
    desktop/unstable/gjs/debian/changelog
    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=34599&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gjs/debian/changelog [utf-8] Thu Apr 26 15:13:45 2012
@@ -5,8 +5,10 @@
   * Fold libgjs-gdbus into libgjs and move the typelib file into a
     package-private directory. Patch cherry-picked from upstream Git.
   * Use dh-autoreconf to update the build system.
-
- -- Michael Biebl <biebl at debian.org>  Thu, 26 Apr 2012 17:04:32 +0200
+  * Extract libmozjs soname from libgjs.so, not the gjs binary since the
+    latter doesn't directly link to libmozjs.
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 26 Apr 2012 17:10:11 +0200
 
 gjs (1.32.0-1) experimental; urgency=low
 

Modified: desktop/unstable/gjs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/rules?rev=34599&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/rules [utf-8] (original)
+++ desktop/unstable/gjs/debian/rules [utf-8] Thu Apr 26 15:13:45 2012
@@ -9,7 +9,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/lib/libgjs.so | 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