[SCM] jokosher packaging branch, master, updated. debian/0.11.5-3-1-g18cb968

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 18cb9685b42ee5de843c8559af4ce2128c69351f
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jul 13 11:53:20 2010 +0200

    Merge Ubuntu changelog entries.

diff --git a/debian/changelog b/debian/changelog
index 3aa6b63..b27d267 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jokosher (0.11.5-3ubuntu1) maverick; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+    - Add patch to workaround python-cairo bug to avoid crash after starting
+      mixer.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Tue, 13 Jul 2010 11:34:34 +0200
+
 jokosher (0.11.5-3) unstable; urgency=low
 
   * Change my email address.
@@ -9,6 +17,14 @@ jokosher (0.11.5-3) unstable; urgency=low
 
  -- Alessio Treglia <alessio at debian.org>  Mon, 12 Jul 2010 19:12:37 +0200
 
+jokosher (0.11.5-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian testing, Ubuntu remaining changes:
+    - Add patch to workaround python-cairo bug to avoid crash after starting
+      mixer.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Sat, 08 May 2010 09:50:19 +0200
+
 jokosher (0.11.5-2) unstable; urgency=low
 
   * New maintainer (Closes: #575843).
@@ -23,6 +39,13 @@ jokosher (0.11.5-2) unstable; urgency=low
 
  -- Alessio Treglia <quadrispro at ubuntu.com>  Tue, 20 Apr 2010 12:19:54 +0200
 
+jokosher (0.11.5-1ubuntu1) lucid; urgency=low
+
+  * Workaround python-cairo bug to avoid crash after starting mixer;
+    fixes LP: #548761.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Sun, 25 Apr 2010 03:56:43 +0200
+
 jokosher (0.11.5-1) unstable; urgency=low
 
   * New upstream release.

-- 
jokosher packaging