[Commits] [SCM] claws branch, master, updated. 3.10.1-61-g5bbaea4

Colin colin at claws-mail.org
Mon Jun 16 14:05:25 CEST 2014


The branch master of project "claws" (Claws Mail) has been updated
       via  5bbaea4009096c4e238bd9fca1717a0224e1db98 (commit)
      from  8592b7085d371b41972e0f3cf79ed9117ab46b2e (commit)

Summary of changes:
 Makefile.am                            |    1 +
 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(+), 28 deletions(-)


- Log -----------------------------------------------------------------
commit 5bbaea4009096c4e238bd9fca1717a0224e1db98
Author: Colin Leroy <colin at colino.net>
Date:   Mon Jun 16 14:04:42 2014 +0200

    Distribute .in files too

diff --git a/Makefile.am b/Makefile.am
index 253a365..ee4ffbd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,7 @@ EXTRA_DIST = \
 	$(desktop_in_files) \
 	claws-mail.png \
 	$(appdata_DATA) \
+	$(appdata_in_files) \
 	autogen.sh \
 	claws-features.h.in \
 	version
diff --git a/src/plugins/acpi_notifier/Makefile.am b/src/plugins/acpi_notifier/Makefile.am
index 2e71b2e..afa1f81 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_DATA)
+EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/address_keeper/Makefile.am b/src/plugins/address_keeper/Makefile.am
index f9f3209..abec728 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_DATA)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/archive/Makefile.am b/src/plugins/archive/Makefile.am
index a66d9cc..c614c22 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_DATA)
+EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am
index 6eaff6f..fc8cb81 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_DATA)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/attachwarner/Makefile.am b/src/plugins/attachwarner/Makefile.am
index c7dcaa5..4a80f5f 100644
--- a/src/plugins/attachwarner/Makefile.am
+++ b/src/plugins/attachwarner/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_DATA)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/bogofilter/Makefile.am b/src/plugins/bogofilter/Makefile.am
index 326a306..0190063 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_DATA)
+EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am
index b530811..4800039 100644
--- a/src/plugins/bsfilter/Makefile.am
+++ b/src/plugins/bsfilter/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_files)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am
index 8f44397..88e5c35 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_DATA)
+EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
 
 SUBDIRS = libclamd
 plugindir = $(pkglibdir)/plugins
diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
index 85e0663..20449ee 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_DATA)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am
index 14be11f..5c37bb1 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_DATA)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
diff --git a/src/plugins/gdata/Makefile.am b/src/plugins/gdata/Makefile.am
index e80cebc..9360848 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_DATA)
+EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/geolocation/Makefile.am b/src/plugins/geolocation/Makefile.am
index d43cc28..06979ae 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_DATA)
+EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/libravatar/Makefile.am b/src/plugins/libravatar/Makefile.am
index 022b07e..05bf4c3 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_DATA)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am
index 9703286..f5a0581 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_DATA)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/newmail/Makefile.am b/src/plugins/newmail/Makefile.am
index 9554f85..e86f4e7 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_DATA)
+EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
index 186ed03..465eb80 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_DATA)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
 CFLAGS += "-Wall"
 
 IFLAGS = \
diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am
index aa9edf4..6b78fe9 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_DATA)
+EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
index 30d984d..9820aa8 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_DATA)
+EXTRA_DIST = cm_perl.pod $(appdata_DATA) $(appdata_in_files)
 
diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am
index 19f5fea..7bfbc6c 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_DATA)
+EXTRA_DIST = version.rc plugin.def claws.def $(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/pgpinline/Makefile.am b/src/plugins/pgpinline/Makefile.am
index 157d64d..6863acc 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_DATA)
+	$(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am
index c1363d2..3d7c7b8 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_DATA)
+	$(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
index 1ed4cbf..45e5980 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_DATA)
+EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
 
 SUBDIRS = examples
 
diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am
index ffc66c3..9eaf574 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_DATA)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/smime/Makefile.am b/src/plugins/smime/Makefile.am
index eea8c22..3007449 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_DATA)
+	$(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index 5b86474..cdc15c9 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_DATA)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am
index 01194c3..7260870 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_DATA)
+EXTRA_DIST = README $(appdata_DATA) $(appdata_in_files)
diff --git a/src/plugins/tnef_parse/Makefile.am b/src/plugins/tnef_parse/Makefile.am
index 2e2226e..2c41d0b 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_DATA)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
 
 if OS_WIN32
 
diff --git a/src/plugins/vcalendar/Makefile.am b/src/plugins/vcalendar/Makefile.am
index fd6a4f1..140036c 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_DATA)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list