diff --git a/debian/copyright b/debian/copyright index efabee0e..f8afc70c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -56,24 +56,3 @@ Files: plugins/* License: LGPL-2.1 Copyright: 2014-2017, Simon Stürz 2014, Michael Zanetti - -Files: plugins/deviceplugins/denon/* - plugins/deviceplugins/orderbutton/* - plugins/deviceplugins/ws2812/* -License: LGPL-2.1 -Copyright: 2016, Bernhard Trinnes - -Files: plugins/deviceplugins/plantcare/* -License: LGPL-2.1 -Copyright: 2016-2017, Simon Stürz - 2016, Bernhard Trinnes - -Files: plugins/deviceplugins/pushbullet/* - plugins/deviceplugins/usbwde/* -License: LGPL-2.1 -Copyright: 2016, Alexander Lampret - -Files: plugins/deviceplugins/multisensor/* -License: LGPL-2.1 -Copyright: 2016-2017, Simon Stürz - 2016-2017, Gil Benkö diff --git a/libguh/devicemanager.cpp b/libguh/devicemanager.cpp index f818ca55..7c59691d 100644 --- a/libguh/devicemanager.cpp +++ b/libguh/devicemanager.cpp @@ -263,8 +263,7 @@ QStringList DeviceManager::pluginSearchDirs() } searchDirs << QCoreApplication::applicationDirPath() + "/../lib/guh/plugins"; searchDirs << QCoreApplication::applicationDirPath() + "/../plugins/"; - searchDirs << QCoreApplication::applicationDirPath() + "/../plugins/deviceplugins"; - searchDirs << QCoreApplication::applicationDirPath() + "/../../../plugins/deviceplugins"; + searchDirs << QCoreApplication::applicationDirPath() + "/../../../plugins/"; searchDirs << QString("%1").arg(GUH_PLUGINS_PATH); #ifdef SNAPPY searchDirs << QString("%1%2").arg(QString::fromUtf8(qgetenv("SNAP"))).arg(GUH_PLUGINS_PATH); diff --git a/plugins/mock/devicepluginmock.cpp b/plugins/mock/devicepluginmock.cpp index a7119873..0317ad6f 100644 --- a/plugins/mock/devicepluginmock.cpp +++ b/plugins/mock/devicepluginmock.cpp @@ -37,7 +37,7 @@ For more details how to read this JSON file please check out the documentation for \l{The plugin JSON File}. - \quotefile plugins/deviceplugins/mailnotification/devicepluginmailnotification.json + \quotefile plugins/mock/devicepluginmock.json */ #include "devicepluginmock.h"