[SCM] x264 packaging branch, ubuntu, updated. debian/0.85.1442.1+git781d30-1-2-g11c4c4e

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 11c4c4e95d8c72998a5cde2d3291d261b91a6e12
Merge: 5c80894b84bf6f2fb21cf3a8f19fb1f58436d1ed 6481f180d5ea4080b1478b5b9db7630d17f0e283
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Feb 20 12:21:59 2010 +0100

    Merge remote branch 'alioth/ubuntu' into ubuntu

diff --combined debian/control
index 6bbeb54,b96442b..59cff9f
--- a/debian/control
+++ b/debian/control
@@@ -8,6 -8,8 +8,8 @@@ Build-Depends: debhelper (>= 7)
                 libx11-dev,
                 quilt
  Standards-Version: 3.8.4
+ Vcs-Git: git://git.debian.org/git/pkg-multimedia/x264.git
+ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/x264.git
  
  Package: x264
  Section: graphics
@@@ -39,7 -41,7 +41,7 @@@ Description: video encoder for the H.26
    * parallel encoding on multiple CPUs
    * interlaced streams
  
 -Package: libx264-84
 +Package: libx264-85
  Section: libs
  Architecture: any
  Depends: ${shlibs:Depends},
@@@ -53,8 -55,7 +55,8 @@@ Description: x264 video coding librar
  Package: libx264-dev
  Section: libdevel
  Architecture: any
 -Depends: libx264-84 (= ${binary:Version})
 +Depends: libx264-85 (= ${binary:Version}),
 +         ${misc:Depends} 
  Description: development files for libx264
   libx264 is an advanced encoding library for creating H.264 (MPEG-4 AVC)
   video streams.

-- 
x264 packaging