[med-svn] [edfbrowser] 04/04: Link against Debian packages libedf

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository edfbrowser.

commit 928b6c5aa1e6df642978cc315c1e474d79236476
Author: Andreas Tille <tille at debian.org>
Date:   Fri Dec 15 13:24:56 2017 +0100

    Link against Debian packages libedf
---
 debian/control                                  |  3 ++-
 debian/patches/series                           |  1 +
 debian/patches/use_debian_packaged_edflib.patch | 31 +++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 23ce165..c99e170 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 10),
                qtbase5-dev,
                qtbase5-dev-tools,
                libqt5opengl5-dev,
-               qttools5-dev-tools
+               qttools5-dev-tools,
+               libedf-dev
 Standards-Version: 4.1.1
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/edfbrowser.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/edfbrowser.git
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5b54b7c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_debian_packaged_edflib.patch
diff --git a/debian/patches/use_debian_packaged_edflib.patch b/debian/patches/use_debian_packaged_edflib.patch
new file mode 100644
index 0000000..4ed9317
--- /dev/null
+++ b/debian/patches/use_debian_packaged_edflib.patch
@@ -0,0 +1,31 @@
+Description; Remove edflib convenient copy
+Bug-Debian: https://bugs.debian.org/752860
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 15 Dec 2017 13:05:55 +0100
+
+--- a/edfbrowser.pro
++++ b/edfbrowser.pro
+@@ -90,7 +90,6 @@ HEADERS += utils.h
+ HEADERS += signalcurve.h
+ HEADERS += spectrumanalyzer.h
+ HEADERS += bi9800.h
+-HEADERS += edflib.h
+ HEADERS += export_annotations.h
+ HEADERS += edit_predefined_mtg.h
+ HEADERS += spectrum_dock.h
+@@ -184,7 +183,6 @@ SOURCES += utils.c
+ SOURCES += signalcurve.cpp
+ SOURCES += spectrumanalyzer.cpp
+ SOURCES += bi9800.cpp
+-SOURCES += edflib.c
+ SOURCES += export_annotations.cpp
+ SOURCES += edit_predefined_mtg.cpp
+ SOURCES += spectrum_dock.cpp
+@@ -237,6 +235,7 @@ win32 {
+ }
+ 
+ QMAKE_CXXFLAGS += -Wextra -Wshadow -Wformat-nonliteral -Wformat-security -Wtype-limits -Wfatal-errors
++QMAKE_LIBS += -ledf
+ 
+ unix {
+ target.path = /usr/bin

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/edfbrowser.git