diff -u frei0r-1.1.22git20091109/debian/changelog frei0r-1.1.22git20091109/debian/changelog
--- frei0r-1.1.22git20091109/debian/changelog
+++ frei0r-1.1.22git20091109/debian/changelog
@@ -1,8 +1,23 @@
-frei0r (1.1.22git20091109-1.2build1) raring; urgency=low
+frei0r (1.1.22git20091109-1.4) unstable; urgency=high
 
-  * Rebuild for opencv 2.4
+  * Non-maintainer upload.
+  * Since the configure script only allows for auto-detecting opencv and
+    gavl, rather than making them mandatory, implement post-configure
+    checking for both through config.log, in the common-configure-arch
+    target.
+  * Switch libcv-dev build-dep to libopencv-dev to restore opencv support
+    since the .pc file moved. Thanks to Rebecca N. Palmer again!
+    (Closes: #726487)
+
+ -- Cyril Brulebois <kibi@debian.org>  Sun, 20 Oct 2013 14:11:54 +0200
+
+frei0r (1.1.22git20091109-1.3) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Apply patch by Rebecca N. Palmer to fix FTBFS (missing compile file)
+    with automake 1.14: add "-i" to autoreconf flags. (Closes: #724186)
 
- -- Fabrice Coutadeur <fabricesp@ubuntu.com>  Tue, 04 Dec 2012 22:17:14 +0100
+ -- Cyril Brulebois <kibi@debian.org>  Tue, 15 Oct 2013 22:49:25 +0200
 
 frei0r (1.1.22git20091109-1.2) unstable; urgency=low
 
diff -u frei0r-1.1.22git20091109/debian/control frei0r-1.1.22git20091109/debian/control
--- frei0r-1.1.22git20091109/debian/control
+++ frei0r-1.1.22git20091109/debian/control
@@ -7,7 +7,7 @@
 Vcs-Git: git://git.dyne.org/frei0r.git
 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),
+Build-Depends: cdbs, debhelper (>> 5.0.0), pkg-config, libopencv-dev, libgavl-dev (>= 1.1.0),
  libtool, autoconf, automake,
  libcvaux-dev, libhighgui-dev
 Standards-Version: 3.8.3
diff -u frei0r-1.1.22git20091109/debian/rules frei0r-1.1.22git20091109/debian/rules
--- frei0r-1.1.22git20091109/debian/rules
+++ frei0r-1.1.22git20091109/debian/rules
@@ -6,6 +6,12 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+common-configure-arch::
+	if [ $(shell egrep -c "^HAVE_(OPENCV|GAVL)_TRUE=''$$" config.log) != 2 ]; then \
+		echo "Either OPENCV or GAVL support is missing according to config.log"; \
+		exit 1; \
+	fi
+
 clean::
 	$(RM) Makefile.in aclocal.m4 configure doc/Makefile.in
 	$(RM) doc/html/Makefile.in include/Makefile.in ltmain.sh
@@ -17 +23 @@
-	autoreconf -fs
+	autoreconf -fsi