add configure option --enable-appdata and put all appdata in appdata/

diff --git a/Makefile.am b/Makefile.am
index ee4ffbd308a3eae99fabfd00d1d04ab27338dedf..9065980322544c0e0e9755e185d8771d97f94cfd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,10 @@ ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2 dist-xz
 
 SUBDIRS = m4 po src tools config doc manual
 AUTOMAKE_OPTIONS = dist-bzip2 dist-xz
 
 SUBDIRS = m4 po src tools config doc manual

+if BUILD_APPDATA
+SUBDIRS += appdata
+endif
+DIST_SUBDIRS = appdata $(SUBDIRS)

 
 # when changing the name or location of the .desktop file,
 # also update src/common/Makefile.am
 
 # when changing the name or location of the .desktop file,
 # also update src/common/Makefile.am


@@ -15,12 +19,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
 
 @INTLTOOL_DESKTOP_RULE@
 

-appdata_in_files = claws-mail.appdata.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-

 EXTRA_DIST = \
        ChangeLog \
        ChangeLog.gtk1 \
 EXTRA_DIST = \
        ChangeLog \
        ChangeLog.gtk1 \


@@ -33,8 +31,6 @@ EXTRA_DIST = \
        claws-mail.pc.in \
        $(desktop_in_files) \
        claws-mail.png \
        claws-mail.pc.in \
        $(desktop_in_files) \
        claws-mail.png \

-       $(appdata_DATA) \
-       $(appdata_in_files) \

        autogen.sh \
        claws-features.h.in \
        version
        autogen.sh \
        claws-features.h.in \
        version

