From 26d8beb7668d88124a954c163de9b1ce1b082c39 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 15 Sep 2018 07:27:07 -0700 Subject: build-system: don't modify a file under git control Instead of editing appdata/subsurface.appdata.xml in place, switch to our usual pattern of modifying a .in file and add the resulting file to .gitignore. Signed-off-by: Dirk Hohndel --- .gitignore | 1 + appdata/subsurface.appdata.xml | 47 --------------------------------------- appdata/subsurface.appdata.xml.in | 47 +++++++++++++++++++++++++++++++++++++++ scripts/add-version-to-appdata.sh | 2 +- 4 files changed, 49 insertions(+), 48 deletions(-) delete mode 100644 appdata/subsurface.appdata.xml create mode 100644 appdata/subsurface.appdata.xml.in diff --git a/.gitignore b/.gitignore index 19e54b349..17ec19f15 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ mobile-widgets/qml/kirigami packaging/ios/install-root packaging/ios/Info.plist packaging/ios/Qt +appdata/subsurface.appdata.xml diff --git a/appdata/subsurface.appdata.xml b/appdata/subsurface.appdata.xml deleted file mode 100644 index 8d25d5a36..000000000 --- a/appdata/subsurface.appdata.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - subsurface - CC-BY-SA-3.0 - GPL-2.0-only - Subsurface - Manage and display dive computer data - -

Subsurface is an opensource diving logbook that runs on Linux, Windows and Mac. - With this program, users can keep track of their dives by logging dive locations (with GPS coordinates), - weights and exposure protection used, divemasters and dive buddies, etc. - Subsurface also enables the users to rate their dives and provide additional dive notes.

-

Dives can be downloaded from a variety of dive computers, inserted manually or imported from other programs. - A wide array of diving statistics and information is calculated and displayed, like the user’s SAC rate, - partial pressures of O2, N2 and He, calculated deco information, and many more.

-

The dive profiles (and the tank pressure curves) can be visualized in a comprehensive and clean way, that - provides the user with additional information on relative velocity (and momentary air consumption) during the dive. - Subsurface also allows the user to print out a detailed log book that includes dive profiles and other relevant information. - The program is localized in about 20 languages and well supported by an active developer community.

- - - - https://subsurface-divelog.org/screenshots/main.png - - - https://subsurface-divelog.org/screenshots/preferences.png - - - https://subsurface-divelog.org/screenshots/preferences2.png - - - https://subsurface-divelog.org - https://github.com/Subsurface-divelog/subsurface/issues - https://subsurface-divelog.org/faq/ - https://subsurface-divelog.org/documentation/ - https://www.transifex.com/subsurface/subsurface/ - - - - The Subsurface development team - subsurface@subsurface-divelog.org - - - subsurface - - diff --git a/appdata/subsurface.appdata.xml.in b/appdata/subsurface.appdata.xml.in new file mode 100644 index 000000000..8d25d5a36 --- /dev/null +++ b/appdata/subsurface.appdata.xml.in @@ -0,0 +1,47 @@ + + + + subsurface + CC-BY-SA-3.0 + GPL-2.0-only + Subsurface + Manage and display dive computer data + +

Subsurface is an opensource diving logbook that runs on Linux, Windows and Mac. + With this program, users can keep track of their dives by logging dive locations (with GPS coordinates), + weights and exposure protection used, divemasters and dive buddies, etc. + Subsurface also enables the users to rate their dives and provide additional dive notes.

+

Dives can be downloaded from a variety of dive computers, inserted manually or imported from other programs. + A wide array of diving statistics and information is calculated and displayed, like the user’s SAC rate, + partial pressures of O2, N2 and He, calculated deco information, and many more.

+

The dive profiles (and the tank pressure curves) can be visualized in a comprehensive and clean way, that + provides the user with additional information on relative velocity (and momentary air consumption) during the dive. + Subsurface also allows the user to print out a detailed log book that includes dive profiles and other relevant information. + The program is localized in about 20 languages and well supported by an active developer community.

+ + + + https://subsurface-divelog.org/screenshots/main.png + + + https://subsurface-divelog.org/screenshots/preferences.png + + + https://subsurface-divelog.org/screenshots/preferences2.png + + + https://subsurface-divelog.org + https://github.com/Subsurface-divelog/subsurface/issues + https://subsurface-divelog.org/faq/ + https://subsurface-divelog.org/documentation/ + https://www.transifex.com/subsurface/subsurface/ + + + + The Subsurface development team + subsurface@subsurface-divelog.org + + + subsurface + + diff --git a/scripts/add-version-to-appdata.sh b/scripts/add-version-to-appdata.sh index a9f3b98ea..a0d8e1f5d 100755 --- a/scripts/add-version-to-appdata.sh +++ b/scripts/add-version-to-appdata.sh @@ -1,4 +1,4 @@ #!/bin/sh version=$(git describe --abbrev=12) date=$(git log -1 --format="%at" | xargs -I{} date -d @{} +%Y-%m-%d) -sed -e "s|||" -i appdata/subsurface.appdata.xml +sed -e "s|||" appdata/subsurface.appdata.xml.in > appdata/subsurface.appdata.xml -- cgit v1.2.3-70-g09d2