Merge lp:~siretart/gxine/bug.542506 into lp:ubuntu/lucid/gxine

Proposed by Reinhard Tartler
Status: Needs review
Proposed branch: lp:~siretart/gxine/bug.542506
Merge into: lp:ubuntu/lucid/gxine
Diff against target: 67 lines (+20/-3)
5 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
debian/gxine-wrapper.sh (+8/-0)
debian/gxine.install (+1/-2)
debian/rules (+3/-0)
To merge this branch: bzr merge lp:~siretart/gxine/bug.542506
To post a comment you must log in.

Unmerged revisions

44. By Reinhard Tartler

manually add depends on xulrunner-1.9.2, the wrapper needs the xulrunner-1.9.2 binary

43. By Reinhard Tartler

Enable gxine to find and load libmozjs.so by installing wrapper that
sets LD_LIBRARY_PATH. Fixes LP: #542506

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-03-14 10:17:03 +0000
3+++ debian/changelog 2010-05-25 16:09:34 +0000
4@@ -1,3 +1,10 @@
5+gxine (0.5.904-2ubuntu3.1) lucid-proposed; urgency=low
6+
7+ * Enable gxine to find and load libmozjs.so by installing wrapper that
8+ sets LD_LIBRARY_PATH. Fixes LP: #542506
9+
10+ -- Reinhard Tartler <siretart@tauware.de> Mon, 24 May 2010 18:32:54 +0200
11+
12 gxine (0.5.904-2ubuntu3) lucid; urgency=low
13
14 * libmozjs-dev doesn't exist anymore, so use xulrunner-dev as build
15
16=== modified file 'debian/control'
17--- debian/control 2010-03-14 10:17:03 +0000
18+++ debian/control 2010-05-25 16:09:34 +0000
19@@ -19,7 +19,7 @@
20
21 Package: gxine
22 Architecture: any
23-Depends: ${shlibs:Depends}, librsvg2-common, libxine1-x | libxine1 (<< 1.1.8-2)
24+Depends: ${shlibs:Depends}, librsvg2-common, libxine1-x | libxine1 (<< 1.1.8-2), xulrunner-1.9.2
25 Recommends: libxine1-ffmpeg
26 Suggests: libgnomevfs2-0, realplayer, libdvdcss2 | libdvdcss, gxineplugin
27 Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a
28
29=== added file 'debian/gxine-wrapper.sh'
30--- debian/gxine-wrapper.sh 1970-01-01 00:00:00 +0000
31+++ debian/gxine-wrapper.sh 2010-05-25 16:09:34 +0000
32@@ -0,0 +1,8 @@
33+#!/bin/sh
34+
35+# wrapper for finding libmozjs.so. See https://launchpad.net/bugs/542506
36+
37+LD_LIBRARY_PATH="/usr/lib/xulrunner-`xulrunner-1.9.2 --gre-version`:$LD_LIBRARY_PATH"
38+export LD_LIBRARY_PATH
39+
40+exec `which gxine.real` "$@"
41\ No newline at end of file
42
43=== modified file 'debian/gxine.install'
44--- debian/gxine.install 2009-05-20 11:48:40 +0000
45+++ debian/gxine.install 2010-05-25 16:09:34 +0000
46@@ -1,6 +1,5 @@
47 etc/gxine
48-usr/bin/gxine
49-usr/bin/gxine_client
50+usr/bin
51 ../../gxine.desktop.in usr/share/gxine
52 usr/share/gxine
53 usr/share/locale
54
55=== modified file 'debian/rules'
56--- debian/rules 2009-11-05 20:04:38 +0000
57+++ debian/rules 2010-05-25 16:09:34 +0000
58@@ -101,6 +101,9 @@
59 dh_clean -k
60 dh_installdirs
61 $(MAKE) $(INSTALL_TARGET) DESTDIR="$(CURDIR)/debian/tmp"
62+ # now replace gxine binary with our wrapper
63+ mv "$(CURDIR)/debian/tmp/usr/bin/gxine" "$(CURDIR)/debian/tmp/usr/bin/gxine.real"
64+ install -m 755 debian/gxine-wrapper.sh "$(CURDIR)/debian/tmp/usr/bin/gxine"
65
66 debian/gxine.postinst: debian/gxine.postinst.in debian/rules
67 sed -e s^@XINE_LIST@^`pkg-config --variable=xine_list libxine`^g <$< >$@

Subscribers

People subscribed via source and target branches

to all changes: