Package: videolink
Severity: important
Tags: patch
Xulrunner 1.9.1 is going to replace xulrunner 1.9 in unstable sometime
soonish, so videolink should switch to using it.
As a matter of being future-proof, a dh_xulrunner program has been added
to xulrunner-dev, that will add the proper dependency to shlibs:Depends.
Please note that the package supporting this command is not yet in the
archive and should reach experimental some time today.
The attached patch implements the necessary changes[1], please upload to
unstable as soon as possible. The package will then be dep-wait, and will
get built as soon as xulrunner 1.9.1 reaches unstable, which will happen
when all the changes required on other packages will be ready.
Cheers,
Mike
1. Please note that this patch still hardcodes the GREVersionRange, which
is not really future-proof. Something similar to what exists in chmsee would
be required for that.
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.30-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -ruN videolink-1.2.8/browser_widget.cpp videolink-1.2.8.new/browser_widget.cpp
--- videolink-1.2.8/browser_widget.cpp
+++ videolink-1.2.8.new/browser_widget.cpp
@@ -532,8 +532,8 @@
{
#if MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR == 9
static const GREVersionRange gre_versions = {
- "1.9a", PR_TRUE,
- "1.9.1", PR_FALSE
+ "1.9.1", PR_TRUE,
+ "1.9.2", PR_FALSE
};
char path[PATH_MAX];
check(GRE_GetGREPathWithProperties(&gre_versions, 1, 0, 0,
diff -ruN videolink-1.2.8/debian/control videolink-1.2.8.new/debian/control
--- videolink-1.2.8/debian/control
+++ videolink-1.2.8.new/debian/control
@@ -2,14 +2,14 @@
Maintainer: Ben Hutchings <[email protected]>
Section: contrib/video
Priority: extra
-Build-Depends: debhelper (>=4), libgtkmm-2.4-dev, xulrunner-dev, libexpat1-dev
+Build-Depends: debhelper (>=4), libgtkmm-2.4-dev, xulrunner-dev (>= 1.9.1.3-2), libexpat1-dev
Standards-Version: 3.8.0
Vcs-Browser: http://git.decadent.org.uk/gitweb?p=videolink.git
Vcs-Git: http://git.decadent.org.uk/git/videolink.git
Package: videolink
Architecture: any
-Depends: xvfb, dvdauthor, ffmpeg | mjpegtools, ffmpeg | netpbm, xulrunner-1.9, ${shlibs:Depends}
+Depends: xvfb, dvdauthor, ffmpeg | mjpegtools, ffmpeg | netpbm, ${shlibs:Depends}
Recommends: genisoimage, xfonts-base
Description: assembles a DVD video filesystem from HTML pages and video files
VideoLink is intended to provide a simple way of producing DVDs with
diff -ruN videolink-1.2.8/debian/rules videolink-1.2.8.new/debian/rules
--- videolink-1.2.8/debian/rules
+++ videolink-1.2.8.new/debian/rules
@@ -10,6 +10,7 @@
$(MAKE) DESTDIR=debian/videolink prefix=/usr install
dh_strip
dh_shlibdeps
+ dh_xulrunner
mkdir -p -m755 debian/videolink/usr/share/doc/videolink
install -m644 debian/copyright debian/videolink/usr/share/doc/videolink/copyright
mv debian/videolink/usr/share/doc/videolink/ChangeLog.gz \
