diff -Nru libav-0.8.3/debian/changelog libav-0.8.3/debian/changelog
--- libav-0.8.3/debian/changelog	2012-08-11 18:25:18.000000000 +0000
+++ libav-0.8.3/debian/changelog	2012-10-01 10:48:26.000000000 +0000
@@ -1,3 +1,10 @@
+libav (6:0.8.3-6ubuntu2) quantal; urgency=low
+
+  * Temporarily fudge the versioning of libavcodec-dev's dependency on
+    libavcodec-extra-53 to cope with the botched merge of libav-extra.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 01 Oct 2012 11:48:25 +0100
+
 libav (6:0.8.3-6ubuntu1) quantal; urgency=low
 
   * Merge from debian, remaining changes:
diff -Nru libav-0.8.3/debian/control libav-0.8.3/debian/control
--- libav-0.8.3/debian/control	2012-08-11 18:51:08.000000000 +0000
+++ libav-0.8.3/debian/control	2012-10-01 09:36:46.000000000 +0000
@@ -317,7 +317,7 @@
 Section: libdevel
 Architecture: any
 Depends:
- libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}-99),
+ libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}.99),
  libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${source:Upstream-Version}),
  libavutil-dev (= ${binary:Version}),
  ${misc:Depends}