Update Debian packaging from Qt4/Harmattan to Qt5/Ubuntu

.package.usage

@@ -0,0 +1,6 @@
+HOW TO PREPARE BUILD ENVIRONMENT
+  ./package setup
+
+HOW TO COMPILE A DEB PACKAGE
+  ./package build
+

debian/compat

@@ -1 +1 @@
-5
+7

debian/control

@@ -4,10 +4,13 @@ Priority: optional
 Maintainer: James Thomas <[email protected]>
 Build-Depends: debhelper (>= 5),
 	       quilt,
-               libqt4-dev (>= 4.7),
+               qtbase5-dev,
+               qt5-qmake,
+               qt5-default,
+               qtdeclarative5-dev,
                doxygen,
-               libtracker-sparql-dev,
-               aegis-builder (>= 1.4)
+               libtracker-sparql-1.0-dev,
+	       libiodbc2-dev
 Standards-Version: 3.9.1
 
 Package: libqtsparql0
@@ -30,17 +33,16 @@ Package: libqtsparql-dev
 Section: libdevel
 Architecture: any
 Depends: libqtsparql0 (= ${binary:Version}),
-         libqt4-dev (>= 4.7),
          ${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
@@ -50,8 +52,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.

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/*

debian/libqtsparql-doc.install

@@ -1 +1 @@
-usr/share/doc/libqtsparql-doc/html/*
+usr/share/doc/libqt5sparql-doc/html/*

debian/libqtsparql-endpoint.install

@@ -1 +1 @@
-/usr/lib/qt4/plugins/sparqldrivers/libqsparqlendpoint.so
+/usr/lib/*/qt5/plugins/sparqldrivers/libqsparqlendpoint.so

debian/libqtsparql-tests.install

@@ -1,2 +1,2 @@
-usr/lib/libqtsparql-tests/
-usr/share/libqtsparql-tests/*
+usr/lib/libqt5sparql-tests/
+usr/share/libqt5sparql-tests/*

debian/libqtsparql-tracker-direct.install

@@ -1 +1 @@
-/usr/lib/qt4/plugins/sparqldrivers/libqsparqltrackerdirect.so
+/usr/lib/*/qt5/plugins/sparqldrivers/libqsparqltrackerdirect.so

debian/libqtsparql-tracker.install

@@ -1 +1,2 @@
-/usr/lib/qt4/plugins/sparqldrivers/libqsparqltracker.so
+/usr/lib/*/qt5/plugins/sparqldrivers/libqsparqltracker.so
+

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/*
+

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
@@ -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

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 <[email protected]>
+# 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 <enter> 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 <enter> 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

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

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.

src/plugins/sparqldrivers/virtuoso/main.cpp

@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include <QtSparql/private/qsparqldriverplugin_p.h>
+#include <private/qsparqldriverplugin_p.h>
 #include <qstringlist.h>
 #include "../../../sparql/drivers/virtuoso/qsparql_virtuoso_p.h"
 

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
 }
 

src/sparql/drivers/virtuoso/qsparql_virtuoso.cpp

@@ -57,12 +57,12 @@
 #include <QtCore/QMutexLocker>
 #include <QtCore/QThread>
 
-#include <QtSparql/qsparqlerror.h>
-#include <QtSparql/qsparqlbinding.h>
-#include <QtSparql/qsparqlresultrow.h>
-#include <QtSparql/qsparqlquery.h>
-#include <QtSparql/qsparqlqueryoptions.h>
-#include <QtSparql/private/qsparqlntriples_p.h>
+#include <qsparqlerror.h>
+#include <qsparqlbinding.h>
+#include <qsparqlresultrow.h>
+#include <qsparqlquery.h>
+#include <qsparqlqueryoptions.h>
+#include <private/qsparqlntriples_p.h>
 #define XSD_DATE
 #include "../../kernel/qsparqlxsd_p.h"
 

src/sparql/drivers/virtuoso/qsparql_virtuoso_p.h

@@ -40,8 +40,8 @@
 #ifndef QSPARQL_VIRTUOSO_H
 #define QSPARQL_VIRTUOSO_H
 
-#include <QtSparql/private/qsparqldriver_p.h>
-#include <QtSparql/qsparqlresult.h>
+#include <private/qsparqldriver_p.h>
+#include <qsparqlresult.h>
 
 #if defined (Q_OS_WIN32)
 #include <QtCore/qt_windows.h>

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 <QtTest/QtTest>
 #include <QtSparql>
+#include <unistd.h>
 
 class tst_QSparqlTrackerDirect : public TrackerDirectCommon
 {