[Pkg-gstreamer-commits] [SCM] GStreamer libav plugin 1.0 Packaging branch, debian-experimental, updated. debian/1.0.4-2-5-g6124ad2

[Sebastian Dröge]

The following commit has been merged in the debian-experimental branch:
commit 0938a3339992b5a69acf68aa38d9d57057cf70b8
Merge: 160fb1a4f53fdc3bb3e3d4a3c8884f0a181c5e53 9baad89f807e4aea26bba9e8f509fdb27ce4972d
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Tue Jan 8 14:01:06 2013 +0100

    Merge branch 'master' into debian-experimental
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 19e5caf,30e71bf..120c1de
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,15 +1,34 @@@
+ gst-libav1.0 (1.0.5-1) unstable; urgency=low
+ 
+   * New upstream bugfix release.
+ 
+  -- Sebastian Dröge <slomo at debian.org>  Tue, 08 Jan 2013 14:00:08 +0100
+ 
 +gst-libav1.0 (1.0.4-2) experimental; urgency=low
 +
 +  * debian/patches/02_plugin-dependencies.patch:
 +    + Update for new libav sonames.
 +  * Upload of new version using libav 9.
 +
 + -- Sebastian Dröge <slomo at debian.org>  Tue, 18 Dec 2012 12:01:15 +0100
 +
  gst-libav1.0 (1.0.4-1) unstable; urgency=low
  
    * New upstream bugfix release.
  
   -- Sebastian Dröge <slomo at debian.org>  Wed, 19 Dec 2012 10:38:34 +0100
  
 +gst-libav1.0 (1.0.3-2) experimental; urgency=low
 +
 +  * debian/control,
 +    debian/patches/03_git-2012-12-18.patch:
 +    + Port to libav 9 API.
 +    + Backport all GIT changes up to today.
 +  * debian/patches/04_gstreamer-1.0.patch:
 +    + Don't use features new since GStreamer 1.1.
 +
 + -- Sebastian Dröge <slomo at debian.org>  Tue, 18 Dec 2012 11:41:55 +0100
 +
  gst-libav1.0 (1.0.3-1) unstable; urgency=low
  
    * New upstream bugfix release.

-- 
GStreamer libav plugin 1.0 Packaging