[PATCH 1/3] Include QDebug header - otherwise a compile error

Signed-off-by: Miika Turkia --- qt-ui/configuredivecomputerdialog.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp index 546032e..c58873c 100644 --- a/qt-ui/configuredivecomputerdialog.cpp +++ b/qt-ui/configured

[PATCH 2/3] Add .dlf to known extensions (Divesoft)

Signed-off-by: Miika Turkia --- qt-ui/mainwindow.cpp | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 4e1f8f2..72ece9a 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -775,6 +775,7 @@ QString MainWindow::filt

[PATCH 3/3] Support gaschange events on Divesoft Freedom import

Signed-off-by: Miika Turkia --- parse-xml.c | 30 +- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/parse-xml.c b/parse-xml.c index 218268d..1da36f0 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -2534,7 +2534,8 @@ int parse_cobalt_buffer(sqlite3 *handle,

[PATCH] Initial support for Divesoft Freedom

This parses the dive profile from Divesoft Freedom log file. Only the depth profile is currently supported. There is also something wrong as the log file cannot be given as parameter but must be opened or imported once Subsurface is running. Note that so far no metadata is parsed. Signed-off-by: M

Re: *** SPAM *** (was: Re: [PATCH] Add missing qt5-qmake package)

On Sat, 27 Dec 2014, Miika Turkia wrote: > On Dec 27, 2014 7:34 PM, "Cristian Ionescu-Idbohrn" > mailto:cristian.ionescu-idbo...@axis.com>> > wrote: > > > > Debian package qt5-default shows it as: > > > > Suggests: qt5-qmake, qtbase5-dev-tools > > > > 'Depends:' is: > > > > Depend

Re: [PATCH] Add missing qt5-qmake package

On Dec 27, 2014 7:34 PM, "Cristian Ionescu-Idbohrn" < cristian.ionescu-idbo...@axis.com> wrote: > > On Sat, 27 Dec 2014, Miika Turkia wrote: > > > On 27 Dec 2014, at 19:04, Cristian Ionescu-Idbohrn < cristian.ionescu-idbo...@axis.com> wrote: > > > > > > > > > See 'Build-Depends:' in packaging/ubunt

Re: [PATCH] Add missing qt5-qmake package

On Sat, 27 Dec 2014, Miika Turkia wrote: > > On 27 Dec 2014, at 19:04, Cristian Ionescu-Idbohrn > > wrote: > > > > > > See 'Build-Depends:' in packaging/ubuntu/debian/control. > > > > Signed-off-by: Cristian Ionescu-Idbohrn > > --- > > INSTALL | 5 +++-- > > 1 file changed, 3 insertions(+), 2 del

Re: [PATCH] Add missing qt5-qmake package

isn't that dependency listed in qt5-default? Thus it is not explicitly needed in Subsurface. (At least this is the case in all the packages that we build with Launchpad.) miuka > On 27 Dec 2014, at 19:04, Cristian Ionescu-Idbohrn > wrote: > > > See 'Build-Depends:' in packaging/ubuntu/deb

[PATCH] Add missing qt5-qmake package

See 'Build-Depends:' in packaging/ubuntu/debian/control. Signed-off-by: Cristian Ionescu-Idbohrn --- INSTALL | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index 2c88a28..37d4ec6 100644 --- a/INSTALL +++ b/INSTALL @@ -84,8 +84,9 @@ On Debian Jessie th

Re: build broken as '-lusb-1.0' is missing...

On Sat, 27 Dec 2014, Thiago Macieira wrote: > On Saturday 27 December 2014 14:14:00 Cristian Ionescu-Idbohrn wrote: > > On Sat, 27 Dec 2014, Thiago Macieira wrote: > > > On Saturday 27 December 2014 11:38:16 Cristian Ionescu-Idbohrn wrote: > > > > ...from the generated Makefile (on the master branc

Re: build broken as '-lusb-1.0' is missing...

On Saturday 27 December 2014 14:14:00 Cristian Ionescu-Idbohrn wrote: > On Sat, 27 Dec 2014, Thiago Macieira wrote: > > On Saturday 27 December 2014 11:38:16 Cristian Ionescu-Idbohrn wrote: > > > ...from the generated Makefile (on the master branch). > > > > > > If I manually add it: > > > ... -

Re: build broken as '-lusb-1.0' is missing...

On Sat, 27 Dec 2014, Thiago Macieira wrote: > On Saturday 27 December 2014 11:38:16 Cristian Ionescu-Idbohrn wrote: > > ...from the generated Makefile (on the master branch). > > > > If I manually add it: > > > > ... -ldivecomputer -lusb-1.0 -lxslt -lxml2 ... > >

Re: build broken as '-lusb-1.0' is missing...

On Saturday 27 December 2014 11:38:16 Cristian Ionescu-Idbohrn wrote: > ...from the generated Makefile (on the master branch). > > If I manually add it: > > ... -ldivecomputer -lusb-1.0 -lxslt -lxml2 ... > ^ > at a strategic point, on line 21: > > LIB

build broken as '-lusb-1.0' is missing...

...from the generated Makefile (on the master branch). If I manually add it: ... -ldivecomputer -lusb-1.0 -lxslt -lxml2 ... ^ at a strategic point, on line 21: LIBS = $(SUBLIBS) ... I get a ./subsurface executable. Cheers, -- Crist