Merge tag 'upstream/2013.12.04'

[youtubedl] / debian / control

diff --git a/debian/control b/debian/control
index 0035c525ef643d8a8c5771978add549a998c4186..b88c011c3dde685316bd094dd2b22fa2d236379a 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,
-Standards-Version: 3.9.3
-DM-Upload-Allowed: yes
+ python
+X-Python-Version: >= 2.6
+Standards-Version: 3.9.4

 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,13 @@ 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}
+ python-pkg-resources,
+ ${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


@@ -32,7 +34,34 @@ Description: downloader of videos from YouTube and other sites
  determine the best (or worst) quality video to grab. It supports
  downloading entire playlists and all videos from a given user.
  .
  determine the best (or worst) quality video to grab. It supports
  downloading entire playlists and all videos from a given user.
  .

- 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, Soundcloud,
- InfoQ, Mixcloud, OpenClassRoom.
+ Currently supported sites (or features of sites) are:
+ .
+ 1up.com, 220.ro, 3sat, 56.com, 8tracks, AddAnime, AppleTrailers,
+ archive.org, ARD, arte.tv, arte.tv:+7, arte.tv:creative, arte.tv:future,
+ AUEngine, bambuser, bambuser:channel, Bandcamp, blip.tv, blip.tv:user,
+ Bloomberg, Break, Brightcove, canalc2.tv, canalplus.fr, Cinemassacre, CNN,
+ CollegeHumor, ComedyCentral, CondeNast, Criterion, CSpan, dailymotion,
+ dailymotion:playlist, dailymotion:user, daum.net, DefenseGouvFr,
+ DepositFiles, Dotsub, EbaumsWorld, eHow, eitb.tv, Escapist, exfm,
+ ExtremeTube, facebook, faz.net, fernsehkritik.tv,
+ fernsehkritik.tv:postecke, Flickr, france2.fr, france2.fr:generation-quoi,
+ francetvinfo.fr, Freesound, FunnyOrDie, GameSpot, Gametrailers, generic,
+ Hark, HotNewHipHop, Howcast, Hypem, ign.com, Ina, InfoQ, Instagram,
+ InternetVideoArchive, JeuxVideo, Jukebox, justin.tv, Kankan, keek,
+ KeezMovies, KickStarter, liveleak, Livestream, metacafe, Metacritic,
+ mixcloud, Mofosex, MTV, muzu.tv, MySpace, MySpass, myvideo, Naver, NBA,
+ NBCNews, Newgrounds, nhl.com, nhl.com:videocenter, NowVideo, Ooyala, ORF,
+ PBS, photobucket, plus.google, pluzz.francetv.fr, PornHub, Pornotube,
+ RBMARadio, RedTube, RingTV, RottenTomatoes, Roxwel, RTLnow, Rutube,
+ screen.yahoo:search, Sina, Slashdot, Slideshare, Sohu, soundcloud,
+ soundcloud:set, soundcloud:user, southparkstudios.com, Space, Spankwire,
+ Spiegel, stanfordoc, Statigram, Steam, SztvHu, Teamcoco, TechTalks,
+ techtv.mit.edu, TED, TF1, ThisAV, TrailerAddict, Trilulilu, Tube8, Tudou,
+ Tumblr, Tutv, Unistra, ustream, ustream:channel, Vbox7, VeeHD, Veoh, Vevo,
+ Vice, Viddler, video.google:search, video.mit.edu, VideoDetective,
+ videofy.me, VideoPremium, vimeo, vimeo:channel, Vine, vk.com, wat.tv,
+ websurg.com, Weibo, Wimp, WorldStarHipHop, XHamster, XNXX, XTube, XVideos,
+ Yahoo, YouJizz, Youku, YouPorn, youtube, youtube:channel,
+ youtube:favorites, youtube:playlist, youtube:recommended, youtube:search,
+ youtube:search, youtube:show, youtube:subscriptions, youtube:truncated_url,
+ youtube:user, youtube:watch_later, ZDF.