From: Ben Hutchings Date: Thu, 3 Mar 2011 03:57:26 +0000 (+0000) Subject: Move back to main section X-Git-Tag: 1.2.11~3 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=7d33bce4f5211d95551ecfa8cf8a637d15cc28b7;p=videolink.git Move back to main section The mpeg2video encoder has been enabled in ffmpeg again. Specify a versioned dependency on ffmpeg. --- diff --git a/debian/changelog b/debian/changelog index d925cb7..f9ee272 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ videolink (1.2.11-1) UNRELEASED; urgency=low * New upstream version - Add support for XULRunner 2.0 (beta) - Add support for dvdauthor 0.7 + * Move back to main section, since the mpeg2video encoder has been + enabled in ffmpeg again. Specify a versioned dependency on ffmpeg. -- Ben Hutchings Thu, 03 Mar 2011 02:27:50 +0000 diff --git a/debian/control b/debian/control index 8a2c613..713c215 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: videolink Maintainer: Ben Hutchings -Section: contrib/video +Section: video Priority: extra Build-Depends: debhelper (>=4), libgtkmm-2.4-dev, xulrunner-dev (>= 1.9.1.3-2), libexpat1-dev Standards-Version: 3.8.0 @@ -9,7 +9,7 @@ Vcs-Git: http://git.decadent.org.uk/git/videolink.git Package: videolink Architecture: any -Depends: xvfb, dvdauthor, ffmpeg | mjpegtools, ffmpeg | netpbm, ${shlibs:Depends} +Depends: xvfb, dvdauthor, ffmpeg (>= 4:0.5.2-2), ${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 --git a/debian/copyright b/debian/copyright index 5b72bbf..45ccf08 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,4 @@ -This is the Debian-packaged version of VideoLink. It is not part of -the Debian system itself because it requires an MPEG-2 video encoder -and Debian cannot distribute these due to patent threats. +This is the Debian-packaged version of VideoLink. Copyright 2005, 2006 Ben Hutchings .