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

[rbalint at users.alioth.debian.org]

Finalize changelog
Finalize changelog
Build with --disable-mips32r6 on mips(el) to fix FTBFS there
Finalize changelog
Upstream patch to fix #823098
Add bug number
Build with opencv everywhere
New upstream release
Merge tag 'upstream/3.0.2'
Imported Upstream version 3.0.2
Upload to unstable
Work in master
Finalize changelog
Fix depends
Finalize changelog
Update Standards-Version
Remove -ffmpeg from powerpc install files
New upstream release
Merge tag 'upstream/3.0.1' into experimental
Imported Upstream version 3.0.1
Finalize changelog
Update description
Update changelog
Checkout experimental branch
--enable-libstagefright-h264 was removed
Always fail loop on error
Do not run tests for -indep builds
Update B-D and --enable switches
Honor nocheck
Update copyright information
Update from github
Update comment
Update use of --disable-mipsdspr1
Simplify CPU check
--enable-libquvi no longer exists
Do not build with -enable-libvo_aacenc
Removed, all included upstream
Update lintian overrides
SONAME bump
No longer add -ffmpeg to SONAME
Use automatic dbg sym packages
New upstream release
Merge tag 'upstream/3.0' into experimental
Imported Upstream version 3.0
Work in experimental
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 50c24b6cff441410c03112f2686d38d4a1a597ed
Merge: 337a7b26de4e948766d3ba3bdf2d0a78268644a2 6e425ba88303430c4c652a37a3c5d2f59db6f724
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed May 18 21:58:47 2016 +0200

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

diff --combined debian/changelog
index 8021d24,ccad98d..7d26767
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,68 +1,74 @@@
- ffmpeg (7:2.8.6-1~bpo8+1) jessie-backports; urgency=medium
++ffmpeg (7:3.0.2-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
-  -- Balint Reczey <balint at balintreczey.hu>  Fri, 26 Feb 2016 18:33:31 +0100
++ -- Balint Reczey <balint at balintreczey.hu>  Wed, 18 May 2016 21:57:55 +0200
++
+ ffmpeg (7:3.0.2-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/rules: Build with --disable-mips32r6 on mips(el) to fix FTBFS
+     there.
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Fri, 13 May 2016 16:49:23 +0200
+ 
+ ffmpeg (7:3.0.2-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release (Closes: #823633).
+   * debian/patches/lavf-mpegts-Return-small-probe-score-for-very-short-.patch:
+     Upstream patch to fix regression in aac in mpegts. (Closes: #823098)
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Sun, 08 May 2016 19:53:57 +0200
+ 
+ ffmpeg (7:3.0.1-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Upload to unstable.
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Sun, 17 Apr 2016 19:24:37 +0200
+ 
+ ffmpeg (7:3.0.1-2) experimental; urgency=medium
+ 
+   * debian/control: Let libavcodec-extra depend on an existing package.
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Mon, 11 Apr 2016 20:26:41 +0200
+ 
+ ffmpeg (7:3.0.1-1) experimental; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * debian/*.install.powerpc: Remove extra -ffmpeg from filenames.
+   * debian/control: Bump Standards-Version.
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Mon, 11 Apr 2016 17:51:27 +0200
+ 
+ ffmpeg (7:3.0-1) experimental; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * SONAME bump and no longer add -ffmpeg to SONAMES.
+   * debian/{rules,control}: Use automatic debug symbol packages.
+   * debian/patches/{build-make-out-of-tree-builds-bit-identical-to-in-tr,
+     doc-make-apidoc-output-independent-of-SRC_PATH}.patch: Removed, included
+     upstream.
+   * debian/missing-sources/ffmpeg-web/src/less/style.less: Update from GitHub.
+   * debian/copyright: Update copyright years and add new copyright holders.
+   * debian/rules:
+     - Honor nocheck.
+     - Simplify CPU check.
+     - No longer build with --enable-libvo_aacenc.
+     - Update use of --disable-mipsdspr1.
+     - Build with --enable-chromaprint and --enable-librubberband.
+     - Do not run tests for -indep builds.
+     - Always fail loop on error.
+   * debian/control:
+     - Update Vcs-Git.
+     - New Build-Depends: libchromaprint-dev, librubberband-dev.
+     - Removed Build-Depends: libvo-aacenc-dev.
+     - Update Description.
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Tue, 08 Mar 2016 01:58:44 +0100
  
  ffmpeg (7:2.8.6-1) unstable; urgency=medium
  

-- 
ffmpeg packaging