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 d925cb7ecad7bb97564cfc0c769ab9ff55fc287b..f9ee272480655c4e18812a8e38cc50bd3c3d97c8 100644 (file)
--- 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 <ben@decadent.org.uk>  Thu, 03 Mar 2011 02:27:50 +0000
 

diff --git a/debian/control b/debian/control
index 8a2c613ae2742ec047efd98b108c74937aac9a03..713c215c091f7255bbd20dd0aae13164ddbe8da2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: videolink
 Maintainer: Ben Hutchings <ben@decadent.org.uk>
-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 5b72bbfc475da4eeb0a2be087f24ed00cea68e0e..45ccf089f1da6ac29cdf37143534fa251356f9e5 100644 (file)
--- 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 <ben@decadent.org.uk>.