[opencv] 01/11: Merge tag 'debian/3.0.0+dfsg-1_exp6'

[Nobuhiro Iwamatsu]

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

iwamatsu pushed a commit to branch master
in repository opencv.

commit 42f196733ece8acedc2a63dcfed5c9d65c6e2ce8
Merge: 41de9f9 756c791
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Sat Aug 6 03:35:31 2016 +0900

    Merge tag 'debian/3.0.0+dfsg-1_exp6'
    
    opencv Debian release 3.0.0+dfsg-1~exp6

 debian/README.Debian                               |   2 +-
 debian/changelog                                   |  89 +++++++-
 debian/control                                     |   8 +-
 debian/opencv-doc.lintian-overrides                |  26 ---
 debian/patches/change_type_from_int_to_Atomic_word | 118 ++++++-----
 debian/patches/ffmpeg_2.9.patch                    | 226 +++++++++++++++++++++
 debian/patches/series                              |   4 +-
 debian/patches/support_x32                         |  40 ++++
 debian/rules                                       |  16 +-
 9 files changed, 443 insertions(+), 86 deletions(-)

diff --cc debian/changelog
index 5135039,faa3002..ded6886
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,54 +1,60 @@@
 +opencv (3.1.0+dfsg-1~exp0) UNRELEASED; urgency=medium
 +
 +  * Update to 3.1.0.
 +
 + -- 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 build on i386.
+   * 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
  
diff --cc debian/control
index 65fc9dc,2da4ebf..31a8f83
--- a/debian/control
+++ b/debian/control
@@@ -1328,8 -1195,8 +1326,8 @@@ Architecture: an
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
  Depends: ${shlibs:Depends}, ${misc:Depends},
- 	libvtk6.2,
+ 	libvtk6.3,
 -	libopencv-core3.0 (= ${binary:Version})
 +	libopencv-core3.1 (= ${binary:Version})
  Description: computer vision 3D data visualization library
   This package contains the OpenCV (Open Computer Vision) 3D data visualization
   runtime libraries.

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