[SCM] vlc/wheezy-backports: Revert "automake 1.9 breaks the build, this is to force newer automake"

[siretart at users.alioth.debian.org]

The following commit has been merged in the wheezy-backports branch:
commit a9fc2412599a75fa3219e651a5d3d85d9cc97e2f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jan 16 21:04:34 2014 -0500

    Revert "automake 1.9 breaks the build, this is to force newer automake"
    
    This reverts commit 24fb3e199da82885fa0cfc7c56efc4e0b5a2496c.

diff --git a/debian/control b/debian/control
index eb319e7..8b5c305 100644
--- a/debian/control
+++ b/debian/control
@@ -108,7 +108,6 @@ Build-Depends: autopoint (>= 0.18.3),
                oss4-dev,
                pkg-config,
                zlib1g-dev
-Build-Conflicts: automake1.9
 Standards-Version: 3.9.5
 Homepage: http://www.videolan.org/vlc/
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/vlc.git

-- 
VLC media player packaging