[SCM] morituri/master: Import Non-maintainer release 0.1.2-1.1.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f5f66b2c079187835cb09d49e25b8092c11250d4
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Feb 14 17:02:39 2012 +0100

    Import Non-maintainer release 0.1.2-1.1.

diff --git a/debian/changelog b/debian/changelog
index 7655dfc..488c6ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,16 @@ morituri (0.1.2-2) UNRELEASED; urgency=low
 
  -- Jonas Smedegaard <dr at jones.dk>  Thu, 11 Aug 2011 11:55:50 +0200
 
+morituri (0.1.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: tests failed": add upstream patch, via Ubuntu / Daniel T Chen:
+    - Add skip_flacparse.patch to fix FTBFS. (LP: #833896)
+    Commit message: "flacparse is busted in gst-plugins-good 0.10.30 too"
+    (Closes: #634400)
+
+ -- gregor herrmann <gregoa at debian.org>  Wed, 25 Jan 2012 19:32:34 +0100
+
 morituri (0.1.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ca70c6d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+skip_flacparse.patch
diff --git a/debian/patches/skip_flacparse.patch b/debian/patches/skip_flacparse.patch
new file mode 100644
index 0000000..4df4366
--- /dev/null
+++ b/debian/patches/skip_flacparse.patch
@@ -0,0 +1,25 @@
+Description: Handle known-bad versions of gst-plugins-good, including 0.10.30
+Forwarded: not-needed
+Origin: upstream, https://thomas.apestaart.org/morituri/trac/changeset/535
+Author: Thomas Vander Stichele
+Reviewed-by: Daniel T Chen <crimsun at ubuntu.com>
+Bug: https://thomas.apestaart.org/morituri/trac/ticket/78
+Bug-Debian: http://bugs.debian.org/634400
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/morituri/+bug/833896
+Last-Updated: 2011-09-15
+
+Index: morituri-0.1.2/morituri/common/gstreamer.py
+===================================================================
+--- morituri-0.1.2.orig/morituri/common/gstreamer.py	2011-09-15 00:33:23.000000000 -0400
++++ morituri-0.1.2/morituri/common/gstreamer.py	2011-09-15 00:34:47.000000000 -0400
+@@ -190,8 +190,9 @@
+         log.debug('gstreamer', 'Found audioparsers plugin from %s %s',
+             plugin.get_source(), plugin.get_version())
+ 
++        # was fixed after 0.10.30 and before 0.10.31
+         if plugin.get_source() == 'gst-plugins-good' \
+-            and plugin.get_version() > '0.10.29.1':
++            and plugin.get_version() > '0.10.30.1':
+             return
+ 
+         registry.remove_plugin(plugin)

-- 
morituri packaging