From b24e2bfa4185334a236bd640ef3ce68ecf21dedd Mon Sep 17 00:00:00 2001 From: Ville Ranki Date: Fri, 12 Sep 2014 14:13:21 +0300 Subject: [PATCH 1/4] Updated Debian packaging for Qt5 / Ubuntu. --- config.tests/unix/tracker-sparql/tracker-sparql.pro | 2 +- debian/compat | 2 +- debian/control | 9 ++++----- debian/libqtsparql-dev.install | 6 +++--- debian/libqtsparql-doc.install | 2 +- debian/libqtsparql-endpoint.install | 2 +- debian/libqtsparql-tests.install | 4 ++-- debian/libqtsparql-tracker-direct.install | 2 +- debian/libqtsparql-tracker.install | 3 ++- debian/libqtsparql0.install | 8 +++----- debian/rules | 1 - rpm/libqt5sparql.spec | 2 +- .../sparqldrivers/tracker_direct/tracker_direct.pro | 2 +- src/sparql/drivers/drivers.pri | 2 +- tests/auto/qsparql_benchmark/qsparql_benchmark.pro | 2 +- .../tst_qsparql_tracker_direct.cpp | 2 ++ 16 files changed, 25 insertions(+), 26 deletions(-) diff --git a/config.tests/unix/tracker-sparql/tracker-sparql.pro b/config.tests/unix/tracker-sparql/tracker-sparql.pro index b64ddf4..61359b6 100644 --- a/config.tests/unix/tracker-sparql/tracker-sparql.pro +++ b/config.tests/unix/tracker-sparql/tracker-sparql.pro @@ -3,5 +3,5 @@ CONFIG -= qt unix: { CONFIG += link_pkgconfig - PKGCONFIG += tracker-sparql-1.0 + PKGCONFIG += tracker-sparql-0.16 } diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 00b6dd4..aa726d3 100644 --- a/debian/control +++ b/debian/control @@ -4,10 +4,10 @@ Priority: optional Maintainer: James Thomas Build-Depends: debhelper (>= 5), quilt, - libqt4-dev (>= 4.7), + qtbase5-dev, doxygen, - libtracker-sparql-dev, - aegis-builder (>= 1.4) + libtracker-sparql-0.16-dev, + libiodbc2-dev Standards-Version: 3.9.1 Package: libqtsparql0 @@ -50,8 +50,7 @@ Depends: ${shlibs:Depends}, libqtsparql0 (>= ${binary:Version}), libqtsparql-tracker (>= ${binary:Version}), libqtsparql-tracker-direct (>= ${binary:Version}), - libqtsparql-endpoint (>= ${binary:Version}), - ci-testing + libqtsparql-endpoint (>= ${binary:Version}) XB-Maemo-CI-Packages: libqtsparql0, libqtsparql-tracker, libqtsparql-tracker-direct, libqtsparql-endpoint XB-Maemo-CI-Stage: staging, acceptance Description: Tests for libqtsparql. diff --git a/debian/libqtsparql-dev.install b/debian/libqtsparql-dev.install index a330c2c..68132af 100644 --- a/debian/libqtsparql-dev.install +++ b/debian/libqtsparql-dev.install @@ -1,4 +1,4 @@ -usr/lib/libQtSparql.so +usr/lib/libQt5Sparql.so usr/lib/pkgconfig/* -usr/share/qt4/mkspecs/features/* -usr/include/QtSparql/* +usr/share/qt5/mkspecs/features/* +usr/include/Qt5Sparql/* diff --git a/debian/libqtsparql-doc.install b/debian/libqtsparql-doc.install index 6e21727..a30e7ab 100644 --- a/debian/libqtsparql-doc.install +++ b/debian/libqtsparql-doc.install @@ -1 +1 @@ -usr/share/doc/libqtsparql-doc/html/* +usr/share/doc/libqt5sparql-doc/html/* diff --git a/debian/libqtsparql-endpoint.install b/debian/libqtsparql-endpoint.install index 8419aca..4365163 100644 --- a/debian/libqtsparql-endpoint.install +++ b/debian/libqtsparql-endpoint.install @@ -1 +1 @@ -/usr/lib/qt4/plugins/sparqldrivers/libqsparqlendpoint.so +/usr/lib/*/qt5/plugins/sparqldrivers/libqsparqlendpoint.so diff --git a/debian/libqtsparql-tests.install b/debian/libqtsparql-tests.install index 1a1d20e..062f76d 100644 --- a/debian/libqtsparql-tests.install +++ b/debian/libqtsparql-tests.install @@ -1,2 +1,2 @@ -usr/lib/libqtsparql-tests/ -usr/share/libqtsparql-tests/* +usr/lib/libqt5sparql-tests/ +usr/share/libqt5sparql-tests/* diff --git a/debian/libqtsparql-tracker-direct.install b/debian/libqtsparql-tracker-direct.install index 46be9cc..c248e6e 100644 --- a/debian/libqtsparql-tracker-direct.install +++ b/debian/libqtsparql-tracker-direct.install @@ -1 +1 @@ -/usr/lib/qt4/plugins/sparqldrivers/libqsparqltrackerdirect.so +/usr/lib/*/qt5/plugins/sparqldrivers/libqsparqltrackerdirect.so diff --git a/debian/libqtsparql-tracker.install b/debian/libqtsparql-tracker.install index ff45fed..7b11e99 100644 --- a/debian/libqtsparql-tracker.install +++ b/debian/libqtsparql-tracker.install @@ -1 +1,2 @@ -/usr/lib/qt4/plugins/sparqldrivers/libqsparqltracker.so +/usr/lib/*/qt5/plugins/sparqldrivers/libqsparqltracker.so + diff --git a/debian/libqtsparql0.install b/debian/libqtsparql0.install index bf7ef07..a3cc3f3 100644 --- a/debian/libqtsparql0.install +++ b/debian/libqtsparql0.install @@ -1,5 +1,3 @@ -usr/lib/libQtSparql.so.* -/usr/lib/qt4/imports/QtSparql/qmldir -/usr/lib/qt4/imports/QtSparql/libsparqllistmodel.so -/usr/lib/qt4/imports/QtSparql/libsparqlconnection.so -/usr/lib/qt4/imports/QtSparql/libsparqlresultslist.so +usr/lib/libQt5Sparql.so.* +usr/lib/*/qt5/qml/QtSparql/* + diff --git a/debian/rules b/debian/rules index f2ad265..c6f2e7e 100755 --- a/debian/rules +++ b/debian/rules @@ -63,7 +63,6 @@ binary-arch: build install dh_gencontrol -a dh_md5sums -a dh_builddeb -a - aegis-deb-add -control debian/libqtsparql-tests/DEBIAN/control .. debian/libqtsparql-tests.aegis=_aegis binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/rpm/libqt5sparql.spec b/rpm/libqt5sparql.spec index 8c24f9c..92ee41b 100644 --- a/rpm/libqt5sparql.spec +++ b/rpm/libqt5sparql.spec @@ -16,7 +16,7 @@ BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(tracker-sparql-1.0) +BuildRequires: pkgconfig(tracker-sparql-0.16) %description Library for accessing RDF stores. diff --git a/src/plugins/sparqldrivers/tracker_direct/tracker_direct.pro b/src/plugins/sparqldrivers/tracker_direct/tracker_direct.pro index c69ec00..f4cb223 100644 --- a/src/plugins/sparqldrivers/tracker_direct/tracker_direct.pro +++ b/src/plugins/sparqldrivers/tracker_direct/tracker_direct.pro @@ -16,7 +16,7 @@ SOURCES = main.cpp \ unix: { CONFIG += link_pkgconfig - PKGCONFIG += tracker-sparql-1.0 + PKGCONFIG += tracker-sparql-0.16 } include(../qsparqldriverbase.pri) diff --git a/src/sparql/drivers/drivers.pri b/src/sparql/drivers/drivers.pri index 947fdfb..a6183aa 100644 --- a/src/sparql/drivers/drivers.pri +++ b/src/sparql/drivers/drivers.pri @@ -26,7 +26,7 @@ contains(sparql-drivers, tracker_direct) { drivers/tracker_direct/qsparql_tracker_direct_sync_result_p.cpp \ drivers/tracker_direct/qsparql_tracker_direct_update_result_p.cpp CONFIG += no_keywords link_pkgconfig - PKGCONFIG += tracker-sparql-1.0 + PKGCONFIG += tracker-sparql-0.16 DEFINES += QT_SPARQL_TRACKER_DIRECT } diff --git a/tests/auto/qsparql_benchmark/qsparql_benchmark.pro b/tests/auto/qsparql_benchmark/qsparql_benchmark.pro index ebb1ade..3c3d577 100644 --- a/tests/auto/qsparql_benchmark/qsparql_benchmark.pro +++ b/tests/auto/qsparql_benchmark/qsparql_benchmark.pro @@ -1,6 +1,6 @@ include(../sparqltest.pri) CONFIG += qt warn_on console depend_includepath testcase link_pkgconfig -PKGCONFIG = tracker-sparql-1.0 +PKGCONFIG = tracker-sparql-0.16 QT += testlib xml SOURCES += tst_qsparql_benchmark.cpp diff --git a/tests/auto/qsparql_tracker_direct/tst_qsparql_tracker_direct.cpp b/tests/auto/qsparql_tracker_direct/tst_qsparql_tracker_direct.cpp index 1dfacf4..a77fbba 100644 --- a/tests/auto/qsparql_tracker_direct/tst_qsparql_tracker_direct.cpp +++ b/tests/auto/qsparql_tracker_direct/tst_qsparql_tracker_direct.cpp @@ -1,3 +1,4 @@ + /**************************************************************************** ** ** Copyright (C) 2010-2011 Nokia Corporation and/or its subsidiary(-ies). @@ -43,6 +44,7 @@ #include #include +#include class tst_QSparqlTrackerDirect : public TrackerDirectCommon { From 34d0d8366875cf1a6dde28afc52f847d9a005326 Mon Sep 17 00:00:00 2001 From: Juhapekka Piiroinen Date: Thu, 19 May 2016 14:36:59 +0300 Subject: [PATCH 2/4] updated packaging --- debian/control | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/control b/debian/control index aa726d3..449fd17 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,9 @@ Maintainer: James Thomas Build-Depends: debhelper (>= 5), quilt, qtbase5-dev, + qt5-qmake, + qt5-default, + qtdeclarative5-dev, doxygen, libtracker-sparql-0.16-dev, libiodbc2-dev From f7637ca7f5c82214d157ed0aa3ae5191599af990 Mon Sep 17 00:00:00 2001 From: Juhapekka Piiroinen Date: Thu, 19 May 2016 16:34:23 +0300 Subject: [PATCH 3/4] removed dependency to libqt4-dev --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 449fd17..293baaf 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,6 @@ Package: libqtsparql-dev Section: libdevel Architecture: any Depends: libqtsparql0 (= ${binary:Version}), - libqt4-dev (>= 4.7), ${misc:Depends} Description: Library for accessing RDF stores. From c43f33d9bacba4a2757eb8ea17bbf9b5ccf8d268 Mon Sep 17 00:00:00 2001 From: Juhapekka Piiroinen Date: Mon, 23 May 2016 23:07:22 +0300 Subject: [PATCH 4/4] Support for 16.04 LTS. Changed dependency from libtracker-sparql-0.16-dev to libtracker-sparql-1.0-dev. Disabled doc package and compiling. Added 'package' helper script for creating the deb package. --- .package.usage | 6 ++ .../unix/tracker-sparql/tracker-sparql.pro | 2 +- debian/control | 16 +++--- debian/rules | 2 +- package | 57 +++++++++++++++++++ projects.pro | 2 +- .../tracker_direct/tracker_direct.pro | 2 +- src/plugins/sparqldrivers/virtuoso/main.cpp | 2 +- .../drivers/virtuoso/qsparql_virtuoso.cpp | 12 ++-- .../drivers/virtuoso/qsparql_virtuoso_p.h | 4 +- .../qsparql_benchmark/qsparql_benchmark.pro | 2 +- 11 files changed, 85 insertions(+), 22 deletions(-) create mode 100644 .package.usage create mode 100755 package diff --git a/.package.usage b/.package.usage new file mode 100644 index 0000000..35f3bc1 --- /dev/null +++ b/.package.usage @@ -0,0 +1,6 @@ +HOW TO PREPARE BUILD ENVIRONMENT + ./package setup + +HOW TO COMPILE A DEB PACKAGE + ./package build + diff --git a/config.tests/unix/tracker-sparql/tracker-sparql.pro b/config.tests/unix/tracker-sparql/tracker-sparql.pro index 61359b6..b64ddf4 100644 --- a/config.tests/unix/tracker-sparql/tracker-sparql.pro +++ b/config.tests/unix/tracker-sparql/tracker-sparql.pro @@ -3,5 +3,5 @@ CONFIG -= qt unix: { CONFIG += link_pkgconfig - PKGCONFIG += tracker-sparql-0.16 + PKGCONFIG += tracker-sparql-1.0 } diff --git a/debian/control b/debian/control index 293baaf..852861f 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5), qt5-default, qtdeclarative5-dev, doxygen, - libtracker-sparql-0.16-dev, + libtracker-sparql-1.0-dev, libiodbc2-dev Standards-Version: 3.9.1 @@ -36,13 +36,13 @@ Depends: libqtsparql0 (= ${binary:Version}), ${misc:Depends} Description: Library for accessing RDF stores. -Package: libqtsparql-doc -Section: doc -Architecture: all -Depends: ${misc:Depends} -Description: Library for accessing RDF stores. - . - This package contains the documentation. +#Package: libqtsparql-doc +#Section: doc +#Architecture: all +#Depends: ${misc:Depends} +#Description: Library for accessing RDF stores. +# . +# This package contains the documentation. Package: libqtsparql-tests Section: devel diff --git a/debian/rules b/debian/rules index c6f2e7e..6aea927 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ build: debian/build-stamp debian/build-stamp: Makefile $(QUILT_STAMPFN) dh_testdir $(MAKE) - $(MAKE) doc + #$(MAKE) doc touch $@ clean: unpatch diff --git a/package b/package new file mode 100755 index 0000000..5a826b6 --- /dev/null +++ b/package @@ -0,0 +1,57 @@ +#!/bin/bash +#################################################################### +# +# This script provides two helpers. One for preparing a cowbuilder +# environment for compiling and another one for building +# the actual package. +# +# USAGE: +# +# This will prepare the environment on your Ubuntu 16.04 LTS: +# ./package setup +# +# And after that you can use this command to compile the package: +# ./package build +# +# +# Author: Juhapekka Piiroinen +# License: LGPL v2.1 +# +# (C) Link Motion Oy +#################################################################### +set -e + +CMD=$1 +SCRIPTPATH=`dirname $0` + +pushd ${SCRIPTPATH} > /dev/null +echo ${CMD} + +if [[ -z ${CMD} ]]; then + cat .package.usage + exit 1 +fi + +if [[ "${CMD}" == "setup" ]]; then + echo + echo "This will install the development tools." + echo + echo "press to continue or ctrl+c to cancel." + read + sudo apt-get install ubuntu-dev-tools debhelper cowbuilder + cowbuilder-dist xenial amd64 create + echo "Build environment is now ready." + exit 0 +elif [[ "${CMD}" == "build" ]]; then + echo + echo "You are about to build a deb package." + echo + echo "press to continue or ctrl+c to cancel." + read + + debuild -S -us -uc + cowbuilder-dist xenial amd64 build ../libqtsparql_0.2.6~unreleased.dsc + echo "Package is now built and is available at ~/pbuilder/xenial_results/" +else + cat .package.usage +fi diff --git a/projects.pro b/projects.pro index 4c8a7d3..ce20e47 100644 --- a/projects.pro +++ b/projects.pro @@ -18,7 +18,7 @@ SUBDIRS = src tests examples xclean.commands = rm -rf lib plugins include xclean.depends = clean -include(doc/doc.pri) +#include(doc/doc.pri) check.CONFIG = recursive check.recurse = tests diff --git a/src/plugins/sparqldrivers/tracker_direct/tracker_direct.pro b/src/plugins/sparqldrivers/tracker_direct/tracker_direct.pro index f4cb223..c69ec00 100644 --- a/src/plugins/sparqldrivers/tracker_direct/tracker_direct.pro +++ b/src/plugins/sparqldrivers/tracker_direct/tracker_direct.pro @@ -16,7 +16,7 @@ SOURCES = main.cpp \ unix: { CONFIG += link_pkgconfig - PKGCONFIG += tracker-sparql-0.16 + PKGCONFIG += tracker-sparql-1.0 } include(../qsparqldriverbase.pri) diff --git a/src/plugins/sparqldrivers/virtuoso/main.cpp b/src/plugins/sparqldrivers/virtuoso/main.cpp index 1c7a2ff..16e0ef9 100644 --- a/src/plugins/sparqldrivers/virtuoso/main.cpp +++ b/src/plugins/sparqldrivers/virtuoso/main.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include +#include #include #include "../../../sparql/drivers/virtuoso/qsparql_virtuoso_p.h" diff --git a/src/sparql/drivers/virtuoso/qsparql_virtuoso.cpp b/src/sparql/drivers/virtuoso/qsparql_virtuoso.cpp index bd22c28..d8d944b 100644 --- a/src/sparql/drivers/virtuoso/qsparql_virtuoso.cpp +++ b/src/sparql/drivers/virtuoso/qsparql_virtuoso.cpp @@ -57,12 +57,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #define XSD_DATE #include "../../kernel/qsparqlxsd_p.h" diff --git a/src/sparql/drivers/virtuoso/qsparql_virtuoso_p.h b/src/sparql/drivers/virtuoso/qsparql_virtuoso_p.h index 3a6d155..97ed7de 100644 --- a/src/sparql/drivers/virtuoso/qsparql_virtuoso_p.h +++ b/src/sparql/drivers/virtuoso/qsparql_virtuoso_p.h @@ -40,8 +40,8 @@ #ifndef QSPARQL_VIRTUOSO_H #define QSPARQL_VIRTUOSO_H -#include -#include +#include +#include #if defined (Q_OS_WIN32) #include diff --git a/tests/auto/qsparql_benchmark/qsparql_benchmark.pro b/tests/auto/qsparql_benchmark/qsparql_benchmark.pro index 3c3d577..ebb1ade 100644 --- a/tests/auto/qsparql_benchmark/qsparql_benchmark.pro +++ b/tests/auto/qsparql_benchmark/qsparql_benchmark.pro @@ -1,6 +1,6 @@ include(../sparqltest.pri) CONFIG += qt warn_on console depend_includepath testcase link_pkgconfig -PKGCONFIG = tracker-sparql-0.16 +PKGCONFIG = tracker-sparql-1.0 QT += testlib xml SOURCES += tst_qsparql_benchmark.cpp