[SCM] ffmpeg/jessie: Merge tag 'debian/7%3.0.2-4' into jessie

[rbalint at users.alioth.debian.org]

Finalize changelog
Update changelog
Switch to libopenjp2-7-dev
Start new revision
Finalize changelog
Remove an extra 'with'
No longer disable i686 optimization on i386 based architectures
Build-depend on libx265-dev (>= 1.8)
Start working on next upload
Disable mips32r6 for all mips architectures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/jessie
X-Git-Reftype: branch
X-Git-Oldrev: 337a7b26de4e948766d3ba3bdf2d0a78268644a2
X-Git-Newrev: c44a288a34f9b3c46a2f45543b98f87cfa78c321

The following commit has been merged in the jessie branch:
commit c44a288a34f9b3c46a2f45543b98f87cfa78c321
Merge: 6647cf591cc07dffdee6fb6746d39cbbb1122c18 bbfc0d6f35027a307bca441c13de4c13e732cb09
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Fri Jun 17 19:09:27 2016 -0700

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

diff --combined debian/changelog
index 0dbc2e7,5b0c655..31db765
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,23 +1,29 @@@
- ffmpeg (7:3.0.2-2~bpo8+1) jessie-backports; urgency=medium
++ffmpeg (7:3.0.2-4~bpo8+1) jessie-backports; urgency=medium
 +
-   * Build-depend on libx265-dev (>= 1.8)
-     Build needs x265 build >= 68 which has been packaged in x265 1.8-1 first
 +  * Rebuild for jessie-backports.
 +
-  -- Balint Reczey <balint at balintreczey.hu>  Fri, 20 May 2016 21:47:15 +0200
++ -- Balint Reczey <balint at balintreczey.hu>  Wed, 06 Jul 2016 01:54:36 +0200
++
+ ffmpeg (7:3.0.2-4) unstable; urgency=medium
+ 
+   * debian/control: Switch to libopenjp2-7-dev. (Closes: #826812)
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Sat, 11 Jun 2016 11:19:42 +0200
+ 
+ ffmpeg (7:3.0.2-3) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Balint Reczey ]
+   * Build-depend on libx265-dev (>= 1.8)
+ 
+   [ Sebastian Ramacher ]
+   * debian/rules:
+     - No longer disable i686 optimization on i386 based architectures.
+     - Disable mips32r6 for all mips architectures.
+   * debian/copyright: Remove an extra 'with'.
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Wed, 01 Jun 2016 20:43:32 +0200
  
  ffmpeg (7:3.0.2-2) unstable; urgency=medium
  

-- 
ffmpeg packaging