2006-12-01 [paul] 2.6.0cvs79

	* tools/Makefile.am
		remove reference to removed file

diff --git a/ChangeLog b/ChangeLog
index af219006d820c03f496b77e431622699d2c95f85..1f52554ebcd990f29a113bd4a8c06c21074054a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-01 [paul]      2.6.0cvs79
+
+       * tools/Makefile.am
+               remove reference to removed file
+

 2006-12-01 [wwp]       2.6.0cvs78
 
        * src/addressbook.c
 2006-12-01 [wwp]       2.6.0cvs78
 
        * src/addressbook.c

diff --git a/PATCHSETS b/PATCHSETS
index 3512f735e28f8e03c8944a8c296c7f2cc120b9d7..87ed635a30c2e2d11ace9c6887f59ca826654508 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2103,3 +2103,4 @@
 ( cvs diff -u -r 1.3.12.19 -r 1.3.12.20 src/message_search.c;  cvs diff -u -r 1.15.2.37 -r 1.15.2.38 src/summary_search.c;  ) > 2.6.0cvs76.patchset
 ( cvs diff -u -r 1.1.2.34 -r 1.1.2.35 manual/advanced.xml;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 manual/fr/advanced.xml;  cvs diff -u -r 1.60.2.70 -r 1.60.2.71 src/addressbook.c;  cvs diff -u -r 1.18.2.4 -r 1.18.2.5 src/addressbook.h;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/addressitem.h;  cvs diff -u -r 1.14.2.17 -r 1.14.2.18 src/editaddress.c;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/editaddress.h;  cvs diff -u -r 1.204.2.110 -r 1.204.2.111 src/prefs_common.c;  cvs diff -u -r 1.103.2.68 -r 1.103.2.69 src/prefs_common.h;  cvs diff -u -r 1.5.2.44 -r 1.5.2.45 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.26 -r 1.4.2.27 src/gtk/gtkutils.h;  ) > 2.6.0cvs77.patchset
 ( cvs diff -u -r 1.60.2.71 -r 1.60.2.72 src/addressbook.c;  cvs diff -u -r 1.14.2.18 -r 1.14.2.19 src/editaddress.c;  ) > 2.6.0cvs78.patchset
 ( cvs diff -u -r 1.3.12.19 -r 1.3.12.20 src/message_search.c;  cvs diff -u -r 1.15.2.37 -r 1.15.2.38 src/summary_search.c;  ) > 2.6.0cvs76.patchset
 ( cvs diff -u -r 1.1.2.34 -r 1.1.2.35 manual/advanced.xml;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 manual/fr/advanced.xml;  cvs diff -u -r 1.60.2.70 -r 1.60.2.71 src/addressbook.c;  cvs diff -u -r 1.18.2.4 -r 1.18.2.5 src/addressbook.h;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/addressitem.h;  cvs diff -u -r 1.14.2.17 -r 1.14.2.18 src/editaddress.c;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/editaddress.h;  cvs diff -u -r 1.204.2.110 -r 1.204.2.111 src/prefs_common.c;  cvs diff -u -r 1.103.2.68 -r 1.103.2.69 src/prefs_common.h;  cvs diff -u -r 1.5.2.44 -r 1.5.2.45 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.26 -r 1.4.2.27 src/gtk/gtkutils.h;  ) > 2.6.0cvs77.patchset
 ( cvs diff -u -r 1.60.2.71 -r 1.60.2.72 src/addressbook.c;  cvs diff -u -r 1.14.2.18 -r 1.14.2.19 src/editaddress.c;  ) > 2.6.0cvs78.patchset

+( cvs diff -u -r 1.25.2.14 -r 1.25.2.15 tools/Makefile.am;  ) > 2.6.0cvs79.patchset

diff --git a/configure.ac b/configure.ac
index c1189f05713991d0978402bd53c84ad6fda1d6c5..d852aa1d171f9c39eb1b5f7835c969128d350459 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=78
+EXTRA_VERSION=79

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 7c02144f209086b2cf78419a78380e87cb1b8c22..977a454367a43124ae17e363f9fd6f5487206b8b 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -36,7 +36,6 @@ EXTRA_DIST = \
        multiwebsearch.conf \
        kdeservicemenu/README \
        kdeservicemenu/template_claws-mail-attach-files.desktop \
        multiwebsearch.conf \
        kdeservicemenu/README \
        kdeservicemenu/template_claws-mail-attach-files.desktop \

-       kdeservicemenu/template_claws-mail-compress-attach.desktop \

        $(EXTRA_TOOLS)
 
 MAKE_EXE = chmod u+x $(EXTRA_TOOLS)
        $(EXTRA_TOOLS)
 
 MAKE_EXE = chmod u+x $(EXTRA_TOOLS)