[opencv] 02/02: Merge tag 'debian/2.4.9.1+dfsg-2.1'

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository opencv.

commit 5721ac162dfe4f9b6ca9477dcf042fb4bab3b10f
Merge: 6d2c576 ba9738e
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Tue Oct 4 17:49:41 2016 +0000

    Merge tag 'debian/2.4.9.1+dfsg-2.1'
    
    Debian release 2.4.9.1+dfsg-2.1
    
    keep only the changelog entry, as the patch is not needed in the 3.x.x version.

 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --cc debian/changelog
index c19af68,7a8f56c..b13e256
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,90 -1,11 +1,98 @@@
 +opencv (3.1.0+dfsg-1~exp0) UNRELEASED; urgency=medium
 +
 +  * Update to 3.1.0.
 +  * Add patches/disable_opengl_test_build.
 +  * Add libjs-mathjax to Depends of opencv-doc and debian/patches/mathjax.
 +  * Add libjs-jquery to Depends of opencv-doc and add
 +    debian/patches/change_jquery.js_path.
 +  * Update Standards-Version to 3.9.8.
 +
 + -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Sat, 25 Jun 2016 06:15:45 +0900
 +
 +opencv (3.0.0+dfsg-1~exp6) experimental; urgency=medium
 +
 +  [ Nobuhiro Iwamatsu ]
 +  * Fix missing install of opencv2/core.hpp
 +
 + -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 26 Jul 2016 08:39:25 +0200
 +
 +opencv (3.0.0+dfsg-1~exp5) experimental; urgency=medium
 +
 +  * Fix libvtk6.3 runtime dependency
 +
 + -- Gianfranco Costamagna <locutusofborg at debian.org>  Sun, 17 Jul 2016 10:08:15 +0200
 +
 +opencv (3.0.0+dfsg-1~exp4) experimental; urgency=medium
 +
 +  * Upload again on experimental, to build against new gdal 2.1.1
 +
 + -- Gianfranco Costamagna <locutusofborg at debian.org>  Sat, 16 Jul 2016 10:07:18 +0200
 +
 +opencv (3.0.0+dfsg-1~exp3) experimental; urgency=medium
 +
 +  [ Andreas Cadhalpun ]
 +  * Fix build with ffmpeg 3.0. (Closes: #803847)
 +
 +  [ Gianfranco Costamagna ]
 +  * Team upload
 +  * merge unstable NMUs
 +  * rebase ffmpeg patch
 +  * Disable optimize i586 patch, now Debian has i686
 +
 +  [ Tobias Frost ]
 +  * Do not use precompiled headers (Closes: #818450)
 +
 +  [ Mattia Rizzolo ]
 +  * Use HTTPS in Vcs-* fields.
 +  * Disable opengl when building in armhf (in Ubuntu only)
 +  * Don't build with jasper.  Closes: #818207
 +    - This causes libopencv-highgui to lose symbols, but we don't rename the
 +      package because the breakage is in experimental only.
 +  * Fix typo in README.Debian.
 +  * Remove unused lintian override python-script-but-no-python-dep.
 +
 + -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 08 Jul 2016 15:43:15 +0200
 +
 +opencv (3.0.0+dfsg-1~exp2) experimental; urgency=medium
 +
 +  * Fix FTBFS on i386.
 +  * Build with -march=i586 instead of -march=i686 on i386.
 +    Add debian/patches/optimize_i586.patch.
 +  * Fix FTBFS on x32. (Closes: #792264)
 +    Add debian/patches/support_x32. Thanks to Thorsten Glaser <tg at mirbsd.de>.
 +
 + -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Thu, 07 Jan 2016 23:48:01 +0900
 +
 +opencv (3.0.0+dfsg-1~exp1) experimental; urgency=medium
 +
 +  * Update to 3.0.0 (Closes: #792677, #805099).
 +  * Remove libopencv-legacy and libopencv-contrib.
 +    These features are not provided from the new version.
 +  * Remove old packages (libcv*, libhightgui*, libcvaux*).
 +  * Add support gdal and vtk.
 +  * Enable parallel building.
 +  * Remove image files of Lena (Closes: #794856).
 +  * Add debug packages (Closes: #803404).
 +
 + -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Thu, 10 Dec 2015 00:07:44 +0900
 +
 +opencv (2.4.11+dfsg-1) unstable; urgency=medium
 +
 +  * Update to 2.4.11.
 +  * Update debian/control.
 +    - Bumped standards-version to 3.9.6.
 +  * Remove image files of Lena (Closes: #794856)
 +
 + -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Wed, 09 Dec 2015 00:36:05 +0900
 +
+ opencv (2.4.9.1+dfsg-2.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * debian/patches:
+     - Add fix_ftbfs_with_gcc6 to fix FTBFS with gcc-6. (Closes: #828928)
+ 
+  -- John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>  Tue, 04 Oct 2016 17:07:49 +0200
+ 
  opencv (2.4.9.1+dfsg-2) unstable; urgency=medium
  
    * Team upload.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git