From 034d65be331c4087f574eaf436e9965d049a1246 Mon Sep 17 00:00:00 2001 From: Ricardo Mones Date: Thu, 6 Dec 2012 00:11:11 +0000 Subject: [PATCH] 2012-12-06 [mones] 3.9.0cvs43 * tools/README * tools/gif2xface.pl * tools/outlook2claws-mail.pl Fix address not working since years ago --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- tools/README | 4 ++-- tools/gif2xface.pl | 4 +--- tools/outlook2claws-mail.pl | 32 ++++++++++++++++---------------- 6 files changed, 28 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87a921752..c31428c4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-12-06 [mones] 3.9.0cvs43 + + * tools/README + * tools/gif2xface.pl + * tools/outlook2claws-mail.pl + Fix address not working since years ago + 2012-12-05 [mones] 3.9.0cvs42 * src/prefs_gtk.c diff --git a/PATCHSETS b/PATCHSETS index ae2c6fad2..28b5d3146 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4540,3 +4540,4 @@ ( cvs diff -u -r 1.395.2.460 -r 1.395.2.461 src/summaryview.c; cvs diff -u -r 1.274.2.362 -r 1.274.2.363 src/mainwindow.c; ) > 3.9.0cvs40.patchset ( cvs diff -u -r 1.9.2.59 -r 1.9.2.60 src/common/ssl.c; ) > 3.9.0cvs41.patchset ( cvs diff -u -r 1.10.2.44 -r 1.10.2.45 src/prefs_gtk.c; ) > 3.9.0cvs42.patchset +( cvs diff -u -r 1.30.2.33 -r 1.30.2.34 tools/README; cvs diff -u -r 1.1 -r 1.2 tools/gif2xface.pl; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 tools/outlook2claws-mail.pl; ) > 3.9.0cvs43.patchset diff --git a/configure.ac b/configure.ac index 61a4c3dfb..e552a1e98 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=9 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=42 +EXTRA_VERSION=43 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/tools/README b/tools/README index ef005edbf..7222bdbcc 100644 --- a/tools/README +++ b/tools/README @@ -354,7 +354,7 @@ Address book conversion the script and change its value if you are sure you exported all fields and script gives the 'unknown csv file format' error. - Contact: Ricardo Mones Lastra + Contact: Ricardo Mones * tb2claws-mail @@ -798,7 +798,7 @@ Extra tools method is valid only if you don't have any other custom header set or they will be lost!). - Contact: Ricardo Mones Lastra + Contact: Ricardo Mones * update-po diff --git a/tools/gif2xface.pl b/tools/gif2xface.pl index 4d09f34da..10dea1a0f 100644 --- a/tools/gif2xface.pl +++ b/tools/gif2xface.pl @@ -2,9 +2,7 @@ # # gif2xface -- converts a 48x48 GIF file to an X-Face mail header # -# Author: Ricardo Mones Lastra -# -# URL: http://www.aic.uniovi.es/mones +# Author: Ricardo Mones # # This is a hack over the original xbm2face script. The xbm files generated # by some graphic tools (notably The Gimp version 1.2.1) aren't suitable to diff --git a/tools/outlook2claws-mail.pl b/tools/outlook2claws-mail.pl index 775db15b2..67bc3ebeb 100644 --- a/tools/outlook2claws-mail.pl +++ b/tools/outlook2claws-mail.pl @@ -1,23 +1,23 @@ #!/usr/bin/perl -w -# * Copyright 2002-2003 Ricardo Mones Lastra -# * -# * This file is free software; you can redistribute it and/or modify it -# * under the terms of the GNU General Public License as published by -# * the Free Software Foundation; either version 3 of the License, or -# * (at your option) any later version. -# * -# * This program is distributed in the hope that it will be useful, but -# * WITHOUT ANY WARRANTY; without even the implied warranty of -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# * General Public License for more details. -# * -# * You should have received a copy of the GNU General Public License -# * along with this program; if not, write to the Free Software -# * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Copyright 2002-2003 Ricardo Mones +# +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # outlook2claws-mail.pl -- perl script to convert an Outlook generated -# contact list into a Claws Mail XML address book. +# contact list into a Claws Mail XML address book. # # This script is based on: # out2syl.sh by Rafael Lossurdo -- 2.25.1