[SCM] libav/ubuntu: Update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 54c48f3cd9275da93b0397d2877ad4f2ba1055c2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Nov 3 13:32:39 2012 +0100

    Update debian/changelog
    
    Uploading to ppa:motumedia/libav9-raring for now
    
    Git-Dch: ignore

diff --git a/debian/changelog b/debian/changelog
index 7136ed4..5076529 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
-libav (6:9~beta2-1ubuntu1) raring; urgency=low
+libav (6:9~beta2-1ubuntu1~ppa1) raring; urgency=low
 
-  * merge from debian. remaining changes:
-     FIXME
+  * Merge from debian, remaining changes:
+    - 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.
+    - 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)
+    - build libav-source for use with Ubuntu's libav-extra package
 
  -- Reinhard Tartler <siretart at tauware.de>  Thu, 01 Nov 2012 17:48:41 +0100
 

-- 
Libav/FFmpeg packaging