diff -u gnome-keyring-2.22.1/debian/changelog gnome-keyring-2.22.1/debian/changelog
--- gnome-keyring-2.22.1/debian/changelog
+++ gnome-keyring-2.22.1/debian/changelog
@@ -1,3 +1,11 @@
+gnome-keyring (2.22.1-1ubuntu1) hardy-proposed; urgency=low
+
+  * debian/patches/90_from_svn_fix_no_volume_crash.patch:
+    - change from svn, fix a crasher when there the volume location registered
+      (lp: #218434)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon, 19 May 2008 16:06:58 +0200
+
 gnome-keyring (2.22.1-1) unstable; urgency=low
 
   [ Michael Banck ]
only in patch2:
unchanged:
--- gnome-keyring-2.22.1.orig/debian/patches/90_from_svn_fix_no_volume_crash.patch
+++ gnome-keyring-2.22.1/debian/patches/90_from_svn_fix_no_volume_crash.patch
@@ -0,0 +1,15 @@
+--- trunk/common/gkr-location.c	2008/04/29 14:50:52	1140
++++ trunk/common/gkr-location.c	2008/05/18 12:50:34	1141
+@@ -320,8 +320,10 @@
+ 		
+ 		g_message ("adding removable location: %s at %s", name, mount); 
+ 		gkr_location_manager_register (locmgr, name, mount, friendly);
++		
+ 		locvol = g_hash_table_lookup (pv->volumes_by_name, name);
+-		locvol->hal_volume = TRUE;
++		if (locvol)
++			locvol->hal_volume = TRUE;
+ 
+ 	/* A mount was removed? */		
+ 	} else if (!is_mounted && g_hash_table_lookup (pv->volumes_by_name, name)) {
+