Merge tag 'upstream/2013.06.34'

[youtubedl] / debian / control

diff --git a/debian/control b/debian/control
index e75080486853b44f754ca85fb7078aed35028cd6..802e6c061935941dd9aa2380229b36b548a68f47 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,11 @@ Section: web
 Priority: extra
 Maintainer: Rogério Brito <rbrito@ime.usp.br>
 Build-Depends:
 Priority: extra
 Maintainer: Rogério Brito <rbrito@ime.usp.br>
 Build-Depends:

- debhelper (>= 7.0.50~)
+ debhelper (>= 9),
+ python-pkg-resources

 Build-Depends-Indep:
 Build-Depends-Indep:

- perl,

  python
  python

-Standards-Version: 3.9.2
-DM-Upload-Allowed: yes
+Standards-Version: 3.9.3

 Homepage: http://rg3.github.com/youtube-dl/
 Vcs-Git: git://anonscm.debian.org/collab-maint/youtube-dl.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/youtube-dl.git
 Homepage: http://rg3.github.com/youtube-dl/
 Vcs-Git: git://anonscm.debian.org/collab-maint/youtube-dl.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/youtube-dl.git


@@ -16,11 +15,12 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/youtube-dl.git
 Package: youtube-dl
 Architecture: all
 Depends:
 Package: youtube-dl
 Architecture: all
 Depends:

- python (>= 2.5),
+ python (>= 2.6),

  ${misc:Depends}
 Recommends:
  ${misc:Depends}
 Recommends:

- ffmpeg
-Suggests:
+ libav-tools | ffmpeg,
+ libav-tools | ffmpeg (>= 4:0.6) | ffprobe,
+ mplayer2 | mplayer,

  rtmpdump
 Description: downloader of videos from YouTube and other sites
  youtube-dl is a small command-line program to download videos from
  rtmpdump
 Description: downloader of videos from YouTube and other sites
  youtube-dl is a small command-line program to download videos from


@@ -34,4 +34,5 @@ Description: downloader of videos from YouTube and other sites
  .
  Currently supported sites are: CollegeHumor, Comedy Central, Dailymotion,
  Facebook, Metacafe, MyVideo, Photobucket, The Escapist, Vimeo, Yahoo!,
  .
  Currently supported sites are: CollegeHumor, Comedy Central, Dailymotion,
  Facebook, Metacafe, MyVideo, Photobucket, The Escapist, Vimeo, Yahoo!,

- YouTube, blip.tv, depositfiles.com, video.google.com, xvideos.
+ YouTube, blip.tv, depositfiles.com, video.google.com, xvideos, Soundcloud,
+ InfoQ, Mixcloud, OpenClassRoom.