[SCM] x264 packaging branch, master, updated. debian/0.85.1448+git1a6d32-3-26-g5b6d1ef

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

The following commit has been merged in the master branch:
commit 5b6d1ef5778d3b7c0390b253925fa93706946ce9
Merge: 9f5114051b659cbee3b30c89f49c8e3ca30b7633 726fedf4899b2c04ba61096ac5ef4350f1df7a9d
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon May 3 23:03:31 2010 -0400

    Merge branch 'ubuntu'
    
    Conflicts:
    	debian/patches/01_link.diff

diff --combined debian/control
index 6425932,b6a7f14..ae4a937
--- a/debian/control
+++ b/debian/control
@@@ -2,13 -2,13 +2,14 @@@ Source: x26
  Section: libs
  Priority: extra
  Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 -Uploaders: Reinhard Tartler <siretart at tauware.de>
 +Uploaders: Reinhard Tartler <siretart at tauware.de>,
 +           Fabian Greffrath <fabian at debian-unofficial.org>
  Build-Depends: debhelper (>= 7),
+                help2man,
                 yasm [i386 amd64 kfreebsd-amd64 lpia],
-                libx11-dev,
-                quilt
- Standards-Version: 3.8.2
+                libgpac-dev,
+                libx11-dev
+ 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
  
@@@ -42,7 -42,8 +43,8 @@@ Description: video encoder for the H.26
    * parallel encoding on multiple CPUs
    * interlaced streams
  
- Package: libx264-67
+ Package: libx264-85
+ Section: libs
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends}
@@@ -55,7 -56,8 +57,8 @@@ Description: x264 video coding librar
  Package: libx264-dev
  Section: libdevel
  Architecture: any
- Depends: libx264-67 (= ${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