Merge branch 'master' of https://git.winfor.ch/nicolas/Almond

Almond.desktop

@@ -5,7 +5,7 @@ Encoding=UTF-8
 Name=Almond
 Version=1.0
 Comment=Fractal Generation Software
-Exec=/usr/bin/Almond
+Exec=/usr/bin/almond
 Icon=Almond.png
 Terminal=false
-Categories=Education;Art;
+Categories=Education;Art;

CMakeLists.txt

@@ -27,6 +27,7 @@ IF (WIN32)
     add_executable(Almond WIN32 ${AlmondSources} Almond.qrc splash.qrc icon.rc ${AlmondHeaders})
 ELSE()
     add_executable(Almond ${AlmondSources} Almond.qrc splash.qrc ${AlmondHeaders})
+    set_target_properties(Almond PROPERTIES OUTPUT_NAME "almond")
 ENDIF()
 
 target_include_directories(Almond PUBLIC .)
@@ -59,7 +60,7 @@ endif()
 
 
 set(CPACK_PACKAGE_NAME "Almond")
-set(CPACK_PACKAGE_VERSION "1.0.0")
+set(CPACK_PACKAGE_VERSION "1.1.0")
 IF (WIN32)
     set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MyPackage Installation Example")
     include(CPack)
@@ -74,6 +75,7 @@ ELSEIF (UNIX AND NOT APPLE)
     install(FILES Almond.desktop DESTINATION "share/applications")
     install(FILES Almond.png DESTINATION "share/pixmaps")
     install(FILES debian/copyright DESTINATION "share/doc/almond/" RENAME "copyright")
+    install(FILES debian/Almond.appdata.xml DESTINATION "share/metainfo/" RENAME "org.winfor.Almond.appdata.xml")
     set(CPACK_GENERATOR "DEB")
     set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
     set(CPACK_STRIP_FILES TRUE)

debian/Almond.appdata.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>org.winfor.Almond</id>
+  <launchable type="desktop-id">
+    Almond.desktop
+  </launchable>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>Zlib</project_license>
+  <name>Almond</name>
+  <summary>Almond, a smooth fractal viewer</summary>
+  <description>
+    <p>
+      Almond is a free application that lets you explore the depths
+      of the most beautiful fractals.
+    </p>
+  </description>
+  <releases>
+    <release version="1.1.0" date="2020-05-27">
+      <description>
+        <p>
+          Added a new gradient editor.
+        </p>
+      </description>
+    </release>
+  </releases>
+  <provides>
+  </provides>
+  <translation type="qt" />
+  <content_rating type="oars-1.0" />
+</component>

debian/copyright

@@ -12,11 +12,11 @@ License: Zlib
 
 Files: libmandel/qd-2.3.22/*
 Copyright: 
-License: BSD-LBNL
+License: BSD-3-Clause-LBNL
 
 Files: libalmond/lpng1637/*
 Copyright: 
-License: libpng
+License: Libpng
 
 Files: libalmond/zlib-1.2.11/
 Copyright: 1995-2017 Jean-loup Gailly and Mark Adler
@@ -40,7 +40,7 @@ the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 
 
-License: BSD-LBNL
+License: BSD-3-Clause-LBNL
 1. Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
@@ -77,7 +77,7 @@ royalty-free perpetual license to install, use, modify, prepare derivative
 works, incorporate into other computer software, distribute, and sublicense
 such enhancements or derivative works thereof, in binary and source code form.
 
-License: libpng
+License: Libpng
  * Copyright (c) 1995-2019 The PNG Reference Library Authors.
  * Copyright (c) 2018-2019 Cosmin Truta.
  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.