r14185 - in /desktop/experimental/gnome-power-manager/debian: changelog patches/01-use-panel-logout.patch rules

[brad-guest at users.alioth.debian.org]

Author: brad-guest
Date: Sat Jan 12 16:46:00 2008
New Revision: 14185

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14185
Log:
* New upstream development release.
* Add check-dist.
* debian/patches/01-use-panel-logout.patch:
  - Updated to apply cleanly again.

Modified:
    desktop/experimental/gnome-power-manager/debian/changelog
    desktop/experimental/gnome-power-manager/debian/patches/01-use-panel-logout.patch
    desktop/experimental/gnome-power-manager/debian/rules

Modified: desktop/experimental/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/changelog?rev=14185&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/changelog (original)
+++ desktop/experimental/gnome-power-manager/debian/changelog Sat Jan 12 16:46:00 2008
@@ -1,3 +1,12 @@
+gnome-power-manager (2.21.1-1) UNRELEASED; urgency=low
+
+  * New upstream development release.
+  * Add check-dist.
+  * debian/patches/01-use-panel-logout.patch:
+    - Updated to apply cleanly again.
+
+ -- Bradley Smith <brad at brad-smith.co.uk>  Sat, 12 Jan 2008 16:11:50 +0000
+
 gnome-power-manager (2.20.2-2) unstable; urgency=low
 
   * 01-use-panel-logout.patch: use gnome-panel-logout if available

Modified: desktop/experimental/gnome-power-manager/debian/patches/01-use-panel-logout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/patches/01-use-panel-logout.patch?rev=14185&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/01-use-panel-logout.patch (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/01-use-panel-logout.patch Sat Jan 12 16:46:00 2008
@@ -1,13 +1,13 @@
 Bugzilla #507393
 --- src/gpm-manager.c.orig	2008-01-05 00:26:15.424255671 +0100
 +++ src/gpm-manager.c	2008-01-05 00:42:32.699947439 +0100
-@@ -474,11 +474,17 @@
+@@ -493,11 +493,17 @@
  		gpm_control_shutdown (manager->priv->control, NULL);
  
  	} else if (strcmp (action, ACTION_INTERACTIVE) == 0) {
 +		const gchar *const argv[] = { "gnome-panel-logout", "--shutdown", NULL };
  		gpm_info_explain_reason (manager->priv->info, GPM_EVENT_NOTIFICATION,
- 					_("GNOME interactive logout"), reason);
+ 					_("GNOME interactive logout."), reason);
 -		gnome_client_request_save (gnome_master_client (),
 -					   GNOME_SAVE_GLOBAL,
 -					   TRUE, GNOME_INTERACT_ANY, FALSE, TRUE);

Modified: desktop/experimental/gnome-power-manager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/rules?rev=14185&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/rules (original)
+++ desktop/experimental/gnome-power-manager/debian/rules Sat Jan 12 16:46:00 2008
@@ -5,6 +5,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += \