diff -u edbrowse-3.4.1/debian/rules edbrowse-3.4.1/debian/rules --- edbrowse-3.4.1/debian/rules +++ edbrowse-3.4.1/debian/rules @@ -17,8 +17,8 @@ endif # Correct upstream's variables for Debian names -CFLAGS += -I/usr/include/mozjs -DXP_UNIX -LIBS = -lpcre -lssl -lmozjs -lcurl +CFLAGS += $(shell pkg-config --cflags mozilla-js) +LIBS = -lpcre -lssl -lcurl $(shell pkg-config --libs mozilla-js) # Avoid stripping binaries LFLAGS is upstream's name # for additional linking flags! LFLAGS = "" @@ -54,6 +54,8 @@ # Build architecture-dependent files here. binary-arch: build install + mv debian/edbrowse/usr/bin/edbrowse debian/edbrowse/usr/bin/edbrowse-real + cp debian/edbrowse.sh debian/edbrowse/usr/bin/edbrowse dh_testdir dh_testroot dh_installdocs README diff -u edbrowse-3.4.1/debian/control edbrowse-3.4.1/debian/control --- edbrowse-3.4.1/debian/control +++ edbrowse-3.4.1/debian/control @@ -2,8 +2,9 @@ Section: net Priority: extra Uploaders: Kapil Hari Paranjape -Maintainer: Mario Lang -Build-Depends: debhelper (>> 4.0.0), libssl-dev (>= 0.9.8b), libpcre3-dev (>= 6.4), libmozjs-dev (>= 1.8.0.5), +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Mario Lang +Build-Depends: debhelper (>> 4.0.0), libssl-dev (>= 0.9.8b), libpcre3-dev (>= 6.4), xulrunner-dev (>= 1.9.2), pkg-config, libcurl4-openssl-dev (>= 7.18.2), Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/edbrowse/ Homepage: http://edbrowse.sourceforge.net/ @@ -11,7 +12,7 @@ Package: edbrowse Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, xulrunner-1.9.2 Recommends: poppler-utils | xpdf-utils Provides: editor, mail-reader, www-browser Description: A /bin/ed-alike webbrowser written in C diff -u edbrowse-3.4.1/debian/changelog edbrowse-3.4.1/debian/changelog --- edbrowse-3.4.1/debian/changelog +++ edbrowse-3.4.1/debian/changelog @@ -1,3 +1,18 @@ +edbrowse (3.4.1-1ubuntu1) lucid; urgency=low + + * fix LP: #553052 - Port edbrowse to xulrunner-1.9.2 + + debian/control: + - replace libmozjs-dev with xulrunner-dev + - add build depends on pkg-config + - add xulrunner-1.9.2 depends to edbrowse package + + debian/rules: + - get mozjs cflags and libs with pkgconfig + - move edbrowse binary to edbrowse-real + - install edbrowse wrapper script so we can set LD_LIBRARY_PATH + + Add debian/edbrowse.sh as a wrapper so we can set LD_LIBRARY_PATH + + -- Micah Gersten Fri, 02 Apr 2010 00:20:48 -0500 + edbrowse (3.4.1-1) unstable; urgency=low * New upstream version (3.4.1). only in patch2: unchanged: --- edbrowse-3.4.1.orig/debian/edbrowse.sh +++ edbrowse-3.4.1/debian/edbrowse.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +# Set LD_LIBRARY_PATH before launching edbrowse + +LD_LIBRARY_PATH="$LD_LIBRARY_PATH;/usr/lib/xulrunner-`xulrunner-1.9.2 --gre-version`" +export LD_LIBRARY_PATH +exec /usr/bin/edbrowse-real $@