Merge ~lkundrak/kicad/+git/kicad:appstream-data into ~kicad-product-committers/kicad:master

[Lubomir Rintel]

Following up on: https://code.launchpad.net/~lkundrak/kicad/appstream-data/+merge/293391

The screenshots may potentially end up in a somewhat more sensible location:
https://github.com/KiCad/kicad-website/pull/197

[Wayne Stambaugh (stambaughw)]

Have the links to the website images been updated yet so I can get this merged? Should this merge request be linked against this bug report?

https://code.launchpad.net/~lkundrak/kicad/+git/kicad/+merge/323027

I know this bug report was for appdata but isn't appstream the successor to appdata?

[Lubomir Rintel (lkundrak)]

> Have the links to the website images been updated yet so I can get this
> merged?

Yes.

> Should this merge request be linked against this bug report?
>
> https://code.launchpad.net/~lkundrak/kicad/+git/kicad/+merge/323027

Not sure what that means.

> I know this bug report was for appdata but isn't appstream the successor to
> appdata?

AppData is part of the AppStream specification. It's the XML files with the application metadata.

[Wayne Stambaugh (stambaughw)]

On 4/27/2017 6:29 AM, Lubomir Rintel wrote:
>> Have the links to the website images been updated yet so I can get this
>> merged?
>
> Yes.

I'll try to get this merged over the weekend. I haven't attempted to
merge git repos using launchpad so that could be interesting.

>
>> Should this merge request be linked against this bug report?
>>
>> https://code.launchpad.net/~lkundrak/kicad/+git/kicad/+merge/323027
>
> Not sure what that means.

Launchpad merge requests can be linked against bug reports so when the
merge request is accepted, the bug report can be tagged as fix
committed. Your answer below means that this bug report should be
linked against your merge request.

>
>> I know this bug report was for appdata but isn't appstream the successor to
>> appdata?
>
> AppData is part of the AppStream specification. It's the XML files with the application metadata.
>

[Wayne Stambaugh (stambaughw)]

I merged your patch into the master branch. Thank you for your contribution to KiCad.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fec4a2..5822c44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -795,6 +795,7 @@ if( UNIX AND NOT APPLE )
     set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime )
     set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons )
     set( UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications )
+    set( UNIX_APPDATA_FILES resources/linux/appdata )
 
     # Install Mime directory
     install( DIRECTORY ${UNIX_ICON_FILES}
@@ -813,6 +814,12 @@ if( UNIX AND NOT APPLE )
         DESTINATION ${CMAKE_INSTALL_PREFIX}/share
         COMPONENT resources
         )
+
+    # Install AppStream directory (app store entry)
+    install( DIRECTORY ${UNIX_APPDATA_FILES}
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share
+        COMPONENT resources
+        )
 endif()
 
 #include( CTest )
diff --git a/resources/linux/appdata/kicad.appdata.xml b/resources/linux/appdata/kicad.appdata.xml
new file mode 100644
index 0000000..8f78863
--- /dev/null
+++ b/resources/linux/appdata/kicad.appdata.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2016-2017 Lubomir Rintel <[e-mail]> -->
+<!-- Copyright (C) 2016-2017 KiCad Developers, see AUTHORS.txt for contributors. -->
+<component type="desktop">
+  <id>kicad.desktop</id>
+  <name>KiCad</name>
+  <project_license>GPL-2.0+</project_license>
+  <metadata_license>CC0-1.0</metadata_license>
+  <summary>EDA Suite</summary>
+
+  <keywords>
+    <keyword>KiCad</keyword>
+    <keyword>EDA</keyword>
+    <keyword>PCB</keyword>
+    <keyword>Schema</keyword>
+    <keyword>PcbNew</keyword>
+    <keyword>Eeschema</keyword>
+  </keywords>
+
+  <description>
+    <p>A Cross Platform and Open Source Electronics Design Automation Suite.</p>
+    <p>The programs handle Schematic Capture, and PCB Layout with Gerber output.</p>
+  </description>
+
+  <screenshots>
+    <screenshot type="default">
+      <image width="1024" height="576">http://kicad-pcb.org/img/screenshots/appstream/kicad.png</image>
+    </screenshot>
+
+    <screenshot>
+      <caption>Eeschema Schematic Editor</caption>
+      <image width="1024" height="576">http://kicad-pcb.org/img/screenshots/appstream/eeschema.png</image>
+    </screenshot>
+
+    <screenshot>
+      <caption>PcbNew PCB Layout</caption>
+      <image width="1024" height="576">http://kicad-pcb.org/img/screenshots/appstream/pcbnew.png</image>
+    </screenshot>
+
+    <screenshot>
+      <caption>PcbNew 3D Viewer</caption>
+      <image width="1024" height="576">http://kicad-pcb.org/img/screenshots/appstream/3dviewer.png</image>
+    </screenshot>
+  </screenshots>
+
+  <url type="homepage">http://kicad-pcb.org/</url>
+  <url type="bugtracker">http://kicad-pcb.org/help/report-a-bug/</url>
+  <update_contact>[e-mail]</update_contact>
+  <developer_name>The KiCad Developers</developer_name>
+</component>