[Libreoffice-commits] online.git: loolwsd/debian

[Andras Timar]

 loolwsd/debian/control          |    4 ++--
 loolwsd/debian/loolwsd.postinst |    8 +-------
 loolwsd/debian/loolwsd.preinst  |    2 +-
 loolwsd/debian/loolwsd.service  |   13 -------------
 loolwsd/debian/rules            |    2 +-
 5 files changed, 5 insertions(+), 24 deletions(-)

New commits:
commit 50bf2ce246a190d5f001f56454a7de4a4f218805
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Sep 25 19:18:38 2016 +0200

    Fix a few lintian errors and warnings

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index fcd503b..6282775 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -2,8 +2,8 @@ Source: loolwsd
 Section: web
 Priority: optional
 Maintainer: Tor Lillqvist <tml at collabora.com>
-Build-Depends: debhelper (>= 8.0.0), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.1)
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.1)
+Standards-Version: 3.9.7
 
 Package: loolwsd
 Section: web
diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
index 9606d4c..ad4f7ec 100755
--- a/loolwsd/debian/loolwsd.postinst
+++ b/loolwsd/debian/loolwsd.postinst
@@ -25,10 +25,4 @@ case "$1" in
 
 esac
 
-if [ -d /run/systemd/system ]; then
-    systemctl --system daemon-reload >/dev/null || true
-    systemctl enable loolwsd.service >/dev/null || true
-    deb-systemd-invoke start loolwsd.service >/dev/null || true
-fi
-
-exit 0
+#DEBHELPER#
diff --git a/loolwsd/debian/loolwsd.preinst b/loolwsd/debian/loolwsd.preinst
index 78112a4..2778ec7 100755
--- a/loolwsd/debian/loolwsd.preinst
+++ b/loolwsd/debian/loolwsd.preinst
@@ -7,4 +7,4 @@ if [ -d /run/systemd/system ]; then
     deb-systemd-invoke stop loolwsd.service >/dev/null || true
 fi
 
-exit 0
+#DEBHELPER#
diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
deleted file mode 100644
index 34b1bb8..0000000
--- a/loolwsd/debian/loolwsd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=LibreOffice On-Line WebSocket Daemon
-After=network.target
-
-[Service]
-EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/collaboraoffice5.1 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd
-User=lool
-KillMode=control-group
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index 2d7a6d8..8a7224d 100755
--- a/loolwsd/debian/rules
+++ b/loolwsd/debian/rules
@@ -13,7 +13,7 @@ export BUILDING_FROM_RPMBUILD=yes
 
 # main packaging script based on dh7 syntax
 %:
-	dh $@
+	dh $@ --with=systemd
 
 override_dh_auto_configure:
 	./configure $(CONFFLAGS)