[SCM] libav-extra/ubuntu: Merge branch 'master' into ubuntu

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon Dec 26 12:34:04 UTC 2011 

update debian/changelog
tighten build-dependency on libav-source
Bump shlibs
Update debian/changelog
Tighten build dependency on libav-source (>= 4:0.7.2-1)
update debian/changelog
prefer libtiff4 over libtiff5 for now
Tighten build dependency on libav-source
Add Built-Using fields
Convert package to be support multiarch.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: fc5e476d175165b61c3db0a3fb6e8c37c70617f2
X-Git-Newrev: 8375149ccd7398cfff438cadc1ca71b222e494bb

The following commit has been merged in the ubuntu branch:
commit 8375149ccd7398cfff438cadc1ca71b222e494bb
Merge: fc5e476d175165b61c3db0a3fb6e8c37c70617f2 c5e5c8612a27e6db432cd940ac56e8658b0a5aa7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Dec 26 13:33:58 2011 +0100

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

diff --combined debian/changelog
index 4bea2a9,d50fe27..f7bf226
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,35 +1,44 @@@
+ libav-extra (4:0.7.3.1) unstable; urgency=low
+ 
+   * Rebuild against libav 0.7.3
+   * Tighten build dependency on libav-source (>= 4:0.7.3-2)
+   * Bump shlibs (technically unnecessary, but added for completeness)
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Mon, 26 Dec 2011 11:21:04 +0100
+ 
+ libav-extra (4:0.7.2.1) unstable; urgency=low
+ 
+   * Rebuild against libav 0.7.2
+   * Tighten build dependency on libav-source (>= 4:0.7.2-1)
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 02 Oct 2011 19:39:40 +0200
+ 
+ libav-extra (4:0.7.1.4) unstable; urgency=low
+ 
+   * Add Built-Using fields
+   * Tighten build dependency on libav-source
+   * prefer libtiff4 over libtiff5 for now
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Wed, 28 Sep 2011 23:10:00 +0200
+ 
+ libav-extra (4:0.7.1.3) unstable; urgency=low
+ 
+   * Convert package to be support multiarch.
+   * Fix deprecated dh_install option 'warn-missing' to 'list-missing'.
+   * Update build depends to have libav-source (>= 4:0.7.1-6).
+   * Update libav-extra source lintian overrides for libav-extra package.
+ 
+  -- Andres Mejia <amejia at debian.org>  Sat, 24 Sep 2011 23:29:38 -0400
+ 
 +libav-extra (4:0.7.1.2ubuntu1) oneiric; urgency=low
 +
 +  * Revert the bits that we need to keep in ubuntu:
 +    - Maintainer field
 +    - gbp configuration
 +  * build against libav-source 4:0.7.1-7ubuntu2
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 28 Sep 2011 11:54:03 +0200
 +
  libav-extra (4:0.7.1.2) unstable; urgency=low
  
    * Tighten dependency on libav-source
diff --combined debian/control
index 85e47fd,a48b2ce..5724eb1
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
  Source: libav-extra
  Section: libs
  Priority: optional
 -Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
   Loic Minier <lool at dooz.org>,
   Reinhard Tartler <siretart at tauware.de>,
@@@ -14,9 -13,9 +14,9 @@@ Standards-Version: 3.9.
  Vcs-Git: git://git.debian.org/git/pkg-multimedia/libav-extra.git
  Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libav-extra.git;a=summary
  Homepage: http://libav.org/
- Build-Depends: debhelper (>= 7),
+ Build-Depends: debhelper (>= 8.1.3~),
   libasound2-dev [linux-any],
-  libav-source (>= 4:0.7.1-7ubuntu2),
+  libav-source (>= 4:0.7.3-2~),
   libbz2-dev,
   libdc1394-22-dev [linux-any],
   libdirac-dev,
@@@ -33,6 -32,7 +33,7 @@@
   libsdl1.2-dev,
   libspeex-dev,
   libtheora-dev (>> 0.0.0.alpha4),
+  libtiff4-dev | libtiff-dev,
   libva-dev [!hurd-i386],
   libvdpau-dev,
   libvo-aacenc-dev,
@@@ -51,10 -51,13 +52,13 @@@
  
  Package: libavutil-extra-51
  Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
  Depends: ${shlibs:Depends},
           ${misc:Depends}
  Conflicts: libavutil51
  Replaces: libavutil51
+ Built-Using: ${libav:Built-Using}
  Description: Libav utility library
   This is the common utility library from the Libav project. It is required
   by all other Libav libraries.
@@@ -64,11 -67,14 +68,14 @@@
  
  Package: libavcodec-extra-53
  Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
  Depends: ${shlibs:Depends},
   ${misc:Depends}
  Suggests: libfaad0
  Conflicts: libavcodec53
  Replaces: libavcodec53
+ Built-Using: ${libav:Built-Using}
  Description: Libav codec library
   This package contains the ffplay multimedia player, the ffserver streaming
   server and the Libav audio and video encoder. They support most existing
@@@ -80,10 -86,13 +87,13 @@@
  
  Package: libavdevice-extra-53
  Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
  Depends: ${shlibs:Depends},
   ${misc:Depends}
  Conflicts: libavdevice53
  Replaces: libavdevice53
+ Built-Using: ${libav:Built-Using}
  Description: Libav device handling library
   This is the device handling library from the Libav project.
   .
@@@ -92,10 -101,13 +102,13 @@@
  
  Package: libavfilter-extra-2
  Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
  Depends: ${shlibs:Depends},
   ${misc:Depends}
  Conflicts: libavfilter2
  Replaces: libavfilter2
+ Built-Using: ${libav:Built-Using}
  Description: Libav filter library
   This is the video postprocessing library from Libav.
   .
@@@ -104,10 -116,13 +117,13 @@@
  
  Package: libpostproc-extra-52
  Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
  Depends: ${shlibs:Depends},
   ${misc:Depends}
  Conflicts: libpostproc52
  Replaces: libpostproc52
+ Built-Using: ${libav:Built-Using}
  Description: Libav video postprocessing library
   This is the video postprocessing library from the Libav project.
   .
@@@ -116,10 -131,13 +132,13 @@@
  
  Package: libavformat-extra-53
  Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
  Depends: ${shlibs:Depends},
   ${misc:Depends}
  Conflicts: libavformat53
  Replaces: libavformat53
+ Built-Using: ${libav:Built-Using}
  Description: Libav file format library
   This is the demuxer library from the Libav project. It supports most
   existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
@@@ -129,10 -147,13 +148,13 @@@
  
  Package: libswscale-extra-2
  Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
  Depends: ${shlibs:Depends},
   ${misc:Depends}
  Conflicts: libswscale-extra-1 (>> 4:0.7~), libswscale2
  Replaces: libswscale-extra-1 (>> 4:0.7~), libswscale2
+ Built-Using: ${libav:Built-Using}
  Description: Libav video scaling library
   This is the video scaling library from the Libav project.
   .

-- 
libav-extra packaging

More information about the pkg-multimedia-commits mailing list