r29675 - in /packages/unstable/gjs/debian: changelog control control.in libgjs0b.symbols rules

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Sep 19 15:38:33 2011
New Revision: 29675

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29675
Log:
* Generate a substitution variable for Provides that embeds the 
  libmozjs version.
* Add this variable to shlibs. Closes: #635174.
* Remove symbols file, it’s useless as long as mozjs is part of the 
  ABI.

Removed:
    packages/unstable/gjs/debian/libgjs0b.symbols
Modified:
    packages/unstable/gjs/debian/changelog
    packages/unstable/gjs/debian/control
    packages/unstable/gjs/debian/control.in
    packages/unstable/gjs/debian/rules

Modified: packages/unstable/gjs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gjs/debian/changelog?rev=29675&op=diff
==============================================================================
--- packages/unstable/gjs/debian/changelog [utf-8] (original)
+++ packages/unstable/gjs/debian/changelog [utf-8] Mon Sep 19 15:38:33 2011
@@ -1,9 +1,17 @@
-gjs (1.29.0-2) UNRELEASED; urgency=low
-
+gjs (1.29.0-2) unstable; urgency=low
+
+  [ Laurent Bigonville ]
   * debian/control.in:
     - Update Vcs- fields to unstable branch
 
- -- Laurent Bigonville <bigon at debian.org>  Fri, 22 Jul 2011 21:46:08 +0200
+  [ Josselin Mouette ]
+  * Generate a substitution variable for Provides that embeds the 
+    libmozjs version.
+  * Add this variable to shlibs. Closes: #635174.
+  * Remove symbols file, it’s useless as long as mozjs is part of the 
+    ABI.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 19 Sep 2011 17:08:10 +0200
 
 gjs (1.29.0-1) unstable; urgency=low
 

Modified: packages/unstable/gjs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gjs/debian/control?rev=29675&op=diff
==============================================================================
--- packages/unstable/gjs/debian/control [utf-8] (original)
+++ packages/unstable/gjs/debian/control [utf-8] Mon Sep 19 15:38:33 2011
@@ -45,6 +45,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libgjs0, libgjs0a
 Replaces: libgjs0, libgjs0a
+Provides: ${gjs:Provides}
 Description: Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform
  libraries using the Javascript language. It's mainly based on the

Modified: packages/unstable/gjs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gjs/debian/control.in?rev=29675&op=diff
==============================================================================
--- packages/unstable/gjs/debian/control.in [utf-8] (original)
+++ packages/unstable/gjs/debian/control.in [utf-8] Mon Sep 19 15:38:33 2011
@@ -40,6 +40,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libgjs0, libgjs0a
 Replaces: libgjs0, libgjs0a
+Provides: ${gjs:Provides}
 Description: Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform
  libraries using the Javascript language. It's mainly based on the

Modified: packages/unstable/gjs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gjs/debian/rules?rev=29675&op=diff
==============================================================================
--- packages/unstable/gjs/debian/rules [utf-8] (original)
+++ packages/unstable/gjs/debian/rules [utf-8] Mon Sep 19 15:38:33 2011
@@ -6,9 +6,13 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_DH_MAKESHLIBS_ARGS_libgjs0b := -Xusr/lib/gjs-1.0/ -V -- -c4
+# 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\\.// )
+DEB_DH_MAKESHLIBS_ARGS_libgjs0b = -Xusr/lib/gjs-1.0/ -V'libgjs0b (>= $(DEB_UPSTREAM_VERSION)), libgjs0-$(LIBMOZJS)' -- -c4
 
 DEB_MAKE_CHECK_TARGET := check || true
 
 install/libgjs0b::
 	chrpath -d "$(CURDIR)"/debian/tmp/usr/lib/libgjs.so.0.0.0
+	echo gjs:Provides=libgjs0-$(LIBMOZJS) >> debian/$(cdbs_curpkg).substvars