Use dh_xulrunner to determine xulrunner dependency

This enables building *and* running with XULRunner 1.9.1.

diff --git a/debian/changelog b/debian/changelog
index 4a1686856392dad28a965cf562c04d19ecd8f4fa..f767978944c67838b622343a0030852f1faeedf4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+videolink (1.2.9-2) unstable; urgency=low
+
+  * Use dh_xulrunner to determine xulrunner dependency
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Thu, 15 Oct 2009 02:56:03 +0100
+

 videolink (1.2.9-1) unstable; urgency=low
 
   * New upstream version
 videolink (1.2.9-1) unstable; urgency=low
 
   * New upstream version

diff --git a/debian/control b/debian/control
index 53dd910c8ba92ac309f08e6b8116bbf81424187e..8a2c613ae2742ec047efd98b108c74937aac9a03 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: videolink
 Maintainer: Ben Hutchings <ben@decadent.org.uk>
 Section: contrib/video
 Priority: extra
 Maintainer: Ben Hutchings <ben@decadent.org.uk>
 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
 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
 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 --git a/debian/rules b/debian/rules
index aeb237600e3c6d99c13d769732bd0c8e439de74d..39fc73595a433de9288a4107b8f79627e3b69c8a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ binary-arch : build
        $(MAKE) DESTDIR=debian/videolink prefix=/usr install
        dh_strip
        dh_shlibdeps
        $(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 \
        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 \