[opencv] 16/26: Merge branch 'master' into debian-robotics
Leopold Palomo-Avellaneda
leo at alaxarxa.net
Thu Sep 7 12:48:18 UTC 2017
This is an automated email from the git hooks/post-receive script.
lepalom-guest pushed a commit to branch debian-robotics
in repository opencv.
commit 45decf42a68f2fb889c246cd2e873aa258a06d45
Merge: 102e073 963bdbc
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date: Mon Aug 21 13:27:56 2017 +0200
Merge branch 'master' into debian-robotics
debian/changelog | 10 ++++++++++
debian/rules | 11 +----------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --cc debian/changelog
index edc323f,a817e0e..bf08be0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
+ opencv (3.2.0+dfsg-1~exp2) experimental; urgency=medium
+
+ * Team upload.
+ * Explicitly disable carotene support to fix FTBFS on arm*.
+ * Drop conditional enabling of OpenGL, it can't be enabled with GTK+3
+ anyway. Closes: #869975
+ * Changelog for 3.2.0+dfsg-1~exp2
+
+ -- Mattia Rizzolo <mattia at debian.org> Mon, 31 Jul 2017 10:50:25 +0200
+
+opencv (3.2.0+dfsg-1~exp1.1~drp9+1) stretch-robotics; urgency=medium
+
+ * Rebuild for drp.
+
+ -- Leopold Palomo-Avellaneda <leo at alaxarxa.net> Thu, 06 Jul 2017 10:52:30 +0200
+
opencv (3.2.0+dfsg-1~exp1) experimental; urgency=medium
* Update to 3.2.0.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git
More information about the debian-science-commits
mailing list