diff -u gjs-0.5/debian/changelog gjs-0.5/debian/changelog --- gjs-0.5/debian/changelog +++ gjs-0.5/debian/changelog @@ -1,3 +1,22 @@ +gjs (0.5-1ubuntu2.3) lucid-proposed; urgency=low + + * fix LP: #576991 - Make gjs not need a rebuild for each xulrunner release; + Use dh_xulrunner to add binary depends on xulrunner for libgjs0a; + Add binary depends on xulrunner-dev (>= 1.9.2) for libgjs-dev + - update debian/control + - update debian/rules + * Add back chrpath as a build-dep and delete the rpath in libgjs and + libgjs-gi.so; Any rdepends of libgjs will now need a wrapper script to find + libmozjs + - update debian/rules + - update debian/control + * Add a wrapper around gjs-console so it can find libmozjs; install wrapper + in override_dh_install + - update debian/rules + - add debian/gjs-console.sh + + -- Micah Gersten Mon, 13 Sep 2010 11:54:51 -0500 + gjs (0.5-1ubuntu2.2) lucid-proposed; urgency=low * No change rebuild for xulrunner-1.9.2.8 update (LP: #608940) diff -u gjs-0.5/debian/rules gjs-0.5/debian/rules --- gjs-0.5/debian/rules +++ gjs-0.5/debian/rules @@ -20,6 +20,13 @@ override_dh_auto_install: dh_auto_install --sourcedirectory=_build + chrpath -d "$(CURDIR)"/debian/tmp/usr/lib/libgjs.so.0.0.0 + chrpath -d "$(CURDIR)"/debian/tmp/usr/lib/libgjs-gi.so.0.0.0 + +override_dh_install: + dh_install + mv debian/gjs/usr/bin/gjs-console debian/gjs/usr/bin/gjs-console.real + cp debian/gjs-console.sh debian/gjs/usr/bin/gjs-console override_dh_clean: real_clean unpatch @@ -37,15 +44,3 @@ - -# This should be folded into dh_xulrunner -XULRUNNER_PACKAGE=xulrunner-1.9.2 -MOZ_JS_VER=$(shell pkg-config --modversion mozilla-js) -MINOR_MOZ_JS_VER=$(suffix $(MOZ_JS_VER)) -NEXT_MINOR_MOZ_JS_VER=$(shell echo $$(($(subst .,,$(MINOR_MOZ_JS_VER)) + 1))) -NEXT_MOZ_JS_VER=$(patsubst %$(MINOR_MOZ_JS_VER),%.$(NEXT_MINOR_MOZ_JS_VER), $(MOZ_JS_VER)) - override_dh_shlibdeps: dh_shlibdeps - @echo Generating xulrunner dependencies - for SUBSTVARS in debian/libgjs0.substvars debian/libgjs-dev.substvars ; do \ - echo "xulrunner:Depends=$(XULRUNNER_PACKAGE) (>= $(MOZ_JS_VER)), $(XULRUNNER_PACKAGE) (< $(NEXT_MOZ_JS_VER)~)" >> $$SUBSTVARS ; \ - echo "xulrunner-dev:Depends=xulrunner-dev (>= $(MOZ_JS_VER)), xulrunner-dev (<< $(NEXT_MOZ_JS_VER)~)" >> $$SUBSTVARS ; \ - done + dh_xulrunner -p libgjs0 diff -u gjs-0.5/debian/control gjs-0.5/debian/control --- gjs-0.5/debian/control +++ gjs-0.5/debian/control @@ -9,6 +9,7 @@ autoconf, automake1.7, libtool, + chrpath, pkg-config, libdbus-glib-1-dev, libglib2.0-dev, @@ -40,7 +41,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${gir:Depends}, - ${xulrunner:Depends} Conflicts: gjs (<< 0.4-3) Replaces: gjs (<< 0.4-3) Description: Mozilla-based javascript bindings for the GNOME platform @@ -56,7 +56,7 @@ Depends: libgjs0 (= ${binary:Version}), ${misc:Depends}, libgirepository1.0-dev, - ${xulrunner-dev:Depends} + xulrunner-dev (>= 1.9.2) Conflicts: gjs-dev (<< 0.4-3) Replaces: gjs-dev (<< 0.4-3) Description: Mozilla-based javascript bindings for the GNOME platform only in patch2: unchanged: --- gjs-0.5.orig/debian/gjs-console.sh +++ gjs-0.5/debian/gjs-console.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# gjs-console wrapper to start gjs-console with LD_LIBRARY_PATH +# +# Copyright (c) 2010, Canonical Ltd. +# Author: Micah Gersten +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. +# +# This wrapper is necessary since Ubuntu does not have a mozjs top level library + +# Set LD_LIBRARY_PATH before launching gjs-console + +LD_LIBRARY_PATH="$LD_LIBRARY_PATH;/usr/lib/xulrunner-`xulrunner-1.9.2 --gre-version`" +export LD_LIBRARY_PATH +exec /usr/bin/gjs-console.real $@