[Commits] [SCM] claws branch, master, updated. 3.10.1-52-g4f405b0

claws at claws-mail.org claws at claws-mail.org
Fri Jun 13 14:15:10 CEST 2014


The branch master of project "claws" (Claws Mail) has been updated
       via  4f405b0b6de3d11b610d3ebba5c7c28b046d6c34 (commit)
      from  c5bf669084880928dcc910820e3bbc968d4e0133 (commit)

Summary of changes:
 Makefile.am                            |    2 +-
 src/plugins/acpi_notifier/Makefile.am  |    2 +-
 src/plugins/address_keeper/Makefile.am |    2 +-
 src/plugins/archive/Makefile.am        |    2 +-
 src/plugins/att_remover/Makefile.am    |    2 +-
 src/plugins/attachwarner/Makefile.am   |    2 +-
 src/plugins/bogofilter/Makefile.am     |    2 +-
 src/plugins/bsfilter/Makefile.am       |    2 +-
 src/plugins/clamd/Makefile.am          |    2 +-
 src/plugins/fancy/Makefile.am          |    2 +-
 src/plugins/fetchinfo/Makefile.am      |    2 +-
 src/plugins/gdata/Makefile.am          |    2 +-
 src/plugins/geolocation/Makefile.am    |    2 +-
 src/plugins/libravatar/Makefile.am     |    2 +-
 src/plugins/mailmbox/Makefile.am       |    2 +-
 src/plugins/newmail/Makefile.am        |    2 +-
 src/plugins/notification/Makefile.am   |    2 +-
 src/plugins/pdf_viewer/Makefile.am     |    2 +-
 src/plugins/perl/Makefile.am           |    2 +-
 src/plugins/pgpcore/Makefile.am        |    2 +-
 src/plugins/pgpinline/Makefile.am      |    2 +-
 src/plugins/pgpmime/Makefile.am        |    2 +-
 src/plugins/python/Makefile.am         |    2 +-
 src/plugins/rssyl/Makefile.am          |    2 +-
 src/plugins/smime/Makefile.am          |    2 +-
 src/plugins/spam_report/Makefile.am    |    2 +-
 src/plugins/spamassassin/Makefile.am   |    2 +-
 src/plugins/tnef_parse/Makefile.am     |    2 +-
 src/plugins/vcalendar/Makefile.am      |    2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)


- Log -----------------------------------------------------------------
commit 4f405b0b6de3d11b610d3ebba5c7c28b046d6c34
Author: Paul <paul at claws-mail.org>
Date:   Fri Jun 13 13:14:54 2014 +0100

    fix this wonderful screw-up that broke `make dist`

diff --git a/Makefile.am b/Makefile.am
index db4b62c..253a365 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = \
 	claws-mail.pc.in \
 	$(desktop_in_files) \
 	claws-mail.png \
-	$(appdata_in_files) \
+	$(appdata_DATA) \
 	autogen.sh \
 	claws-features.h.in \
 	version
diff --git a/src/plugins/acpi_notifier/Makefile.am b/src/plugins/acpi_notifier/Makefile.am
index 706a203..2e71b2e 100644
--- a/src/plugins/acpi_notifier/Makefile.am
+++ b/src/plugins/acpi_notifier/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/address_keeper/Makefile.am b/src/plugins/address_keeper/Makefile.am
index 54fbb32..f9f3209 100644
--- a/src/plugins/address_keeper/Makefile.am
+++ b/src/plugins/address_keeper/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/archive/Makefile.am b/src/plugins/archive/Makefile.am
index 6752e67..a66d9cc 100644
--- a/src/plugins/archive/Makefile.am
+++ b/src/plugins/archive/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am
index 5609912..6eaff6f 100644
--- a/src/plugins/att_remover/Makefile.am
+++ b/src/plugins/att_remover/Makefile.am
@@ -7,7 +7,7 @@ appdatadir=$(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/attachwarner/Makefile.am b/src/plugins/attachwarner/Makefile.am
index 317a3b2..2141bbb 100644
--- a/src/plugins/attachwarner/Makefile.am
+++ b/src/plugins/attachwarner/Makefile.am
@@ -6,7 +6,7 @@ appdata_in_files = claws-mail-attachwarner.metainfo.xml.in
 appdatadir=$(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/bogofilter/Makefile.am b/src/plugins/bogofilter/Makefile.am
index 9d01cde..326a306 100644
--- a/src/plugins/bogofilter/Makefile.am
+++ b/src/plugins/bogofilter/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am
index 7332c3a..bb42bc9 100644
--- a/src/plugins/bsfilter/Makefile.am
+++ b/src/plugins/bsfilter/Makefile.am
@@ -5,7 +5,7 @@
 appdata_files = claws-mail-bsfilter.metainfo.xml
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_files)
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am
index d38d37f..8f44397 100644
--- a/src/plugins/clamd/Makefile.am
+++ b/src/plugins/clamd/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 SUBDIRS = libclamd
 plugindir = $(pkglibdir)/plugins
diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
index 96389cf..85e0663 100644
--- a/src/plugins/fancy/Makefile.am
+++ b/src/plugins/fancy/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am
index cba9e53..14be11f 100644
--- a/src/plugins/fetchinfo/Makefile.am
+++ b/src/plugins/fetchinfo/Makefile.am
@@ -81,4 +81,4 @@ fetchinfo_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS)
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
diff --git a/src/plugins/gdata/Makefile.am b/src/plugins/gdata/Makefile.am
index 4632af5..e80cebc 100644
--- a/src/plugins/gdata/Makefile.am
+++ b/src/plugins/gdata/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/geolocation/Makefile.am b/src/plugins/geolocation/Makefile.am
index 47ffab5..d43cc28 100644
--- a/src/plugins/geolocation/Makefile.am
+++ b/src/plugins/geolocation/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/libravatar/Makefile.am b/src/plugins/libravatar/Makefile.am
index 19d38ed..022b07e 100644
--- a/src/plugins/libravatar/Makefile.am
+++ b/src/plugins/libravatar/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am
index 20608bc..9703286 100644
--- a/src/plugins/mailmbox/Makefile.am
+++ b/src/plugins/mailmbox/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/newmail/Makefile.am b/src/plugins/newmail/Makefile.am
index 8d363c0..9554f85 100644
--- a/src/plugins/newmail/Makefile.am
+++ b/src/plugins/newmail/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
index d7d1d34..186ed03 100644
--- a/src/plugins/notification/Makefile.am
+++ b/src/plugins/notification/Makefile.am
@@ -17,7 +17,7 @@ hotkey_lib_path =
 endif
 
 SUBDIRS=gtkhotkey
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 CFLAGS += "-Wall"
 
 IFLAGS = \
diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am
index 44ab32f..aa9edf4 100644
--- a/src/plugins/pdf_viewer/Makefile.am
+++ b/src/plugins/pdf_viewer/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
index bee013d..30d984d 100644
--- a/src/plugins/perl/Makefile.am
+++ b/src/plugins/perl/Makefile.am
@@ -36,5 +36,5 @@ perl_la_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(PERL_CFLAGS)
 
-EXTRA_DIST = cm_perl.pod $(appdata_in_files)
+EXTRA_DIST = cm_perl.pod $(appdata_DATA)
 
diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am
index a3a51d1..19f5fea 100644
--- a/src/plugins/pgpcore/Makefile.am
+++ b/src/plugins/pgpcore/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = version.rc plugin.def claws.def $(appdata_in_files)
+EXTRA_DIST = version.rc plugin.def claws.def $(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/pgpinline/Makefile.am b/src/plugins/pgpinline/Makefile.am
index 17a0278..157d64d 100644
--- a/src/plugins/pgpinline/Makefile.am
+++ b/src/plugins/pgpinline/Makefile.am
@@ -9,7 +9,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpinline.deps \
-	$(appdata_in_files)
+	$(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am
index 22358bd..c1363d2 100644
--- a/src/plugins/pgpmime/Makefile.am
+++ b/src/plugins/pgpmime/Makefile.am
@@ -9,7 +9,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpmime.deps \
-	$(appdata_in_files)
+	$(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
index 800e899..1ed4cbf 100644
--- a/src/plugins/python/Makefile.am
+++ b/src/plugins/python/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 SUBDIRS = examples
 
diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am
index 7ca8a74..ffc66c3 100644
--- a/src/plugins/rssyl/Makefile.am
+++ b/src/plugins/rssyl/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/smime/Makefile.am b/src/plugins/smime/Makefile.am
index 2b7a2a9..eea8c22 100644
--- a/src/plugins/smime/Makefile.am
+++ b/src/plugins/smime/Makefile.am
@@ -9,7 +9,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def smime.deps \
-	$(appdata_in_files)
+	$(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index 923f105..5b86474 100644
--- a/src/plugins/spam_report/Makefile.am
+++ b/src/plugins/spam_report/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am
index cbb56c8..5a7c985 100644
--- a/src/plugins/spamassassin/Makefile.am
+++ b/src/plugins/spamassassin/Makefile.am
@@ -40,4 +40,4 @@ spamassassin_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS)
 
-EXTRA_DIST = README $(appdata_in_files)
+EXTRA_DIST = README $(appdata_DATA)
diff --git a/src/plugins/tnef_parse/Makefile.am b/src/plugins/tnef_parse/Makefile.am
index 40fe3fe..2e2226e 100644
--- a/src/plugins/tnef_parse/Makefile.am
+++ b/src/plugins/tnef_parse/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 if OS_WIN32
 
diff --git a/src/plugins/vcalendar/Makefile.am b/src/plugins/vcalendar/Makefile.am
index b978ebf..fd6a4f1 100644
--- a/src/plugins/vcalendar/Makefile.am
+++ b/src/plugins/vcalendar/Makefile.am
@@ -9,7 +9,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 SUBDIRS = libical
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list