diff --git a/appdata/Makefile.am b/appdata/Makefile.am
new file mode 100644 (file)
index 0000000..c89e44e
--- /dev/null
+++ b/appdata/Makefile.am
@@ -0,0 +1,41 @@
+ # Makefile.am for "appdata" directory
+# This file is part of Claws Mail package.
+# See COPYING file for license details.
+
+@INTLTOOL_XML_RULE@
+
+appdata_in_files = claws-mail.appdata.xml.in \
+       claws-mail-acpi_notifier.metainfo.xml.in \
+       claws-mail-address_keeper.metainfo.xml.in \
+       claws-mail-archive.metainfo.xml.in \
+       claws-mail-att_remover.metainfo.xml.in \
+       claws-mail-attachwarner.metainfo.xml.in \
+       claws-mail-bogofilter.metainfo.xml.in \
+       claws-mail-bsfilter.metainfo.xml.in \
+       claws-mail-clamd.metainfo.xml.in \
+       claws-mail-fancy.metainfo.xml.in \
+       claws-mail-fetchinfo.metainfo.xml.in \
+       claws-mail-gdata.metainfo.xml.in \
+       claws-mail-geolocation.metainfo.xml.in \
+       claws-mail-libravatar.metainfo.xml.in \
+       claws-mail-mailmbox.metainfo.xml.in \
+       claws-mail-newmail.metainfo.xml.in \
+       claws-mail-notification.metainfo.xml.in \
+       claws-mail-pdf_viewer.metainfo.xml.in \
+       claws-mail-perl.metainfo.xml.in \
+       claws-mail-pgpcore.metainfo.xml.in \
+       claws-mail-pgpinline.metainfo.xml.in \
+       claws-mail-pgpmime.metainfo.xml.in \
+       claws-mail-python.metainfo.xml.in \
+       claws-mail-rssyl.metainfo.xml.in \
+       claws-mail-smime.metainfo.xml.in \
+       claws-mail-spam_report.metainfo.xml.in \
+       claws-mail-spamassassin.metainfo.xml.in \
+       claws-mail-tnef_parse.metainfo.xml.in \
+       claws-mail-vcalendar.metainfo.xml.in
+
+appdatadir=$(datarootdir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
+

diff --git a/src/plugins/acpi_notifier/claws-mail-acpi_notifier.metainfo.xml.in b/appdata/claws-mail-acpi_notifier.metainfo.xml.in
similarity index 83%
rename from src/plugins/acpi_notifier/claws-mail-acpi_notifier.metainfo.xml.in
rename to appdata/claws-mail-acpi_notifier.metainfo.xml.in
index 83c07d0024498a6ada9eea89263d1bb3d44111a4..ae3ed52f855d961a9c76683bfc1d161ed123e723 100644 (file)
--- a/src/plugins/acpi_notifier/claws-mail-acpi_notifier.metainfo.xml.in
+++ b/appdata/claws-mail-acpi_notifier.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-acpi_notifier</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-acpi_notifier</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/address_keeper/claws-mail-address_keeper.metainfo.xml.in b/appdata/claws-mail-address_keeper.metainfo.xml.in
similarity index 84%
rename from src/plugins/address_keeper/claws-mail-address_keeper.metainfo.xml.in
rename to appdata/claws-mail-address_keeper.metainfo.xml.in
index c5a1e82c2dc8fbd48b6334873992c2d97bb45bcd..3eb0669f5b8fd466aa86839d1e9f839547eea3b1 100644 (file)
--- a/src/plugins/address_keeper/claws-mail-address_keeper.metainfo.xml.in
+++ b/appdata/claws-mail-address_keeper.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-address_keeper</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-address_keeper</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/archive/claws-mail-archive.metainfo.xml.in b/appdata/claws-mail-archive.metainfo.xml.in
similarity index 82%
rename from src/plugins/archive/claws-mail-archive.metainfo.xml.in
rename to appdata/claws-mail-archive.metainfo.xml.in
index 47003415af90efc6bb5baf525586a1ad3e91cbd4..66ed4870a758db19a018e22ed94aa4c28b595721 100644 (file)
--- a/src/plugins/archive/claws-mail-archive.metainfo.xml.in
+++ b/appdata/claws-mail-archive.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-archive</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-archive</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/att_remover/claws-mail-att_remover.metainfo.xml.in b/appdata/claws-mail-att_remover.metainfo.xml.in
similarity index 82%
rename from src/plugins/att_remover/claws-mail-att_remover.metainfo.xml.in
rename to appdata/claws-mail-att_remover.metainfo.xml.in
index ba68a9453e92c17209005e82217fc9ad0c87d062..54a2a785cf44a50ae849da740e855c75c4dbb808 100644 (file)
--- a/src/plugins/att_remover/claws-mail-att_remover.metainfo.xml.in
+++ b/appdata/claws-mail-att_remover.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-att_remover</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-att_remover</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/attachwarner/claws-mail-attachwarner.metainfo.xml.in b/appdata/claws-mail-attachwarner.metainfo.xml.in
similarity index 85%
rename from src/plugins/attachwarner/claws-mail-attachwarner.metainfo.xml.in
rename to appdata/claws-mail-attachwarner.metainfo.xml.in
index c61f3aa07c21496a21a182393ff29ae1d40de0e4..9c2995f96b293d0ad4d772b5074b19d4633d2fdf 100644 (file)
--- a/src/plugins/attachwarner/claws-mail-attachwarner.metainfo.xml.in
+++ b/appdata/claws-mail-attachwarner.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-attachwarner</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-attachwarner</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/bogofilter/claws-mail-bogofilter.metainfo.xml.in b/appdata/claws-mail-bogofilter.metainfo.xml.in
similarity index 84%
rename from src/plugins/bogofilter/claws-mail-bogofilter.metainfo.xml.in
rename to appdata/claws-mail-bogofilter.metainfo.xml.in
index f40dfedbdc84c8fa09857cfc987a6d591a598eda..29640db83a69a0163da249083a2300d9ac50deda 100644 (file)
--- a/src/plugins/bogofilter/claws-mail-bogofilter.metainfo.xml.in
+++ b/appdata/claws-mail-bogofilter.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-bogofilter</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-bogofilter</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/bsfilter/claws-mail-bsfilter.metainfo.xml.in b/appdata/claws-mail-bsfilter.metainfo.xml.in
similarity index 84%
rename from src/plugins/bsfilter/claws-mail-bsfilter.metainfo.xml.in
rename to appdata/claws-mail-bsfilter.metainfo.xml.in
index 2e171b2436ef2e1ca6acfa59b21f1629b32d3692..b78a080daa8904e93e53d063f04eb03fe591075f 100644 (file)
--- a/src/plugins/bsfilter/claws-mail-bsfilter.metainfo.xml.in
+++ b/appdata/claws-mail-bsfilter.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-bsfilter</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-bsfilter</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/clamd/claws-mail-clamd.metainfo.xml.in b/appdata/claws-mail-clamd.metainfo.xml.in
similarity index 84%
rename from src/plugins/clamd/claws-mail-clamd.metainfo.xml.in
rename to appdata/claws-mail-clamd.metainfo.xml.in
index c0c6a4fbf82a77b3fde700c82e819f6238b82638..e2299a2bec43b1275bcc52b9d0be0e3f075b7de0 100644 (file)
--- a/src/plugins/clamd/claws-mail-clamd.metainfo.xml.in
+++ b/appdata/claws-mail-clamd.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-clamd</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-clamd</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/fancy/claws-mail-fancy.metainfo.xml.in b/appdata/claws-mail-fancy.metainfo.xml.in
similarity index 82%
rename from src/plugins/fancy/claws-mail-fancy.metainfo.xml.in
rename to appdata/claws-mail-fancy.metainfo.xml.in
index 34098810f2e4d4dddde97510cc951129140c7deb..b5cf73827f82adcd44db9e4f137fd8e007c5e592 100644 (file)
--- a/src/plugins/fancy/claws-mail-fancy.metainfo.xml.in
+++ b/appdata/claws-mail-fancy.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-fancy</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-fancy</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/fetchinfo/claws-mail-fetchinfo.metainfo.xml.in b/appdata/claws-mail-fetchinfo.metainfo.xml.in
similarity index 84%
rename from src/plugins/fetchinfo/claws-mail-fetchinfo.metainfo.xml.in
rename to appdata/claws-mail-fetchinfo.metainfo.xml.in
index e915cae8a6faf025f220d0d57b84af9a7db0509c..426b859dc895c7d6ec62c3fb50ae4c3dc1b7a29d 100644 (file)
--- a/src/plugins/fetchinfo/claws-mail-fetchinfo.metainfo.xml.in
+++ b/appdata/claws-mail-fetchinfo.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-fetchinfo</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-fetchinfo</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/gdata/claws-mail-gdata.metainfo.xml.in b/appdata/claws-mail-gdata.metainfo.xml.in
similarity index 82%
rename from src/plugins/gdata/claws-mail-gdata.metainfo.xml.in
rename to appdata/claws-mail-gdata.metainfo.xml.in
index ab6f35a9aeb5cb20d948cc20c554864ee4667f80..9159d229083313d2f5ca7dcedb515c6ed89b3482 100644 (file)
--- a/src/plugins/gdata/claws-mail-gdata.metainfo.xml.in
+++ b/appdata/claws-mail-gdata.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-gdata</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-gdata</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/geolocation/claws-mail-geolocation.metainfo.xml.in b/appdata/claws-mail-geolocation.metainfo.xml.in
similarity index 82%
rename from src/plugins/geolocation/claws-mail-geolocation.metainfo.xml.in
rename to appdata/claws-mail-geolocation.metainfo.xml.in
index bfbed10b325d6acf46df382b5e579607bcdce468..ba8960de1991dd486888146949d43fe762e53c6c 100644 (file)
--- a/src/plugins/geolocation/claws-mail-geolocation.metainfo.xml.in
+++ b/appdata/claws-mail-geolocation.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-geolocation</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-geolocation</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/libravatar/claws-mail-libravatar.metainfo.xml.in b/appdata/claws-mail-libravatar.metainfo.xml.in
similarity index 84%
rename from src/plugins/libravatar/claws-mail-libravatar.metainfo.xml.in
rename to appdata/claws-mail-libravatar.metainfo.xml.in
index 36b50ab715b3a73fb83ea6d3bfafce168e2e4dfb..7a47ae25c2c92d30a6524296bb50c5cf15e06933 100644 (file)
--- a/src/plugins/libravatar/claws-mail-libravatar.metainfo.xml.in
+++ b/appdata/claws-mail-libravatar.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-libravatar</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-libravatar</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/mailmbox/claws-mail-mailmbox.metainfo.xml.in b/appdata/claws-mail-mailmbox.metainfo.xml.in
similarity index 82%
rename from src/plugins/mailmbox/claws-mail-mailmbox.metainfo.xml.in
rename to appdata/claws-mail-mailmbox.metainfo.xml.in
index 89b5900cb79ba3034a4c6b5dc9ceba96867fc6e7..0b832afcc75d45e94d0e50572b1deea7f10d75f3 100644 (file)
--- a/src/plugins/mailmbox/claws-mail-mailmbox.metainfo.xml.in
+++ b/appdata/claws-mail-mailmbox.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-mailmbox</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-mailmbox</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/newmail/claws-mail-newmail.metainfo.xml.in b/appdata/claws-mail-newmail.metainfo.xml.in
similarity index 83%
rename from src/plugins/newmail/claws-mail-newmail.metainfo.xml.in
rename to appdata/claws-mail-newmail.metainfo.xml.in
index 9be56904fd40d7f6e27660dea07e168f98a90dd9..00a522d8ae88dbda9e53f08bfd5e32dcba08b5b3 100644 (file)
--- a/src/plugins/newmail/claws-mail-newmail.metainfo.xml.in
+++ b/appdata/claws-mail-newmail.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-newmail</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-newmail</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/notification/claws-mail-notification.metainfo.xml.in b/appdata/claws-mail-notification.metainfo.xml.in
similarity index 84%
rename from src/plugins/notification/claws-mail-notification.metainfo.xml.in
rename to appdata/claws-mail-notification.metainfo.xml.in
index a54256b27169a69cb0daa5c69b59d7dab5b5e2e1..7684186482d2783e29a8c6c79f0025664be03648 100644 (file)
--- a/src/plugins/notification/claws-mail-notification.metainfo.xml.in
+++ b/appdata/claws-mail-notification.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-notification</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-notification</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/pdf_viewer/claws-mail-pdf_viewer.metainfo.xml.in b/appdata/claws-mail-pdf_viewer.metainfo.xml.in
similarity index 84%
rename from src/plugins/pdf_viewer/claws-mail-pdf_viewer.metainfo.xml.in
rename to appdata/claws-mail-pdf_viewer.metainfo.xml.in
index 396eb117589ceaf2ed2909a843790418ea4dbd37..353b81ac6c126f24efd321533affb91708ae49be 100644 (file)
--- a/src/plugins/pdf_viewer/claws-mail-pdf_viewer.metainfo.xml.in
+++ b/appdata/claws-mail-pdf_viewer.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-pdf_viewer</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-pdf_viewer</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/perl/claws-mail-perl.metainfo.xml.in b/appdata/claws-mail-perl.metainfo.xml.in
similarity index 82%
rename from src/plugins/perl/claws-mail-perl.metainfo.xml.in
rename to appdata/claws-mail-perl.metainfo.xml.in
index ea436830f3a01805d592ed4b4ed21dbfef206b73..69afa3d37a95b77fee3f78d145e9266d672b0964 100644 (file)
--- a/src/plugins/perl/claws-mail-perl.metainfo.xml.in
+++ b/appdata/claws-mail-perl.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-perl</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-perl</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/pgpcore/claws-mail-pgpcore.metainfo.xml.in b/appdata/claws-mail-pgpcore.metainfo.xml.in
similarity index 100%
rename from src/plugins/pgpcore/claws-mail-pgpcore.metainfo.xml.in
rename to appdata/claws-mail-pgpcore.metainfo.xml.in

diff --git a/src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml.in b/appdata/claws-mail-pgpinline.metainfo.xml.in
similarity index 83%
rename from src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml.in
rename to appdata/claws-mail-pgpinline.metainfo.xml.in
index 62ab433d3357674fb23dcc93c29416c790858149..6a407693e0f7c07936e2b219ce8779d708acd6b4 100644 (file)
--- a/src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml.in
+++ b/appdata/claws-mail-pgpinline.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-pgpinline</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-pgpinline</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/pgpmime/claws-mail-pgpmime.metainfo.xml.in b/appdata/claws-mail-pgpmime.metainfo.xml.in
similarity index 83%
rename from src/plugins/pgpmime/claws-mail-pgpmime.metainfo.xml.in
rename to appdata/claws-mail-pgpmime.metainfo.xml.in
index e71de2d0dc2d4a1f1b699a4b33a00eb1aa82c1a9..49c6dde4b90193d4872f7d57a3733c70a62b4b1f 100644 (file)
--- a/src/plugins/pgpmime/claws-mail-pgpmime.metainfo.xml.in
+++ b/appdata/claws-mail-pgpmime.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-pgpmime</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-pgpmime</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/python/claws-mail-python.metainfo.xml.in b/appdata/claws-mail-python.metainfo.xml.in
similarity index 84%
rename from src/plugins/python/claws-mail-python.metainfo.xml.in
rename to appdata/claws-mail-python.metainfo.xml.in
index ebf6c61921641672bd4e5ecf8ab74a4510bac3e9..e4b8d05e6dba39a2621a540e8c95b0cfec9a9d3a 100644 (file)
--- a/src/plugins/python/claws-mail-python.metainfo.xml.in
+++ b/appdata/claws-mail-python.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-python</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-python</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/rssyl/claws-mail-rssyl.metainfo.xml.in b/appdata/claws-mail-rssyl.metainfo.xml.in
similarity index 82%
rename from src/plugins/rssyl/claws-mail-rssyl.metainfo.xml.in
rename to appdata/claws-mail-rssyl.metainfo.xml.in
index 2b5f713f8b64d1edd1248d9bb7d1f2412622c1fb..ce69b6aa933affff1491d65b6a4a237d0d04b2a4 100644 (file)
--- a/src/plugins/rssyl/claws-mail-rssyl.metainfo.xml.in
+++ b/appdata/claws-mail-rssyl.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-rssyl</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-rssyl</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/smime/claws-mail-smime.metainfo.xml.in b/appdata/claws-mail-smime.metainfo.xml.in
similarity index 82%
rename from src/plugins/smime/claws-mail-smime.metainfo.xml.in
rename to appdata/claws-mail-smime.metainfo.xml.in
index ad42c247f6bddeae2072e55b15a747b88ee51c4a..8714037b8557fd1ae8aa3b3001329a450891bfa2 100644 (file)
--- a/src/plugins/smime/claws-mail-smime.metainfo.xml.in
+++ b/appdata/claws-mail-smime.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-smime</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-smime</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/spam_report/claws-mail-spam_report.metainfo.xml.in b/appdata/claws-mail-spam_report.metainfo.xml.in
similarity index 82%
rename from src/plugins/spam_report/claws-mail-spam_report.metainfo.xml.in
rename to appdata/claws-mail-spam_report.metainfo.xml.in
index a42fbf80bae198fb66af937e9e4c3083a3a5db9c..a64a3cc2fb3bb2e3993afc9251b546ef104b2470 100644 (file)
--- a/src/plugins/spam_report/claws-mail-spam_report.metainfo.xml.in
+++ b/appdata/claws-mail-spam_report.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-spam_report</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-spam_report</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/spamassassin/claws-mail-spamassassin.metainfo.xml.in b/appdata/claws-mail-spamassassin.metainfo.xml.in
similarity index 85%
rename from src/plugins/spamassassin/claws-mail-spamassassin.metainfo.xml.in
rename to appdata/claws-mail-spamassassin.metainfo.xml.in
index c4f1bd3e4cb8ada18544e677aa005df8611c2bb2..940d013803f4a6d647b992f47dff3f57d9818e3f 100644 (file)
--- a/src/plugins/spamassassin/claws-mail-spamassassin.metainfo.xml.in
+++ b/appdata/claws-mail-spamassassin.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-spamassassin</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-spamassassin</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/tnef_parse/claws-mail-tnef_parse.metainfo.xml.in b/appdata/claws-mail-tnef_parse.metainfo.xml.in
similarity index 83%
rename from src/plugins/tnef_parse/claws-mail-tnef_parse.metainfo.xml.in
rename to appdata/claws-mail-tnef_parse.metainfo.xml.in
index 6e6dbbc9afeb6d38c9dfba2406eb74c30f15ce54..f32ddcfb481f9b9bbaff4af7b291e1b57b510d77 100644 (file)
--- a/src/plugins/tnef_parse/claws-mail-tnef_parse.metainfo.xml.in
+++ b/appdata/claws-mail-tnef_parse.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-tnef_parse</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-tnef_parse</id>
 <extends>claws-mail.desktop</extends>

diff --git a/src/plugins/vcalendar/claws-mail-vcalendar.metainfo.xml.in b/appdata/claws-mail-vcalendar.metainfo.xml.in
similarity index 84%
rename from src/plugins/vcalendar/claws-mail-vcalendar.metainfo.xml.in
rename to appdata/claws-mail-vcalendar.metainfo.xml.in
index cfd7f84f0851b035b685289155dee6980cf279d7..74dacc753dcc8d2844d667d0a61655eff0b2f6f6 100644 (file)
--- a/src/plugins/vcalendar/claws-mail-vcalendar.metainfo.xml.in
+++ b/appdata/claws-mail-vcalendar.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->

 <component type="addon">
 <id>claws-mail-vcalendar</id>
 <extends>claws-mail.desktop</extends>
 <component type="addon">
 <id>claws-mail-vcalendar</id>
 <extends>claws-mail.desktop</extends>

diff --git a/claws-mail.appdata.xml.in b/appdata/claws-mail.appdata.xml.in
similarity index 100%
rename from claws-mail.appdata.xml.in
rename to appdata/claws-mail.appdata.xml.in

diff --git a/configure.ac b/configure.ac
index 612b555c877abebda320882131326f39f6c57ce7..1cc5e25058043728ef98ecfefc86937594e16d79 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -904,6 +904,19 @@ else
 fi
 AM_CONDITIONAL(CLAWS_VALGRIND, test x"$enable_valgrind" = x"yes")
 
 fi
 AM_CONDITIONAL(CLAWS_VALGRIND, test x"$enable_valgrind" = x"yes")
 

+dnl disabled by default
+AC_ARG_ENABLE(appdata,
+               [  --enable-appdata             Build appdata],
+               [enable_appdata=$enableval], [enable_appdata=no])
+
+AC_MSG_CHECKING([whether to build appdata])
+if test x"$enable_appdata" != xno; then
+       AC_MSG_RESULT(yes)
+else
+       AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(BUILD_APPDATA, test x"$enable_appdata" = x"yes")
+

 dnl *************************
 dnl ** section for plugins **
 dnl *************************
 dnl *************************
 dnl ** section for plugins **
 dnl *************************


@@ -1892,6 +1905,7 @@ dnl ****************************
 
 AC_OUTPUT([
 Makefile
 
 AC_OUTPUT([
 Makefile

+appdata/Makefile

 m4/Makefile
 po/Makefile.in
 src/common/version.h
 m4/Makefile
 po/Makefile.in
 src/common/version.h


@@ -2002,6 +2016,7 @@ echo "DBUS               : $enable_dbus"
 echo "NetworkManager     : $enable_networkmanager"
 echo "Manual             : $enable_manual"
 echo "Generic UMPC code  : $enable_generic_umpc"
 echo "NetworkManager     : $enable_networkmanager"
 echo "Manual             : $enable_manual"
 echo "Generic UMPC code  : $enable_generic_umpc"

+echo "AppData            : $enable_appdata"

 echo "Config dir         : $ac_cv_with_config_dir"
 
 echo "Plugins"
 echo "Config dir         : $ac_cv_with_config_dir"
 
 echo "Plugins"

diff --git a/po/POTFILES.in b/po/POTFILES.in
index af7da4ae2f912a85fd14c8f9447b6ff7c0bc0f99..1f3a3960dafb029a8a30d7c7816da8529010ad31 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,33 @@
-claws-mail.appdata.xml.in

 claws-mail.desktop.in
 claws-mail.desktop.in

+appdata/claws-mail.appdata.xml.in
+appdata/claws-mail-acpi_notifier.metainfo.xml.in
+appdata/claws-mail-address_keeper.metainfo.xml.in
+appdata/claws-mail-archive.metainfo.xml.in
+appdata/claws-mail-att_remover.metainfo.xml.in
+appdata/claws-mail-attachwarner.metainfo.xml.in
+appdata/claws-mail-bogofilter.metainfo.xml.in
+appdata/claws-mail-bsfilter.metainfo.xml.in
+appdata/claws-mail-clamd.metainfo.xml.in
+appdata/claws-mail-fancy.metainfo.xml.in
+appdata/claws-mail-fetchinfo.metainfo.xml.in
+appdata/claws-mail-gdata.metainfo.xml.in
+appdata/claws-mail-geolocation.metainfo.xml.in
+appdata/claws-mail-libravatar.metainfo.xml.in
+appdata/claws-mail-mailmbox.metainfo.xml.in
+appdata/claws-mail-newmail.metainfo.xml.in
+appdata/claws-mail-notification.metainfo.xml.in
+appdata/claws-mail-pdf_viewer.metainfo.xml.in
+appdata/claws-mail-perl.metainfo.xml.in
+appdata/claws-mail-pgpcore.metainfo.xml.in
+appdata/claws-mail-pgpinline.metainfo.xml.in
+appdata/claws-mail-pgpmime.metainfo.xml.in
+appdata/claws-mail-python.metainfo.xml.in
+appdata/claws-mail-rssyl.metainfo.xml.in
+appdata/claws-mail-smime.metainfo.xml.in
+appdata/claws-mail-spam_report.metainfo.xml.in
+appdata/claws-mail-spamassassin.metainfo.xml.in
+appdata/claws-mail-tnef_parse.metainfo.xml.in
+appdata/claws-mail-vcalendar.metainfo.xml.in

 src/account.c
 src/action.c
 src/addrclip.c
 src/account.c
 src/action.c
 src/addrclip.c


@@ -88,53 +116,37 @@ src/mimeview.c
 src/news.c
 src/news_gtk.c
 src/plugins/acpi_notifier/acpi_notifier.c
 src/news.c
 src/news_gtk.c
 src/plugins/acpi_notifier/acpi_notifier.c

-src/plugins/acpi_notifier/claws-mail-acpi_notifier.metainfo.xml.in

 src/plugins/address_keeper/address_keeper.c
 src/plugins/address_keeper/address_keeper.h
 src/plugins/address_keeper/address_keeper_prefs.c
 src/plugins/address_keeper/address_keeper.c
 src/plugins/address_keeper/address_keeper.h
 src/plugins/address_keeper/address_keeper_prefs.c

-src/plugins/address_keeper/claws-mail-address_keeper.metainfo.xml.in

 src/plugins/archive/archiver.c
 src/plugins/archive/archiver_gtk.c
 src/plugins/archive/archiver_prefs.c
 src/plugins/archive/archiver.c
 src/plugins/archive/archiver_gtk.c
 src/plugins/archive/archiver_prefs.c

-src/plugins/archive/claws-mail-archive.metainfo.xml.in

 src/plugins/att_remover/att_remover.c
 src/plugins/att_remover/att_remover.c

-src/plugins/att_remover/claws-mail-att_remover.metainfo.xml.in

 src/plugins/attachwarner/attachwarner.c
 src/plugins/attachwarner/attachwarner_prefs.c
 src/plugins/attachwarner/attachwarner.c
 src/plugins/attachwarner/attachwarner_prefs.c

-src/plugins/attachwarner/claws-mail-attachwarner.metainfo.xml.in

 src/plugins/bogofilter/bogofilter.c
 src/plugins/bogofilter/bogofilter_gtk.c
 src/plugins/bogofilter/bogofilter.c
 src/plugins/bogofilter/bogofilter_gtk.c

-src/plugins/bogofilter/claws-mail-bogofilter.metainfo.xml.in

 src/plugins/bsfilter/bsfilter.c
 src/plugins/bsfilter/bsfilter_gtk.c
 src/plugins/bsfilter/bsfilter.c
 src/plugins/bsfilter/bsfilter_gtk.c

-src/plugins/bsfilter/claws-mail-bsfilter.metainfo.xml.in

 src/plugins/clamd/clamav_plugin.c
 src/plugins/clamd/clamav_plugin_gtk.c
 src/plugins/clamd/clamav_plugin.c
 src/plugins/clamd/clamav_plugin_gtk.c

-src/plugins/clamd/claws-mail-clamd.metainfo.xml.in

 src/plugins/clamd/libclamd/clamd-plugin.c
 src/plugins/demo/demo.c
 src/plugins/clamd/libclamd/clamd-plugin.c
 src/plugins/demo/demo.c

-src/plugins/fancy/claws-mail-fancy.metainfo.xml.in

 src/plugins/fancy/fancy_prefs.c
 src/plugins/fancy/fancy_viewer.c
 src/plugins/fancy/fancy_prefs.c
 src/plugins/fancy/fancy_viewer.c

-src/plugins/fetchinfo/claws-mail-fetchinfo.metainfo.xml.in

 src/plugins/fetchinfo/fetchinfo_plugin.c
 src/plugins/fetchinfo/fetchinfo_plugin_gtk.c
 src/plugins/fetchinfo/fetchinfo_plugin.c
 src/plugins/fetchinfo/fetchinfo_plugin_gtk.c

-src/plugins/gdata/claws-mail-gdata.metainfo.xml.in

 src/plugins/gdata/cm_gdata_contacts.c
 src/plugins/gdata/cm_gdata_prefs.c
 src/plugins/gdata/gdata_plugin.c
 src/plugins/gdata/cm_gdata_contacts.c
 src/plugins/gdata/cm_gdata_prefs.c
 src/plugins/gdata/gdata_plugin.c

-src/plugins/geolocation/claws-mail-geolocation.metainfo.xml.in

 src/plugins/geolocation/geolocation_plugin.c
 src/plugins/geolocation/geolocation_plugin.c

-src/plugins/libravatar/claws-mail-libravatar.metainfo.xml.in

 src/plugins/libravatar/libravatar.c
 src/plugins/libravatar/libravatar_prefs.c
 src/plugins/libravatar/libravatar.c
 src/plugins/libravatar/libravatar_prefs.c

-src/plugins/mailmbox/claws-mail-mailmbox.metainfo.xml.in

 src/plugins/mailmbox/mailmbox_folder.c
 src/plugins/mailmbox/plugin.c
 src/plugins/mailmbox/plugin_gtk.c
 src/plugins/mailmbox/mailmbox_folder.c
 src/plugins/mailmbox/plugin.c
 src/plugins/mailmbox/plugin_gtk.c

-src/plugins/newmail/claws-mail-newmail.metainfo.xml.in

 src/plugins/newmail/newmail.c
 src/plugins/newmail/newmail.c

-src/plugins/notification/claws-mail-notification.metainfo.xml.in

 src/plugins/notification/notification_banner.c
 src/plugins/notification/notification_foldercheck.c
 src/plugins/notification/notification_lcdproc.c
 src/plugins/notification/notification_banner.c
 src/plugins/notification/notification_foldercheck.c
 src/plugins/notification/notification_lcdproc.c


@@ -142,28 +154,21 @@ src/plugins/notification/notification_plugin.c
 src/plugins/notification/notification_popup.c
 src/plugins/notification/notification_prefs.c
 src/plugins/notification/notification_trayicon.c
 src/plugins/notification/notification_popup.c
 src/plugins/notification/notification_prefs.c
 src/plugins/notification/notification_trayicon.c

-src/plugins/pdf_viewer/claws-mail-pdf_viewer.metainfo.xml.in

 src/plugins/pdf_viewer/poppler_viewer.c
 src/plugins/pdf_viewer/poppler_viewer.c

-src/plugins/perl/claws-mail-perl.metainfo.xml.in

 src/plugins/perl/perl_gtk.c
 src/plugins/pgpcore/autocompletion.c
 src/plugins/perl/perl_gtk.c
 src/plugins/pgpcore/autocompletion.c

-src/plugins/pgpcore/claws-mail-pgpcore.metainfo.xml.in

 src/plugins/pgpcore/passphrase.c
 src/plugins/pgpcore/pgp_viewer.c
 src/plugins/pgpcore/plugin.c
 src/plugins/pgpcore/prefs_gpg.c
 src/plugins/pgpcore/select-keys.c
 src/plugins/pgpcore/sgpgme.c
 src/plugins/pgpcore/passphrase.c
 src/plugins/pgpcore/pgp_viewer.c
 src/plugins/pgpcore/plugin.c
 src/plugins/pgpcore/prefs_gpg.c
 src/plugins/pgpcore/select-keys.c
 src/plugins/pgpcore/sgpgme.c

-src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml.in

 src/plugins/pgpinline/pgpinline.c
 src/plugins/pgpinline/plugin.c
 src/plugins/pgpinline/pgpinline.c
 src/plugins/pgpinline/plugin.c

-src/plugins/pgpmime/claws-mail-pgpmime.metainfo.xml.in

 src/plugins/pgpmime/pgpmime.c
 src/plugins/pgpmime/plugin.c
 src/plugins/pgpmime/pgpmime.c
 src/plugins/pgpmime/plugin.c

-src/plugins/python/claws-mail-python.metainfo.xml.in

 src/plugins/python/composewindowtype.c
 src/plugins/python/python_plugin.c
 src/plugins/python/composewindowtype.c
 src/plugins/python/python_plugin.c

-src/plugins/rssyl/claws-mail-rssyl.metainfo.xml.in

 src/plugins/rssyl/old_feeds.c
 src/plugins/rssyl/opml_export.c
 src/plugins/rssyl/opml_import.c
 src/plugins/rssyl/old_feeds.c
 src/plugins/rssyl/opml_export.c
 src/plugins/rssyl/opml_import.c


@@ -182,18 +187,13 @@ src/plugins/rssyl/rssyl_subscribe_gtk.c
 src/plugins/rssyl/rssyl_update_comments.c
 src/plugins/rssyl/rssyl_update_feed.c
 src/plugins/rssyl/rssyl_update_format.c
 src/plugins/rssyl/rssyl_update_comments.c
 src/plugins/rssyl/rssyl_update_feed.c
 src/plugins/rssyl/rssyl_update_format.c

-src/plugins/smime/claws-mail-smime.metainfo.xml.in

 src/plugins/smime/plugin.c
 src/plugins/smime/smime.c
 src/plugins/smime/plugin.c
 src/plugins/smime/smime.c

-src/plugins/spam_report/claws-mail-spam_report.metainfo.xml.in

 src/plugins/spam_report/spam_report.c
 src/plugins/spam_report/spam_report_prefs.c
 src/plugins/spam_report/spam_report.c
 src/plugins/spam_report/spam_report_prefs.c

-src/plugins/spamassassin/claws-mail-spamassassin.metainfo.xml.in

 src/plugins/spamassassin/spamassassin.c
 src/plugins/spamassassin/spamassassin_gtk.c
 src/plugins/spamassassin/spamassassin.c
 src/plugins/spamassassin/spamassassin_gtk.c

-src/plugins/tnef_parse/claws-mail-tnef_parse.metainfo.xml.in

 src/plugins/tnef_parse/tnef_parse.c
 src/plugins/tnef_parse/tnef_parse.c

-src/plugins/vcalendar/claws-mail-vcalendar.metainfo.xml.in

 src/plugins/vcalendar/common-views.c
 src/plugins/vcalendar/day-view.c
 src/plugins/vcalendar/month-view.c
 src/plugins/vcalendar/common-views.c
 src/plugins/vcalendar/day-view.c
 src/plugins/vcalendar/month-view.c

diff --git a/src/plugins/acpi_notifier/Makefile.am b/src/plugins/acpi_notifier/Makefile.am
index afa1f811c2a106fc5d11187e05fa85b2dfe43902..3d6b9a80a1f7e54e7a988a22c740e2fd4ce7cc23 100644 (file)
--- a/src/plugins/acpi_notifier/Makefile.am
+++ b/src/plugins/acpi_notifier/Makefile.am
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-acpi_notifier.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-

 plugindir = $(pkglibdir)/plugins
 
 if BUILD_ACPI_NOTIFIER_PLUGIN
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_ACPI_NOTIFIER_PLUGIN

diff --git a/src/plugins/address_keeper/Makefile.am b/src/plugins/address_keeper/Makefile.am
index abec728f9b7526b4493f9e2e5716cf4020195b19..cb97455c84b7c093d0b380b75e0d32270f1b7ae3 100644 (file)
--- a/src/plugins/address_keeper/Makefile.am
+++ b/src/plugins/address_keeper/Makefile.am
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-address_keeper.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/archive/Makefile.am b/src/plugins/archive/Makefile.am
index c614c22434e851fbe3870d0daa3ef2f198c02a99..a5281970e9d2605d20efcfea95d0e94ea12194b0 100644 (file)
--- a/src/plugins/archive/Makefile.am
+++ b/src/plugins/archive/Makefile.am
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 #
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 #

-appdata_in_files = claws-mail-archive.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-

 plugindir = $(pkglibdir)/plugins
 
 if BUILD_ARCHIVE_PLUGIN
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_ARCHIVE_PLUGIN

diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am
index fc8cb81a9b0f52cfcb8cccc5cee32325845ddf87..5fdc0376492b59f7cab93c5c8556323a8b315aae 100644 (file)
--- a/src/plugins/att_remover/Makefile.am
+++ b/src/plugins/att_remover/Makefile.am
@@ -2,12 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-att_remover.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/attachwarner/Makefile.am b/src/plugins/attachwarner/Makefile.am
index 4a80f5f24ab769e2c391f7fc679e46304582dd67..5c892e2ea2a7b7bffceab42acb6020bff00001a5 100644 (file)
--- a/src/plugins/attachwarner/Makefile.am
+++ b/src/plugins/attachwarner/Makefile.am
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-attachwarner.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/bogofilter/Makefile.am b/src/plugins/bogofilter/Makefile.am
index e0f6752d22f7698ba40fbb122c949dff0f934106..d6dec04b1f163a3cdb3799574a22c34e55d2eb1b 100644 (file)
--- a/src/plugins/bogofilter/Makefile.am
+++ b/src/plugins/bogofilter/Makefile.am
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-bogofilter.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-

 plugindir = $(pkglibdir)/plugins
 
 if BUILD_BOGOFILTER_PLUGIN
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_BOGOFILTER_PLUGIN

diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am
index 77ef72de1f92468482aab3d24413c59ae3159bfc..260c5c9e291279639dd5d7e2bb5fd04273bfcd66 100644 (file)
--- a/src/plugins/bsfilter/Makefile.am
+++ b/src/plugins/bsfilter/Makefile.am
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-bsfilter.metainfo.xml.in
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am
index 88e5c35cacbe6b053273a79ce2e87044dc1b27b2..b59c84e26def96acb532af3831d54390d2e64b0e 100644 (file)
--- a/src/plugins/clamd/Makefile.am
+++ b/src/plugins/clamd/Makefile.am
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-clamd.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-

 SUBDIRS = libclamd
 plugindir = $(pkglibdir)/plugins
 
 SUBDIRS = libclamd
 plugindir = $(pkglibdir)/plugins
 

diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
index 20449ee25fbca0e55509a530f59fbbb3562c03ad..7591451826b77b895c4916b3f38d54ed0438134e 100644 (file)
--- a/src/plugins/fancy/Makefile.am
+++ b/src/plugins/fancy/Makefile.am
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-fancy.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am
index 5c37bb13e9c0e7ce2c563e32ead2d4409464e047..5e9af51cf9ca3b5f7de45b320c1b66eebb62276b 100644 (file)
--- a/src/plugins/fetchinfo/Makefile.am
+++ b/src/plugins/fetchinfo/Makefile.am
@@ -2,12 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-fetchinfo.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-

 if OS_WIN32
 
 LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
 if OS_WIN32
 
 LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \


@@ -81,4 +75,4 @@ fetchinfo_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS)
 
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS)
 

-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc

diff --git a/src/plugins/gdata/Makefile.am b/src/plugins/gdata/Makefile.am
index 9360848dd3bfdd54bc26a3741a4934d86f732b3b..f43e8d21dfe387e0cd6132c25aef88f2afded6e4 100644 (file)
--- a/src/plugins/gdata/Makefile.am
+++ b/src/plugins/gdata/Makefile.am
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-gdata.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-

 plugindir = $(pkglibdir)/plugins
 
 if BUILD_GDATA_PLUGIN
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_GDATA_PLUGIN

diff --git a/src/plugins/geolocation/Makefile.am b/src/plugins/geolocation/Makefile.am
index 06979ae9521856ca3f0baaef874a5ce59c3df40b..5306832aa7fa660005ee2df7adda1789e7790b03 100644 (file)
--- a/src/plugins/geolocation/Makefile.am
+++ b/src/plugins/geolocation/Makefile.am
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-geolocation.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-

 plugindir = $(pkglibdir)/plugins
 
 if BUILD_GEOLOCATION_PLUGIN
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_GEOLOCATION_PLUGIN

diff --git a/src/plugins/libravatar/Makefile.am b/src/plugins/libravatar/Makefile.am
index 05bf4c3d45048b5d01a11e1543fe24f556f3adf8..1950bfd1dcb3be97a61899e9b39cb42679d93d1c 100644 (file)
--- a/src/plugins/libravatar/Makefile.am
+++ b/src/plugins/libravatar/Makefile.am
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-libravatar.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am
index f5a0581458c287a02ce176ff7d800e6cebffd0f2..46caaece06506e66bbd27d34759b3785fb2cbe09 100644 (file)
--- a/src/plugins/mailmbox/Makefile.am
+++ b/src/plugins/mailmbox/Makefile.am
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-mailmbox.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/newmail/Makefile.am b/src/plugins/newmail/Makefile.am
index e86f4e79df40d19ec725d765fd6c971caeac6e51..2653d4f6031de68a9ca048852be657694b4a138a 100644 (file)
--- a/src/plugins/newmail/Makefile.am
+++ b/src/plugins/newmail/Makefile.am
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-newmail.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-

 plugindir = $(pkglibdir)/plugins
 
 if BUILD_NEWMAIL_PLUGIN
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_NEWMAIL_PLUGIN

diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
index 465eb8069277adc00f901cd2748fcfbf65c7a6fe..a5a196952763049666a9b28d3e873c8745ccecd0 100644 (file)
--- a/src/plugins/notification/Makefile.am
+++ b/src/plugins/notification/Makefile.am
@@ -2,12 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-notification.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-

 if BUILD_HOTKEYS
 hotkey_lib = libcmnpgtkhotkey.la
 hotkey_lib_path = $(top_builddir)/src/plugins/notification/gtkhotkey/libcmnpgtkhotkey.la
 if BUILD_HOTKEYS
 hotkey_lib = libcmnpgtkhotkey.la
 hotkey_lib_path = $(top_builddir)/src/plugins/notification/gtkhotkey/libcmnpgtkhotkey.la


@@ -17,7 +11,7 @@ hotkey_lib_path =
 endif
 
 SUBDIRS=gtkhotkey
 endif
 
 SUBDIRS=gtkhotkey

-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc

 CFLAGS += "-Wall"
 
 IFLAGS = \
 CFLAGS += "-Wall"
 
 IFLAGS = \

diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am
index 6b78fe93fbc317cf90c1ba49d7b02a567b495929..3e8071c68f7f2a498adb79d6630c3c5c0d7c2bed 100644 (file)
--- a/src/plugins/pdf_viewer/Makefile.am
+++ b/src/plugins/pdf_viewer/Makefile.am
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-pdf_viewer.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-

 plugindir = $(pkglibdir)/plugins
 
 if BUILD_PDF_VIEWER_PLUGIN
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_PDF_VIEWER_PLUGIN

diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
index 9820aa88eb17bc507a229e00205f2774e2a9051f..21737cac3314d59910190de8284192a3d86de402 100644 (file)
--- a/src/plugins/perl/Makefile.am
+++ b/src/plugins/perl/Makefile.am
@@ -2,12 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-perl.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-

 SUBDIRS = tools
 
 plugindir = $(pkglibdir)/plugins
 SUBDIRS = tools
 
 plugindir = $(pkglibdir)/plugins


@@ -36,5 +30,5 @@ perl_la_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(PERL_CFLAGS)
 
        $(GTK_CFLAGS) \
        $(PERL_CFLAGS)
 

-EXTRA_DIST = cm_perl.pod $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = cm_perl.pod

 
 

diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am
index 7bfbc6c86f9a6a50398bcecee4f15a7a1f39ac49..50abc807c7c1b9e3555d37fcd1f18bb4d0cf15b2 100644 (file)
--- a/src/plugins/pgpcore/Makefile.am
+++ b/src/plugins/pgpcore/Makefile.am
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-pgpcore.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = version.rc plugin.def claws.def $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = version.rc plugin.def claws.def

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/pgpinline/Makefile.am b/src/plugins/pgpinline/Makefile.am
index 6863acc94fb68b8aad2b759fc4910b33353a03a5..c639cf1e1182253cb36e0c76e29a9cacbc9d78b8 100644 (file)
--- a/src/plugins/pgpinline/Makefile.am
+++ b/src/plugins/pgpinline/Makefile.am
@@ -2,14 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-pgpinline.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-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_in_files)
+EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpinline.deps

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am
index 3d7c7b831430ca854f4de275049ae65f00271763..9c70cd1b29464386331d8707568872c80f88630a 100644 (file)
--- a/src/plugins/pgpmime/Makefile.am
+++ b/src/plugins/pgpmime/Makefile.am
@@ -2,14 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-pgpmime.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-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_in_files)
+EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpmime.deps

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
index 45e598033601d7f5f527b800481dc061ba2b7a35..8af099cbe21be8474c1a8847805d1c9d6a738aa4 100644 (file)
--- a/src/plugins/python/Makefile.am
+++ b/src/plugins/python/Makefile.am
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-python.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-

 SUBDIRS = examples
 
 plugindir = $(pkglibdir)/plugins
 SUBDIRS = examples
 
 plugindir = $(pkglibdir)/plugins

diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am
index 949efd3230b32171d8b05de46a60c06ec2a25638..64417c97dc9c52a1537726c65a174ed5cf325d01 100644 (file)
--- a/src/plugins/rssyl/Makefile.am
+++ b/src/plugins/rssyl/Makefile.am
@@ -4,13 +4,7 @@
 
 SUBDIRS = libfeed
 
 
 SUBDIRS = libfeed
 

-appdata_in_files = claws-mail-rssyl.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/smime/Makefile.am b/src/plugins/smime/Makefile.am
index 3007449f81ee452e741b352cb14b8b08c763a787..177b61a489354ab12e3c8a56fdafbe9f8c12b3a8 100644 (file)
--- a/src/plugins/smime/Makefile.am
+++ b/src/plugins/smime/Makefile.am
@@ -2,14 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-smime.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-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_in_files)
+EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def smime.deps

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index cdc15c9581006b8abd9a8c8fe6286bfcd8c6954f..bb3b3f5f6b42bfef1fa944cb2a583eab287a02a3 100644 (file)
--- a/src/plugins/spam_report/Makefile.am
+++ b/src/plugins/spam_report/Makefile.am
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-spam_report.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am
index 7260870f5a6c4964dcbfaea4047322f041874ae7..748b67910e596caa9be91393f678cbafcb0998de 100644 (file)
--- a/src/plugins/spamassassin/Makefile.am
+++ b/src/plugins/spamassassin/Makefile.am
@@ -2,12 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-spamassassin.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-

 plugindir = $(pkglibdir)/plugins
 
 if BUILD_SPAMASSASSIN_PLUGIN
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_SPAMASSASSIN_PLUGIN


