[opencv] 01/02: Merge tag 'debian/3.0.0+dfsg-1_exp7'

[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 c9a89a8fc4626e9061cae3ebc9ac0320a4ce94e6
Merge: b45b6e7 54e091c
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Apr 3 18:23:36 2017 +0200

    Merge tag 'debian/3.0.0+dfsg-1_exp7'
    
    that upload was overwrote by successive uploads.
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>

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

diff --cc debian/changelog
index 08ac0ac,9a1e9da..8ed1b7f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,9 +1,38 @@@
 +opencv (3.1.0+dfsg-1~exp2) experimental; urgency=medium
 +
 +  * Fix Depends of libopencv-shape3.1 and libopencv-shape-dev.
 +
 + -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Wed, 19 Oct 2016 09:17:57 +0900
 +
 +opencv (3.1.0+dfsg-1~exp1) experimental; urgency=medium
 +
 +  * Add old header files into libopencv-dev.
 +  * Update debian/control.
 +    - Add Replaces and Conflicts to libopencv-dev.
 +    - Fix version of libopencv3.1-jni for libopencv3.1-java.
 +    - Fix Depends of libopencv-dev. Add libopencv3.1-java. (Closes: #833616)
 +    - Add libopencv-shape-dev to Depends of libopencv-dev. (Closes: #818738)
 +    - Add libtbb-dev to Depends of libopencv-core-dev. (Closes: #838916)
 +
 + -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Tue, 18 Oct 2016 06:22:32 +0900
 +
 +opencv (3.1.0+dfsg-1~exp0) experimental; 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~exp7) experimental; urgency=medium
+ 
+   * Fix libopencv_shape dependencies.
+ 
+  -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 27 Jul 2016 15:07:29 +0200
+ 
  opencv (3.0.0+dfsg-1~exp6) experimental; urgency=medium
  
    [ Nobuhiro Iwamatsu ]

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