[SCM] ffmpeg/master: let ffmpeg suggest ffmpeg-doc

aca-guest at users.alioth.debian.org aca-guest at users.alioth.debian.org
Wed Jun 10 22:50:27 UTC 2015


The following commit has been merged in the master branch:
commit 8dbc9ff58c040cfdfb852257da2d233e026136f9
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Wed Jun 10 21:28:11 2015 +0200

    let ffmpeg suggest ffmpeg-doc

diff --git a/debian/changelog b/debian/changelog
index f1b476c..493ac51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ffmpeg (7:2.7-1) UNRELEASED; urgency=medium
 
   * Import new major upstream release 2.7.
   * Change maintainer to the pkg-multimedia team and move myself to uploaders.
+  * Let ffmpeg suggest ffmpeg-doc.
 
  -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>  Fri, 05 Jun 2015 14:23:01 +0200
 
diff --git a/debian/control b/debian/control
index 05c1b02..7ea6b1f 100644
--- a/debian/control
+++ b/debian/control
@@ -146,6 +146,8 @@ Depends:
  ${misc:Depends}
 Recommends:
  qt-faststart
+Suggests:
+ ffmpeg-doc
 Breaks: libav-tools (<< 6:9~)
 Replaces: libav-tools (<< 6:9~)
 Description: Tools for transcoding, streaming and playing of multimedia files

-- 
ffmpeg packaging



More information about the pkg-multimedia-commits mailing list