mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix problems from rebase, clean up debian packaging definition.

Browse source 
Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
Michael Keller 2024-09-13 12:27:26 +12:00
parent 28cd093d37
commit 478e444cd9
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/metadata.cpp
View file

@ -535,8 +535,8 @@ static bool parseASF(QFile &f, metadata *metadata)
degrees_t degminsec_to_udeg(float a[3]) degrees_t degminsec_to_udeg(float a[3])
{ {
if (a[0] == 0.0 && a[1] == 0.0 && a[2] == 0.0) if (a[0] == 0.0 && a[1] == 0.0 && a[2] == 0.0)
return { 0 }; return { .udeg = 0 };
return { static_cast<int>(round(a[0] * 1'000'000.0 + return { .udeg = static_cast<int>(round(a[0] * 1'000'000.0 +
a[1] * (1'000'000.0/60.0) + a[1] * (1'000'000.0/60.0) +
a[2] * (1'000'000.0/3600.0))) }; a[2] * (1'000'000.0/3600.0))) };
} }

3
packaging/ubuntu/debian/control
View file

@ -9,7 +9,6 @@ Build-Depends: asciidoc,
libxslt-dev, libxslt-dev,
libgit2-dev, libgit2-dev,
libsoup2.4-dev, libsoup2.4-dev,
libraw-dev,
pkg-config, pkg-config,
txt2html, txt2html,
libzip-dev, libzip-dev,
@ -48,7 +47,7 @@ Homepage: http://subsurface-divelog.org
Package: subsurface Package: subsurface
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, qml-module-qtlocation, qml-module-qtpositioning, qml-module-qtquick2, libraw20 Depends: ${shlibs:Depends}, ${misc:Depends}, qml-module-qtlocation, qml-module-qtpositioning, qml-module-qtquick2
Description: Dive log program Description: Dive log program
Subsurface is an open source divelog program that runs on Windows, Mac and Linux. Subsurface is an open source divelog program that runs on Windows, Mac and Linux.
Subsurface is able to track single- and multi-tank dives using air, Nitrox or Subsurface is able to track single- and multi-tank dives using air, Nitrox or