[SCM] libav/experimental: Revert "Update changelog and control file."

[js at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8c15b70ec313596ad5ee69397539789a2ae5a185
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jan 24 16:38:02 2013 +0100

    Revert "Update changelog and control file."
    
    This reverts commit 97156a472c95b7799a33178c48c8fddf4954b2f7.

diff --git a/debian/changelog b/debian/changelog
index dd94f8c..3b96eb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,3 @@
-libav (6:9.1-4) UNRELEASED; urgency=low
-
-  * Reuse CDBS variables in rules file, and similarly resolve EPOCH from
-    changelog.
-  * Build-depend on devscripts, to always enable CDBS copyright check.
-  * Resolve build-dependencies in rules file, using CDBS.
-    Have certain build-dependencies tightened conditional to building
-    targeted experimental.
-    Update README.source to cover auto-updating build-dependencies.
-  * Tighten build-dependency on libva, to use experimental package.
-
- -- Jonas Smedegaard <dr at jones.dk>  Thu, 24 Jan 2013 14:21:34 +0100
-
 libav (6:9.1-3) experimental; urgency=low
 
   * Build-depend on libopus-dev.
diff --git a/debian/control b/debian/control
index a3c89c2..9f5de4b 100644
--- a/debian/control
+++ b/debian/control
@@ -19,10 +19,14 @@ Build-Depends-Indep:
 Build-Depends:
  cdbs,
  devscripts,
+ debhelper (>= 8.1.3~),
+ frei0r-plugins-dev (>= 1.3),
+ libasound2-dev [linux-any],
  libbz2-dev,
  libcdio-cdda-dev,
  libcdio-dev,
  libcdio-paranoia-dev,
+ libdc1394-22-dev [linux-any],
  libfreetype6-dev,
  libgnutls-dev,
  libgsm1-dev,
@@ -31,33 +35,29 @@ Build-Depends:
  libmp3lame-dev,
  libopencore-amrnb-dev,
  libopencore-amrwb-dev,
+ libopencv-dev (>= 2.4),
  libopenjpeg-dev,
+ libopus-dev (>= 1.0.1),
  libpulse-dev,
+ libraw1394-dev [linux-any],
+ librtmp-dev (>= 2.2e-4),
  libschroedinger-dev,
  libsdl1.2-dev,
  libspeex-dev,
+ libtheora-dev (>> 0.0.0.alpha4),
+ libtiff4-dev | libtiff-dev,
+ libva-dev [!hurd-any],
  libvdpau-dev,
  libvo-aacenc-dev,
  libvo-amrwbenc-dev,
  libvorbis-dev,
  libvpx-dev,
  libx11-dev,
+ libx264-dev (>= 2:0.129),
  libxext-dev,
  libxfixes-dev,
  libxvidcore-dev,
  libxvmc-dev,
- debhelper (>= 8.1.3~),
- frei0r-plugins-dev (>= 1.3),
- libasound2-dev [linux-any],
- libdc1394-22-dev [linux-any],
- libopencv-dev (>= 2.4),
- libopus-dev (>= 1.0.1),
- libraw1394-dev [linux-any],
- librtmp-dev (>= 2.2e-4),
- libtheora-dev (>> 0.0.0.alpha4),
- libtiff4-dev | libtiff-dev,
- libva-dev(>= 1.1) [!hurd-any],
- libx264-dev (>= 2:0.129),
  texi2html,
  yasm [any-amd64 any-i386],
  zlib1g-dev

-- 
Libav/FFmpeg packaging