diff --git a/debian/control b/debian/control index c1b93ac..5e2a621 100644 --- a/debian/control +++ b/debian/control @@ -3,28 +3,31 @@ Section: utils Priority: optional Maintainer: Simon Stürz Build-Depends: debhelper (>= 9.0.0), - dpkg-dev (>= 1.16.1~), - dh-systemd, - qt5-default, - qtbase5-dev, - qtbase5-dev-tools, - libqt5bluetooth5, - qtconnectivity5-dev + dpkg-dev (>= 1.16.1~), + dh-systemd, + qt5-default, + qtbase5-dev, + qtbase5-dev-tools, + libqt5bluetooth5, + qtconnectivity5-dev Standards-Version: 3.9.7 Package: libnymea-networkmanager Section: libs Architecture: any -Depends: ${misc:Depends}, - libqt5network5 +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libqt5network5 Description: Qt 5 based library for the network-manager DBus API. Qt 5 based library for the network-manager DBus API. Package: libnymea-networkmanager-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, - libnymea-networkmanager (= ${binary:Version}) +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libnymea-networkmanager (= ${binary:Version}), + pkg-config Description: Qt 5 based library for the network-manager DBus API - development files Development files for Qt 5 based network-manager DBus API. @@ -33,6 +36,7 @@ Priority: extra Architecture: any Section: debug Depends: ${misc:Depends}, - libnymea-networkmanager (= ${binary:Version}) + ${shlibs:Depends}, + libnymea-networkmanager (= ${binary:Version}) Description: Qt 5 based library for the network-manager DBus API - debug symbols Debug Symbols for Qt 5 based network-manager DBus API. diff --git a/debian/copyright b/debian/copyright index 57a982b..fc92e44 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,11 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Author: Simon Stürz -Download: https://github.com/guh/nymea-networkmanager +Author: Simon Stürz +Download: https://github.com/guh/libnymea-networkmanager License: GPL-3+ On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'. Files: * -Copyright: (C) 2018 Simon Stürz +Copyright: (C) 2018 - 2019 Simon Stürz License: GPL-3+ diff --git a/debian/libnymea-networkmanager-dev.dirs.in b/debian/libnymea-networkmanager-dev.dirs.in index a877bf3..160c41e 100644 --- a/debian/libnymea-networkmanager-dev.dirs.in +++ b/debian/libnymea-networkmanager-dev.dirs.in @@ -1,2 +1,2 @@ usr/lib/@DEB_HOST_MULTIARCH@ -usr/include/nymea-networkmanager +usr/include/libnymea-networkmanager diff --git a/debian/libnymea-networkmanager-dev.install.in b/debian/libnymea-networkmanager-dev.install.in index d11e061..482577f 100644 --- a/debian/libnymea-networkmanager-dev.install.in +++ b/debian/libnymea-networkmanager-dev.install.in @@ -1,3 +1,3 @@ usr/lib/@DEB_HOST_MULTIARCH@/libnymea-networkmanager.so usr/include/libnymea-networkmanager/* usr/include/libnymea-networkmanager - +usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/libnymea-networkmanager.pc diff --git a/libnymea-networkmanager.pro b/libnymea-networkmanager.pro index e013ac2..f3a02f4 100644 --- a/libnymea-networkmanager.pro +++ b/libnymea-networkmanager.pro @@ -1,2 +1,4 @@ TEMPLATE = subdirs SUBDIRS += libnymea-networkmanager + +VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"') diff --git a/libnymea-networkmanager/libnymea-networkmanager.pro b/libnymea-networkmanager/libnymea-networkmanager.pro index c83a4d0..f68c5bc 100644 --- a/libnymea-networkmanager/libnymea-networkmanager.pro +++ b/libnymea-networkmanager/libnymea-networkmanager.pro @@ -1,13 +1,10 @@ TARGET = nymea-networkmanager TEMPLATE = lib -target.path = /usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH') -INSTALLS += target - QT += dbus network -QMAKE_CXXFLAGS *= -Werror -std=c++1z -g -QMAKE_LFLAGS *= -std=c++1z +QMAKE_CXXFLAGS *= -Werror -std=c++11 -g +QMAKE_LFLAGS *= -std=c++11 HEADERS += \ networkmanager.h \ @@ -30,6 +27,9 @@ SOURCES += \ networkmanagerutils.cpp \ +target.path = $$[QT_INSTALL_LIBS] +INSTALLS += target + # install header file with relative subdirectory for(header, HEADERS) { path = /usr/include/libnymea-networkmanager/$${dirname(header)} @@ -37,3 +37,14 @@ for(header, HEADERS) { eval(headers_$${path}.path = $${path}) eval(INSTALLS *= headers_$${path}) } + +# Create pkgconfig file +CONFIG += create_pc create_prl no_install_prl +QMAKE_PKGCONFIG_NAME = libnymea-networkmanager +QMAKE_PKGCONFIG_DESCRIPTION = nymea networkmanager development library +QMAKE_PKGCONFIG_PREFIX = $$[QT_INSTALL_PREFIX] +QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_PREFIX]/include/libnymea-networkmanager/ +QMAKE_PKGCONFIG_LIBDIR = $$target.path +QMAKE_PKGCONFIG_VERSION = $$VERSION_STRING +QMAKE_PKGCONFIG_FILE = libnymea-networkmanager +QMAKE_PKGCONFIG_DESTDIR = pkgconfig