From eb2af4c9a4af317af1b6bd36ae6c9b9702d4ece1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 6 May 2019 13:11:16 +0200 Subject: [PATCH] Rename to nymea-zigbee --- debian/changelog | 2 +- debian/control | 18 +++++++++--------- debian/libnymea-zigbee1-dev.install | 2 ++ debian/libnymea-zigbee1.install | 3 +++ debian/libqtzigbee1-dev.install | 2 -- debian/libqtzigbee1.install | 3 --- debian/rules | 2 +- .../interface/zigbeeinterface.cpp | 0 .../interface/zigbeeinterface.h | 0 .../interface/zigbeeinterfacemessage.cpp | 0 .../interface/zigbeeinterfacemessage.h | 0 .../interface/zigbeeinterfacereply.cpp | 0 .../interface/zigbeeinterfacereply.h | 0 .../interface/zigbeeinterfacerequest.cpp | 0 .../interface/zigbeeinterfacerequest.h | 0 .../libnymea-zigbee.pro | 4 ++-- .../loggingcategory.cpp | 0 .../loggingcategory.h | 0 {libqtzigbee => libnymea-zigbee}/zigbee.cpp | 0 {libqtzigbee => libnymea-zigbee}/zigbee.h | 0 .../zigbeeaddress.cpp | 0 .../zigbeeaddress.h | 0 .../zigbeebridgecontroller.cpp | 0 .../zigbeebridgecontroller.h | 0 .../zigbeenetworkmanager.cpp | 0 .../zigbeenetworkmanager.h | 0 .../zigbeenode.cpp | 0 {libqtzigbee => libnymea-zigbee}/zigbeenode.h | 0 .../zigbeeutils.cpp | 0 {libqtzigbee => libnymea-zigbee}/zigbeeutils.h | 0 qt-zigbee.pro => nymea-zigbee.pro | 2 +- zigbee-cli/zigbee-cli.pro | 4 ++-- 32 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 debian/libnymea-zigbee1-dev.install create mode 100644 debian/libnymea-zigbee1.install delete mode 100644 debian/libqtzigbee1-dev.install delete mode 100644 debian/libqtzigbee1.install rename {libqtzigbee => libnymea-zigbee}/interface/zigbeeinterface.cpp (100%) rename {libqtzigbee => libnymea-zigbee}/interface/zigbeeinterface.h (100%) rename {libqtzigbee => libnymea-zigbee}/interface/zigbeeinterfacemessage.cpp (100%) rename {libqtzigbee => libnymea-zigbee}/interface/zigbeeinterfacemessage.h (100%) rename {libqtzigbee => libnymea-zigbee}/interface/zigbeeinterfacereply.cpp (100%) rename {libqtzigbee => libnymea-zigbee}/interface/zigbeeinterfacereply.h (100%) rename {libqtzigbee => libnymea-zigbee}/interface/zigbeeinterfacerequest.cpp (100%) rename {libqtzigbee => libnymea-zigbee}/interface/zigbeeinterfacerequest.h (100%) rename libqtzigbee/libqtzigbee.pro => libnymea-zigbee/libnymea-zigbee.pro (92%) rename {libqtzigbee => libnymea-zigbee}/loggingcategory.cpp (100%) rename {libqtzigbee => libnymea-zigbee}/loggingcategory.h (100%) rename {libqtzigbee => libnymea-zigbee}/zigbee.cpp (100%) rename {libqtzigbee => libnymea-zigbee}/zigbee.h (100%) rename {libqtzigbee => libnymea-zigbee}/zigbeeaddress.cpp (100%) rename {libqtzigbee => libnymea-zigbee}/zigbeeaddress.h (100%) rename {libqtzigbee => libnymea-zigbee}/zigbeebridgecontroller.cpp (100%) rename {libqtzigbee => libnymea-zigbee}/zigbeebridgecontroller.h (100%) rename {libqtzigbee => libnymea-zigbee}/zigbeenetworkmanager.cpp (100%) rename {libqtzigbee => libnymea-zigbee}/zigbeenetworkmanager.h (100%) rename {libqtzigbee => libnymea-zigbee}/zigbeenode.cpp (100%) rename {libqtzigbee => libnymea-zigbee}/zigbeenode.h (100%) rename {libqtzigbee => libnymea-zigbee}/zigbeeutils.cpp (100%) rename {libqtzigbee => libnymea-zigbee}/zigbeeutils.h (100%) rename qt-zigbee.pro => nymea-zigbee.pro (50%) diff --git a/debian/changelog b/debian/changelog index f22a253..8bc62d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -qtzigbee (0.0.1) xenial; urgency=medium +nymea-zigbee (0.0.1) bionic; urgency=medium * Initial release. diff --git a/debian/control b/debian/control index 7b2f05f..7f9552a 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,10 @@ -Source: qtzigbee +Source: nymea-zigbee Section: utils Priority: optional Maintainer: Simon Stuerz Standards-Version: 3.9.7 -Homepage: https://guh.io -Vcs-Git: https://github.com/guh/guh.git +Homepage: https://nymea.io +Vcs-Git: https://github.com/guh/nymea.git Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), qt5-default, @@ -20,14 +20,14 @@ Section: net Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - libqtzigbee1 (= ${binary:Version}), + libnymea-zigbee1 (= ${binary:Version}), libncurses5 Description: Zigbee bridge controller Qt5 - tool Command line tool written in Qt for interacting with the NXP Zigbee controller. . This package will install the zigbee-cli tool. -Package: libqtzigbee1 +Package: libnymea-zigbee1 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -39,21 +39,21 @@ Description: Qt 5 based library for Zigbee Qt 5 based library for Zigbee. -Package: libqtzigbee1-dev +Package: libnymea-zigbee1-dev Section: libdevel Architecture: any -Depends: libqtzigbee1 (= ${binary:Version}), +Depends: libnymea-zigbee1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Qt 5 based library for Zigbee - development files Development files for Qt 5 based Zigbee library. -Package: libqtzigbee1-dbg +Package: libnymea-zigbee1-dbg Priority: extra Architecture: any Section: debug -Depends: libqtzigbee1 (= ${binary:Version}), +Depends: libnymea-zigbee1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Qt 5 based library for Zigbee - debug symbols diff --git a/debian/libnymea-zigbee1-dev.install b/debian/libnymea-zigbee1-dev.install new file mode 100644 index 0000000..10346e5 --- /dev/null +++ b/debian/libnymea-zigbee1-dev.install @@ -0,0 +1,2 @@ +usr/lib/libnymea-zigbee1.so +usr/include/nymea-zigbee/* usr/include/nymea-zigbee/ diff --git a/debian/libnymea-zigbee1.install b/debian/libnymea-zigbee1.install new file mode 100644 index 0000000..3404537 --- /dev/null +++ b/debian/libnymea-zigbee1.install @@ -0,0 +1,3 @@ +usr/lib/libnymea-zigbee1.so.1 +usr/lib/libnymea-zigbee1.so.1.0 +usr/lib/libnymea-zigbee1.so.1.0.0 diff --git a/debian/libqtzigbee1-dev.install b/debian/libqtzigbee1-dev.install deleted file mode 100644 index d3c85d6..0000000 --- a/debian/libqtzigbee1-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libqtzigbee1.so -usr/include/qtzigbee/* usr/include/qtzigbee/ diff --git a/debian/libqtzigbee1.install b/debian/libqtzigbee1.install deleted file mode 100644 index 93e8e31..0000000 --- a/debian/libqtzigbee1.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libqtzigbee1.so.1 -usr/lib/libqtzigbee1.so.1.0 -usr/lib/libqtzigbee1.so.1.0.0 diff --git a/debian/rules b/debian/rules index c178048..ef08355 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ include /usr/share/dpkg/buildflags.mk dh $@ --buildsystem=qmake --parallel override_dh_strip: - dh_strip --dbg-package=libqtzigbee1-dbg + dh_strip --dbg-package=libnymea-zigbee1-dbg override_dh_auto_build: make -j$(DEB_PARALLEL_JOBS) diff --git a/libqtzigbee/interface/zigbeeinterface.cpp b/libnymea-zigbee/interface/zigbeeinterface.cpp similarity index 100% rename from libqtzigbee/interface/zigbeeinterface.cpp rename to libnymea-zigbee/interface/zigbeeinterface.cpp diff --git a/libqtzigbee/interface/zigbeeinterface.h b/libnymea-zigbee/interface/zigbeeinterface.h similarity index 100% rename from libqtzigbee/interface/zigbeeinterface.h rename to libnymea-zigbee/interface/zigbeeinterface.h diff --git a/libqtzigbee/interface/zigbeeinterfacemessage.cpp b/libnymea-zigbee/interface/zigbeeinterfacemessage.cpp similarity index 100% rename from libqtzigbee/interface/zigbeeinterfacemessage.cpp rename to libnymea-zigbee/interface/zigbeeinterfacemessage.cpp diff --git a/libqtzigbee/interface/zigbeeinterfacemessage.h b/libnymea-zigbee/interface/zigbeeinterfacemessage.h similarity index 100% rename from libqtzigbee/interface/zigbeeinterfacemessage.h rename to libnymea-zigbee/interface/zigbeeinterfacemessage.h diff --git a/libqtzigbee/interface/zigbeeinterfacereply.cpp b/libnymea-zigbee/interface/zigbeeinterfacereply.cpp similarity index 100% rename from libqtzigbee/interface/zigbeeinterfacereply.cpp rename to libnymea-zigbee/interface/zigbeeinterfacereply.cpp diff --git a/libqtzigbee/interface/zigbeeinterfacereply.h b/libnymea-zigbee/interface/zigbeeinterfacereply.h similarity index 100% rename from libqtzigbee/interface/zigbeeinterfacereply.h rename to libnymea-zigbee/interface/zigbeeinterfacereply.h diff --git a/libqtzigbee/interface/zigbeeinterfacerequest.cpp b/libnymea-zigbee/interface/zigbeeinterfacerequest.cpp similarity index 100% rename from libqtzigbee/interface/zigbeeinterfacerequest.cpp rename to libnymea-zigbee/interface/zigbeeinterfacerequest.cpp diff --git a/libqtzigbee/interface/zigbeeinterfacerequest.h b/libnymea-zigbee/interface/zigbeeinterfacerequest.h similarity index 100% rename from libqtzigbee/interface/zigbeeinterfacerequest.h rename to libnymea-zigbee/interface/zigbeeinterfacerequest.h diff --git a/libqtzigbee/libqtzigbee.pro b/libnymea-zigbee/libnymea-zigbee.pro similarity index 92% rename from libqtzigbee/libqtzigbee.pro rename to libnymea-zigbee/libnymea-zigbee.pro index b741c45..72ff1ac 100644 --- a/libqtzigbee/libqtzigbee.pro +++ b/libnymea-zigbee/libnymea-zigbee.pro @@ -1,6 +1,6 @@ include(../config.pri) -TARGET = qtzigbee1 +TARGET = nymea-zigbee1 TEMPLATE = lib target.path = /usr/lib @@ -35,7 +35,7 @@ INSTALLS += target # install header file with relative subdirectory for(header, HEADERS) { - path = /usr/include/qtzigbee/$${dirname(header)} + path = /usr/include/nymea-zigbee/$${dirname(header)} eval(headers_$${path}.files += $${header}) eval(headers_$${path}.path = $${path}) eval(INSTALLS *= headers_$${path}) diff --git a/libqtzigbee/loggingcategory.cpp b/libnymea-zigbee/loggingcategory.cpp similarity index 100% rename from libqtzigbee/loggingcategory.cpp rename to libnymea-zigbee/loggingcategory.cpp diff --git a/libqtzigbee/loggingcategory.h b/libnymea-zigbee/loggingcategory.h similarity index 100% rename from libqtzigbee/loggingcategory.h rename to libnymea-zigbee/loggingcategory.h diff --git a/libqtzigbee/zigbee.cpp b/libnymea-zigbee/zigbee.cpp similarity index 100% rename from libqtzigbee/zigbee.cpp rename to libnymea-zigbee/zigbee.cpp diff --git a/libqtzigbee/zigbee.h b/libnymea-zigbee/zigbee.h similarity index 100% rename from libqtzigbee/zigbee.h rename to libnymea-zigbee/zigbee.h diff --git a/libqtzigbee/zigbeeaddress.cpp b/libnymea-zigbee/zigbeeaddress.cpp similarity index 100% rename from libqtzigbee/zigbeeaddress.cpp rename to libnymea-zigbee/zigbeeaddress.cpp diff --git a/libqtzigbee/zigbeeaddress.h b/libnymea-zigbee/zigbeeaddress.h similarity index 100% rename from libqtzigbee/zigbeeaddress.h rename to libnymea-zigbee/zigbeeaddress.h diff --git a/libqtzigbee/zigbeebridgecontroller.cpp b/libnymea-zigbee/zigbeebridgecontroller.cpp similarity index 100% rename from libqtzigbee/zigbeebridgecontroller.cpp rename to libnymea-zigbee/zigbeebridgecontroller.cpp diff --git a/libqtzigbee/zigbeebridgecontroller.h b/libnymea-zigbee/zigbeebridgecontroller.h similarity index 100% rename from libqtzigbee/zigbeebridgecontroller.h rename to libnymea-zigbee/zigbeebridgecontroller.h diff --git a/libqtzigbee/zigbeenetworkmanager.cpp b/libnymea-zigbee/zigbeenetworkmanager.cpp similarity index 100% rename from libqtzigbee/zigbeenetworkmanager.cpp rename to libnymea-zigbee/zigbeenetworkmanager.cpp diff --git a/libqtzigbee/zigbeenetworkmanager.h b/libnymea-zigbee/zigbeenetworkmanager.h similarity index 100% rename from libqtzigbee/zigbeenetworkmanager.h rename to libnymea-zigbee/zigbeenetworkmanager.h diff --git a/libqtzigbee/zigbeenode.cpp b/libnymea-zigbee/zigbeenode.cpp similarity index 100% rename from libqtzigbee/zigbeenode.cpp rename to libnymea-zigbee/zigbeenode.cpp diff --git a/libqtzigbee/zigbeenode.h b/libnymea-zigbee/zigbeenode.h similarity index 100% rename from libqtzigbee/zigbeenode.h rename to libnymea-zigbee/zigbeenode.h diff --git a/libqtzigbee/zigbeeutils.cpp b/libnymea-zigbee/zigbeeutils.cpp similarity index 100% rename from libqtzigbee/zigbeeutils.cpp rename to libnymea-zigbee/zigbeeutils.cpp diff --git a/libqtzigbee/zigbeeutils.h b/libnymea-zigbee/zigbeeutils.h similarity index 100% rename from libqtzigbee/zigbeeutils.h rename to libnymea-zigbee/zigbeeutils.h diff --git a/qt-zigbee.pro b/nymea-zigbee.pro similarity index 50% rename from qt-zigbee.pro rename to nymea-zigbee.pro index 8bff3d3..18385e6 100644 --- a/qt-zigbee.pro +++ b/nymea-zigbee.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += libqtzigbee zigbee-cli +SUBDIRS += libnymea-zigbee zigbee-cli diff --git a/zigbee-cli/zigbee-cli.pro b/zigbee-cli/zigbee-cli.pro index f32f991..a0bbe74 100644 --- a/zigbee-cli/zigbee-cli.pro +++ b/zigbee-cli/zigbee-cli.pro @@ -5,9 +5,9 @@ CONFIG -= app_bundle TARGET = zigbee-cli -LIBS += -L$$buildDir/libqtzigbee -lqtzigbee1 -lreadline +LIBS += -L$$buildDir/libnymea-zigbee -lnymea-zigbee1 -lreadline -INCLUDEPATH += ../libqtzigbee/ +INCLUDEPATH += ../libnymea-zigbee/ target.path = /usr/bin INSTALLS += target