[SCM] mplayer/master.experimental: normalize fields with wrap-and-sort(1)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 87265a2b56b92fa44c02dc8c98bb5a89a8195687
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 4 19:37:55 2012 +0100

    normalize fields with wrap-and-sort(1)
    
    Git-Dch: ignore

diff --git a/debian/control b/debian/control
index e18ce4a..8baea5b 100644
--- a/debian/control
+++ b/debian/control
@@ -115,7 +115,8 @@ Replaces:
  mplayer-doc (<< 2:1.0~rc3+svn20090426-2),
  mplayer-nogui (<< 2:1.0~rc3+svn20090426-2),
  mplayer2
-Conflicts: 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,
@@ -143,8 +144,10 @@ Depends:
  ${misc:Depends}
 Recommends:
  ffmpeg-dbg
-Replaces: mplayer2-dbg
-Conflicts: mplayer2-dbg
+Replaces:
+ mplayer2-dbg
+Conflicts:
+ mplayer2-dbg
 Description: debugging symbols for MPlayer
  This package contains the debugging symbols for MPlayer, a movie
  player for Unix-like systems.

-- 
mplayer packaging