[SCM] smplayer/master: mplayer is back to Debian repository

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

The following commit has been merged in the master branch:
commit b965ab990ab3f477bd2ac42dd051d6cf3d8ad046
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Tue Oct 6 15:32:31 2015 +0200

    mplayer is back to Debian repository

diff --git a/debian/changelog b/debian/changelog
index 5fd1eac..f9eb1a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,7 +21,6 @@ smplayer (15.9.0~ds0-1) UNRELEASED; urgency=medium
   * Add support for mpv: (Closes: #783401)
     - debian/control: Add mpv instead of mplayer|mplayer2.
   * Update debian/repack.local for new upstream version.
-  * Drop depends on mplayer. (Closes: #698506)
   
   [ Alf Gaida ]
   * debian/rules:
diff --git a/debian/control b/debian/control
index c976875..c6f552f 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/smplayer.git
 Package: smplayer
 Architecture: any
 Depends:
- mpv (>= 0.6.2) | mplayer2,
+ mpv (>= 0.6.2) | mplayer | mplayer2,
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:

-- 
smplayer packaging