[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SRM] kupfer_0+v201-2+squeeze1



Hi SRMs,

I'd like to get your permission to upload to stable a fix for bug
#632933, which has been addressed upstream some time ago.

I attach a debdiff of the proposed changes.

Thanks in advance,

-- 
  .''`.
 :  :' :   Luca Falavigna <dktrkranz@debian.org>
 `.  `'
   `-
diff -Nru kupfer-0+v201/debian/changelog kupfer-0+v201/debian/changelog
--- kupfer-0+v201/debian/changelog	2011-04-30 12:48:21.000000000 +0200
+++ kupfer-0+v201/debian/changelog	2011-07-08 19:40:23.000000000 +0200
@@ -1,3 +1,10 @@
+kupfer (0+v201-2+squeeze2) stable; urgency=low
+
+  * debian/patches/evolution_contacts.patch:
+    - Do not crash if Evolution address book is missing (Closes: #632933).
+
+ -- Luca Falavigna <dktrkranz@debian.org>  Fri, 08 Jul 2011 19:39:20 +0200
+
 kupfer (0+v201-2+squeeze1) stable; urgency=low
 
   * debian/patches/TYPE_UINT.patch:
diff -Nru kupfer-0+v201/debian/patches/evolution_contacts.patch kupfer-0+v201/debian/patches/evolution_contacts.patch
--- kupfer-0+v201/debian/patches/evolution_contacts.patch	1970-01-01 01:00:00.000000000 +0100
+++ kupfer-0+v201/debian/patches/evolution_contacts.patch	2011-07-08 19:38:41.000000000 +0200
@@ -0,0 +1,17 @@
+Description: Do not crash if Evolution address book is missing
+Author: Luca Falavigna <dktrkranz@debian.org>
+Forwarded: https://bugs.launchpad.net/kupfer/+bug/691305
+
+Index: kupfer-v203/kupfer/plugin/evolution.py
+===================================================================
+--- kupfer-v203.orig/kupfer/plugin/evolution.py	2010-12-16 22:56:12.860901147 +0100
++++ kupfer-v203/kupfer/plugin/evolution.py	2010-12-16 22:56:23.076394741 +0100
+@@ -101,6 +101,8 @@
+ 
+ 	def get_items(self):
+ 		ebook_ = evolution.ebook.open_addressbook("default")
++		if not ebook_:
++			return
+ 		for contact in ebook_.get_all_contacts():
+ 			name = contact.get_property("full-name")
+ 			email = contact.get_property("email-1")
diff -Nru kupfer-0+v201/debian/patches/series kupfer-0+v201/debian/patches/series
--- kupfer-0+v201/debian/patches/series	2011-04-30 12:50:59.000000000 +0200
+++ kupfer-0+v201/debian/patches/series	2011-07-08 19:40:17.000000000 +0200
@@ -1,2 +1,3 @@
 debian_path.patch
 TYPE_UINT.patch
+evolution_contacts.patch

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: