# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: arnaud.faucher@gmail.com-20090712225059-\
#   xw4wow3l2jprt634
# target_branch: http://bazaar.launchpad.net/%7Egnome-power-manager-\
#   team/gnome-power/trunk/
# testament_sha1: 2310bd894e035080bfaf47d72a7fa6a1251dbdf9
# timestamp: 2009-07-12 18:52:12 -0400
# base_revision_id: martin.pitt@canonical.com-20090708061653-\
#   eho0995xw48gmxze
# 
# Begin patch
=== added file 'debian/patches/crash-when-battery-charge-full.patch'
--- debian/patches/crash-when-battery-charge-full.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/crash-when-battery-charge-full.patch	2009-07-12 22:50:59 +0000
@@ -0,0 +1,13 @@
+Index: gnome-power-manager-2.27.2/src/gpm-engine.c
+===================================================================
+--- gnome-power-manager-2.27.2.orig/src/gpm-engine.c	2009-07-11 11:58:37.870998218 -0400
++++ gnome-power-manager-2.27.2/src/gpm-engine.c	2009-07-11 11:59:57.278000299 -0400
+@@ -1104,7 +1104,7 @@
+ 			      G_TYPE_FROM_CLASS (object_class),
+ 			      G_SIGNAL_RUN_LAST,
+ 			      G_STRUCT_OFFSET (GpmEngineClass, fully_charged),
+-			      NULL, NULL, g_cclosure_marshal_VOID__UINT,
++			      NULL, NULL, g_cclosure_marshal_VOID__POINTER,
+ 			      G_TYPE_NONE, 1, G_TYPE_POINTER);
+ 	signals [DISCHARGING] =
+ 		g_signal_new ("discharging",

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-07-07 23:53:16 +0000
+++ debian/patches/series	2009-07-12 22:50:59 +0000
@@ -12,3 +12,4 @@
 74-disable-quirks-reference.patch
 96_feedback-notify-osd.patch
 97_remove-discharging-notify.patch
+crash-when-battery-charge-full.patch

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUIQn8kAAnrfgBAwW3/////n
3yq////wUAXPRdABt0OAAKENNQo2lPEanqNpiT0mT1Mm1DIaAA0GhtR6gBqp6hkyZqaGgyGhoGg0
AA0aaDQHqaDCSJNqFPVPyU/RTT1GI0NGmRkD00jepPKDIxNHomOMmTRiGmhgJoYmjTJiBkYTRpph
BkwkkE0NASegCMjQ0mUY1DAg0BpkaGRYQPQMCLITsBVHb0R4B7SiQTzNFB3MKpzQ8jhdKXDFJ+1r
Y3vUmRj0uoamBDmFATAshdXx/30/nZ6uU9eves+JJ1aRWx68QxZUqaTRa9KXUrW/UdNwVRfrXUyU
zvuOETkKIGohN/Zgz04pRC4RJZxhoO3VwBAue6tAOQpkaLwrFbAmO3L6ry5b4Lk2bhaVd03kICIx
rUA2g+JRXQDSGQsSZkDhgOfcXjGo6zYb0STilHByGL0FNy4pjzQt5C8qCblqxproMvCsEP6ay0x6
yHmZCTrxUQIO8zEj2R3GRIiPHg45ASqURwlEJCD0J3yNpamrkSIhE8Ki8JDOGgYHQRKTXJdtJItE
U26SDR0jZ1V+JRJZ9GJ0aMTMPmrTxqM5kSNRbjfLFYL0jgB5hxNVZMREReabyDoCJhecw80+aSPa
LOdIFsOau8gsrAg95nAgYkLrcsSv23lxSUnE9YHHEwk4LxjUOLIJw4zxLo8Bri1zKxb1WaxxXzTN
BopAfe++UwOssOFCpdqOBC3YYDqUDcxqNhmKD/iKjhniV1VqfqA1YUqp15cGkLjE9BYZ1jlUaCko
DSyQ7IhRMqwKistCJQPKCVWA64rsV9ER2+gkVWOkFRSriEJzKUDFjCWkKChZGBRfCsxJ1hNw4Hji
B8PnGLSsTjsMCNzhkwQwTyCxxyA5hEUTlIwy3RzQrLoVDgFkWGBQJbzpf0DFnUumRW7yjlLq7VtF
yDW6f3xllVqZhj56dXXPV/CyrQVepaPaXqfYBCAcU0+wB3PzJBTKxgabRAkSzwETIIklHkiFBQhR
/jwF992pQeMu18tGviolMaJ1ppLJY9AO5WsWPVXS02i6EPymU6D17i85tswEPu9UyKXO/gTFumc4
j/5jOVmBxl+aseD63nvRkRwCL1eS6GC5yaIhfmktAZHXnPkDFSKkbA6pDQjewQYhGwadBnMCCZqK
iBmNxApDf7iw3GX6c50EzWTP6eS3r2LYrziFB1FxYPMxwX4LuOv6azsNMu42bCqqoRZUbHVUdpoQ
q3No09jbLGTIIVmJoOc9xkFANelnOg2G8tMi1in39ix/YOnw8h4V3POYid6LFAoou98HcDiaxiZV
YTVhT3dLFEyKOS7uRSTPjlxpvLzep5kW2ocnn8phPpWSLanmaKDkGwHofwYYJGhVoM76EQyfgZxj
SMZGvtQcTYrl8jrORgwazqc+hx/eSsSZkRB3T2oPBUlK8xDvXzzmXOwwzAMkxfwQ9C2IaBzBuwpM
U5vqScoG5OkZCNQomZl5EdIWN++19FSCufWg4rq10HZ4HSZ/OBpNPIp1IYq3mtMA4rAgoKn76CYx
FjTR5kSHO317W4oWQU9DAdiMDy9RtVKLVx34m2MZKajZGI4en84wEEROhTESISR+TKTXMRXrgsM8
0VJxQiTCZfUdjLrtr1oW9DSRtYN8FbLaMDI77FtetxZZyAih5s1Ldu3BYdZQpA9Xr1V7Ea5zG84H
jt3ahycMkFqOOSNqmZb6QLd+guZSoRZDKzbZaZoNmMgSNwcCokqXId0wxuYLxlAZnHA3deDVJ6sX
AHjvLJA48ZkwsmqSBxGmK4hYB0UvKlqqPsDFRB0RaQlXWPGXf5SpFYfBiLBzBYh5pcCOSJw7SpeJ
UskH0aQGZIxcjHsOg1gS0mBmejzqQHkWbUweLrnqq+sYa8szHcLuSKcKEghCE/kg