--- sonata-1.0.1.orig/debian/changelog
+++ sonata-1.0.1/debian/changelog
@@ -0,0 +1,53 @@
+sonata (1.0.1-5) unstable; urgency=low
+
+  * Do not build against experimental packages (Closes: #420123).
+
+ -- Michal Čihař <nijel@debian.org>  Fri, 20 Apr 2007 10:45:28 +0200
+
+sonata (1.0.1-4) unstable; urgency=low
+
+  * Add XS-Vcs headers.
+  * Fix suggests (Closes: #411565):
+    - Remove python-taglib, no such thing exits, sorry.
+    - python-tagpy is in NEW queue and should be soon available.
+  * Use dpatch for patching upstream.
+
+ -- Michal Čihař <nijel@debian.org>  Tue, 17 Apr 2007 09:07:46 +0200
+
+sonata (1.0.1-3) unstable; urgency=low
+
+  * Fix wrong sonata.py file, sorry for this error (Closes: #415014).
+  * Use my Debian email address.
+
+ -- Michal Čihař <nijel@debian.org>  Thu, 15 Mar 2007 15:05:45 +0100
+
+sonata (1.0.1-2) unstable; urgency=low
+
+  * Enabled GNOME session support (Closes: #409193).
+
+ -- Michal Čihař <michal@cihar.com>  Wed, 14 Mar 2007 14:17:42 +0100
+
+sonata (1.0.1-1) unstable; urgency=low
+
+  * New upstream version.
+  	- Should fix displying of log text (Closes: #409193).
+  * It includes commented out Gnome session support, please enable and test it
+    if you want to see this in next version (see bug #410286).
+
+ -- Michal Čihař <michal@cihar.com>  Fri,  9 Mar 2007 10:11:28 +0100
+
+sonata (1.0-1) unstable; urgency=low
+
+  * New upstream version (Closes: #409457).
+    - Includes fixed French translation (Closes: #405056).
+  * Introduce new optional depenencies as Sonata can do more with them (I know
+    some of these packages do not yet exist in Debian, but somebody will
+    hopefully package them soon :-)).
+
+ -- Michal Čihař <michal@cihar.com>  Mon,  5 Feb 2007 10:55:13 +0100
+
+sonata (0.9-1) unstable; urgency=low
+
+  * Initial release for Debian (Closes: #394201).
+
+ -- Michal Čihař <michal@cihar.com>  Fri, 20 Oct 2006 11:51:51 +0200
--- sonata-1.0.1.orig/debian/copyright
+++ sonata-1.0.1/debian/copyright
@@ -0,0 +1,36 @@
+This package was debianized by Michal Čihař <michal@cihar.com> on
+Fri, 20 Oct 2006 11:51:51 +0200.
+
+It was downloaded from <http://sonata.berlios.de/>
+
+Upstream Author: Scott Horowitz <stonecrest@gmail.com>
+
+Copyright: Copyright 2006 Scott Horowitz <stonecrest@gmail.com>
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2006, Michal Čihař <michal@cihar.com> and
+is licensed under the GPL, see above.
+
+mmkeys extesions has different copyright holders (but is still under GPL):
+ * Copyright (C) 2004 Lee Willis <lee@leewillis.co.uk>
+ *    Borrowed heavily from code by Jan Arne Petersen <jpetersen@uni-bonn.de>
+ * Copyright 2004 Joe Wreschnig.
+mpdclient3.py is public domain
--- sonata-1.0.1.orig/debian/control
+++ sonata-1.0.1/debian/control
@@ -0,0 +1,22 @@
+Source: sonata
+Section: sound
+Priority: optional
+Maintainer: Michal Čihař <nijel@debian.org>
+Build-Depends: debhelper (>= 5.0.38), python-central (>= 0.5.6), python-dev (>= 2.3.5-11), python-gtk2-dev, libgtk2.0-dev, dpatch
+Standards-Version: 3.7.2
+XS-Python-Version: current
+XS-Vcs-Svn: svn://svn.cihar.com/debian-sonata
+XS-Vcs-Browser: http://viewsvn.cihar.com/debian-sonata
+
+Package: sonata
+Architecture: any
+Provides: ${python:Provides}, mpd-client
+XB-Python-Version: ${python:Versions}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gtk2, python-dbus
+Suggests: python-gnome2-extras, python-soappy, python-tagpy
+Description: GTK+ client for the Music Player Daemon
+ Sonata is a lightweight GTK+ music client for the Music Player Daemon (MPD).
+ It aims to be efficient (no toolbar, main menu, or statusbar),
+ user-friendly, and clean.
+ .
+  Homepage: http://sonata.berlios.de/
--- sonata-1.0.1.orig/debian/sonata.1
+++ sonata-1.0.1/debian/sonata.1
@@ -0,0 +1,33 @@
+.TH SONATA 1 "October 20, 2006"
+.SH NAME
+sonata \- GTK+ client for the Music Player Daemon
+.SH SYNOPSIS
+.B sonata
+[\fIOPTION\fR]
+.SH DESCRIPTION
+Sonata is a lightweight GTK+ music client for the Music Player Daemon (MPD).
+It aims to be efficient (no toolbar, main menu, or statusbar),
+user-friendly, and clean.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show this help and exit
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information and exit
+.TP
+\fB\-s\fR, \fB\-\-status\fR
+Display current song info
+.TP
+\fB\-t\fR, \fB\-\-toggle\fR
+Toggles whether the app is minimized
+to tray or visible (requires D\-Bus)
+.SH "SEE ALSO"
+.PP
+Website: http://sonata.berlios.de
+.SH AUTHOR
+Sonata was written by Scott Horowitz <stonecrest@gmail.com>.
+
+.PP
+This manual page was written by Michal Cihar <michal@cihar.com>,
+for the Debian project (but may be used by others).
--- sonata-1.0.1.orig/debian/watch
+++ sonata-1.0.1/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sonata.berlios.de/download.html http://download.berlios.de/sonata/sonata-(.*).tar.gz
--- sonata-1.0.1.orig/debian/sonata.menu
+++ sonata-1.0.1/debian/sonata.menu
@@ -0,0 +1,4 @@
+?package(sonata):needs="X11" section="Apps/Sound"\
+  title="Sonata" command="/usr/bin/sonata" \
+  longtitle="A simple GTK+ MPD client" \
+  icon="/usr/share/pixmaps/sonata.xpm"
--- sonata-1.0.1.orig/debian/pycompat
+++ sonata-1.0.1/debian/pycompat
@@ -0,0 +1 @@
+2
--- sonata-1.0.1.orig/debian/sonata.xpm
+++ sonata-1.0.1/debian/sonata.xpm
@@ -0,0 +1,177 @@
+/* XPM */
+static char *sonata[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 139 2",
+"   c #2E476000",
+".  c #2E496300",
+"X  c #2D486400",
+"o  c #2D486500",
+"O  c #2C496A00",
+"+  c #2C4A6C00",
+"@  c #2D4D6F00",
+"#  c #35476800",
+"$  c #374D6200",
+"%  c #364E6700",
+"&  c #324B6A00",
+"*  c #324D6800",
+"=  c #334D6800",
+"-  c #314F6D00",
+";  c #364F6B00",
+":  c #3C4F6400",
+">  c #36506B00",
+",  c #35506C00",
+"<  c #35506D00",
+"1  c #35516D00",
+"2  c #34526F00",
+"3  c #36506C00",
+"4  c #37526F00",
+"5  c #33527100",
+"6  c #37537100",
+"7  c #36547400",
+"8  c #375A7F00",
+"9  c #39567700",
+"0  c #3B597800",
+"q  c #3D5B7900",
+"w  c #3C5D7C00",
+"e  c #455A6F00",
+"r  c #405A7300",
+"t  c #4F5E7700",
+"y  c #56737F00",
+"u  c #626E7F00",
+"i  c #375B8000",
+"p  c #385B8100",
+"a  c #395D8200",
+"s  c #3C5D8000",
+"d  c #3D5E8000",
+"f  c #3F608200",
+"g  c #3F648B00",
+"h  c #46558300",
+"j  c #41618200",
+"k  c #41618300",
+"l  c #42618200",
+"z  c #42618300",
+"x  c #42628200",
+"c  c #42628300",
+"v  c #43638300",
+"b  c #43668C00",
+"n  c #47698E00",
+"m  c #466A9100",
+"M  c #466C9400",
+"N  c #496B9000",
+"B  c #4E709500",
+"V  c #5E708700",
+"C  c #537BA600",
+"Z  c #547BA400",
+"A  c #557BA400",
+"S  c #577DA500",
+"D  c #6D788300",
+"F  c #5880AB00",
+"G  c #5B82AB00",
+"H  c #5A84AF00",
+"J  c #5D85AF00",
+"K  c #5F86B000",
+"L  c #5F87B300",
+"P  c #5F89B500",
+"I  c #74818F00",
+"U  c #75828F00",
+"Y  c #70819600",
+"T  c #77859400",
+"R  c #74899F00",
+"E  c #6088B300",
+"W  c #778CA100",
+"Q  c #7F91A300",
+"!  c #6792C000",
+"~  c #6893C100",
+"^  c #6B96C400",
+"/  c #6B97C600",
+"(  c #6C97C600",
+")  c #6D99C700",
+"_  c #6D99C900",
+"`  c #6E9AC900",
+"'  c #6F9CCB00",
+"]  c #709CCB00",
+"[  c #709DCC00",
+"{  c #709DCD00",
+"}  c #719DCD00",
+"|  c #719ECE00",
+" . c #729ECE00",
+".. c #729FCF00",
+"X. c #8092A500",
+"o. c #8295A800",
+"O. c #8296A900",
+"+. c #8597A900",
+"@. c #8C9DAF00",
+"#. c #ADB7C300",
+"$. c #B6BAC000",
+"%. c #B9C0C600",
+"&. c #B8C3C900",
+"*. c #BAC2CA00",
+"=. c #C0C6CD00",
+"-. c #C0C9D300",
+";. c #C7CBD500",
+":. c #C7CCD200",
+">. c #CCD2D500",
+",. c #CED4DC00",
+"<. c #D4D6DB00",
+"1. c #D4D7DA00",
+"2. c #D7DCE200",
+"3. c #D7DCE300",
+"4. c #E1E3E600",
+"5. c #E1E6EA00",
+"6. c #E5E7E800",
+"7. c #E4E7EB00",
+"8. c #E4E8EC00",
+"9. c #EAEBED00",
+"0. c #E9ECEF00",
+"q. c #EAECEE00",
+"w. c #EBEDEF00",
+"e. c #EEEEEE00",
+"r. c #EBEDF000",
+"t. c #EDEFF000",
+"y. c #EFF1F200",
+"u. c #F0F1F200",
+"i. c #F2F3F500",
+"p. c #F4F4F600",
+"a. c #F6F7F700",
+"s. c #F6F7F800",
+"d. c #F6F8F900",
+"f. c #F7F8F900",
+"g. c #F9FAFB00",
+"h. c #FAFBFC00",
+"j. c #FEFEFF00",
+"k. c gray100",
+"l. c None",
+/* pixels */
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.w.9.9.w.w.y.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.X 7 5 - X ; T *.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ........) J 0 I a.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ............' B U l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ..............' q $.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ..n f N G ^ ....J u l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ' * :.&.V r S ..^ V l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ' > l.l.l.;.# E ] & 1.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ' 1 l.l.l.l.$.c ..4 1.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ..1 l.l.l.l.>.1 ] 6 1.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ' 1 l.l.l.l.4.$ . : 6.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ' ; l.l.l.l.l.y.9.u.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ..> l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ..1 l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ' 1 l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ' ; l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.k ] ; l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.9.7.7.l.l.k ..1 l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.s.-.R 9 @ + r Y d ' 1 l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.s.W 8 H ^ ..' ! A A ' ; l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.+.g ` ..............' 1 l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.5.w ~ ................' = l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.3.p ..................`   l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.3.a ..................L h l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.8.k ( ................d *.l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.@.M ' ..........^ b t l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.g.O.i C P P G m O D i.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.h.,.Q O.O.Q #.r.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l."
+};
--- sonata-1.0.1.orig/debian/compat
+++ sonata-1.0.1/debian/compat
@@ -0,0 +1 @@
+5
--- sonata-1.0.1.orig/debian/rules
+++ sonata-1.0.1/debian/rules
@@ -0,0 +1,64 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+build: build-stamp
+
+build-stamp: patch-stamp
+	dh_testdir
+	PKG_CONFIG_PATH=${PKGCONFIGPATH}:/usr/lib/pkgconfig/$(pyversions -d) /usr/bin/python setup.py build
+	touch $@
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	/usr/bin/python setup.py clean
+	rm -rf build 
+	find . -name '*.pyc' -print0 | xargs -0 -r rm -f
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+	/usr/bin/python setup.py install --no-compile --prefix $(CURDIR)/debian/sonata/usr
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs CHANGELOG
+	dh_installdocs
+	dh_install debian/sonata.xpm usr/share/pixmaps
+	dh_installmenu
+	dh_pycentral
+	dh_installman debian/sonata.1
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- sonata-1.0.1.orig/debian/patches/00list
+++ sonata-1.0.1/debian/patches/00list
@@ -0,0 +1 @@
+01_sonata-session
--- sonata-1.0.1.orig/debian/patches/01_sonata-session.dpatch
+++ sonata-1.0.1/debian/patches/01_sonata-session.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_config-browser.dpatch by Michal Čihař <nijel@debian.org>
+##
+## DP: Enables session support
+
+--- sonata-1.0.1.orig/sonata.py
++++ sonata-1.0.1/sonata.py
+@@ -95,11 +95,11 @@
+ except:
+ 	HAVE_WSDL = False
+ 	
+-#try:
+-#	import gnome, gnome.ui
+-#	HAVE_GNOME_UI = True
+-#except:
+-#	HAVE_GNOME_UI = False
++try:
++	import gnome, gnome.ui
++	HAVE_GNOME_UI = True
++except:
++	HAVE_GNOME_UI = False
+ 
+ # Test pygtk version
+ if gtk.pygtk_version < (2, 6, 0):
+@@ -193,7 +193,7 @@
+ 
+ 		start_dbus_interface(toggle_arg)
+ 		
+-		#self.gnome_session_management()
++		self.gnome_session_management()
+ 
+ 		# Initialize vars:
+ 		self.TAB_CURRENT = 0
--- sonata-1.0.1.orig/debian/docs
+++ sonata-1.0.1/debian/docs
@@ -0,0 +1,2 @@
+TODO
+TRANSLATORS