[Python-apps-commits] r10582 - in packages/sonata/trunk/debian (3 files)

[vicho at users.alioth.debian.org]

    Date: Sunday, February 23, 2014 @ 20:51:26
  Author: vicho
Revision: 10582

Acknowledge NMU

Added:
  packages/sonata/trunk/debian/patches/fix-missing-crossfade.patch
Modified:
  packages/sonata/trunk/debian/changelog
  packages/sonata/trunk/debian/patches/series

Modified: packages/sonata/trunk/debian/changelog
===================================================================
--- packages/sonata/trunk/debian/changelog	2014-02-23 17:52:07 UTC (rev 10581)
+++ packages/sonata/trunk/debian/changelog	2014-02-23 20:51:26 UTC (rev 10582)
@@ -3,6 +3,7 @@
   [ Javi Merino ]
   * Add my new DD account
   * Bump standards-version to 3.9.3 (no change needed)
+  * Acknowledge NMU
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
@@ -12,6 +13,14 @@
 
  -- Jackson Doak <noskcaj at ubuntu.com>  Wed, 06 Nov 2013 19:19:40 +1100
 
+sonata (1.6.2.1-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "missing crossfade in status breaks sonata (mpd >=0.18)" by
+    applying the patch provided by Mattia Dongili. (Closes: #728704.)
+
+ -- Stephen Kitt <skitt at debian.org>  Sat, 25 Jan 2014 15:29:25 +0100
+
 sonata (1.6.2.1-5) unstable; urgency=low
 
   * Fix "Breaks gnome-settings-daemon media-keys plugin" by applying a

Added: packages/sonata/trunk/debian/patches/fix-missing-crossfade.patch
===================================================================
--- packages/sonata/trunk/debian/patches/fix-missing-crossfade.patch	                        (rev 0)
+++ packages/sonata/trunk/debian/patches/fix-missing-crossfade.patch	2014-02-23 20:51:26 UTC (rev 10582)
@@ -0,0 +1,24 @@
+Description: Support MPD >= 0.18 which drops crossfade when not enabled
+Author: Mattia Dongili <malattia at debian.org>
+Origin: http://bugs.debian.org/728704
+
+--- a/sonata/main.py
++++ b/sonata/main.py
+@@ -989,7 +989,7 @@
+ 						self.repeatmenu.set_active(self.status['repeat'] == '1')
+ 					if not self.last_random or self.last_random != self.status['random']:
+ 						self.randommenu.set_active(self.status['random'] == '1')
+-					if self.status['xfade'] == '0':
++					if not 'xfade' in self.status or self.status['xfade'] == '0':
+ 						self.config.xfade_enabled = False
+ 					else:
+ 						self.config.xfade_enabled = True
+@@ -1001,7 +1001,7 @@
+ 					return
+ 		except:
+ 			pass
+-		self.prevconn = self.client
++		self.prevconn = self.conn
+ 		self.prevstatus = self.status
+ 		self.prevsonginfo = self.songinfo
+ 		self.conn = False

Modified: packages/sonata/trunk/debian/patches/series
===================================================================
--- packages/sonata/trunk/debian/patches/series	2014-02-23 17:52:07 UTC (rev 10581)
+++ packages/sonata/trunk/debian/patches/series	2014-02-23 20:51:26 UTC (rev 10582)
@@ -1,3 +1,4 @@
 fix-cras-on-no-albums.patch
 fix-lyrics-fetching.patch
 from_upstream__fix-mmkeys.patch
+fix-missing-crossfade.patch