r20778 - in /desktop/experimental/gnome-power-manager/debian: ./ patches/

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Fri Jul 24 14:23:23 UTC 2009 

Author: sjoerd
Date: Fri Jul 24 14:23:22 2009
New Revision: 20778

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20778
Log:
* debian/patches/01-use-panel-logout.patch:
  - Remove.d Not needed anymore
* debian/patches/02_autostart_init.patch: Updated
* debian/patches/03-system-policy.patch: Update with git version
* debian/patches/04_cast-align.patch: Removed, gstreamer isn't used directly
  anymore, so this patch shouldn't be needed
* debian/patches/70_relibtoolize.patch: removed
* debian/patches/series: Updated to reflect the above

Removed:
    desktop/experimental/gnome-power-manager/debian/patches/01-use-panel-logout.patch
    desktop/experimental/gnome-power-manager/debian/patches/04_cast-align.patch
    desktop/experimental/gnome-power-manager/debian/patches/70_relibtoolize.patch
Modified:
    desktop/experimental/gnome-power-manager/debian/changelog
    desktop/experimental/gnome-power-manager/debian/control
    desktop/experimental/gnome-power-manager/debian/control.in
    desktop/experimental/gnome-power-manager/debian/patches/02_autostart_init.patch
    desktop/experimental/gnome-power-manager/debian/patches/03-system-policy.patch
    desktop/experimental/gnome-power-manager/debian/patches/series

Modified: desktop/experimental/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/changelog?rev=20778&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/changelog [utf-8] Fri Jul 24 14:23:22 2009
@@ -1,8 +1,16 @@
 gnome-power-manager (2.26.3-1) UNRELEASED; urgency=low
 
   * New upstream release
-
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 24 Jul 2009 13:21:39 +0200
+  * debian/patches/01-use-panel-logout.patch:
+    - Remove.d Not needed anymore
+  * debian/patches/02_autostart_init.patch: Updated
+  * debian/patches/03-system-policy.patch: Update with git version
+  * debian/patches/04_cast-align.patch: Removed, gstreamer isn't used directly
+    anymore, so this patch shouldn't be needed
+  * debian/patches/70_relibtoolize.patch: removed
+  * debian/patches/series: Updated to reflect the above
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 24 Jul 2009 16:20:55 +0200
 
 gnome-power-manager (2.24.4-3) unstable; urgency=low
 

Modified: desktop/experimental/gnome-power-manager/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/control?rev=20778&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/control [utf-8] Fri Jul 24 14:23:22 2009
@@ -28,8 +28,13 @@
                gnome-doc-utils,
                scrollkeeper,
                gnome-pkg-tools (>= 0.10),
-               libgstreamer0.10-dev,
-               libdevkit-power-gobject-dev
+               libdevkit-gobject-dev,
+               libdevkit-power-gobject-dev,
+               libcanberra-gtk-dev,
+               libunique-dev,
+               libpolkit-dbus-dev,
+               libpolkit-grant-dev,
+               libpolkit-gnome-dev
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-power-manager
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager

Modified: desktop/experimental/gnome-power-manager/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/control.in?rev=20778&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/control.in [utf-8] Fri Jul 24 14:23:22 2009
@@ -28,8 +28,13 @@
                gnome-doc-utils,
                scrollkeeper,
                gnome-pkg-tools (>= 0.10),
-               libgstreamer0.10-dev,
-               libdevkit-power-gobject-dev
+               libdevkit-gobject-dev,
+               libdevkit-power-gobject-dev,
+               libcanberra-gtk-dev,
+               libunique-dev,
+               libpolkit-dbus-dev,
+               libpolkit-grant-dev,
+               libpolkit-gnome-dev
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-power-manager
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager

