Removed support for mozilla-dev.

diff --git a/debian/control b/debian/control
index 375666c1a8746281286bb5943f178f592deb06e8..6f08f92891afdc1129395ace89f04c14462dcfe0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: videolink
 Maintainer: Ben Hutchings <ben@decadent.org.uk>
 Section: graphics
 Priority: extra
 Maintainer: Ben Hutchings <ben@decadent.org.uk>
 Section: graphics
 Priority: extra

-Build-Depends: debhelper (>=4), libboost-dev, libgtkmm-2.4-dev, libxul-dev | mozilla-dev, libexpat1-dev
+Build-Depends: debhelper (>=4), libboost-dev, libgtkmm-2.4-dev, libxul-dev, libexpat1-dev

 Standards-Version: 3.7.2
 
 Package: videolink
 Architecture: any
 Standards-Version: 3.7.2
 
 Package: videolink
 Architecture: any

-Depends: xvfb, dvdauthor, ffmpeg | mjpegtools, ffmpeg | netpbm, ${shlibs:Depends}, ${mozilla:Depends}
+Depends: xvfb, dvdauthor, ffmpeg | mjpegtools, ffmpeg | netpbm, ${shlibs:Depends}

 Recommends: mkisofs, 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: mkisofs, 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 ff70afd77f0316fe468af1553a9af51fe3e27506..cd3c062c54267d33402fc8559f012a4d9e0859d7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,17 +10,6 @@ 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

-       # VideoLink relies on some un-frozen APIs which may break
-       # between releases and even with backported security patches.
-       # The libxul packages have sonames and a shlibs file so we
-       # should get correct dependencies automatically, but this is
-       # not the case for mozilla-browser.
-       if dpkg-query -W libxul-dev >&/dev/null; then \
-           echo "mozilla:Depends=" >> debian/videolink.substvars ; \
-       else \
-           MOZ_VERSION=$$(dpkg-query -W --showformat='$${version}' mozilla-browser | sed 's/+b[0-9]*$$//') \
-           && echo "mozilla:Depends=mozilla-browser (>= $$MOZ_VERSION), mozilla-browser (<< $${MOZ_VERSION}+b99)" >> debian/videolink.substvars ; \
-       fi

        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 \