[SCM] ffmpeg/jessie: Merge tag 'debian/7%2.8.6-1' into jessie

[rbalint at users.alioth.debian.org]

Update changelog.
Use https for the Vcs-Git link.
Update Standards-Version to 3.9.7.
Move documentatation from /u/s/d/ffmpeg-doc/ to /u/s/d/ffmpeg/.
Merge tag 'upstream/2.8.6'
Imported Upstream version 2.8.6
Update changelog
Change priority of libavcodec*-extra* to extra.
Update copyright year for the debian files.
Fix altivec-extra compile time optimization.
Enable the now available opencv and frei0r on mips64el.
Add patch to make out-of-tree builds bit-identical to in-tree-builds.
Update doc-make-apidoc-output-independent-of-SRC_PATH.patch.
Merge tag 'upstream/2.8.5'
Imported Upstream version 2.8.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/jessie
X-Git-Reftype: branch
X-Git-Oldrev: f4f72e07462e11f3b414f808400876fef90dbec2
X-Git-Newrev: 337a7b26de4e948766d3ba3bdf2d0a78268644a2

The following commit has been merged in the jessie branch:
commit 337a7b26de4e948766d3ba3bdf2d0a78268644a2
Merge: f4f72e07462e11f3b414f808400876fef90dbec2 0b63693ea9723c214f439e2a86fb8bc297c4121d
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Fri Feb 26 18:34:18 2016 +0100

    Merge tag 'debian/7%2.8.6-1' into jessie
    
    ffmpeg Debian release 7:2.8.6-1
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 291482a,60e744b..8021d24
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,24 +1,30 @@@
- ffmpeg (7:2.8.4-1~bpo8+1) jessie-backports; urgency=medium
++ffmpeg (7:2.8.6-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
-  -- Balint Reczey <balint at balintreczey.hu>  Thu, 07 Jan 2016 23:04:25 +0100
++ -- Balint Reczey <balint at balintreczey.hu>  Fri, 26 Feb 2016 18:33:31 +0100
++
+ ffmpeg (7:2.8.6-1) unstable; urgency=medium
+ 
+   * Import new upstream bugfix release 2.8.6.
+   * Update Standards-Version to 3.9.7.
+      - Move documentatation from /u/s/d/ffmpeg-doc/ to /u/s/d/ffmpeg/.
+   * Use https for the Vcs-Git link.
+ 
+  -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>  Tue, 02 Feb 2016 23:46:23 +0100
+ 
+ ffmpeg (7:2.8.5-1) unstable; urgency=medium
+ 
+   * Import new upstream bugfix release 2.8.5.
+      - Fixes CVE-2016-1897 and CVE-2016-1898.
+   * Update doc-make-apidoc-output-independent-of-SRC_PATH.patch.
+   * Add patch to make out-of-tree builds bit-identical to in-tree-builds.
+   * Enable the now available opencv and frei0r on mips64el.
+   * Fix altivec-extra compile time optimization.
+   * Update copyright year for the debian files.
+   * Change priority of libavcodec*-extra* to extra.
+ 
+  -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>  Fri, 15 Jan 2016 20:23:56 +0100
  
  ffmpeg (7:2.8.4-1) unstable; urgency=medium
  

-- 
ffmpeg packaging