Browse Source

Merge pull request #9229 from onitake/fix/appstream

Fix upstream metadata
Jaime van Kessel 4 years ago
parent
commit
adacb95dc6
3 changed files with 7 additions and 5 deletions
  1. 3 3
      CMakeLists.txt
  2. 4 2
      com.ultimaker.cura.appdata.xml
  3. 0 0
      com.ultimaker.cura.desktop.in

+ 3 - 3
CMakeLists.txt

@@ -28,7 +28,7 @@ set(CURA_CLOUD_ACCOUNT_API_ROOT "" CACHE STRING "Alternative Cura cloud account
 set(CURA_MARKETPLACE_ROOT "" CACHE STRING "Alternative Marketplace location")
 set(CURA_MARKETPLACE_ROOT "" CACHE STRING "Alternative Marketplace location")
 set(CURA_DIGITAL_FACTORY_URL "" CACHE STRING "Alternative Digital Factory location")
 set(CURA_DIGITAL_FACTORY_URL "" CACHE STRING "Alternative Digital Factory location")
 
 
-configure_file(${CMAKE_SOURCE_DIR}/cura.desktop.in ${CMAKE_BINARY_DIR}/cura.desktop @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/com.ultimaker.cura.desktop.in ${CMAKE_BINARY_DIR}/com.ultimaker.cura.desktop @ONLY)
 
 
 configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY)
 configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY)
 
 
@@ -82,11 +82,11 @@ if(NOT APPLE AND NOT WIN32)
         install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
         install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
             DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura)
             DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura)
     endif()
     endif()
-    install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
+    install(FILES ${CMAKE_BINARY_DIR}/com.ultimaker.cura.desktop
             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
     install(FILES ${CMAKE_SOURCE_DIR}/resources/images/cura-icon.png
     install(FILES ${CMAKE_SOURCE_DIR}/resources/images/cura-icon.png
             DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/)
             DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/)
-    install(FILES cura.appdata.xml
+    install(FILES com.ultimaker.cura.appdata.xml
             DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
             DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
     install(FILES cura.sharedmimeinfo
     install(FILES cura.sharedmimeinfo
             DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/
             DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/

+ 4 - 2
cura.appdata.xml → com.ultimaker.cura.appdata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2016 Richard Hughes <richard@hughsie.com> -->
 <!-- Copyright 2016 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop">
 <component type="desktop">
-  <id>cura.desktop</id>
+  <id>com.ultimaker.cura.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-3.0 and CC-BY-SA-4.0</project_license>
   <project_license>LGPL-3.0 and CC-BY-SA-4.0</project_license>
   <name>Cura</name>
   <name>Cura</name>
@@ -24,7 +24,9 @@
     </ul>
     </ul>
   </description>
   </description>
   <screenshots>
   <screenshots>
-    <screenshot type="default" width="1280" height="720">http://software.ultimaker.com/Cura.png</screenshot>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/Ultimaker/Cura/master/screenshot.png</image>
+    </screenshot>
   </screenshots>
   </screenshots>
   <url type="homepage">https://ultimaker.com/en/products/cura-software?utm_source=cura&amp;utm_medium=software&amp;utm_campaign=resources</url>
   <url type="homepage">https://ultimaker.com/en/products/cura-software?utm_source=cura&amp;utm_medium=software&amp;utm_campaign=resources</url>
   <translation type="gettext">Cura</translation>
   <translation type="gettext">Cura</translation>

+ 0 - 0
cura.desktop.in → com.ultimaker.cura.desktop.in