talons

commit ac117afc9456eae0b84353b752e0af121afd1130
parent 6a6af7ab57cef02c395da11939e3488c104572fb
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sun, 12 Apr 2009 12:08:28 +0000

2009-04-12 [paul]	3.7.1cvs43

	* tools/csv2addressbook.pl
		add extra CSV fields that are now appended
		by thunderbird (version 2.0.0.21)

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
tools/csv2addressbook.pl
 | 
4
+++-

4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-12 [paul]	3.7.1cvs43
+
+	* tools/csv2addressbook.pl
+		add extra CSV fields that are now appended
+		by thunderbird (version 2.0.0.21)
+
 2009-04-08 [colin]	3.7.1cvs42
 
 	* src/procmime.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3782,3 +3782,4 @@
 ( cvs diff -u -r 1.150.2.114 -r 1.150.2.115 src/procmsg.c;  ) > 3.7.1cvs40.patchset
 ( cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/manage_window.c;  ) > 3.7.1cvs41.patchset
 ( cvs diff -u -r 1.49.2.129 -r 1.49.2.130 src/procmime.c;  ) > 3.7.1cvs42.patchset
+( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 tools/csv2addressbook.pl;  ) > 3.7.1cvs43.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=42
+EXTRA_VERSION=43
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/tools/csv2addressbook.pl b/tools/csv2addressbook.pl
@@ -71,7 +71,9 @@ my @tbird_fields = ('First Name','Last Name','Display Name','Nickname',
 		    'Work City','Work State','Work ZipCode','Work Country',
 		    'Job Title','Department','Organization','Web Page 1',
 		    'Web Page 2','Birth Year','Birth Month','Birth Day',
-		    'Custom 1','Custom 2','Custom 3','Custom 4','Notes','junk');
+		    'Custom 1','Custom 2','Custom 3','Custom 4','Notes',
+		    'Anniversary Year','Anniversary Month','Anniversary Day',
+		    'Category','Spouse name');
 my @kmail_fields = ('Formatted Name','Family Name','Given Name',
 		    'Additional Names','Honorific Prefixes','Honorific Suffixes',
 		    'Nick Name','Birthday','Home Address Street',