[SCM] libav/squeeze-backports: Merge tag 'debian/6%0.8.6-1' into squeeze-backports

[siretart at users.alioth.debian.org]

update debian/changelog
Merge tag 'upstream/0.8.6'
Imported Upstream version 0.8.6
prepare new upload
fix typo in last changelog entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/squeeze-backports
X-Git-Reftype: branch
X-Git-Oldrev: 50c63690b0902ba59c8ddf800b8cbb7bd3125cf5
X-Git-Newrev: 06401fbc1205ff8037375f55f46cd0a195cecddd

The following commit has been merged in the squeeze-backports branch:
commit abb17f2988c522178f52aebf33b989b5f6493e7e
Merge: 50c63690b0902ba59c8ddf800b8cbb7bd3125cf5 10f44614433071370a21b78410946247dd3f12af
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Thu Jul 11 16:41:51 2013 +0200

    Merge tag 'debian/6%0.8.6-1' into squeeze-backports
    
    Debian release 6:0.8.6-1
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 1678374,151315e..d5d725b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,14 +1,25 @@@
+ libav (6:0.8.6-1) unstable; urgency=low
+ 
+   * Imported Upstream version 0.8.6, new releases fixes:
+     - h264: check for luma and chroma bit depth being equal (CVE-2013-2277)
+     - iff: validate CMAP palette size (CVE-2013-2495)
+     - msrledec: convert to bytestream2 API and add proper bounds checking (CVE-2013-2496)
+     - vorbisdec: Error on bark_map_size equal to 0 (CVE-2013-0894)
+     - Thus, closes: #703200
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 24 Mar 2013 07:35:51 +0100
+ 
 +libav (6:0.8.5-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * Don't install to multiarch paths.
 +  * Bump libx264 build-dep to >= 2:0.118.
 +  * Do not enable opencv support until the required packages reach
 +    squeeze-backports.
 +  * do not use XZ compression for binary packages in squeeze
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 24 Jan 2013 12:20:31 +0100
 +
  libav (6:0.8.5-1) unstable; urgency=low
  
    * New upstream security/bugfix release. New releases fixes
@@@ -25,7 -25,7 +36,7 @@@
      - ID3v2 (Bug 395)
      - Serious Memory leaks on broken Ogg files
    * drop recordshow script. This clearly undermaintained script has
-     unclear copyright status and is unlikely to work properly anyways.
+     unclear copyright status and is unlikely to work properly anyway.
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 13 Jan 2013 11:56:59 +0100
  
@@@ -146,16 -146,6 +157,16 @@@ libav (6:0.8.3-2) unstable; urgency=lo
  
   -- Reinhard Tartler <siretart at tauware.de>  Mon, 25 Jun 2012 19:06:49 +0200
  
 +libav (6:0.8.3-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * Don't install to multiarch paths.
 +  * Bump libx264 build-dep to >= 2:0.118.
 +  * Do not enable opencv support until the required packages reach
 +    squeeze-backports.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 16 Jun 2012 11:56:20 +0200
 +
  libav (6:0.8.3-1) unstable; urgency=medium
  
    [ Andres Mejia ]
@@@ -276,14 -266,6 +287,14 @@@ libav (4:0.8.1-1) unstable; urgency=med
  
   -- Reinhard Tartler <siretart at tauware.de>  Mon, 19 Mar 2012 08:39:18 +0100
  
 +libav (4:0.8-2~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * Don't install to multiarch paths.
 +  * Bump libx264 build-dep to >= 2:0.118.
 +
 + -- Julien Cristau <jcristau at debian.org>  Sat, 17 Mar 2012 13:34:26 +0100
 +
  libav (4:0.8-2) unstable; urgency=low
  
    [ Reinhard Tartler ]
@@@ -410,13 -392,6 +421,13 @@@ libav (4:0.7.3-1) unstable; urgency=hig
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 25 Dec 2011 22:04:54 +0100
  
 +libav (4:0.7.2-1~bpo50+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * Revert "Convert package to include multiarch support."
 +  
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 06 Oct 2011 21:13:19 +0200
 +
  libav (4:0.7.2-1) unstable; urgency=low
  
    * New upstream release: 0.7.2

-- 
Libav/FFmpeg packaging