Merge tag 'upstream/2013.07.02'

[youtubedl] / debian / control

diff --git a/debian/control b/debian/control
index 0035c525ef643d8a8c5771978add549a998c4186..4b0f4ddf81871ed2a1ecdd3d9a209ffa60c4ad9f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ 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 (>= 9)
+ debhelper (>= 9),
+ python-pkg-resources

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

- perl,
- python,
+ python
+X-Python-Version: >= 2.6, << 2.8

 Standards-Version: 3.9.3
 Standards-Version: 3.9.3

-DM-Upload-Allowed: yes

 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 +16,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.6),
- ${misc:Depends}
+ ${misc:Depends},
+ ${python:Depends}

 Recommends:
  libav-tools | ffmpeg,
  libav-tools | ffmpeg (>= 4:0.6) | ffprobe,
 Recommends:
  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