[SCM] multimedia-blends/master: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/multimedia-blends

[ross-guest at users.alioth.debian.org]

Libyami now in the archive
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9dfebcbb694e61c5b8b305bd721bbb9837c58a57
X-Git-Newrev: 805838e03fb96647949338074750ed9af52f3832

The following commit has been merged in the master branch:
commit 805838e03fb96647949338074750ed9af52f3832
Merge: 2f08b413046a5917441b875547ee35c3faf2d6fc 9dfebcbb694e61c5b8b305bd721bbb9837c58a57
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Sun Apr 16 17:04:13 2017 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/multimedia-blends

diff --combined tasks/video
index f992266,fd34c59..8de558e
--- a/tasks/video
+++ b/tasks/video
@@@ -157,7 -157,7 +157,7 @@@ Recommends: xbmc-pvr-argustv, xbmc-pvr-
  
  Depends: kodi
  
 -Depends: kodi-eventclients-j2me, kodi-eventclients-kodi-send,
 +Depends: kodi-eventclients-kodi-send,
           kodi-eventclients-ps3, kodi-eventclients-wiiremote
  
  Depends: kodi-pvr-argustv
@@@ -336,8 -336,8 +336,8 @@@ Pkg-Description: DVD authoring program 
  Homepage: http://www.bombono.org/
  License: GPL
  WNPP: 690032
 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-multimedia/bombono-dvd.git
 -Vcs-Git: git://anonscm.debian.org/pkg-multimedia/bombono-dvd.git
 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/bombono-dvd.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/bombono-dvd.git
  
  Depends: booh
  Pkg-Description: image classifier and web album generator
@@@ -433,16 -433,16 +433,16 @@@ Pkg-Description: DVD9 to DVD5 converte
  Homepage: http://dvd95.sourceforge.net/
  License: GPL
  WNPP: 444368
 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-multimedia/dvd95.git
 -Vcs-Git: git://anonscm.debian.org/pkg-multimedia/dvd95.git
 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/dvd95.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/dvd95.git
  
  Depends: dvdstyler
  Pkg-Description: DVD authoring and burning tool
  Homepage: http://dvdstyler.sf.net/
  License: GPL2
  WNPP: 635516
 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-multimedia/dvdstyler.git
 -Vcs-Git: git://anonscm.debian.org/pkg-multimedia/dvdstyler.git
 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/dvdstyler.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/dvdstyler.git
  
  Depends: djv-imaging
  Pkg-Description: professional movie playback software for film production
@@@ -555,8 -555,8 +555,8 @@@ Pkg-Description: h.264 video encoding s
  Homepage: http://h264enc.sourceforge.net/
  License: GPL
  WNPP: 490386
 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-multimedia/h264enc.git
 -Vcs-Git: git://anonscm.debian.org/pkg-multimedia/h264enc.git
 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/h264enc.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/h264enc.git
  
  Recommends: ht5streamer
  Pkg-Description: Youtube/Dailymotion streamer without need of flashplugin
@@@ -710,8 -710,6 +710,8 @@@ Pkg-Description: A libmpv based media p
  Homepage: http://bakamplayer.u8sand.net/
  License: GPL-2
  WNPP: 813591
 +Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/baka-mplayer.git
 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/baka-mplayer.git
  
  Depends: smoviecat
  Pkg-Description: scan for movies, query imdb and generate a catalog
@@@ -734,3 -732,5 +734,5 @@@ License: GPLv
  WNPP: 825061
  
  Suggests: vamps
+ 
+ Suggests: libyami-utils

-- 
multimedia-blends packaging