[SCM] gmerlin-encoders/master.ubuntu: Re-generate debian/control.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master.ubuntu branch:
commit 449446a9ef6e616e2ca168e0c600185988e7f720
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 31 14:03:36 2011 +0100

    Re-generate debian/control.

diff --git a/debian/control b/debian/control
index 1abb556..c353663 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,12 @@ Uploaders: Alessio Treglia <alessio at debian.org>,
  IOhannes m zmoelnig (gpg-key at iem) <zmoelnig at iem.at>
 Homepage: http://gmerlin.sourceforge.net/
 Standards-Version: 3.9.2
-Build-Depends: autotools-dev,
+Build-Depends: cdbs (>= 0.4.70~),
+ autotools-dev,
  gnulib,
- cdbs (>= 0.4.85~),
- debhelper (>= 7.0.1),
+ debhelper,
  dh-buildinfo,
- devscripts (>= 2.10.7~),
+ devscripts,
  libgavl-dev (>= 1.2.0),
  libgmerlin-dev (>= 1.0.0~),
  libflac-dev,
@@ -25,6 +25,7 @@ Build-Depends: autotools-dev,
  libavformat-dev,
  libpostproc-dev,
  libswscale-dev,
+ libmp3lame-dev,
  libmjpegtools-dev,
  libshout3-dev
 Vcs-Git: git://git.debian.org/pkg-multimedia/gmerlin-encoders.git

-- 
gmerlin-encoders packaging