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

[rbalint at users.alioth.debian.org]

Finalize changelog
Removed unused override
Fix dep5-copyright-license-name-not-unique
Clean up
Drop symbols files and generate tighter dependencies
Remove useless target
New upstream release
Merge tag 'upstream/3.1.3'
Imported Upstream version 3.1.3
Finalize changelog
Remove patches included upstream
New upstream release
Merge tag 'upstream/3.1.2'
Imported Upstream version 3.1.2
Finalize changelog
Temporary workaround for local dependent parsing
Remove obsolete Breaks against dmo packages
Remove obsolete Conflicts
Finalize changelog
Apply upstream patch to disable GCC vectorization
Update changelog
Re-enable x264 on sparc64 as the linker has been fixed
Finalize changelog
Update changelog
Fix FTBFS on mips64el: fatal error: gnu/stubs-n64_hard_2008.h: No such file or directory
Finalize changelog
Fix a typo
Update copyright information
Patch to undefine OPJ_STATIC
Remove unused paragraph
Remove unused override
Add new symbols
Update changelog
Enable libebur128
Remove obsolete comment
Update changelog
Drop obsolete patches
Merge tag 'upstream/3.1.1'
Imported Upstream version 3.1.1
Update changelog
Really build with opencv everywhere
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/jessie
X-Git-Reftype: branch
X-Git-Oldrev: c44a288a34f9b3c46a2f45543b98f87cfa78c321
X-Git-Newrev: a247225932ece881bca0c32f12b2b5ef31b0208c

The following commit has been merged in the jessie branch:
commit 13dbe6502991859b208425bfafd2543452bbae7a
Merge: c44a288a34f9b3c46a2f45543b98f87cfa78c321 a27d60e8c43c47443c9bb9ab34c102547250cad0
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sun Sep 25 23:30:50 2016 +0200

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

diff --combined debian/changelog
index 31db765,1a2f370..030aaab
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,74 +1,80 @@@
- ffmpeg (7:3.0.2-4~bpo8+1) jessie-backports; urgency=medium
++ffmpeg (7:3.1.3-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
-  -- Balint Reczey <balint at balintreczey.hu>  Wed, 06 Jul 2016 01:54:36 +0200
++ -- Balint Reczey <balint at balintreczey.hu>  Sun, 25 Sep 2016 23:29:56 +0200
++
+ ffmpeg (7:3.1.3-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * debian/{rules,*.symbols}: Remove symbol files and generate tighter
+     dependencies using a dh_makeshlibs override. (Closes: #835645)
+   * debian/copyright: Fix dep5-copyright-license-name-not-unique.
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Sun, 28 Aug 2016 12:12:44 +0200
+ 
+ ffmpeg (7:3.1.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * debian/patches:
+     - fix-vaapi-default-values.patch: Removed, applied upstream.
+     - Revert-configure-Enable-GCC-vectorization-on-4.9-on-.patch: Removed,
+       included upstream.
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Wed, 10 Aug 2016 20:42:29 +0200
+ 
+ ffmpeg (7:3.1.1-4) unstable; urgency=high
+ 
+   * debian/control:
+     - Remove obsolete Conflicts.
+     - Remove obsolete Breaks against dmo packages.
+   * debian/patches/fix-vaapi-default-values.patch: Use local independent
+     default values. Thanks to Carl Eugen Hoyos. (Closes: #831529)
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Wed, 03 Aug 2016 15:16:59 +0200
+ 
+ ffmpeg (7:3.1.1-3) unstable; urgency=medium
+ 
+   [ James Clarke ]
+   * debian/rules: Re-enable x264 on sparc64 as the linker has been fixed.
+     (Closes: #831582)
+ 
+   [ Sebastian Ramacher ]
+   * debian/patches/Revert-configure-Enable-GCC-vectorization-on-4.9-on-.patch:
+     Apply upstream patch to disable GCC vectorization.
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Thu, 21 Jul 2016 20:26:12 +0200
+ 
+ ffmpeg (7:3.1.1-2) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Aurelien Jarno ]
+   * debian/rules: Fix FTBFS on mips64el by adding --disable-mips64r6. (Closes:
+     #830868)
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Tue, 12 Jul 2016 16:38:52 +0200
+ 
+ ffmpeg (7:3.1.1-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * debian/rules:
+     - Really build with opencv everywhere. (Closes: #827868)
+     - Remove obsolete comments.
+     - Build with --enable-libebur128.
+   * debian/patches
+     - lavf-mpegts-Return-small-probe-score-for-very-short-.patch: Removed,
+       included upstream.
+     - disable-opj-static.patch: Do not define OPJ_STATIC when building against
+       openjpeg 2.1.x.
+   * debian/control: Add libebur128-dev to B-D.
+   * debian/copyright:
+     - Add new copyright holders.
+     - Update copyright years.
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Tue, 12 Jul 2016 09:37:46 +0200
  
  ffmpeg (7:3.0.2-4) unstable; urgency=medium
  

-- 
ffmpeg packaging