From 6069e8f441927b8271e76b8843b634f6722ceb3f Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Tue, 30 Jun 2020 00:58:00 +0200 Subject: [PATCH] Linux: add version number automatically to rpi-imager.metainfo - Automate putting version number in rpi-imager.metainfo.xml.in - Remove qt5-default dependency from debian/control --- CMakeLists.txt | 7 ++++++- debian/control | 2 +- ...{rpi-imager.metainfo.xml => rpi-imager.metainfo.xml.in} | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) rename linux/{rpi-imager.metainfo.xml => rpi-imager.metainfo.xml.in} (96%) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb93c99..f0588ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -235,10 +235,15 @@ else() endif() endif() + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/linux/rpi-imager.metainfo.xml.in" + "${CMAKE_CURRENT_BINARY_DIR}/rpi-imager.metainfo.xml" + @ONLY) + install(TARGETS rpi-imager DESTINATION bin) install(FILES icons/rpi-imager.png DESTINATION share/icons/hicolor/128x128/apps) install(FILES linux/rpi-imager.desktop DESTINATION share/applications) - install(FILES linux/rpi-imager.metainfo.xml DESTINATION share/metainfo) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/rpi-imager.metainfo.xml" DESTINATION share/metainfo) endif() get_target_property(QT_TARGET_TYPE Qt5::Core TYPE) diff --git a/debian/control b/debian/control index 7b251f8..b83dfa6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: Floris Bos Build-Depends: debhelper (>= 10), cmake, libarchive-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, - qtbase5-dev, qtbase5-dev-tools, qtdeclarative5-dev, libqt5svg5-dev, qttools5-dev, qt5-default, libssl-dev, + qtbase5-dev, qtbase5-dev-tools, qtdeclarative5-dev, libqt5svg5-dev, qttools5-dev, libssl-dev, qml-module-qtquick2, qml-module-qtquick-controls2, qml-module-qt-labs-settings, qml-module-qtquick-layouts, qml-module-qtquick-templates2, qml-module-qtquick-window2, qml-module-qtgraphicaleffects Standards-Version: 4.1.2 Homepage: https://www.raspberrypi.org/ diff --git a/linux/rpi-imager.metainfo.xml b/linux/rpi-imager.metainfo.xml.in similarity index 96% rename from linux/rpi-imager.metainfo.xml rename to linux/rpi-imager.metainfo.xml.in index 43dfa79..0695f9c 100644 --- a/linux/rpi-imager.metainfo.xml +++ b/linux/rpi-imager.metainfo.xml.in @@ -1,5 +1,4 @@ - org.raspberrypi.rpi-imager CC0-1.0 @@ -56,7 +55,7 @@ rpi-imager - +