[evolution-ews] Revert "Adapt to rename of evolution.desktop to org.gnome.Evolution.desktop"

[Milan Crha <mcrha src gnome org>]

commit aa7469992eb86fcbcbf4188917508ab4c72c46a0
Author: Milan Crha <mcrha redhat com>
Date:   Mon Sep 4 16:59:09 2017 +0200

    Revert "Adapt to rename of evolution.desktop to org.gnome.Evolution.desktop"
    
    This reverts commit 6318d937a950e30d5cd83d4ff5276dca98526d94.

 CMakeLists.txt                                     |    2 +-
 cmake/modules/FindIntltool.cmake                   |    2 +-
 ...etainfo.xml.in => evolution-ews.metainfo.xml.in |    2 +-
 po/POTFILES.in                                     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9d7236..131f226 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -206,7 +206,7 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/${PROJECT_NAM
 
 print_build_options()
 
-add_appdata_file(org.gnome.Evolution-ews.metainfo.xml.in org.gnome.Evolution-ews.metainfo.xml)
+add_appdata_file(evolution-ews.metainfo.xml.in evolution-ews.metainfo.xml)
 
 add_subdirectory(po)
 add_subdirectory(src)
diff --git a/cmake/modules/FindIntltool.cmake b/cmake/modules/FindIntltool.cmake
index 1397b6d..a2c3547 100644
--- a/cmake/modules/FindIntltool.cmake
+++ b/cmake/modules/FindIntltool.cmake
@@ -189,7 +189,7 @@ macro(add_appdata_file _infilename _outfilename)
        endif(NOT TARGET appdata-files)
 
        set(_out ${_outfilename})
-       get_filename_component(_outtarget ${_out} NAME)
+       get_filename_component(_outtarget ${_out} NAME_WE)
        get_filename_component(_path ${_out} DIRECTORY)
        if(_path STREQUAL "")
                set(_out ${CMAKE_CURRENT_BINARY_DIR}/${_out})
diff --git a/org.gnome.Evolution-ews.metainfo.xml.in b/evolution-ews.metainfo.xml.in
similarity index 91%
rename from org.gnome.Evolution-ews.metainfo.xml.in
rename to evolution-ews.metainfo.xml.in
index 010bff8..2b7ab22 100644
--- a/org.gnome.Evolution-ews.metainfo.xml.in
+++ b/evolution-ews.metainfo.xml.in
@@ -2,7 +2,7 @@
 <!-- Copyright 2014 Evolution Team <evolution-hackers gnome org> -->
 <component type="addon">
        <id>evolution-ews</id>
-       <extends>org.gnome.Evolution.desktop</extends>
+       <extends>evolution.desktop</extends>
        <_name>Exchange Web Services</_name>
        <_summary>For accessing Exchange servers using Web Services</_summary>
        <url type="homepage">https://live.gnome.org/Apps/Evolution</url>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a4271db..50a2671 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this list in alphabetic order.
 [encoding: UTF-8]
-org.gnome.Evolution-ews.metainfo.xml.in
+evolution-ews.metainfo.xml.in
 src/addressbook/e-book-backend-ews.c
 src/calendar/e-cal-backend-ews.c
 src/camel/camel-ews-folder.c