Merge tag 'upstream/2013.12.04'

[youtubedl] / debian / control

diff --git a/debian/control b/debian/control
index 8d817623f16824ff943473b2d8364799e4a65b5d..b88c011c3dde685316bd094dd2b22fa2d236379a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  python-pkg-resources
 Build-Depends-Indep:
  python
  python-pkg-resources
 Build-Depends-Indep:
  python

-X-Python-Version: >= 2.6, << 2.8
+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
 Standards-Version: 3.9.4
 Homepage: http://rg3.github.com/youtube-dl/
 Vcs-Git: git://anonscm.debian.org/collab-maint/youtube-dl.git


@@ -16,6 +16,7 @@ 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-pkg-resources,

  ${misc:Depends},
  ${python:Depends}
 Recommends:
  ${misc:Depends},
  ${python:Depends}
 Recommends:


@@ -35,19 +36,32 @@ Description: downloader of videos from YouTube and other sites
  .
  Currently supported sites (or features of sites) are:
  .
  .
  Currently supported sites (or features of sites) are:
  .

- 1up.com, 3sat, 56.com, 8tracks, archive.org, ARD, arte.tv, AUEngine,
- Bandcamp, blip.tv, blip.tv:user, Break, Brightcove, canalplus.fr,
+ 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,
  CollegeHumor, ComedyCentral, CondeNast, Criterion, CSpan, dailymotion,

- DailymotionPlaylist, DepositFiles, Dotsub, eHow, Escapist, exfm, facebook,
- Flickr, Freesound, FunnyOrDie, GameSpot, Gametrailers, generic,
- HotNewHipHop, Howcast, Hypem, ign.com, Ina, InfoQ, Instagram, Jukebox,
- justin.tv, Kankan, keek, liveleak, Livestream, metacafe, mixcloud (CURRENTLY
- BROKEN), MTV, muzu.tv, MySpass, myvideo, NBA, Ooyala, photobucket,
- plus.google, Pornotube, RBMARadio, RedTube, RingTV, Roxwel,
- screen.yahoo:search, Sina, soundcloud, soundcloud:set, Spiegel, stanfordoc,
- Statigram, Steam, Teamcoco, TED, TF1, ThisAV, TrailerAddict, Tudou, Tumblr,
- Tutv, ustream, Vbox7, Veoh, Vevo, video.google:search, videofy.me, vimeo,
- vimeo:channel, Vine, wat.tv, Weibo, Wimp, WorldStarHipHop, XHamster, XNXX,
- XVideos, Yahoo, YouJizz, Youku, YouPorn, youtube, youtube:channel,
+ 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:favorites, youtube:playlist, youtube:recommended, youtube:search,

- youtube:show, youtube:subscriptions, youtube:user, youtube:watch_later, ZDF.
+ youtube:search, youtube:show, youtube:subscriptions, youtube:truncated_url,
+ youtube:user, youtube:watch_later, ZDF.