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

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Wed Dec 24 17:42:47 UTC 2008 

Author: sjoerd
Date: Wed Dec 24 17:42:47 2008
New Revision: 17976

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17976
Log:
* New upstream release
* debian/patches/02-ups-invalid-free.patch
  - Removed, fixed upstream
* debian/patches/03-system-policy.patch
  - Updated
* debian/patches/04-graph-labels.patch
  - Removed, fixed upstream
* debian/patches/05_translation_crash.patch
  - Removed, fixed upstream
* debian/patches/06-bugreport-debian.patch
  - Updated
* debian/patches/08-desktop-bugreport-path.patch
  - Updated

Removed:
    desktop/experimental/gnome-power-manager/debian/patches/02-ups-invalid-free.patch
    desktop/experimental/gnome-power-manager/debian/patches/04-graph-labels.patch
    desktop/experimental/gnome-power-manager/debian/patches/05_translation_crash.patch
Modified:
    desktop/experimental/gnome-power-manager/debian/changelog
    desktop/experimental/gnome-power-manager/debian/patches/03-system-policy.patch
    desktop/experimental/gnome-power-manager/debian/patches/06-bugreport-debian.patch
    desktop/experimental/gnome-power-manager/debian/patches/08-desktop-bugreport-path.patch

Modified: desktop/experimental/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/changelog?rev=17976&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/changelog (original)
+++ desktop/experimental/gnome-power-manager/debian/changelog Wed Dec 24 17:42:47 2008
@@ -1,3 +1,21 @@
+gnome-power-manager (2.24.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/02-ups-invalid-free.patch
+    - Removed, fixed upstream
+  * debian/patches/03-system-policy.patch
+    - Updated
+  * debian/patches/04-graph-labels.patch
+    - Removed, fixed upstream
+  * debian/patches/05_translation_crash.patch
+    - Removed, fixed upstream
+  * debian/patches/06-bugreport-debian.patch
+    - Updated
+  * debian/patches/08-desktop-bugreport-path.patch
+    - Updated
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 24 Dec 2008 18:39:39 +0100
+
 gnome-power-manager (2.22.1-4) unstable; urgency=low
 
   * Rewrite description. Closes: #388109.

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=17976&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/03-system-policy.patch (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/03-system-policy.patch Wed Dec 24 17:42:47 2008
@@ -1,32 +1,18 @@
---- src/gpm-main.c.orig	2007-11-02 18:31:05.000000000 +0100
-+++ src/gpm-main.c	2008-01-29 09:44:53.000000000 +0100
-@@ -147,6 +147,7 @@
-  	GnomeProgram *program;
- 	char **debugoptions = NULL;
- 	int i;
-+	gint ret;
+Index: src/gpm-main.c
+===================================================================
+--- src/gpm-main.c	(revision 3137)
++++ src/gpm-main.c	(working copy)
+@@ -143,7 +143,8 @@
+ 	GpmManager *manager = NULL;
+ 	GError *error = NULL;
+ 	GOptionContext *context;
+- 	GnomeProgram *program;
++	GnomeProgram *program;
++	int ret;
  
  	const GOptionEntry options[] = {
  		{ "no-daemon", '\0', 0, G_OPTION_ARG_NONE, &no_daemon,
-@@ -217,7 +218,7 @@
- 
- 	gpm_debug ("GNOME %s %s", GPM_NAME, VERSION);
- 
--if (0) {
-+/* if (0) { */
- 	/* check dbus connections, exit if not valid */
- 	system_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
- 	if (error) {
-@@ -228,7 +229,7 @@
- 			   "It is <b>strongly recommended</b> you reboot "
- 			   "your computer after starting this service.");
- 	}
--}
-+/* } */
- 
- 	session_connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
- 	if (error) {
-@@ -257,6 +258,20 @@
+@@ -243,6 +244,20 @@
  
  	loop = g_main_loop_new (NULL, FALSE);
  
@@ -35,7 +21,7 @@
 +				    DBUS_NAME_FLAG_REPLACE_EXISTING, NULL);
 +	switch (ret) {
 +	case DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
-+		gpm_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.");
@@ -46,4 +32,4 @@
 +
  	/* Only timeout and close the mainloop if we have specified it
  	 * on the command line */
- 	if (timed_exit == TRUE) {
+ 	if (timed_exit) {

Modified: desktop/experimental/gnome-power-manager/debian/patches/06-bugreport-debian.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/patches/06-bugreport-debian.patch?rev=17976&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/06-bugreport-debian.patch (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/06-bugreport-debian.patch Wed Dec 24 17:42:47 2008
@@ -1,11 +1,17 @@
---- tools/gnome-power-bugreport.sh.orig	2008-09-30 10:23:02.007813004 +0200
-+++ tools/gnome-power-bugreport.sh	2008-09-30 10:24:16.468246731 +0200
-@@ -36,7 +36,7 @@
+Index: tools/gnome-power-bugreport.sh
+===================================================================
+--- tools/gnome-power-bugreport.sh	(revision 3137)
++++ tools/gnome-power-bugreport.sh	(working copy)
+@@ -36,7 +36,11 @@
  }
  
  echo -n "Distro version:       "
--cat /etc/*-release | uniq
-+cat /etc/debian_version
+-cat /etc/*release | uniq
++if [ -f /etc/debian_version ] ; then
++  cat /etc/debian_version 
++else
++  cat /etc/*release | uniq
++fi
  
  echo -n "Kernel version:       "
  uname -r

Modified: desktop/experimental/gnome-power-manager/debian/patches/08-desktop-bugreport-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/patches/08-desktop-bugreport-path.patch?rev=17976&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/08-desktop-bugreport-path.patch (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/08-desktop-bugreport-path.patch Wed Dec 24 17:42:47 2008
@@ -1,34 +1,8 @@
-diff -pruN data.orig/gnome-power-manager.desktop.in data/gnome-power-manager.desktop.in
---- data.orig/gnome-power-manager.desktop.in	2008-03-10 22:52:48.000000000 +0100
-+++ data/gnome-power-manager.desktop.in	2008-10-24 20:39:03.323827888 +0200
-@@ -12,4 +12,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-power-manager
- X-GNOME-Bugzilla-Component=gnome-power-manager
- X-GNOME-Bugzilla-Version=2.22.1
--X-GNOME-Bugzilla-ExtraInfoScript=gnome-power-bugreport.sh
-+X-GNOME-Bugzilla-ExtraInfoScript=/usr/share/gnome-power-manager/gnome-power-bugreport
-diff -pruN data.orig/gnome-power-manager.desktop.in.in data/gnome-power-manager.desktop.in.in
---- data.orig/gnome-power-manager.desktop.in.in	2008-03-10 22:50:01.000000000 +0100
-+++ data/gnome-power-manager.desktop.in.in	2008-10-24 20:39:03.328333000 +0200
-@@ -12,4 +12,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
- 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-Bugzilla-ExtraInfoScript=/usr/share/gnome-power-manager/gnome-power-bugreport
-diff -pruN data.orig/gnome-power-preferences.desktop.in data/gnome-power-preferences.desktop.in
---- data.orig/gnome-power-preferences.desktop.in	2008-03-10 22:52:48.000000000 +0100
-+++ data/gnome-power-preferences.desktop.in	2008-10-24 20:39:03.336326334 +0200
-@@ -13,4 +13,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-power-manager
- X-GNOME-Bugzilla-Component=gnome-power-preferences
- X-GNOME-Bugzilla-Version=2.22.1
--X-GNOME-Bugzilla-ExtraInfoScript=gnome-power-bugreport.sh
-+X-GNOME-Bugzilla-ExtraInfoScript=/usr/share/gnome-power-manager/gnome-power-bugreport
-diff -pruN data.orig/gnome-power-preferences.desktop.in.in data/gnome-power-preferences.desktop.in.in
---- data.orig/gnome-power-preferences.desktop.in.in	2008-03-10 22:50:01.000000000 +0100
-+++ data/gnome-power-preferences.desktop.in.in	2008-10-24 20:39:03.336326334 +0200
-@@ -13,4 +13,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
+Index: data/gnome-power-preferences.desktop.in.in
+===================================================================
+--- data/gnome-power-preferences.desktop.in.in	(revision 3137)
++++ data/gnome-power-preferences.desktop.in.in	(working copy)
+@@ -13,4 +13,4 @@
  X-GNOME-Bugzilla-Product=gnome-power-manager
  X-GNOME-Bugzilla-Component=gnome-power-preferences
  X-GNOME-Bugzilla-Version=@VERSION@

More information about the pkg-gnome-commits mailing list