[SCM] mplayer2/master: Set Replaces/Conflicts/Provides field to properly fix file overwrite errors (Closes: #640100).

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d6aa56b5b2963575be010856ef77ffe20129669d
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Sep 5 12:41:00 2011 +0200

    Set Replaces/Conflicts/Provides field to properly fix file overwrite errors (Closes: #640100).

diff --git a/debian/control b/debian/control
index 7005810..170ed75 100644
--- a/debian/control
+++ b/debian/control
@@ -101,6 +101,9 @@ Section: debug
 Architecture: any
 Depends: mplayer2 (= ${binary:Version}),
  ${misc:Depends}
+Replaces: mplayer-dbg
+Conflicts: mplayer-dbg
+Provides: mplayer-dbg
 Description: Debugging symbols for mplayer2
  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