diff -u pygmy-0.48/debian/control pygmy-0.48/debian/control
--- pygmy-0.48/debian/control
+++ pygmy-0.48/debian/control
@@ -1,7 +1,8 @@
 Source: pygmy
 Section: sound
 Priority: optional
-Maintainer: Decklin Foster <decklin@red-bean.com>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Decklin Foster <decklin@red-bean.com>
 XS-Python-Version: all
 Build-Depends: debhelper (>= 5.0.37.1), python, python-dev
 Build-Depends-Indep: python-support (>= 0.2.3)
diff -u pygmy-0.48/debian/changelog pygmy-0.48/debian/changelog
--- pygmy-0.48/debian/changelog
+++ pygmy-0.48/debian/changelog
@@ -1,9 +1,24 @@
+pygmy (0.48-3ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+      - pygmy.py: Applied patch to fix TypeError on tray icon right-click (LP #56176)
+      - debian/control: set maintainer to Ubuntu MOTU
+
+ -- Andrea Gasparini <gaspa@yattaweb.it>  Mon, 12 Nov 2007 18:49:21 +0100
+
 pygmy (0.48-3) unstable; urgency=low
 
   * Corrected watch file (Closes: #449982)
 
  -- Decklin Foster <decklin@red-bean.com>  Tue, 06 Nov 2007 20:59:34 -0500
 
+pygmy (0.48-2ubuntu1) gutsy; urgency=low
+
+  * Applied patch to fix TypeError on tray icon right-click (LP #56176)
+  * Set Ubuntu maintainer
+
+ -- Andy Price <andy@andrewprice.me.uk>  Fri, 25 May 2007 02:05:54 +0100
+
 pygmy (0.48-2) unstable; urgency=low
 
   * Really build with python-support, now that we can do it properly.
only in patch2:
unchanged:
--- pygmy-0.48.orig/pygmy.py
+++ pygmy-0.48/pygmy.py
@@ -1360,8 +1360,9 @@
 
 	def _remove_timer(self):
 		self.hide()
-		gobject.source_remove(self.timer_tag)
-		self.timer_tag = None
+		if self.timer_tag != None:
+			gobject.source_remove(self.timer_tag)
+			self.timer_tag = None
 
 	# from gtktooltips.c:gtk_tooltips_paint_window
 	def _on__expose_event(self, window, event):