From 42007c31aa44e73b0718d8943871519f3440b535 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Mon, 8 Oct 2007 10:26:54 +0000 Subject: [PATCH] 2007-10-08 [paul] 3.0.2cvs33 * tools/kdeservicemenu/README * tools/kdeservicemenu/claws-mail-attach-files.desktop.template * tools/kdeservicemenu/install.sh * tools/kdeservicemenu/template_claws-mail-attach-files.desktop renamed template* to *template so as not to confuse lintian --- ChangeLog | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- tools/kdeservicemenu/README | 4 ++-- ....desktop => claws-mail-attach-files.desktop.template} | 0 tools/kdeservicemenu/install.sh | 2 +- 6 files changed, 14 insertions(+), 4 deletions(-) rename tools/kdeservicemenu/{template_claws-mail-attach-files.desktop => claws-mail-attach-files.desktop.template} (100%) diff --git a/ChangeLog b/ChangeLog index e605b0e70..e13214270 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-10-08 [paul] 3.0.2cvs33 + + * tools/kdeservicemenu/README + * tools/kdeservicemenu/claws-mail-attach-files.desktop.template + * tools/kdeservicemenu/install.sh + * tools/kdeservicemenu/template_claws-mail-attach-files.desktop + renamed template* to *template so as not to confuse + lintian + 2007-10-08 [paul] 3.0.2cvs32 * src/prefs_themes.c diff --git a/PATCHSETS b/PATCHSETS index 32ff3e832..48d27f180 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2945,3 +2945,4 @@ ( cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/exporthtml.c; cvs diff -u -r 1.28.2.40 -r 1.28.2.41 src/mbox.c; cvs diff -u -r 1.36.2.116 -r 1.36.2.117 src/common/utils.c; ) > 3.0.2cvs30.patchset ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/addrduplicates.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/addrduplicates.h; cvs diff -u -r 1.60.2.99 -r 1.60.2.100 src/addressbook.c; cvs diff -u -r 1.18.2.9 -r 1.18.2.10 src/addressbook.h; cvs diff -u -r 1.28.2.32 -r 1.28.2.33 src/addrindex.c; cvs diff -u -r 1.9.2.12 -r 1.9.2.13 src/addrindex.h; ) > 3.0.2cvs31.patchset ( cvs diff -u -r 1.3.2.50 -r 1.3.2.51 src/prefs_themes.c; cvs diff -u -r 1.25.2.47 -r 1.25.2.48 src/stock_pixmap.c; ) > 3.0.2cvs32.patchset +( cvs diff -u -r 1.2.2.11 -r 1.2.2.12 tools/kdeservicemenu/README; diff -u /dev/null tools/kdeservicemenu/claws-mail-attach-files.desktop.template; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 tools/kdeservicemenu/install.sh; cvs diff -u -r -1.1.2.2 -r -1.1.2.3 tools/kdeservicemenu/template_claws-mail-attach-files.desktop; ) > 3.0.2cvs33.patchset diff --git a/configure.ac b/configure.ac index e22959818..62e88b3f0 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=32 +EXTRA_VERSION=33 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/tools/kdeservicemenu/README b/tools/kdeservicemenu/README index fdb091d19..e16819193 100644 --- a/tools/kdeservicemenu/README +++ b/tools/kdeservicemenu/README @@ -1,12 +1,12 @@ claws-mail-kdeservicemenu.pl -Version: 1.4 +Version: 1.5 Claws Mail servicemenu for Konqueror FILES o README You're reading it o install.sh installer script o claws-mail-kdeservicemenu.pl perl program -o template_claws-attach-files.desktop +o claws-attach-files.desktop.template .desktop file template DESCRIPTION diff --git a/tools/kdeservicemenu/template_claws-mail-attach-files.desktop b/tools/kdeservicemenu/claws-mail-attach-files.desktop.template similarity index 100% rename from tools/kdeservicemenu/template_claws-mail-attach-files.desktop rename to tools/kdeservicemenu/claws-mail-attach-files.desktop.template diff --git a/tools/kdeservicemenu/install.sh b/tools/kdeservicemenu/install.sh index 905f98a1c..6bb7874a1 100644 --- a/tools/kdeservicemenu/install.sh +++ b/tools/kdeservicemenu/install.sh @@ -1,7 +1,7 @@ #!/bin/bash PERL_SCRIPT="claws-mail-kdeservicemenu.pl" -DESKTOP_TEMPLATE="template_claws-mail-attach-files.desktop" +DESKTOP_TEMPLATE="claws-mail-attach-files.desktop.template" DESKTOP="claws-mail-attach-files.desktop" SERVICEMENU_DIR="share/apps/konqueror/servicemenus" -- 2.25.1