gxine

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

  1. bug.542506
  2. Merge into lucid
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
=== modified file 'debian/changelog'
--- debian/changelog 2010-03-14 10:17:03 +0000
+++ debian/changelog 2010-05-25 16:09:34 +0000
@@ -1,3 +1,10 @@
1gxine (0.5.904-2ubuntu3.1) lucid-proposed; urgency=low
2
3 * Enable gxine to find and load libmozjs.so by installing wrapper that
4 sets LD_LIBRARY_PATH. Fixes LP: #542506
5
6 -- Reinhard Tartler <siretart@tauware.de> Mon, 24 May 2010 18:32:54 +0200
7
1gxine (0.5.904-2ubuntu3) lucid; urgency=low8gxine (0.5.904-2ubuntu3) lucid; urgency=low
29
3 * libmozjs-dev doesn't exist anymore, so use xulrunner-dev as build 10 * libmozjs-dev doesn't exist anymore, so use xulrunner-dev as build
411
=== modified file 'debian/control'
--- debian/control 2010-03-14 10:17:03 +0000
+++ debian/control 2010-05-25 16:09:34 +0000
@@ -19,7 +19,7 @@
1919
20Package: gxine20Package: gxine
21Architecture: any21Architecture: any
22Depends: ${shlibs:Depends}, librsvg2-common, libxine1-x | libxine1 (<< 1.1.8-2)22Depends: ${shlibs:Depends}, librsvg2-common, libxine1-x | libxine1 (<< 1.1.8-2), xulrunner-1.9.2
23Recommends: libxine1-ffmpeg23Recommends: libxine1-ffmpeg
24Suggests: libgnomevfs2-0, realplayer, libdvdcss2 | libdvdcss, gxineplugin24Suggests: libgnomevfs2-0, realplayer, libdvdcss2 | libdvdcss, gxineplugin
25Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a25Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a
2626
=== added file 'debian/gxine-wrapper.sh'
--- debian/gxine-wrapper.sh 1970-01-01 00:00:00 +0000
+++ debian/gxine-wrapper.sh 2010-05-25 16:09:34 +0000
@@ -0,0 +1,8 @@
1#!/bin/sh
2
3# wrapper for finding libmozjs.so. See https://launchpad.net/bugs/542506
4
5LD_LIBRARY_PATH="/usr/lib/xulrunner-`xulrunner-1.9.2 --gre-version`:$LD_LIBRARY_PATH"
6export LD_LIBRARY_PATH
7
8exec `which gxine.real` "$@"
0\ No newline at end of file9\ No newline at end of file
110
=== modified file 'debian/gxine.install'
--- debian/gxine.install 2009-05-20 11:48:40 +0000
+++ debian/gxine.install 2010-05-25 16:09:34 +0000
@@ -1,6 +1,5 @@
1etc/gxine1etc/gxine
2usr/bin/gxine2usr/bin
3usr/bin/gxine_client
4../../gxine.desktop.in usr/share/gxine3../../gxine.desktop.in usr/share/gxine
5usr/share/gxine4usr/share/gxine
6usr/share/locale5usr/share/locale
76
=== modified file 'debian/rules'
--- debian/rules 2009-11-05 20:04:38 +0000
+++ debian/rules 2010-05-25 16:09:34 +0000
@@ -101,6 +101,9 @@
101 dh_clean -k101 dh_clean -k
102 dh_installdirs102 dh_installdirs
103 $(MAKE) $(INSTALL_TARGET) DESTDIR="$(CURDIR)/debian/tmp"103 $(MAKE) $(INSTALL_TARGET) DESTDIR="$(CURDIR)/debian/tmp"
104 # now replace gxine binary with our wrapper
105 mv "$(CURDIR)/debian/tmp/usr/bin/gxine" "$(CURDIR)/debian/tmp/usr/bin/gxine.real"
106 install -m 755 debian/gxine-wrapper.sh "$(CURDIR)/debian/tmp/usr/bin/gxine"
104107
105debian/gxine.postinst: debian/gxine.postinst.in debian/rules108debian/gxine.postinst: debian/gxine.postinst.in debian/rules
106 sed -e s^@XINE_LIST@^`pkg-config --variable=xine_list libxine`^g <$< >$@109 sed -e s^@XINE_LIST@^`pkg-config --variable=xine_list libxine`^g <$< >$@

Subscribers

People subscribed via source and target branches

to all changes: