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)

diff --git a/ChangeLog b/ChangeLog
index c7b0cc0b9f85b497db34b4a466a35dd918f0cc39..3a70fc132cc2e3b4e9274524b471ba02f7b72a76 100644 (file)
--- 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
index e29e30af5bcaedcdb454b86c4af0a7831c2e957f..56ff640c76082df2fda15cd5f73af2ffc7782937 100644 (file)
--- 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
index c6d40aa75af5f642eb56c7615c57094cb02ed387..ebd1758eabfb5db048a5d741c4cd19e1d0722ce6 100644 (file)
--- 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
index 9ad356127ae169262113603642ba3bbbc3fba1b1..309cfd54c761c402163e3b7d39e6b984b2ec81d7 100644 (file)
--- 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',