[SCM] x264/master: Merge branch 'ubuntu'

[ceros-guest at users.alioth.debian.org]

Add README.source file that explains patching.
Merge with master. Resolve conflicts with:   debian/control   debian/copyright   debian/rules
update debian/changelog
add fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch on upstream's request
reintroduce quilt infrastructure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 75fa1015836a6ea856e3725a7b1e38d0799156ce
X-Git-Newrev: f6d1afb8ff9960f92091638554b0892209e4340c

The following commit has been merged in the master branch:
commit f6d1afb8ff9960f92091638554b0892209e4340c
Merge: 75fa1015836a6ea856e3725a7b1e38d0799156ce 44de5706d993bec34816745472cd3f736eb644e6
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Oct 4 14:28:54 2010 -0400

    Merge branch 'ubuntu'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/rules

diff --combined debian/control
index 90d7ab1,a720fa8..9aa1d62
--- a/debian/control
+++ b/debian/control
@@@ -9,7 -9,9 +9,8 @@@ Build-Depends: debhelper (>= 7)
                 libavformat-dev (>= 4:0.5),
                 help2man,
                 yasm [i386 amd64 kfreebsd-amd64 lpia],
-                libx11-dev
 -               libgpac-dev,
+                libx11-dev,
+                quilt
  Standards-Version: 3.9.1
  Vcs-Git: git://git.debian.org/git/pkg-multimedia/x264.git
  Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/x264.git

-- 
x264 packaging