loolwsd/debian/control | 6 +++---
loolwsd/debian/loolwsd.postinst | 8 +-------
loolwsd/debian/loolwsd.preinst | 2 +-
loolwsd/debian/loolwsd.service | 13 -------------
loolwsd/debian/rules | 5 ++++-
loolwsd/loolwsd.spec.in | 6 +++---
6 files changed, 12 insertions(+), 28 deletions(-)
New commits:
commit ff287806442d937d081a02506602afaade98a2cc
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Sep 26 10:17:51 2016 +0200
loolwsd: poco 1.7.5 as dependency of binary packages
(cherry picked from commit 89ee9fd94b4821d1b5e4beefab8af7f28db065fe)
diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 6282775..80af0eb 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -2,7 +2,7 @@ Source: loolwsd
Section: web
Priority: optional
Maintainer: Tor Lillqvist <t...@collabora.com>
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin,
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.1)
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin,
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5)
Standards-Version: 3.9.7
Package: loolwsd
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index f444cce..0732ec4 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -18,7 +18,7 @@ Summary: LibreOffice On-Line WebSocket Daemon
License: MPL
Source0: loolwsd-@package_vers...@.tar.gz
Source1: loleaflet-@package_vers...@.tar.gz
-BuildRequires: libcap-devel libpng-devel poco-devel >= 1.7.1
+BuildRequires: libcap-devel libpng-devel poco-devel >= 1.7.5
%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: libpcap
%else
@@ -33,7 +33,7 @@ Requires(post): coreutils grep sed
%if 0%{?fedora} || 0%{?rhel} >= 7
# loolwsd dependencies
Requires: expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc
libpng libselinux openssl-libs pcre xz-libs zlib
-Requires: poco-crypto >= 1.7.1 poco-foundation >= 1.7.1 poco-json >=
1.7.1 poco-net >= 1.7.1 poco-netssl >= 1.7.1 poco-util >= 1.7.1 poco-xml >=
1.7.1
+Requires: poco-crypto >= 1.7.5 poco-foundation >= 1.7.5 poco-json >=
1.7.5 poco-net >= 1.7.5 poco-netssl >= 1.7.5 poco-util >= 1.7.5 poco-xml >=
1.7.5
# Collabora Office dependencies (unfortunately Collabora Office RPM packages
does not have real dependencies)
Requires: atk avahi-glib avahi-libs bzip2-libs cairo cups-libs dbus-glib
dbus-libs fontconfig freetype GConf2 gdk-pixbuf2 glib2 gnome-vfs2 graphite2
gstreamer gstreamer-plugins-base gtk2 harfbuzz libdrm libffi libICE libSM
libuuid libX11 libXau libxcb libXcomposite libXcursor libXdamage libXext
libXfixes libXi libXinerama libXrandr libXrender libxshmfence libXt libXxf86vm
mesa-libEGL mesa-libgbm mesa-libGL mesa-libglapi pango pixman
%else
@@ -41,7 +41,7 @@ Requires: atk avahi-glib avahi-libs bzip2-libs cairo
cups-libs dbus-glib d
# loolwsd dependencies
Requires(post): libcap-progs
Requires: libcap2 libopenssl1_0_0 libpng12-0 libpcre1 libz1
%{?systemd_requires} %{fillup_prereq}
-Requires: libPocoCrypto42 >= 1.7.1 libPocoFoundation42 >= 1.7.1
libPocoJSON42 >= 1.7.1 libPocoNet42 >= 1.7.1 libPocoNetSSL42 >= 1.7.1
libPocoUtil42 >= 1.7.1 libPocoXML42 >= 1.7.1
+Requires: libPocoCrypto45 >= 1.7.5 libPocoFoundation45 >= 1.7.5
libPocoJSON45 >= 1.7.5 libPocoNet45 >= 1.7.5 libPocoNetSSL45 >= 1.7.5
libPocoUtil45 >= 1.7.5 libPocoXML45 >= 1.7.5
# Collabora Office dependencies (unfortunately Collabora Office RPM packages
does not have real dependencies)
Requires: Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib
fontconfig libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1
libbz2-1 libcairo2 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6
libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0
libgraphite2-3 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5
libpixman-1-0 libpng16-16 libuuid1 libxml2 libffi4 libgbm1 libICE6 libselinux1
libSM6 libwayland-client0 libwayland-server0 libX11-6 libX11-xcb1 libXau6
libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0
libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libXdamage1 libXext6 libXfixes3
libXrender1 libxshmfence1 libXxf86vm1
%endif
commit 62b3d4fc235d4800d8c9c13516707ad46e7d15a3
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Sep 25 19:18:38 2016 +0200
Fix a few lintian errors and warnings
(cherry picked from commit 50bf2ce246a190d5f001f56454a7de4a4f218805)
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 <t...@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)
commit 905b6938bd88161c55b2dbd0cf27bb3c2119b39c
Author: Katarina Behrens <katarina.behr...@cib.de>
Date: Mon Sep 19 16:54:53 2016 +0200
Silence lintian: there are no init.d-style scripts here
Change-Id: Idae03c6ad015d5f09ce012117e6ffb88b7c7abb8
Reviewed-on: https://gerrit.libreoffice.org/29037
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
(cherry picked from commit 8dfa3a49c7c6413ccf9cbda49fd63f367c6ab77e)
diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index 622daf9..2d7a6d8 100755
--- a/loolwsd/debian/rules
+++ b/loolwsd/debian/rules
@@ -24,3 +24,6 @@ override_dh_auto_test:
override_dh_auto_install:
make install DESTDIR=`pwd`/debian/loolwsd/
cp -ar `pwd`/loleaflet `pwd`/debian/loolwsd/usr/share/loolwsd
+
+override_dh_installinit:
+ # no init.d scripts here, assume systemd
commit dd748482e8c7ba270003d3566c642a0bb8d4066d
Author: Katarina Behrens <katarina.behr...@cib.de>
Date: Mon Sep 19 11:59:21 2016 +0200
Add dependency on 'adduser', postinst script needs it
Change-Id: I41c6b2d6ef9191db3a07bfaf55530659bc06a1d0
Reviewed-on: https://gerrit.libreoffice.org/29017
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
(cherry picked from commit 7424bfd11e00ff261ed11556d7ced09a13abcd91)
diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 9bdbfa7..fcd503b 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.2
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libssl1.0.0, libodbc1,
libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio,
collaboraofficebasis5.1-base, collaboraofficebasis5.1-calc,
collaboraofficebasis5.1-core, collaboraofficebasis5.1-draw,
collaboraofficebasis5.1-extension-beanshell-script-provider,
collaboraofficebasis5.1-extension-ct2n,
collaboraofficebasis5.1-extension-javascript-script-provider,
collaboraofficebasis5.1-extension-mediawiki-publisher,
collaboraofficebasis5.1-extension-nlpsolver,
collaboraofficebasis5.1-extension-numbertext,
collaboraofficebasis5.1-extension-pdf-import,
collaboraofficebasis5.1-extension-report-builder,
collaboraofficebasis5.1-gnome-integration,
collaboraofficebasis5.1-graphicfilter, collaboraofficebasis5.1-images,
collaboraofficebasis5.1-impress, collaboraofficebasis5.1-librelogo,
collaboraofficebasis5.1-math, collaboraofficebasis5.1-ogltrans,
collaboraofficebasis5.1-ooofonts, collaboraofficebasis5.1-ooolinguistic, c
ollaboraofficebasis5.1-postgresql-sdbc,
collaboraofficebasis5.1-python-script-provider, collaboraofficebasis5.1-pyuno,
collaboraofficebasis5.1-writer, collaboraofficebasis5.1-xsltfilter,
collaboraoffice5.1, collaboraoffice5.1-base, collaboraoffice5.1-calc,
collaboraoffice5.1-dict-en, collaboraoffice5.1-draw,
collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress,
collaboraoffice5.1-math, collaboraoffice5.1-ure, collaboraoffice5.1-writer,
collaboraofficebasis5.1-en-us, collaboraofficebasis5.1-en-us-base,
collaboraofficebasis5.1-en-us-calc, collaboraofficebasis5.1-en-us-math,
collaboraofficebasis5.1-en-us-res, collaboraofficebasis5.1-en-us-writer,
collaboraoffice5.1-en-us
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0,
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2,
cpio, collaboraofficebasis5.1-base, collaboraofficebasis5.1-calc,
collaboraofficebasis5.1-core, collaboraofficebasis5.1-draw,
collaboraofficebasis5.1-extension-beanshell-script-provider,
collaboraofficebasis5.1-extension-ct2n,
collaboraofficebasis5.1-extension-javascript-script-provider,
collaboraofficebasis5.1-extension-mediawiki-publisher,
collaboraofficebasis5.1-extension-nlpsolver,
collaboraofficebasis5.1-extension-numbertext,
collaboraofficebasis5.1-extension-pdf-import,
collaboraofficebasis5.1-extension-report-builder,
collaboraofficebasis5.1-gnome-integration,
collaboraofficebasis5.1-graphicfilter, collaboraofficebasis5.1-images,
collaboraofficebasis5.1-impress, collaboraofficebasis5.1-librelogo,
collaboraofficebasis5.1-math, collaboraofficebasis5.1-ogltrans,
collaboraofficebasis5.1-ooofonts, collaboraofficebasis5.1-oooling
uistic, collaboraofficebasis5.1-postgresql-sdbc,
collaboraofficebasis5.1-python-script-provider, collaboraofficebasis5.1-pyuno,
collaboraofficebasis5.1-writer, collaboraofficebasis5.1-xsltfilter,
collaboraoffice5.1, collaboraoffice5.1-base, collaboraoffice5.1-calc,
collaboraoffice5.1-dict-en, collaboraoffice5.1-draw,
collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress,
collaboraoffice5.1-math, collaboraoffice5.1-ure, collaboraoffice5.1-writer,
collaboraofficebasis5.1-en-us, collaboraofficebasis5.1-en-us-base,
collaboraofficebasis5.1-en-us-calc, collaboraofficebasis5.1-en-us-math,
collaboraofficebasis5.1-en-us-res, collaboraofficebasis5.1-en-us-writer,
collaboraoffice5.1-en-us
Description: LibreOffice On-Line WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
