[Pkg-gstreamer-commits] [SCM] GStreamer libav plugin 1.0 Packaging branch, debian-experimental, updated. debian/1.0.3-2-6-g160fb1a

[Sebastian Dröge]

The following commit has been merged in the debian-experimental branch:
commit 6908c74ce34fe88fed27e7f1022fe4f8acf7d7cc
Merge: f28ed8adde83ab4d1012acbd0146f76b4d33fd89 267516c5776d66f3688bb2a96691462f50b9f603
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Wed Dec 19 10:42:21 2012 +0100

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

diff --combined debian/changelog
index 908a03a,0ada048..60db322
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,9 +1,27 @@@
- gst-libav1.0 (1.0.3-3) UNRELEASED; urgency=low
++gst-libav1.0 (1.0.4-2) UNRELEASED; urgency=low
 +
 +  * debian/patches/02_plugin-dependencies.patch:
 +    + Update for new libav sonames.
 +
 + -- 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