From 48535e5c561e392204ff235aad21750c4146e302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 27 Jul 2016 12:12:23 +0200 Subject: [PATCH] add build dependecy for translation tools add translation path for packages --- debian/control | 2 ++ debian/guh-plugins-maker.dirs | 1 + debian/guh-plugins-merkur.dirs | 1 + debian/guh-plugins.dirs | 1 + debian/guhd.dirs | 1 + plugins/deviceplugins/mock/devicepluginmock.json | 1 - plugins/guh-generateplugininfo | 2 +- 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 306a102f..971dbe93 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 9.0.0), python, qt5-default, qtbase5-dev, + qttools5-dev-tools, qtconnectivity5-dev, libqt5websockets5-dev, libqt5bluetooth5, @@ -107,6 +108,7 @@ Depends: libguh1 (= ${binary:Version}), ${misc:Depends}, python, qtconnectivity5-dev, + qttools5-dev-tools, libqt5websockets5-dev, libavahi-client-dev, libavahi-common-dev diff --git a/debian/guh-plugins-maker.dirs b/debian/guh-plugins-maker.dirs index 0a803bb8..40037615 100644 --- a/debian/guh-plugins-maker.dirs +++ b/debian/guh-plugins-maker.dirs @@ -1 +1,2 @@ usr/lib/guh/plugins +usr/share/guh/translations diff --git a/debian/guh-plugins-merkur.dirs b/debian/guh-plugins-merkur.dirs index 0a803bb8..40037615 100644 --- a/debian/guh-plugins-merkur.dirs +++ b/debian/guh-plugins-merkur.dirs @@ -1 +1,2 @@ usr/lib/guh/plugins +usr/share/guh/translations diff --git a/debian/guh-plugins.dirs b/debian/guh-plugins.dirs index 0a803bb8..40037615 100644 --- a/debian/guh-plugins.dirs +++ b/debian/guh-plugins.dirs @@ -1 +1,2 @@ usr/lib/guh/plugins +usr/share/guh/translations diff --git a/debian/guhd.dirs b/debian/guhd.dirs index e5721b19..9092d70f 100644 --- a/debian/guhd.dirs +++ b/debian/guhd.dirs @@ -1,2 +1,3 @@ usr/bin etc/guh/ +usr/share/guh/translations diff --git a/plugins/deviceplugins/mock/devicepluginmock.json b/plugins/deviceplugins/mock/devicepluginmock.json index 7b802960..f7a108d7 100644 --- a/plugins/deviceplugins/mock/devicepluginmock.json +++ b/plugins/deviceplugins/mock/devicepluginmock.json @@ -1,7 +1,6 @@ { "name": "Mock Devices", "idName": "MockDevice", - "translationPrefix": "mock", "id": "727a4a9a-c187-446f-aadf-f1b2220607d1", "paramTypes": [ { diff --git a/plugins/guh-generateplugininfo b/plugins/guh-generateplugininfo index 2b81740e..7761d44d 100755 --- a/plugins/guh-generateplugininfo +++ b/plugins/guh-generateplugininfo @@ -245,7 +245,7 @@ writePluginInfo("PluginId pluginId = PluginId(\"%s\");" % pluginMap['id']) extractVendors(pluginMap) writePluginInfo("") -writePluginInfo("// Loging category") +writePluginInfo("// Logging category") if 'idName' in pluginMap: writePluginInfo('Q_DECLARE_LOGGING_CATEGORY(dc%s)' % pluginMap['idName'])