[SCM] mplayer/master: Restore Conflicts with mplayer2

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b66b7b6c3a49bed333be2ccfccf3bf5cf542e17d
Author: James Cowgill <jcowgill at debian.org>
Date:   Wed Oct 26 08:57:51 2016 +0100

    Restore Conflicts with mplayer2

diff --git a/debian/control b/debian/control
index bdbc0a2..f30cdd4 100644
--- a/debian/control
+++ b/debian/control
@@ -161,9 +161,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 (<< 2:1.2)
-Breaks:
- mplayer2 (<< 2:1.2)
+ mplayer2
+Conflicts:
+ mplayer2
 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,

-- 
mplayer packaging