[SCM] mplayer packaging branch, master, updated. 556a2fa886ec9a925f1a6fd5e260aaddb1dcbff6

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 265f785a622838a86e0d3251881de8388cf0f349
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Mar 2 22:11:19 2009 +0100

    drop build conflicts
    
    Versions of gcc-4.3 of today:
       gcc-4.3 |  4.3.2-1.1 |        stable | source
       gcc-4.3 |    4.3.3-3 |       testing | source
       gcc-4.3 |    4.3.3-5 |      unstable | source

diff --git a/debian/control b/debian/control
index 33b4f97..5272c4b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Vcs-Browser: http://svn.mplayerhq.hu/mplayer/trunk/
 Vcs-Svn: svn://svn.mplayerhq.hu/mplayer
 Homepage: http://www.mplayerhq.hu/
 Build-Depends-Indep: 
-Build-Conflicts: gcc-4.3 (<= 4.3.0-3), libavcodec-dev (>= 0.svn20080207)
 Build-Depends: debhelper (>= 4), dpatch, make (>= 3.80), pkg-config, po-debconf,
  libsdl1.2-dev | libsdl1.1-dev, libsvga1-dev [i386 amd64],
  libdts-dev, ladspa-sdk, vstream-client-dev,

-- 
mplayer packaging