[SCM] x264 packaging branch, master, updated. debian/0.85.1448+git1a6d32-5-10-gcb59f2e

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 81645b715cf31b8f7d78074762d88cda3610b9fa
Merge: a57f9280ac4e6b2a962e2e87ddb135ab82c411c1 0f64f26e20554426f716dbbd32a83588f20f1075
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 31 20:57:36 2010 -0400

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

diff --combined debian/changelog
index 1e57810,795d7f0..392c31b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,21 @@@
+ x264 (2:0.98.1653+git88b90d9-1) maverick; urgency=low
+ 
+   * require libavformat-dev from 0.6 or better
+   * remove conflicts/replaces to ancient package x264-bin (dapper!
+     times)
+   * new upstream release
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 04 Jul 2010 16:23:51 -0400
+ 
 +x264 (2:0.85.1448+git1a6d32-5) unstable; urgency=low
 +
 +  * Prepare new upload for Debian.
 +  * Edit git-buildpackage config file for master branch.
 +  * Add myself to Uploaders field.
 +  * Note the x264 homepage.
 +
 + -- Andres Mejia <mcitadel at gmail.com>  Sat, 08 May 2010 02:08:19 -0400
 +
  x264 (2:0.85.1448+git1a6d32-4) lucid; urgency=low
  
    * install sse optimized version in /usr/lib/sse2. LP: #550524
diff --combined debian/control
index daef3f6,90685c4..0de8b8b
--- a/debian/control
+++ b/debian/control
@@@ -2,10 -2,9 +2,11 @@@ 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>,
 +           Andres Mejia <mcitadel at gmail.com>
  Build-Depends: debhelper (>= 7),
+                libavformat-dev (>= 4:0.6-1~),
                 help2man,
                 yasm [i386 amd64 kfreebsd-amd64 lpia],
                 libgpac-dev,
@@@ -13,7 -12,6 +14,7 @@@
  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
 +Homepage: http://www.videolan.org/developers/x264.html
  
  Package: x264
  Section: graphics
@@@ -45,7 -43,8 +46,8 @@@ Description: video encoder for the H.26
    * parallel encoding on multiple CPUs
    * interlaced streams
  
- Package: libx264-85
+ Package: libx264-98
+ Section: libs
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends}
@@@ -58,7 -57,7 +60,7 @@@ Description: x264 video coding librar
  Package: libx264-dev
  Section: libdevel
  Architecture: any
- Depends: libx264-85 (= ${binary:Version}),
+ Depends: libx264-98 (= ${binary:Version}),
           ${misc:Depends} 
  Description: development files for libx264
   libx264 is an advanced encoding library for creating H.264 (MPEG-4 AVC)

-- 
x264 packaging