Modified: desktop/experimental/gnome-power-manager/debian/patches/02_autostart_init.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/patches/02_autostart_init.patch?rev=20778&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/02_autostart_init.patch [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/02_autostart_init.patch [utf-8] Fri Jul 24 14:23:22 2009
@@ -1,9 +1,11 @@
-Index: gnome-power-manager-2.24.4/data/gnome-power-manager.desktop.in.in
-===================================================================
---- gnome-power-manager-2.24.4.orig/data/gnome-power-manager.desktop.in.in	2009-06-02 22:36:20.197517541 +0200
-+++ gnome-power-manager-2.24.4/data/gnome-power-manager.desktop.in.in	2009-06-02 22:36:36.973978504 +0200
-@@ -13,3 +13,4 @@ X-GNOME-Bugzilla-Product=gnome-power-man
+diff --git a/data/gnome-power-manager.desktop.in.in b/data/gnome-power-manager.desktop.in.in
+index a0ed930..de5d86a 100644
+--- a/data/gnome-power-manager.desktop.in.in
++++ b/data/gnome-power-manager.desktop.in.in
+@@ -13,5 +13,6 @@ X-GNOME-Bugzilla-Product=gnome-power-manager
  X-GNOME-Bugzilla-Component=gnome-power-manager
  X-GNOME-Bugzilla-Version=@VERSION@
  X-GNOME-Bugzilla-ExtraInfoScript=gnome-power-bugreport.sh
 +X-GNOME-Autostart-Phase=Initialization
+ #X-GNOME-AutoRestart=true
+ 

Modified: desktop/experimental/gnome-power-manager/debian/patches/03-system-policy.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/patches/03-system-policy.patch?rev=20778&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/03-system-policy.patch [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/03-system-policy.patch [utf-8] Fri Jul 24 14:23:22 2009
@@ -1,30 +1,39 @@
-Index: src/gpm-main.c
-===================================================================
---- a/src/gpm-main.c	(revision 3137)
-+++ b/src/gpm-main.c	(working copy)
-@@ -143,7 +143,8 @@
+commit ca9cf6b95d88b3930439395277baa73efcc0a585
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Date:   Wed Jul 22 19:19:56 2009 +0200
+
+    claim org.freedesktop.Policy.Power on D-BUS
+    
+    Make gnome-power-manager claim org.freedesktop.Policy.Power on the D-Bus system
+    bus on startup. This ensures that gnome-power-manager, kpowersave and
+    powersaved are not stepping on each other's toes and only one program is acting
+    on power management events.
+
+diff --git a/src/gpm-main.c b/src/gpm-main.c
+index 8885f73..98259bd 100644
+--- a/src/gpm-main.c
++++ b/src/gpm-main.c
+@@ -164,6 +164,7 @@ main (int argc, char *argv[])
  	GpmManager *manager = NULL;
  	GError *error = NULL;
  	GOptionContext *context;
-- 	GnomeProgram *program;
-+	GnomeProgram *program;
-+	int ret;
++	gint ret;
  
  	const GOptionEntry options[] = {
- 		{ "no-daemon", '\0', 0, G_OPTION_ARG_NONE, &no_daemon,
-@@ -243,6 +244,20 @@
- 
- 	loop = g_main_loop_new (NULL, FALSE);
+ 		{ "verbose", '\0', 0, G_OPTION_ARG_NONE, &verbose,
+@@ -250,6 +251,20 @@ main (int argc, char *argv[])
+ 		return 0;
+ 	}
  
 +	ret = dbus_bus_request_name(dbus_g_connection_get_connection(system_connection),
 +				    "org.freedesktop.Policy.Power",
 +				    DBUS_NAME_FLAG_REPLACE_EXISTING, NULL);
 +	switch (ret) {
 +	case DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
-+		egg_debug("Successfully acquired interface org.freedesktop.Policy.Power.");
++		egg_debug ("Successfully acquired interface org.freedesktop.Policy.Power.");
 +		break;
 +	case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
-+		printf("Queued for interface org.freedesktop.Policy.Power.");
++		egg_debug ("Queued for interface org.freedesktop.Policy.Power.");
 +		break;
 +	default:
 +		break;

Modified: desktop/experimental/gnome-power-manager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/patches/series?rev=20778&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/series [utf-8] Fri Jul 24 14:23:22 2009
@@ -1,8 +1,5 @@
-01-use-panel-logout.patch
 02_autostart_init.patch
 03-system-policy.patch
-04_cast-align.patch
 06-bugreport-debian.patch
 07-bugreport-shebang.patch
 08-desktop-bugreport-path.patch
-70_relibtoolize.patch

More information about the pkg-gnome-commits mailing list