r11354 - in /desktop/unstable/deskbar-applet/debian: changelog patches/100-fix-pythonlib.patch patches/100-gpm-methods.patch

[rfrancoise at users.alioth.debian.org]

Author: rfrancoise
Date: Thu Jun  7 17:00:16 2007
New Revision: 11354

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11354
Log:
* debian/patches/100-gpm-methods.patch: New patch stolen from Ubuntu,
  fixes the gnome-power-manager dbus calls in the gdm handler.
* debian/patches/100-fix-pythonlib.patch: New patch stolen from Ubuntu,
  avoids hardcoding the Python version in deskbar-applet.py.

Added:
    desktop/unstable/deskbar-applet/debian/patches/100-fix-pythonlib.patch
    desktop/unstable/deskbar-applet/debian/patches/100-gpm-methods.patch
Modified:
    desktop/unstable/deskbar-applet/debian/changelog

Modified: desktop/unstable/deskbar-applet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/changelog?rev=11354&op=diff
==============================================================================
--- desktop/unstable/deskbar-applet/debian/changelog (original)
+++ desktop/unstable/deskbar-applet/debian/changelog Thu Jun  7 17:00:16 2007
@@ -1,3 +1,12 @@
+deskbar-applet (2.18.1-2) UNRELEASED; urgency=low
+
+  * debian/patches/100-gpm-methods.patch: New patch stolen from Ubuntu,
+    fixes the gnome-power-manager dbus calls in the gdm handler.
+  * debian/patches/100-fix-pythonlib.patch: New patch stolen from Ubuntu,
+    avoids hardcoding the Python version in deskbar-applet.py.
+
+ -- Romain Francoise <rfrancoise at debian.org>  Thu, 07 Jun 2007 18:30:57 +0200
+
 deskbar-applet (2.18.1-1) unstable; urgency=low
 
   [ Romain Francoise ]

Added: desktop/unstable/deskbar-applet/debian/patches/100-fix-pythonlib.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/patches/100-fix-pythonlib.patch?rev=11354&op=file
==============================================================================
--- desktop/unstable/deskbar-applet/debian/patches/100-fix-pythonlib.patch (added)
+++ desktop/unstable/deskbar-applet/debian/patches/100-fix-pythonlib.patch Thu Jun  7 17:00:16 2007
@@ -1,0 +1,15 @@
+--- ./deskbar/deskbar-applet.py~	2007-02-22 11:51:07.000000000 +0100
++++ ./deskbar/deskbar-applet.py	2007-02-22 12:23:52.000000000 +0100
+@@ -23,8 +23,10 @@
+ 	print 'Running uninstalled deskbar, modifying PYTHONPATH'
+ 	sys.path.insert(0, abspath(name))
+ else:
+-	sys.path.insert(0, abspath("@PYTHONDIR@"))
+-	print "Running installed deskbar, using [@PYTHONDIR@:$PYTHONPATH]"
++	# this may be done better; at least its version independent
++	pythondir = '/usr/lib/python%s/site-packages/deskbar' % sys.version[:3]
++	sys.path.insert(0, abspath(pythondir))
++	print "Running installed deskbar, using [%s:$PYTHONPATH]" % pythondir
+ 
+ # Now the path is set, import our applet
+ import deskbar, deskbar.DeskbarApplet, deskbar.defs

Added: desktop/unstable/deskbar-applet/debian/patches/100-gpm-methods.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/patches/100-gpm-methods.patch?rev=11354&op=file
==============================================================================
--- desktop/unstable/deskbar-applet/debian/patches/100-gpm-methods.patch (added)
+++ desktop/unstable/deskbar-applet/debian/patches/100-gpm-methods.patch Thu Jun  7 17:00:16 2007
@@ -1,0 +1,18 @@
+diff -Nur deskbar-applet-2.16.0/deskbar/handlers/gdmactions.py deskbar-applet-2.16.0.new/deskbar/handlers/gdmactions.py
+--- deskbar-applet-2.16.0/deskbar/handlers/gdmactions.py	2006-08-31 15:21:35.000000000 +0200
++++ deskbar-applet-2.16.0.new/deskbar/handlers/gdmactions.py	2006-10-03 18:26:03.000000000 +0200
+@@ -192,11 +192,11 @@
+ 			bus = dbus.Bus(dbus.Bus.TYPE_SESSION)
+ 			obj = bus.get_object('org.gnome.PowerManager', '/org/gnome/PowerManager')
+ 			gpm = dbus.Interface (obj, "org.gnome.PowerManager")
+-			if gpm.canSuspend():
++			if gpm.AllowedSuspend():
+ 				self.indexer.add(_("Suspend"), SuspendMatch(self))
+-			if gpm.canHibernate():
++			if gpm.AllowedHibernate():
+ 				self.indexer.add(_("Hibernate"), HibernateMatch(self))
+-			if gpm.canShutdown():
++			if gpm.AllowedShutdown():
+ 				self.indexer.add(_("Shutdown"), ShutdownMatch(self))
+ 		except dbus.dbus_bindings.DBusException:
+ 			return False