[SCM] libav/ubuntu: Imported Debian patch 6:0.8.3-6ubuntu2

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 8cf50e974ef00b5cd050b139c7d9c00c09130f1e
Author: Colin Watson <cjwatson at ubuntu.com>
Date:   Mon Oct 1 11:48:25 2012 +0100

    Imported Debian patch 6:0.8.3-6ubuntu2

diff --git a/.gitignore b/.gitignore
index f420dde..2118a51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,4 +43,3 @@ tools/probetest
 tools/qt-faststart
 tools/trasher
 version.h
-/.pc
diff --git a/debian/changelog b/debian/changelog
index 2019cbe..a247690 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at 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 --git a/debian/control b/debian/control
index 3347eb0..3ab1b81 100644
--- a/debian/control
+++ b/debian/control
@@ -317,7 +317,7 @@ Package: libavcodec-dev
 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}
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches

-- 
Libav/FFmpeg packaging