[opencv] 01/01: Bring back many files, needed for reverse dependencies

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch experimental/master
in repository opencv.

commit 91960c3ec7a9593e0ebdf2b4db47b2d3a6519d5d
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date:   Wed Jul 27 23:07:37 2016 +0200

    Bring back many files, needed for reverse dependencies
---
 debian/changelog                       | 5 +++--
 debian/control                         | 5 +++++
 debian/libcv-dev.install               | 2 ++
 debian/libcvaux-dev.docs               | 1 -
 debian/libcvaux-dev.install            | 3 ---
 debian/libcvaux2.4.lintian-overrides   | 1 -
 debian/libcvaux3.0.lintian-overrides   | 1 -
 debian/libhighgui-dev.docs             | 1 -
 debian/libhighgui-dev.install          | 1 -
 debian/libhighgui3.0.lintian-overrides | 1 -
 debian/libopencv-highgui-dev.install   | 1 +
 debian/libopencv-ml-dev.install        | 1 +
 12 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 478c132..9f1ebfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-opencv (3.0.0+dfsg-1~exp8) UNRELEASED; urgency=medium
+opencv (3.0.0+dfsg-1~exp8) experimental; urgency=medium
 
-  * Bring back libcv-dev, many files are missing (e.g. cv.h)
+  * Bring back libcv-dev, many files are missing (e.g. cv.h cvaux*)
+  * Bring back highgui.h and old_ml.h
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 27 Jul 2016 15:43:53 +0200
 
diff --git a/debian/control b/debian/control
index f0247a6..0c4d1c6 100644
--- a/debian/control
+++ b/debian/control
@@ -57,6 +57,8 @@ Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}
 Conflicts: libcvaux-dev (<= 2.1.0-7), libhighgui-dev (<= 2.1.0-7)
+Breaks: libcvaux-dev (<<3.0.0+dfsg-1~exp8)
+Replaces: libcvaux-dev (<<3.0.0+dfsg-1~exp8)
 Description: Translation package for libcv-dev
  This package provide files for translation from libcv-dev to
  subdivided packages.
@@ -88,6 +90,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
 	libopencv-superres-dev (= ${binary:Version}),
 	libopencv-imgcodecs-dev (= ${binary:Version}),
 	libopencv-viz-dev (= ${binary:Version}),
+	libopencv3.0-java (= ${source:Version}),
 	pkg-config
 Recommends: opencv-data
 Breaks: libopencv-core-dev (<= 2.3.1-8)
@@ -560,6 +563,8 @@ Package: libopencv-highgui-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
+Breaks: libhighgui-dev (<<3.0.0+dfsg-1~exp8)
+Replaces: libhighgui-dev (<<3.0.0+dfsg-1~exp8)
 Depends: ${misc:Depends},
 	libopencv-videoio-dev (= ${binary:Version}),
 	libopencv-highgui3.0 (= ${binary:Version}),
diff --git a/debian/libcv-dev.install b/debian/libcv-dev.install
index b75ca65..a7539bf 100644
--- a/debian/libcv-dev.install
+++ b/debian/libcv-dev.install
@@ -1,4 +1,6 @@
 # header files
+usr/include/opencv/cvaux.h
+usr/include/opencv/cvaux.hpp
 usr/include/opencv/cv.h
 usr/include/opencv/cv.hpp
 usr/include/opencv/cvwimage.h
diff --git a/debian/libcvaux-dev.docs b/debian/libcvaux-dev.docs
deleted file mode 100644
index e174728..0000000
--- a/debian/libcvaux-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/README.Debian
diff --git a/debian/libcvaux-dev.install b/debian/libcvaux-dev.install
deleted file mode 100644
index a0cee0a..0000000
--- a/debian/libcvaux-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-# header files
-usr/include/opencv/cvaux.h
-usr/include/opencv/cvaux.hpp
diff --git a/debian/libcvaux2.4.lintian-overrides b/debian/libcvaux2.4.lintian-overrides
deleted file mode 100644
index 1292c73..0000000
--- a/debian/libcvaux2.4.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libcvaux2.4: empty-binary-package
diff --git a/debian/libcvaux3.0.lintian-overrides b/debian/libcvaux3.0.lintian-overrides
deleted file mode 100644
index 1658fb5..0000000
--- a/debian/libcvaux3.0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libcvaux3.0: empty-binary-package
diff --git a/debian/libhighgui-dev.docs b/debian/libhighgui-dev.docs
deleted file mode 100644
index e174728..0000000
--- a/debian/libhighgui-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/README.Debian
diff --git a/debian/libhighgui-dev.install b/debian/libhighgui-dev.install
deleted file mode 100644
index 91b29fc..0000000
--- a/debian/libhighgui-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/opencv/highgui.h
diff --git a/debian/libhighgui3.0.lintian-overrides b/debian/libhighgui3.0.lintian-overrides
deleted file mode 100644
index 3a4ba9d..0000000
--- a/debian/libhighgui3.0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libhighgui3.0: empty-binary-package
diff --git a/debian/libopencv-highgui-dev.install b/debian/libopencv-highgui-dev.install
index 7f99297..fe42954 100644
--- a/debian/libopencv-highgui-dev.install
+++ b/debian/libopencv-highgui-dev.install
@@ -1,3 +1,4 @@
+usr/include/opencv/highgui.h
 usr/include/opencv2/highgui/*
 usr/include/opencv2/highgui.hpp
 usr/lib/*/libopencv_highgui.a
diff --git a/debian/libopencv-ml-dev.install b/debian/libopencv-ml-dev.install
index 4c2db9e..207cf41 100644
--- a/debian/libopencv-ml-dev.install
+++ b/debian/libopencv-ml-dev.install
@@ -1,4 +1,5 @@
 usr/include/opencv2/ml/*
 usr/include/opencv2/ml.hpp
+apps/traincascade/old_ml.hpp /usr/include/opencv2
 usr/lib/*/libopencv_ml.a
 usr/lib/*/libopencv_ml.so

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