[SCM] x264/ubuntu: minimize diff to debian

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 3c6892671449a89a94fb9371e2e1ed8ec886fb55
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Oct 29 17:46:38 2011 +0200

    minimize diff to debian

diff --git a/debian/control b/debian/control
index 9b31e08..d6702f8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,17 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Reinhard Tartler <siretart at tauware.de>,
            Fabian Greffrath <fabian+debian at greffrath.com>,
            Andres Mejia <amejia at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3~),
                libavcodec-dev (>= 4:0.7~),
                libavformat-dev (>= 4:0.7~),
                libavutil-dev (>= 4:0.7~),
                libpostproc-dev (>= 4:0.7~),
                libswscale-dev (>= 4:0.7~),
-               help2man,
                libffms2-dev,
                yasm [any-i386 any-amd64],
                libffms2-dev,
                libgpac-dev,
-               libx11-dev,
+               libx11-dev
 Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/x264.git

-- 
x264 packaging