Merge tag 'upstream/2014.01.17.2'

[youtubedl] / debian / control

diff --git a/debian/control b/debian/control
index 5f1c0f62e444eb37cd5b5da8ad2ead369fa43642..74c28b3bfc7a330ebda1210239473377462fa70f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/youtube-dl.git
 Package: youtube-dl
 Architecture: all
 Depends:
+ python-pkg-resources,
  ${misc:Depends},
  ${python:Depends}
 Recommends:
@@ -35,29 +36,35 @@ Description: downloader of videos from YouTube and other sites
  .
  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, 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, Escapist, exfm, facebook, faz.net, fernsehkritik.tv,
+ 1up.com, 220.ro, 3sat, 56.com, 8tracks, AddAnime, anitube.se,
+ AppleTrailers, archive.org, ARD, arte.tv, arte.tv:+7, arte.tv:creative,
+ arte.tv:future, AUEngine, bambuser, bambuser:channel, Bandcamp,
+ Bandcamp:album, blip.tv, blip.tv:user, Bloomberg, Break, Brightcove,
+ canalc2.tv, canalplus.fr, Cinemassacre, clipfish, Clipsyndicate, CNN,
+ CollegeHumor, ComedyCentral, ComedyCentralShows, CondeNast, Criterion,
+ CSpan, d8.tv, 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,
- KickStarter, liveleak, Livestream, metacafe, Metacritic, mixcloud, MTV,
- muzu.tv, MySpass, myvideo, Naver, NBA, NBCNews, Newgrounds, nhl.com,
- nhl.com:videocenter, NowVideo, Ooyala, ORF, PBS, photobucket, plus.google,
- pluzz.francetv.fr, Pornotube, RBMARadio, RedTube, RingTV, RottenTomatoes,
- Roxwel, RTLnow, Rutube, screen.yahoo:search, Sina, Slashdot, Slideshare,
- Sohu, soundcloud, soundcloud:set, soundcloud:user, southparkstudios.com,
- Spiegel, stanfordoc, Statigram, Steam, SztvHu, Teamcoco, TechTalks,
- techtv.mit.edu, TED, TF1, ThisAV, TrailerAddict, Trilulilu, Tudou, Tumblr,
- Tutv, Unistra, ustream, ustream:channel, Vbox7, VeeHD, Veoh, Vevo, Vice,
+ francetvinfo.fr, Freesound, FunnyOrDie, Gamekings, GameSpot, Gametrailers,
+ generic, Hark, HotNewHipHop, Howcast, Hypem, ign.com, imdb, Ina, InfoQ,
+ Instagram, InternetVideoArchive, JeuxVideo, Jukebox, justin.tv, Kankan,
+ keek, KeezMovies, KickStarter, liveleak, livestream, livestream:original,
+ metacafe, Metacritic, mixcloud, Mofosex, MTV, muzu.tv, MySpace, MySpass,
+ myvideo, Naver, NBA, NBCNews, Newgrounds, nhl.com, nhl.com:videocenter,
+ niconico, NowVideo, Ooyala, ORF, PBS, photobucket, plus.google,
+ pluzz.francetv.fr, podomatic, PornHub, Pornotube, RBMARadio, RedTube,
+ RingTV, RottenTomatoes, Roxwel, RTLnow, Rutube, screen.yahoo:search, Sina,
+ Slashdot, Slideshare, smotri, smotri:community, smotri:user, Sohu,
+ soundcloud, soundcloud:set, soundcloud:user, southpark.de,
+ southparkstudios.com, Space, Spankwire, Spiegel, stanfordoc, Statigram,
+ Steam, streamcloud.eu, SztvHu, Teamcoco, TechTalks, techtv.mit.edu, TED,
+ TF1, ThisAV, tou.tv, TrailerAddict, Trilulilu, Tube8, Tudou, Tumblr, Tutv,
+ tvp.pl, Unistra, ustream, ustream:channel, Vbox7, VeeHD, Veoh, Vevo, Vice,
  Viddler, video.google:search, video.mit.edu, VideoDetective, videofy.me,
- VideoPremium, vimeo, vimeo:channel, Vine, wat.tv, websurg.com, Weibo, Wimp,
- WorldStarHipHop, XHamster, XNXX, XVideos, Yahoo, YouJizz, Youku, YouPorn,
- youtube, youtube:channel, youtube:favorites, youtube:playlist,
- youtube:recommended, youtube:search, youtube:show, youtube:subscriptions,
+ VideoPremium, viki, vimeo, vimeo:channel, vimeo:user, Vine, vk.com, wat.tv,
+ websurg.com, Weibo, Wimp, WorldStarHipHop, XHamster, XNXX, XTube, XVideos,
+ Yahoo, yahoo:news, YouJizz, Youku, YouPorn, youtube, youtube:channel,
+ youtube:favorites, youtube:history, youtube:playlist, youtube:recommended,
+ youtube:search, youtube:search:date, youtube:show, youtube:subscriptions,
  youtube:truncated_url, youtube:user, youtube:watch_later, ZDF.