talons

commit 211fd4d1175d8b46b347c9e9a4b1431e8bcee5bf
parent b2c06746b485e0f18834959f6aa2a635d78657e5
Author: Ricardo Mones <mones@claws-mail.org>
Date:   Tue, 10 Jun 2008 08:24:45 +0000

2008-06-10 [mones]	3.4.0cvs86

	* AUTHORS
	* tools/README
	* tools/convert_mbox.sh
		Added script to convert Evolution mail folders contributed
		by Daniel Dickinson <cshore@fionavar.ca>
		Fixes debian bug 461435

Diffstat:
M
AUTHORS
 | 
1
+
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
tools/README
 | 
2
++
A
tools/convert_mbox.sh
 | 
4
++++

6 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/AUTHORS b/AUTHORS
@@ -255,3 +255,4 @@ contributors (in addition to the above; based on Changelog)
 	Federico Heinz
 	Marius Glauser
 	Christian Cornelssen
+	Daniel Dickinson
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-10 [mones]	3.4.0cvs86
+
+	* AUTHORS
+	* tools/README
+	* tools/convert_mbox.sh
+		Added script to convert Evolution mail folders contributed
+		by Daniel Dickinson <cshore@fionavar.ca>
+		Fixes debian bug 461435
+
 2008-06-09 [colin]	3.4.0cvs85
 
 	* src/main.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3381,3 +3381,4 @@
 ( cvs diff -u -r 1.60.2.44 -r 1.60.2.45 src/filtering.c;  ) > 3.4.0cvs83.patchset
 ( cvs diff -u -r 1.115.2.196 -r 1.115.2.197 src/main.c;  ) > 3.4.0cvs84.patchset
 ( cvs diff -u -r 1.115.2.197 -r 1.115.2.198 src/main.c;  cvs diff -u -r 1.213.2.182 -r 1.213.2.183 src/folder.c;  cvs diff -u -r 1.23.2.16 -r 1.23.2.17 src/common/session.c;  ) > 3.4.0cvs85.patchset
+( cvs diff -u -r 1.100.2.60 -r 1.100.2.61 AUTHORS;  cvs diff -u -r 1.30.2.29 -r 1.30.2.30 tools/README;  diff -u /dev/null tools/convert_mbox.sh;  ) > 3.4.0cvs86.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=85
+EXTRA_VERSION=86
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/tools/README b/tools/README
@@ -28,6 +28,8 @@ Mailbox conversion:
   convert_mbox.pl               Import mbox files
   kmail-mailbox2claws-mail.pl   Convert a kmail mailbox to a Claws Mail mailbox
   tbird2claws.py                Integrate a Thunderbird folder tree into Claws
+  convert_mbox.sh               Convert arbitrary Evolution mail folders (mbox 
+                                format + subfolders) - uses convert_mbox.pl
 
 Other tools:
   acroread2claws-mail.pl        Send PDFs from Adobe Reader 7
diff --git a/tools/convert_mbox.sh b/tools/convert_mbox.sh
@@ -0,0 +1,4 @@
+<HTML><HEAD><TITLE>Error</TITLE></HEAD><BODY>
+An error occurred. Dammit.
+Error was: No bug number.
+</BODY></HTML>