[SCM] sonic-visualiser/master: Dont build against internal dataquay.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4d82670ba5ea9bf173efa66862e44d4bb7dea8b0
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Oct 7 10:47:49 2014 +0200

    Dont build against internal dataquay.

diff --git a/debian/control b/debian/control
index 848a391..1bb51cd 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders:
 Build-Depends:
  debhelper (>= 9),
  libbz2-dev,
- libdataquay-dev,
+ libdataquay-dev (>= 0.9-3),
  libfftw3-dev,
  libfishsound1-dev,
  libid3tag0-dev,
diff --git a/debian/patches/01_disable-internal-dataquay.patch b/debian/patches/01_disable-internal-dataquay.patch
new file mode 100644
index 0000000..0d04833
--- /dev/null
+++ b/debian/patches/01_disable-internal-dataquay.patch
@@ -0,0 +1,66 @@
+Description: Build against systemwide dataquay
+Forwarded: No
+
+Index: sonic-visualiser/sv.pro
+===================================================================
+--- sonic-visualiser.orig/sv.pro
++++ sonic-visualiser/sv.pro
+@@ -56,10 +56,10 @@ RC_FILE = icons/sv.rc
+ 
+ contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
+ 
+-MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Ldataquay -lsvapp -lsvgui -lsvcore -ldataquay
++MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -lsvapp -lsvgui -lsvcore
+ 
+ linux* {
+-MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
++MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic -ldataquay
+ }
+ 
+ win* {
+@@ -77,8 +77,7 @@ PRE_TARGETDEPS += svapp/release/libsvapp
+ !win* {
+ PRE_TARGETDEPS += svapp/libsvapp.a \
+                   svgui/libsvgui.a \
+-                  svcore/libsvcore.a \
+-                  dataquay/libdataquay.a
++                  svcore/libsvcore.a
+ }
+ 
+ RESOURCES += sonic-visualiser.qrc
+Index: sonic-visualiser/sonic-visualiser.pro
+===================================================================
+--- sonic-visualiser.orig/sonic-visualiser.pro
++++ sonic-visualiser/sonic-visualiser.pro
+@@ -1,17 +1,14 @@
+ TEMPLATE = subdirs
+-SUBDIRS = sub_dataquay svcore svgui svapp sub_sv 
++SUBDIRS = svcore svgui svapp sub_sv
+ 
+ !win* {
+     # We should build and run the tests on any platform,
+     # but doing it automatically doesn't work so well from
+     # within an IDE on Windows, so remove that from here
+-    SUBDIRS += svcore/base/test svcore/data/fileio/test
+ }
+ 
+ sub_sv.file = sv.pro
+ 
+-sub_dataquay.file = dataquay/lib.pro
+-
+ svgui.depends = svcore
+ svapp.depends = svcore svgui
+ sub_sv.depends = svcore svgui svapp
+Index: sonic-visualiser/svcore/svcore.pro
+===================================================================
+--- sonic-visualiser.orig/svcore/svcore.pro
++++ sonic-visualiser/svcore/svcore.pro
+@@ -36,7 +36,7 @@ QT -= gui
+ TARGET = svcore
+ 
+ DEPENDPATH += . data plugin plugin/api/alsa
+-INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay
++INCLUDEPATH += . data plugin plugin/api/alsa
+ OBJECTS_DIR = o
+ MOC_DIR = o
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9f7c3a8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_disable-internal-dataquay.patch

-- 
sonic-visualiser packaging