From a803ef829244b5ec77c973eaf36a1d5d332374b7 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 12 Oct 2014 13:09:53 +0200 Subject: [PATCH] rename guh to guhd. added a meta package for guh, that pulls in guhd and guh-plugins --- data/init/guhd | 8 ++++---- debian/control | 12 ++++++++++++ debian/guhd.dirs | 1 + debian/{guh.install => guhd.install} | 0 server/server.pro | 2 +- 5 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 debian/guhd.dirs rename debian/{guh.install => guhd.install} (100%) diff --git a/data/init/guhd b/data/init/guhd index e7a8a48d..a7305e8c 100644 --- a/data/init/guhd +++ b/data/init/guhd @@ -25,7 +25,7 @@ DESC="guh daemon" case "$1" in start) log_daemon_msg "Starting guh daemon" "guh" || true - if start-stop-daemon --start --background --quiet --oknodo -m --pidfile /var/run/guh.pid --exec /usr/bin/guh -- $GUH_OPTS; then + if start-stop-daemon --start --background --quiet --oknodo -m --pidfile /var/run/guh.pid --exec /usr/bin/guhd -- $GUH_OPTS; then log_end_msg 0 || true else log_end_msg 1 || true @@ -33,7 +33,7 @@ case "$1" in ;; stop) log_daemon_msg "Stopping guh daemon" "guh" || true - if start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/guh.pid; then + if start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/guhd.pid; then log_end_msg 0 || true else log_end_msg 1 || true @@ -44,10 +44,10 @@ case "$1" in check_privsep_dir check_config log_daemon_msg "Restarting guh daemon" "guh" || true - start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/guh.pid + start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/guhd.pid check_for_no_start log_end_msg check_dev_null log_end_msg - if start-stop-daemon --start --background --quiet --oknodo -m --pidfile /var/run/guh.pid --exec /usr/bin/guh -- $GUH_OPTS; then + if start-stop-daemon --start --background --quiet --oknodo -m --pidfile /var/run/guhd.pid --exec /usr/bin/guhd -- $GUH_OPTS; then log_end_msg 0 || true else log_end_msg 1 || true diff --git a/debian/control b/debian/control index 893cba42..d8127ce8 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,18 @@ Build-Depends: debhelper (>= 8.0.0), Standards-Version: 3.9.3 Package: guh +Architecture: all +Depends: guh (= ${binary:Version}), + guh-plugins (= ${binary:Version}), +Description: server for home automation systems - meta package + 'Gear Up your Home!' - Home automation server. + guh is a home automation system aiming for easy integration of various + existing home automation and controlling devices into a fully automated + system. + This meta package installs the guh daemon and the main plugins. + + +Package: guhd Architecture: any Depends: libqt5network5, libqt5gui5, diff --git a/debian/guhd.dirs b/debian/guhd.dirs new file mode 100644 index 00000000..e7724817 --- /dev/null +++ b/debian/guhd.dirs @@ -0,0 +1 @@ +usr/bin diff --git a/debian/guh.install b/debian/guhd.install similarity index 100% rename from debian/guh.install rename to debian/guhd.install diff --git a/server/server.pro b/server/server.pro index 75a5358e..45ea7c5a 100644 --- a/server/server.pro +++ b/server/server.pro @@ -2,7 +2,7 @@ include(../guh.pri) message("Building guh version $${GUH_VERSION_STRING}") -TARGET = guh +TARGET = guhd TEMPLATE = app INCLUDEPATH += ../libguh jsonrpc