[Pkg-citadel-commit] r141 - in webcit/trunk/debian: . patches

[dothebart-guest at alioth.debian.org]

Author: dothebart-guest
Date: 2008-09-02 22:58:22 +0000 (Tue, 02 Sep 2008)
New Revision: 141

Added:
   webcit/trunk/debian/patches/r6563_fix_vcard_interoperability.diff
Modified:
   webcit/trunk/debian/changelog
   webcit/trunk/debian/patches/series
Log:
* added r6563 from trunk; this fixes a vcard <-> gui client reported by liquidat via IRC


Modified: webcit/trunk/debian/changelog
===================================================================
--- webcit/trunk/debian/changelog	2008-08-28 14:32:14 UTC (rev 140)
+++ webcit/trunk/debian/changelog	2008-09-02 22:58:22 UTC (rev 141)
@@ -1,3 +1,11 @@
+webcit (7.37-dfsg-3) unstable; urgency=low
+
+  [ Wilfried Goesgens ]
+  * [r6563] add prepatch from devel branch to improve vcard interoperability
+    with other UI clients
+
+ -- Michael Meskes <meskes at debian.org>  Fri, 15 Aug 2008 14:25:03 +0200
+
 webcit (7.37-dfsg-2) unstable; urgency=low
 
   [ Wilfried Goesgens ]

Added: webcit/trunk/debian/patches/r6563_fix_vcard_interoperability.diff
===================================================================
--- webcit/trunk/debian/patches/r6563_fix_vcard_interoperability.diff	                        (rev 0)
+++ webcit/trunk/debian/patches/r6563_fix_vcard_interoperability.diff	2008-09-02 22:58:22 UTC (rev 141)
@@ -0,0 +1,43 @@
+Index: vcard_edit.c
+===================================================================
+--- vcard_edit.c	(revision 6562)
++++ vcard_edit.c	(revision 6563)
+@@ -134,7 +134,7 @@
+ 				safestrncpy(org, value, sizeof org);
+ 			}
+ 	
+-			else if (!strcasecmp(key, "adr")) {
++			else if ( (!strcasecmp(key, "adr")) || (!strncasecmp(key, "adr;", 4)) ) {
+ 				extract_token(pobox, value, 0, ';', sizeof pobox);
+ 				extract_token(extadr, value, 1, ';', sizeof extadr);
+ 				extract_token(street, value, 2, ';', sizeof street);
+@@ -144,23 +144,24 @@
+ 				extract_token(country, value, 6, ';', sizeof country);
+ 			}
+ 	
+-			else if (!strcasecmp(key, "tel;home")) {
++			else if ( (!strcasecmp(key, "tel;home")) || (!strcasecmp(key, "tel;type=home")) ) {
+ 				extract_token(hometel, value, 0, ';', sizeof hometel);
+ 			}
+ 	
+-			else if (!strcasecmp(key, "tel;work")) {
++			else if ( (!strcasecmp(key, "tel;work")) || (!strcasecmp(key, "tel;type=work")) ) {
+ 				extract_token(worktel, value, 0, ';', sizeof worktel);
+ 			}
+ 	
+-			else if (!strcasecmp(key, "tel;fax")) {
++			else if ( (!strcasecmp(key, "tel;fax")) || (!strcasecmp(key, "tel;type=fax")) ) {
+ 				extract_token(faxtel, value, 0, ';', sizeof faxtel);
+ 			}
+ 	
+-			else if (!strcasecmp(key, "tel;cell")) {
++			else if ( (!strcasecmp(key, "tel;cell")) || (!strcasecmp(key, "tel;type=cell")) ) {
+ 				extract_token(mobiletel, value, 0, ';', sizeof mobiletel);
+ 			}
+ 	
+-			else if (!strcasecmp(key, "email;internet")) {
++			else if ( (!strcasecmp(key, "email;internet"))
++			     || (!strcasecmp(key, "email;type=internet")) ) {
+ 				if (primary_inetemail[0] == 0) {
+ 					safestrncpy(primary_inetemail, value, sizeof primary_inetemail);
+ 				}

Modified: webcit/trunk/debian/patches/series
===================================================================
--- webcit/trunk/debian/patches/series	2008-08-28 14:32:14 UTC (rev 140)
+++ webcit/trunk/debian/patches/series	2008-09-02 22:58:22 UTC (rev 141)
@@ -3,3 +3,4 @@
 r6425_url_parser_fix.diff
 r6443_fix_im_window_weakness.diff
 r6476_memleak_notes.diff
+r6563_fix_vcard_interoperability.diff