@@ -40,4 +34,4 @@ spamassassin_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS)
 
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS)
 

-EXTRA_DIST = README $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = README

diff --git a/src/plugins/tnef_parse/Makefile.am b/src/plugins/tnef_parse/Makefile.am
index 2c41d0b4cf01b3161245d589c86a4215c5c484fe..37845077047c2daa00d927d63a2b36872cc37585 100644 (file)
--- a/src/plugins/tnef_parse/Makefile.am
+++ b/src/plugins/tnef_parse/Makefile.am
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-tnef_parse.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc

 
 if OS_WIN32
 
 
 if OS_WIN32
 

diff --git a/src/plugins/vcalendar/Makefile.am b/src/plugins/vcalendar/Makefile.am
index 140036caf64da7d2031b36312784ca6e77129fe6..2c6806ffcb5db672a60090a2b88dce06a0dd68f1 100644 (file)
--- a/src/plugins/vcalendar/Makefile.am
+++ b/src/plugins/vcalendar/Makefile.am
@@ -2,14 +2,8 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 

-appdata_in_files = claws-mail-vcalendar.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-

 SUBDIRS = libical
 SUBDIRS = libical

-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc

 
 IFLAGS = \
        -I$(top_srcdir)/src \
 
 IFLAGS = \
        -I$(top_srcdir)/src \