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

[rbalint at users.alioth.debian.org]

Finalize changelog
New upstream release
Merge tag 'upstream/3.2.5'
New upstream version 3.2.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: bb6003397ae3386ae6b4765a54c943030a35d600
X-Git-Newrev: 64d2981bbefc3a1c5a2158644bab6b17048f66d9

The following commit has been merged in the jessie branch:
commit 64d2981bbefc3a1c5a2158644bab6b17048f66d9
Merge: bb6003397ae3386ae6b4765a54c943030a35d600 129b047f75e453c5a42163565b9959561846c2fb
Author: Balint Reczey <balint.reczey at canonical.com>
Date:   Wed May 31 23:35:14 2017 +0200

    Merge tag 'debian/7%3.2.5-1' into jessie
    
    ffmpeg Debian release 7:3.2.5-1

diff --combined debian/changelog
index 69f9dbb,ad75f8a..d15585a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,9 +1,27 @@@
- ffmpeg (7:3.2.4-1~bpo8+1) jessie-backports; urgency=medium
++ffmpeg (7:3.2.5-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Build-depend on yasm to work around nasm issues in jessie
 +  * Disable building with libebur128 because jessie's version breaks the
 +    build
 +  * Build-depend on libchromaprint-dev from jessie-backports
 +  * Disable OCR with Tesseract because it is missing the pkg-config file on
 +    jessie
 +  * Omit -fstack-protector-strong from used CFLAGs, FFmpeg already sets
 +    -fstack-protector-all
 +  * Use GCC 4.8 on i386 instead of disabling PIE
 +  * Fix FTBFS on i386 due to PIC/PIE incompatible ASM
 +  * Revert switch from libmodplug to libopenmpt because libopenmpt is not
 +    available in jessie-backports yet
 +
-  -- Balint Reczey <balint at balintreczey.hu>  Sun, 26 Feb 2017 18:21:53 +0100
++ -- Balint Reczey <rbalint at ubuntu.com>  Wed, 31 May 2017 23:36:34 +0200
++
+ ffmpeg (7:3.2.5-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Mon, 22 May 2017 22:03:36 +0200
  
  ffmpeg (7:3.2.4-1) unstable; urgency=medium
  

-- 
ffmpeg packaging