diff --git a/cmake/FindIntltool.cmake b/cmake/FindIntltool.cmake index 44c3c921..b35279dc 100644 --- a/cmake/FindIntltool.cmake +++ b/cmake/FindIntltool.cmake @@ -12,6 +12,13 @@ else (INTLTOOL_MERGE_EXECUTABLE) endif (INTLTOOL_MERGE_EXECUTABLE) if (INTLTOOL_MERGE_FOUND) + macro (INTLTOOL_MERGE_APPDATA appstream_name po_dir) + add_custom_target (${appstream_name}.in ALL + ${INTLTOOL_MERGE_EXECUTABLE} --xml-style ${CMAKE_SOURCE_DIR}/${po_dir} + ${CMAKE_CURRENT_SOURCE_DIR}/${appstream_name}.in ${appstream_name} + ) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/{$appstream_name} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata) + endmacro (INTLTOOL_MERGE_DESKTOP appstream_name po_dir) macro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir) add_custom_target (geary.desktop ALL ${INTLTOOL_MERGE_EXECUTABLE} --desktop-style ${CMAKE_SOURCE_DIR}/${po_dir} diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt index f61e912c..9776df80 100644 --- a/desktop/CMakeLists.txt +++ b/desktop/CMakeLists.txt @@ -2,14 +2,13 @@ # Build and install geary.desktop # -install(FILES geary.appdata.xml DESTINATION share/appdata) - include (FindIntltool) include (FindDesktopFileValidate) if (INTLTOOL_MERGE_FOUND) + INTLTOOL_MERGE_APPDATA (geary.appdata.xml po) INTLTOOL_MERGE_DESKTOP (geary.desktop po) INTLTOOL_MERGE_AUTOSTART_DESKTOP (geary-autostart.desktop po) - + if (DESKTOP_VALIDATE) if (DESKTOP_FILE_VALIDATE_FOUND) VALIDATE_DESKTOP_FILE (geary.desktop) diff --git a/desktop/geary.appdata.xml b/desktop/geary.appdata.xml.in similarity index 73% rename from desktop/geary.appdata.xml rename to desktop/geary.appdata.xml.in index d833eebf..a9f7e106 100644 --- a/desktop/geary.appdata.xml +++ b/desktop/geary.appdata.xml.in @@ -5,26 +5,26 @@ geary.desktop CC0-1.0 LGPL-2.1+ - Geary - Send and receive email + <_name>Geary + <_summary>Send and receive email -

+ <_p> Geary is an email application built around conversations, for the GNOME 3 desktop. It allows you to read, find and send email with a straightforward, modern interface. -

-

+ + <_p> Conversations allow you to read a complete discussion without having to find and click from message to message. -

-

Geary's features include:

+ + <_p>Geary's features include:
https://wiki.gnome.org/Apps/Geary diff --git a/po/POTFILES.in b/po/POTFILES.in index d74839ae..edca1aec 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,5 @@ [encoding: UTF-8] +desktop/geary.appdata.xml.in desktop/geary.desktop.in desktop/geary-autostart.desktop.in [type: gettext/ini]desktop/geary-attach.contract.in