[Pkg-utopia-commits] r707 - in packages/experimental/gnome-power-manager/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-03-03 11:08:04 +0000 (Fri, 03 Mar 2006)
New Revision: 707

Added:
   packages/experimental/gnome-power-manager/debian/patches/02_gpm_struct_type.patch
Modified:
   packages/experimental/gnome-power-manager/debian/changelog
   packages/experimental/gnome-power-manager/debian/control
Log:
* debian/patches/02_gpm_struct_type.patch
  + Added. Fix compatibility with dbus 0.61
* Build-depend on libdbus-glib-1-dev (>= 0.61)
* Add myself to uploaders 

Modified: packages/experimental/gnome-power-manager/debian/changelog
===================================================================
--- packages/experimental/gnome-power-manager/debian/changelog	2006-03-03 02:14:04 UTC (rev 706)
+++ packages/experimental/gnome-power-manager/debian/changelog	2006-03-03 11:08:04 UTC (rev 707)
@@ -1,3 +1,12 @@
+gnome-power-manager (2.13.92-2) experimental; urgency=low
+
+  * debian/patches/02_gpm_struct_type.patch
+    + Added. Fix compatibility with dbus 0.61
+  * Build-depend on libdbus-glib-1-dev (>= 0.61)
+  * Add myself to uploaders 
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri,  3 Mar 2006 11:48:33 +0100
+
 gnome-power-manager (2.13.92-1) experimental; urgency=low
 
   * New upstream

Modified: packages/experimental/gnome-power-manager/debian/control
===================================================================
--- packages/experimental/gnome-power-manager/debian/control	2006-03-03 02:14:04 UTC (rev 706)
+++ packages/experimental/gnome-power-manager/debian/control	2006-03-03 11:08:04 UTC (rev 707)
@@ -2,7 +2,8 @@
 Section: gnome
 Priority: optional
 Maintainer: Riccardo Setti <giskard at autistici.org>
-Build-Depends: debhelper (>= 5), cdbs, libtool, autoconf, libgnomeui-dev, libglade2-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.60), libdbus-glib-1-dev (>= 0.60), libxml-parser-perl, libxext-dev, libx11-dev, libgtk2.0-dev, libwnck-dev, docbook-to-man, intltool, libnotify-dev (>= 0.3.0), docbook-utils, libxres-dev, gnome-doc-utils
+Uploaders: Sjoerd Simons <sjoerd at debian.org>
+Build-Depends: debhelper (>= 5), cdbs, libtool, autoconf, libgnomeui-dev, libglade2-dev, libhal-dev (>= 0.5.6), libdbus-glib-1-dev (>= 0.61), libxml-parser-perl, libxext-dev, libx11-dev, libgtk2.0-dev, libwnck-dev, docbook-to-man, intltool, libnotify-dev (>= 0.3.0), docbook-utils, libxres-dev, gnome-doc-utils
 Standards-Version: 3.6.2
 
 Package: gnome-power-manager

Added: packages/experimental/gnome-power-manager/debian/patches/02_gpm_struct_type.patch
===================================================================
--- packages/experimental/gnome-power-manager/debian/patches/02_gpm_struct_type.patch	2006-03-03 02:14:04 UTC (rev 706)
+++ packages/experimental/gnome-power-manager/debian/patches/02_gpm_struct_type.patch	2006-03-03 11:08:04 UTC (rev 707)
@@ -0,0 +1,30 @@
+Index: src/gpm-hal-monitor.c
+===================================================================
+RCS file: /cvs/gnome/gnome-power-manager/src/gpm-hal-monitor.c,v
+retrieving revision 1.17
+diff -u -r1.17 gpm-hal-monitor.c
+--- src/gpm-hal-monitor.c	28 Feb 2006 17:55:42 -0000	1.17
++++ src/gpm-hal-monitor.c	3 Mar 2006 10:00:39 -0000
+@@ -350,15 +350,19 @@
+ 					const char    *udi)
+ {
+ 	DBusGProxy *proxy;
+-	GType       struct_array_type;
++	GType       struct_array_type, struct_type;
+ 
+ 	proxy = g_hash_table_lookup (monitor->priv->devices, udi);
+ 	if (proxy == NULL) {
+ 		gpm_warning ("Device is not being watched: %s", udi);
+ 		return;
+ 	}
+-
+-	struct_array_type = dbus_g_type_get_collection ("GPtrArray", G_TYPE_VALUE_ARRAY);
++	struct_type = dbus_g_type_get_struct ("GValueArray", 
++						G_TYPE_STRING, 
++						G_TYPE_BOOLEAN, 
++						G_TYPE_BOOLEAN, 
++						G_TYPE_INVALID);
++	struct_array_type = dbus_g_type_get_collection ("GPtrArray", struct_type);
+ 
+ 	dbus_g_object_register_marshaller (gpm_marshal_VOID__INT_BOXED,
+ 					   G_TYPE_NONE, G_TYPE_INT,