[SCM] mplayer2/master: wrap-and-sort -a -s

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d30f67cc99156a1c3dfd80b62f69ee0ce5ae8b26
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Apr 1 10:21:57 2012 +0200

    wrap-and-sort -a -s
    
    Git-Dch: Ignore

diff --git a/debian/control b/debian/control
index 92f2e34..220e6f7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: mplayer2
 Section: video
 Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Reinhard Tartler <siretart at tauware.de>,
+Uploaders:
+ Reinhard Tartler <siretart at tauware.de>,
  Alessio Treglia <alessio at debian.org>
 Build-Depends:
  autoconf,
@@ -78,9 +79,12 @@ Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Replaces: mplayer
-Conflicts: mplayer
-Provides: mplayer
+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,
@@ -98,11 +102,15 @@ Description: next generation movie player for Unix-like systems
 Package: mplayer2-dbg
 Section: debug
 Architecture: any
-Depends: mplayer2 (= ${binary:Version}),
+Depends:
+ mplayer2 (= ${binary:Version}),
  ${misc:Depends}
-Replaces: mplayer-dbg
-Conflicts: mplayer-dbg
-Provides: mplayer-dbg
+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,
diff --git a/debian/copyright b/debian/copyright
index 6469679..dd59fd6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -357,7 +357,7 @@ License: ISC
  Permission to use, copy, modify, and/or distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
  copyright notice and this permission notice appear in all copies.
- . 
+ .
  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

-- 
mplayer2 packaging