From f3928494ef43eeff9e680f0de5f71eb0efbeddf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Sat, 24 Sep 2016 17:00:04 +0200 Subject: [PATCH] fix some litian warnings/errors --- debian/control | 13 +++++---- debian/copyright | 4 +++ debian/guh-generateplugininfo.1 | 52 +++++++++++++++++++++++++++++++++ debian/guhd.1 | 10 +++---- debian/guhd.install | 2 +- debian/guhd.postinst | 7 +++-- 6 files changed, 73 insertions(+), 15 deletions(-) create mode 100644 debian/guh-generateplugininfo.1 diff --git a/debian/control b/debian/control index bee8c85f..c1992400 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Simon Stuerz Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), - hardening-wrapper, + dpkg-buildflags, python, rsync, qt5-default, @@ -16,12 +16,13 @@ Build-Depends: debhelper (>= 9.0.0), libqt5sql5-sqlite, libavahi-client-dev, libavahi-common-dev -Standards-Version: 3.9.5 +Standards-Version: 3.9.7 Package: guh Architecture: any Section: metapackages -Depends: guhd (= ${binary:Version}), +Depends: ${misc:Depends}, + guhd (= ${binary:Version}), guh-plugins (= ${binary:Version}), Description: An open source IoT server - meta package guh is an open source IoT (Internet of Things) server, @@ -77,11 +78,11 @@ Description: Documentation for the guh package (on-site) - documentation the system and create individual scenes and behaviors for your home. Package: guh-translations -Section: translations +Section: misc Architecture: all Depends: ${misc:Depends} Recommends: guh (= ${binary:Version}) -Description: Translation files for guhd and plugins +Description: Translation files for guhd and plugins - translations guh is an open source home automation server, which allows to control a lot of different devices from many different manufacturers. With the powerful rule engine you are able to connect any device available in @@ -93,7 +94,7 @@ Architecture: any Depends: guh (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: Translation files for guh - translations +Description: Tests and mock plugin for the guh daemon - tests guh is an open source IoT (Internet of Things) server, which allows to control a lot of different devices from many different manufacturers. With the powerful rule engine you are able to connect any diff --git a/debian/copyright b/debian/copyright index 56ba682c..da49ecb5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,6 +7,10 @@ License: GPL-2+ On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. +License: LGPL-2.1 + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. + Files: * Copyright: (C) 2014 Michael Zanetti 2014 Simon Stürz diff --git a/debian/guh-generateplugininfo.1 b/debian/guh-generateplugininfo.1 new file mode 100644 index 00000000..be974fd2 --- /dev/null +++ b/debian/guh-generateplugininfo.1 @@ -0,0 +1,52 @@ +.\" Manpage for guh-generateplugininfo. +.\" Contact simon.stuerz@guh.io to correct errors or typos. +.TH man 1 "September 2016" "1.0" "guh-generateplugininfo man page" +.SH NAME +guh-generateplugininfo \- A precompiler for building guh plugins. +.SH SYNOPSIS +.B guh-generateplugininfo +[\fIOPTION\fR] +.SH DESCRIPTION +The guh-generateplugininfo is a precompiler for building plugins. This +precompiler will create a plugininfo.h containing the uuid definitions from +the plugin json file and creates the translations for the plugin. +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +Displays this help. +.TP +\fB\-v\fR, \fB\-\-version\fR +Displays version information. +.TP +\fB\-j\fR, \fB\-\-jsonfile\fR, \fB\\fR +The JSON input file name with the plugin description. +.TP +\fB\-b\fR, \fB\-\-builddir\fR, \fB\\fR +The path to the build directory of the plugin where the plugininfo.h +file can be found.. +.TP +\fB\-o\fR, \fB\-\-output\fR, \fB\\fR +The plugininfo.h outputFile with the uuid declarations. +.TP +\fB\-t\fR, \fB\-\-translations\fR, \fB[<*.ts>]\fR +The translation files for the plugin. + +.SH SEE ALSO +Full developer documentation at: +.br +Wiki on github: +.SH "REPORTING BUGS" +Issue tracker on github: +.br +How to report bugs: +.SH AUTHOR +Written by Simon Stürz +.SH COPYRIGHT +Copyright \(co 2014-2016 guh GmbH. +.br + +License GPLv2: GNU GPL version 2 . +.br +This is free software: you are free to change and redistribute it. +.br +There is NO WARRANTY, to the extent permitted by law. diff --git a/debian/guhd.1 b/debian/guhd.1 index b849612d..d51b94c4 100644 --- a/debian/guhd.1 +++ b/debian/guhd.1 @@ -1,6 +1,6 @@ .\" Manpage for guhd. -.\" Contact simon.stuerz@guh.guru to correct errors or typos. -.TH man 1 "June 2016" "1.6" "guhd man page" +.\" Contact simon.stuerz@guh.io to correct errors or typos. +.TH man 1 "June 2016" "1.7" "guhd man page" .SH NAME guhd \- An open source IoT (Internet of Things) server .SH SYNOPSIS @@ -13,7 +13,7 @@ manufacturers. With the powerful rule engine you are able to connect any device available in the system and create individual scenes and behaviors for your environment. .SH OPTIONS -.TP +.TP \fB\-h\fR, \fB\-\-help\fR Displays this help. .TP @@ -94,11 +94,11 @@ The logrotate config file: \fI/etc/logrotate.d/guhd\fR .br The logging database: \fI/var/log/guhd.sqlite\fR .br -The systemd unit file: \fI/etc/systemd/system/guhd.service\fR +The systemd unit file: \fI/lib/systemd/system/guhd.service\fR .br The plugins directory: \fI/usr/lib/guh/plugins/\fR .SH SEE ALSO -Full developer documentation at: +Full developer documentation at: .br Wiki on github: .SH "REPORTING BUGS" diff --git a/debian/guhd.install b/debian/guhd.install index b3a74c6e..30874570 100644 --- a/debian/guhd.install +++ b/debian/guhd.install @@ -1,3 +1,3 @@ usr/bin/guhd -data/systemd/guhd.service /etc/systemd/system/ +data/systemd/guhd.service /lib/systemd/system/ data/logrotate/guhd /etc/logrotate.d/ diff --git a/debian/guhd.postinst b/debian/guhd.postinst index c3b40578..c58aa1d8 100755 --- a/debian/guhd.postinst +++ b/debian/guhd.postinst @@ -2,7 +2,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# Copyright (C) 2015 Simon Stuerz # +# Copyright (C) 2015-2016 Simon Stuerz # # # # This file is part of guh. # # # @@ -20,11 +20,10 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# restart the guh daemon after update if it's running +# Restart the guh daemon after update if it's running systemctl daemon-reload systemctl status guhd > /dev/null 2>&1 if [ $? -eq 0 ]; then - #echo -n "Restart guh daemon..." systemctl restart guhd if [ $? -eq 0 ]; then echo "Successfully restarted guh daemon." @@ -33,5 +32,7 @@ if [ $? -eq 0 ]; then fi fi +#DEBHELPER# + exit 0