[evolution] Bug 709108 - Make Appdata file translatable

[Matthew Barnes <mbarnes src gnome org>]

commit 09690189c8d29dcc3348df2be7e3533bb8b6ddbc
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Mon Sep 30 13:55:20 2013 -0400

    Bug 709108 - Make Appdata file translatable

 data/Makefile.am           |   10 ++++++----
 data/evolution.appdata.xml |    8 ++++----
 po/POTFILES.in             |    1 +
 3 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 62dca8b..fbe0556 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,9 +4,6 @@ desktopdir = $(datadir)/applications
 desktop_in_files = evolution.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-appdatadir = $(datadir)/appdata
-appdata_DATA = evolution.appdata.xml
-
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = evolution-alarm-notify.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
@@ -34,6 +31,10 @@ gsettings_SCHEMAS =                                                  \
        org.gnome.evolution.plugin.templates.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
+appdatadir = $(datadir)/appdata
+appdata_files = evolution.appdata.xml
+dist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appdata_in_files = evolution.appdata.xml.in
 
 @GSETTINGS_RULES@
 
@@ -68,13 +69,14 @@ CLEANFILES =                                        \
        $(desktop_DATA)
 
 EXTRA_DIST =                                   \
-       $(appdata_DATA)                         \
+       $(appdata_files)                        \
        $(autostart_in_files)                   \
        $(desktop_in_files)                     \
        $(convert_DATA)                         \
        $(gsettings_SCHEMAS:.xml=.xml.in)
 
 DISTCLEANFILES =               \
+       $(app_data_in_files)    \
        $(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/evolution.appdata.xml b/data/evolution.appdata.xml
index 00ccb10..02534f7 100644
--- a/data/evolution.appdata.xml
+++ b/data/evolution.appdata.xml
@@ -3,12 +3,12 @@
 <id type="desktop">evolution.desktop</id>
 <licence>CC0</licence>
 <description>
-<p>
+<_p>
 Evolution is a personal information management application that provides integrated mail, calendaring and 
address book functionality.
-</p>
-<p>
+</_p>
+<_p>
 Evolution supports a wide range of industry standard data formats and network protocols for information 
exchange, with an emphasis on standards compliance and security. Evolution can also integrate smoothly with 
Microsoft Exchange by way of the "Exchange Web Services" (EWS) extension.
-</p>
+</_p>
 </description>
 <url type="homepage">https://live.gnome.org/Apps/Evolution</url>
 <screenshots>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9a09b16..7cab584 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -125,6 +125,7 @@ composer/e-composer-private.c
 composer/e-msg-composer.c
 composer/mail-composer.error.xml
 data/evolution-alarm-notify.desktop.in.in
+data/evolution.appdata.xml
 data/evolution.desktop.in.in
 data/org.gnome.evolution.addressbook.gschema.xml.in
 data/org.gnome.evolution.bogofilter.gschema.xml.in