[SCM] mplayer2/master: provide, conflict and replace old mplayer1 package

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5055375309659451608c0e1015ced040f500b00b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Apr 18 18:35:03 2011 +0200

    provide, conflict and replace old mplayer1 package
    
    see http://devel.mplayer2.org/ticket/11 for a discussion what's needed
    for actually being able to co-install mplayer and mplayer2

diff --git a/debian/control b/debian/control
index 01aa2da..aec0bdd 100644
--- a/debian/control
+++ b/debian/control
@@ -72,6 +72,9 @@ Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Replaces: mplayer
+Conflicts: mplayer
+Provides: mplayer
 Description: next generation 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,

-- 
mplayer2 packaging