Bug#657410: frei0r patch, opencv transition and cheese

[Neil Williams]

In an attempt to allow Gregor's patch to #657410 to be uploaded to fix
cheese, I've investigated the FTBFS of frei0r and I have a patch
(attached).

debdiff ../frei0r_1.1.22git20091109-1.1.dsc ../frei0r_1.1.22git20091109-1.2.dsc
diffstat for frei0r_1.1.22git20091109-1.1 frei0r_1.1.22git20091109-1.2

 frei0r-1.1.22git20091109/debian/changelog |   10 ++++++++++
 frei0r-1.1.22git20091109/debian/control   |    1 +
 frei0r-1.1.22git20091109/debian/rules     |    9 +++++++++
 src/filter/facedetect/facedetect.c        |    2 +-
 4 files changed, 21 insertions(+), 1 deletion(-)

The reason for the FTBFS is that libopencv-objdetect-dev contains
the /usr/include/opencv2/objdetect/objdetect.hpp header which has had
an ABI-incompatible change to cvHaarDetectObjects - removing the
definition with 7 arguments and adding a definition with 8. 

Old:
http://www.emgu.com/wiki/files/1.3.0.0/html/55a16889-537c-534f-f2fa-fbbe60e1d8d4.htm

The current header adds a maxSize, so the patch simply sets the maxSize
to the same as the minSize.

frei0r doesn't have a patch system (source format 1.0 - undeclared), so
I haven't added one - simply added a suitable clean target so that the
autotools changes are handled. 

The rebuilt package also allows the frei0r-plugins package to install
cleanly, so I've merged with 657942.

There is an RFS but it doesn't look ready and includes lots more
changes than just fixing the FTBFS.

http://lists.debian.org/debian-mentors/2012/02/msg00013.html

Please let me know if this is OK to upload.

-- 


Neil Williams
=============
http://www.linux.codehelp.co.uk/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 652759.diff
Type: text/x-diff
Size: 2565 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-gnome-maintainers/attachments/20120303/3f982bf2/attachment.diff>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-gnome-maintainers/attachments/20120303/3f982bf2/attachment.pgp>