diffstat of debian/ for opencv_3.1.0+dfsg1-1~exp1 opencv_3.1.0+dfsg1-1~exp1ubuntu3

 changelog                 |   18 ++++++++++++++++++
 control                   |    3 ++-
 patches/fix_VFP_asm.patch |   14 ++++++++++++++
 patches/series            |    1 +
 4 files changed, 35 insertions(+), 1 deletion(-)

diff -Nru opencv-3.1.0+dfsg1/debian/changelog opencv-3.1.0+dfsg1/debian/changelog
--- opencv-3.1.0+dfsg1/debian/changelog	2017-04-26 16:17:33.000000000 +0000
+++ opencv-3.1.0+dfsg1/debian/changelog	2017-07-24 20:43:38.000000000 +0000
@@ -1,3 +1,21 @@
+opencv (3.1.0+dfsg1-1~exp1ubuntu3) artful; urgency=medium
+
+  * No-change rebuild for python3.6.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 24 Jul 2017 22:43:38 +0200
+
+opencv (3.1.0+dfsg1-1~exp1ubuntu2) artful; urgency=medium
+
+  * Rebuild against new gdal ABI.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 14 Jul 2017 11:48:48 +0200
+
+opencv (3.1.0+dfsg1-1~exp1ubuntu1) artful; urgency=medium
+
+  * Fix FTBFS of mrpt by properly using __asm__() instead of asm().
+
+ -- Mattia Rizzolo <mapreri@ubuntu.com>  Fri, 23 Jun 2017 16:25:30 +0200
+
 opencv (3.1.0+dfsg1-1~exp1) experimental; urgency=medium
 
   * Team upload.
diff -Nru opencv-3.1.0+dfsg1/debian/control opencv-3.1.0+dfsg1/debian/control
--- opencv-3.1.0+dfsg1/debian/control	2017-04-26 15:51:29.000000000 +0000
+++ opencv-3.1.0+dfsg1/debian/control	2017-06-23 14:25:30.000000000 +0000
@@ -1,7 +1,8 @@
 Source: opencv
 Priority: optional
 Section: devel
-Maintainer: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
 Uploaders:
  Sam Hocevar (Debian packages) <sam+deb@zoy.org>,
  Nobuhiro Iwamatsu <iwamatsu@debian.org>,
diff -Nru opencv-3.1.0+dfsg1/debian/patches/fix_VFP_asm.patch opencv-3.1.0+dfsg1/debian/patches/fix_VFP_asm.patch
--- opencv-3.1.0+dfsg1/debian/patches/fix_VFP_asm.patch	1970-01-01 00:00:00.000000000 +0000
+++ opencv-3.1.0+dfsg1/debian/patches/fix_VFP_asm.patch	2017-06-23 14:25:30.000000000 +0000
@@ -0,0 +1,14 @@
+Description: fix compilation failure of this header in arm (where VFP is enabled)
+Author: James Clarke <jrtc27@jrtc27.com>
+
+--- a/modules/core/include/opencv2/core/fast_math.hpp
++++ b/modules/core/include/opencv2/core/fast_math.hpp
+@@ -71,7 +71,7 @@
+     #define ARM_ROUND(_value, _asm_string) \
+         int res; \
+         float temp; \
+-        asm(_asm_string : [res] "=r" (res), [temp] "=w" (temp) : [value] "w" (_value)); \
++        __asm__(_asm_string : [res] "=r" (res), [temp] "=w" (temp) : [value] "w" (_value)); \
+         return res
+     // 2. version for double
+     #ifdef __clang__
diff -Nru opencv-3.1.0+dfsg1/debian/patches/series opencv-3.1.0+dfsg1/debian/patches/series
--- opencv-3.1.0+dfsg1/debian/patches/series	2017-04-26 15:51:29.000000000 +0000
+++ opencv-3.1.0+dfsg1/debian/patches/series	2017-06-23 14:21:26.000000000 +0000
@@ -5,3 +5,4 @@
 mathjax
 change_jquery.js_path
 moudles_hdf5.patch
+fix_VFP_asm.patch