diff --git a/debian/changelog b/debian/changelog index 8c5caa4..50b171b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +frei0r (1.1.22git20091109-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: filter/facedetect/facedetect.c:231:36: error: too few + arguments to function 'cvHaarDetectObjects'" Supply minimum and + maximum sizes to mimic previous single size requirement. + (Closes: #652759) + + -- Neil Williams Sat, 03 Mar 2012 11:17:14 +0000 + frei0r (1.1.22git20091109-1.1) unstable; urgency=low * Non-maintainer upload. diff --git a/debian/control b/debian/control index 9f3900f..3d1c4b7 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Vcs-Browser: http://git.dyne.org/?r=frei0r Homepage: http://www.piksel.org/frei0r Build-Depends: cdbs, debhelper (>> 5.0.0), pkg-config, libcv-dev, libgavl-dev (>= 1.1.0), + libtool, autoconf, automake, libcvaux-dev, libhighgui-dev Standards-Version: 3.8.3 diff --git a/debian/rules b/debian/rules index 42e7a17..3971cee 100755 --- a/debian/rules +++ b/debian/rules @@ -6,3 +6,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk +clean:: + $(RM) Makefile.in aclocal.m4 configure doc/Makefile.in + $(RM) doc/html/Makefile.in include/Makefile.in ltmain.sh + $(RM) m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4 + $(RM) m4/lt~obsolete.m4 m4/ltsugar.m4 src/Makefile.in + +makebuilddir:: + libtoolize -f + autoreconf -fs diff --git a/src/filter/facedetect/facedetect.c b/src/filter/facedetect/facedetect.c index 720de36..8965129 100644 --- a/src/filter/facedetect/facedetect.c +++ b/src/filter/facedetect/facedetect.c @@ -228,7 +228,7 @@ double t = (double)cvGetTickCount(); faces = cvHaarDetectObjects( small_img, cascade, storage, 1.1, 2, 0/*CV_HAAR_DO_CANNY_PRUNING*/, - cvSize(30, 30) ); + cvSize(30, 30), cvSize(30, 30) ); t = (double)cvGetTickCount() - t; //printf( "detection time = %gms\n", t/((double)cvGetTickFrequency()*1000.) );