Merge pull request #295 from evgenyz/v1-2

Fix appdata, desktop and icons for Linux (Freedesktop)

Author: matejak

CMakeLists.txt

@@ -263,13 +263,13 @@ install(FILES "man/scap-workbench.8"
 
 install(DIRECTORY "share/scap-workbench"
     DESTINATION "${CMAKE_INSTALL_DATADIR}")
-install(FILES "scap_workbench.desktop"
+install(FILES "org.open_scap.scap_workbench.desktop"
     DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
 install(FILES "share/pixmaps/scap-workbench.png"
     DESTINATION "${CMAKE_INSTALL_DATADIR}/pixmaps")
 install(FILES "share/pixmaps/scap-workbench.svg"
-    DESTINATION "${CMAKE_INSTALL_DATADIR}/pixmaps")
-install(FILES "org.open-scap.scap-workbench.appdata.xml"
+    DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps")
+install(FILES "org.open_scap.scap_workbench.appdata.xml"
     DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo")
 
 if (ASCIIDOC_EXECUTABLE)

org.open-scap.scap-workbench.appdata.xml renamed to org.open_scap.scap_workbench.appdata.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-    <id>org.openscap.scap_workbench.desktop</id>
+<component type="desktop-application">
+    <id>org.open_scap.scap_workbench</id>
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-3.0+</project_license>
     <name>SCAP Workbench</name>
     <summary>A GUI tool that serves as an SCAP scanner and provides tailoring functionality for SCAP content</summary>
+    <launchable type="desktop-id">org.open_scap.scap_workbench.desktop</launchable>
     <description>
         <p>
             The main goal of this application is to lower the initial barrier of using SCAP.

scap_workbench.desktop renamed to org.open_scap.scap_workbench.desktop

@@ -1,11 +1,11 @@
 [Desktop Entry]
+Version=1.0
 Type=Application
 Name=SCAP Workbench
 GenericName=SCAP Scanner and Profile Editor
-Comment=GUI tool that allows scanning both local and remote computers using SCAP content of your choice.
+Comment=GUI tool that allows scanning both local and remote computers using SCAP content of your choice
 TryExec=scap-workbench
 Exec=scap-workbench
 Icon=scap-workbench
-Categories=System;
-Keywords=scap;
-X-Desktop-File-Install-Version=0.3
+Categories=System;Security;
+Keywords=SCAP;