[SCM] dataquay/master: Refresh patch

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

The following commit has been merged in the master branch:
commit 4a3115ff390a6db9c2cb14db7227b188eb201cb4
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Nov 15 13:11:30 2012 +0100

    Refresh patch

diff --git a/debian/patches/01-build-fix.patch b/debian/patches/01-build-fix.patch
index b85b879..a2d2cf3 100644
--- a/debian/patches/01-build-fix.patch
+++ b/debian/patches/01-build-fix.patch
@@ -1,50 +1,17 @@
 Description: Patch fixing build 
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Author: Chris Cannam <chris.cannam at breakfastquay.com>
 Forwarded: no
 
-Index: dataquay-0.9/dataquay.pro
+Index: dataquay/tests/main.cpp
 ===================================================================
---- dataquay-0.9.orig/dataquay.pro	2012-11-14 02:17:52.521899869 +0100
-+++ dataquay-0.9/dataquay.pro	2012-11-14 23:43:03.101035221 +0100
-@@ -1,8 +1,7 @@
+--- dataquay.orig/tests/main.cpp	2012-11-15 09:21:06.534763985 +0100
++++ dataquay/tests/main.cpp	2012-11-15 13:05:42.641588378 +0100
+@@ -42,7 +42,7 @@
+ {
+     int good = 0, bad = 0;
  
- TEMPLATE = subdirs
--SUBDIRS = sub_lib sub_tests
-+SUBDIRS = sub_lib
+-    QApplication app(argc, argv);
++    QCoreApplication app(argc, argv);
  
- sub_lib.file = lib.pro
--sub_tests.file = tests/tests.pro
- sub_tests.depends = sub_lib
- 
-Index: dataquay-0.9/config.pri
-===================================================================
---- dataquay-0.9.orig/config.pri	2012-11-14 02:17:52.521899869 +0100
-+++ dataquay-0.9/config.pri	2012-11-14 23:41:45.381032061 +0100
-@@ -5,6 +5,7 @@
- DEFINES += USE_REDLAND
- QMAKE_CXXFLAGS += -I/usr/include/rasqal -I/usr/include/raptor2
- EXTRALIBS += -lrdf
-+LIBS += -lrdf
- 
- # Define this to use the Sord datastore (http://drobilla.net/software/sord/)
- #DEFINES += USE_SORD
-Index: dataquay-0.9/lib.pro
-===================================================================
---- dataquay-0.9.orig/lib.pro	2012-11-14 02:17:52.521899869 +0100
-+++ dataquay-0.9/lib.pro	2012-11-14 23:41:45.381032061 +0100
-@@ -62,7 +62,6 @@
-            src/objectmapper/TypeMapping.cpp \
-            src/acsymbols.c
- 
--linux* {
- 	isEmpty(PREFIX) {
- 		PREFIX = /usr/local
- 	}
-@@ -73,7 +72,6 @@
-         pkgconfig.files = deploy/dataquay.pc
-         pkgconfig.extra = sed -e "'"s.%PREFIX%.$${PREFIX}."'" -e "'"s.%EXTRALIBS%.$${EXTRALIBS}."'" deploy/dataquay.pc.in > deploy/dataquay.pc
-         INSTALLS += target includes pkgconfig
--}
- 
- exists(platform.pri) {
- 	include(./platform.pri)
+     Dataquay::TestBasicStore tbs;
+     if (QTest::qExec(&tbs, argc, argv) == 0) ++good;

-- 
dataquay packaging