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
This commit is contained in:
Floris Bos 2020-06-30 00:58:00 +02:00
parent 12784a0092
commit 6069e8f441
3 changed files with 8 additions and 4 deletions

View file

@ -235,10 +235,15 @@ else()
endif() endif()
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(TARGETS rpi-imager DESTINATION bin)
install(FILES icons/rpi-imager.png DESTINATION share/icons/hicolor/128x128/apps) 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.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() endif()
get_target_property(QT_TARGET_TYPE Qt5::Core TYPE) get_target_property(QT_TARGET_TYPE Qt5::Core TYPE)

2
debian/control vendored
View file

@ -3,7 +3,7 @@ Section: admin
Priority: optional Priority: optional
Maintainer: Floris Bos <bos@je-eigen-domein.nl> Maintainer: Floris Bos <bos@je-eigen-domein.nl>
Build-Depends: debhelper (>= 10), cmake, libarchive-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, 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 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 Standards-Version: 4.1.2
Homepage: https://www.raspberrypi.org/ Homepage: https://www.raspberrypi.org/

View file

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!--Copyright 2020 Flathub maintainers-->
<component type="desktop-application"> <component type="desktop-application">
<id>org.raspberrypi.rpi-imager</id> <id>org.raspberrypi.rpi-imager</id>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
@ -56,7 +55,7 @@
<binary>rpi-imager</binary> <binary>rpi-imager</binary>
</provides> </provides>
<releases> <releases>
<release version="1.2" date="2020-03-10" /> <release version="@IMAGER_VERSION_STR@" />
</releases> </releases>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
</component> </component>