[SCM] libav/ubuntu: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 2dee5c9d805f9e7f37ffb064b02c73de82a5ec4f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 11 11:29:14 2012 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 2e7d159..f139435 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
-libav (6:0.8.3-6ubuntu1) quantal; urgency=low
+libav (4:0.8.3-6ubuntu1) quantal; urgency=low
 
   * Merge from debian, remaining changes:
+    - epoch set to 4:
     - don't build against libdirac, lame, libopenjpeg, librtmp, frei0r,
       vo-aacenc, vo-amrenc, x264, and xvid  (all in universe)
+    - do not build libav-extra-dbg, it is build from the libav-extra source
+      package in ubuntu.
+    - drop libav-regular-dbg, not necessary in ubuntu
+    - Adjust LIB_PKGS/LIB_PKGS2 lists in debian/rules
+    - several ifdefs in debian/rules that allow the use of the same file
+      in libav and libav-extra (most of this can be merged into the debian
+      package)
+    - several dependency fixups in debian/control
 
  -- Reinhard Tartler <siretart at tauware.de>  Tue, 07 Aug 2012 22:23:55 +0200
 

-- 
Libav/FFmpeg packaging