[SCM] mplayer/master: merge changes from ubuntu

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

The following commit has been merged in the master branch:
commit d75cc1737a6d1bac9fdab1b21d1b213091663218
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Thu May 12 22:12:02 2016 +0200

    merge changes from ubuntu

diff --git a/debian/control b/debian/control
index 7e2a7f6..93a0fee 100644
--- a/debian/control
+++ b/debian/control
@@ -163,9 +163,9 @@ Replaces:
  mencoder (<< 2:1.0~rc3+svn20090426-2),
  mplayer-doc (<< 2:1.0~rc3+svn20090426-2),
  mplayer-nogui (<< 2:1.0~rc3+svn20090426-2),
- mplayer2
-Conflicts:
- mplayer2
+ mplayer2 (<< 2:1.2)
+Breaks:
+ mplayer2 (<< 2:1.2)
 Description: movie player for Unix-like systems
  MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
  ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
@@ -200,6 +200,8 @@ Package: mplayer2
 Depends: mplayer, ${misc:Depends}
 Architecture: all
 Section: oldlibs
+Multi-Arch: foreign
+Depends: mplayer (>= 2:1.2)
 Description: transitional dummy package for mplayer
  This is a transitional dummy package to get upgrading systems to install
  the mplayer package. It can safely be removed once no other package

-- 
mplayer packaging