commit b713e7b163c939179999744c9698d8844313ac4e
parent fd96e9bd41020f5dd3227db831597cc78b562531
Author: Ricardo Mones <mones@claws-mail.org>
Date: Tue, 10 Jun 2008 21:23:13 +0000
2008-06-10 [mones] 3.4.0cvs89
* AUTHORS
* tools/Makefile.am
* tools/README
* tools/convert_mbox.sh
Undo cvs86 and cvs87, it really should be a patch to
convert_mbox.pl
Diffstat:
7 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -255,4 +255,3 @@ 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.0cvs89
+
+ * AUTHORS
+ * tools/Makefile.am
+ * tools/README
+ * tools/convert_mbox.sh
+ Undo cvs86 and cvs87, it really should be a patch to
+ convert_mbox.pl
+
2008-06-10 [wwp] 3.4.0cvs88
* po/fr.po
diff --git a/PATCHSETS b/PATCHSETS
@@ -3384,3 +3384,4 @@
( 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
( cvs diff -u -r 1.25.2.25 -r 1.25.2.26 tools/Makefile.am; ) > 3.4.0cvs87.patchset
( cvs diff -u -r 1.42.2.38 -r 1.42.2.39 po/fr.po; ) > 3.4.0cvs88.patchset
+( cvs diff -u -r 1.100.2.61 -r 1.100.2.62 AUTHORS; cvs diff -u -r 1.25.2.26 -r 1.25.2.27 tools/Makefile.am; cvs diff -u -r 1.30.2.30 -r 1.30.2.31 tools/README; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 tools/convert_mbox.sh; ) > 3.4.0cvs89.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=88
+EXTRA_VERSION=89
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/tools/Makefile.am b/tools/Makefile.am
@@ -32,8 +32,7 @@ EXTRA_TOOLS = \
uuooffice \
vcard2xml.py \
kdeservicemenu/install.sh \
- kdeservicemenu/claws-mail-kdeservicemenu.pl \
- convert_mbox.sh
+ kdeservicemenu/claws-mail-kdeservicemenu.pl
EXTRA_DIST = \
README \
diff --git a/tools/README b/tools/README
@@ -28,8 +28,6 @@ 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
@@ -1,4 +0,0 @@
-<HTML><HEAD><TITLE>Error</TITLE></HEAD><BODY>
-An error occurred. Dammit.
-Error was: No bug number.
-</BODY></HTML>