[libreoffice-online] 02/08: initial Debianisation based on upstreams debian/ for loolwsd
Rene Engelhard
rene at moszumanska.debian.org
Sun Feb 26 18:44:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice-online.
commit 35dc3c1ba521586f977b0dd7df3c2940c723d49b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Tue Jan 31 11:26:59 2017 +0100
initial Debianisation based on upstreams debian/ for loolwsd
---
debian/changelog | 26 ++--------------
debian/control | 10 +++---
debian/copyright | 45 ++++++++++++++-------------
debian/loolwsd.postinst | 16 +++++-----
debian/patches/lo-path.diff | 75 +++++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +-
7 files changed, 118 insertions(+), 57 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 56cbc55..b4a526a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,5 @@
-loolwsd (1.8.2-1) unstable; urgency=medium
+libreoffice-online (5.3.0.2-1) UNRELEASED; urgency=medium
- * Fix crash in Impress.
+ * Initial release. (closes: #787080)
- -- Jan Holesovsky <kendy at collabora.com> Thu, 11 Aug 2016 16:46:00 +0100
-
-loolwsd (1.8.0-1) unstable; urgency=medium
-
- [ Tor Lillqvist ]
- * Back to packaging this for Debian.
-
- [ Jan Holesovsky ]
- * Update to match Collabora Office 5.1
-
- -- Jan Holesovsky <kendy at collabora.com> Fri, 05 Aug 2016 16:51:54 +0100
-
-loolwsd (1.0.0-1) unstable; urgency=low
-
- * Initial release
-
- * Local Variables:
- * Mode: fundamental
- * End:
-
- -- Tor Lillqvist <tml at collabora.com> Fri, 15 May 2015 11:10:20 +0300
+ -- Rene Engelhard <rene at debian.org> Tue, 31 Jan 2017 11:11:04 +0100
diff --git a/debian/control b/debian/control
index 80af0eb..1a29b6c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,16 @@
-Source: loolwsd
+Source: libreoffice-online
Section: web
Priority: optional
-Maintainer: Tor Lillqvist <tml at collabora.com>
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5)
+Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Uploaders: Rene Engelhard <rene at debian.org>
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), libreofficekit-dev
Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-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-publ [...]
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libodbc1, libcups2, cpio, libreoffice
Description: LibreOffice On-Line WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
diff --git a/debian/copyright b/debian/copyright
index a75b302..0794a2f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,31 +1,34 @@
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
Name: loolwsd
-Maintainer: Tor Lillqvist <tml at collabora.com>
+Maintainer: Rene Engelhard <rene at debian.org>
Source: git://gerrit.libreoffice.org/online
+Files: *
Copyright: 2015 Collabora Productivity <libreoffice at collabora.com>
License: MPL-2
+Files: loleaflet/*
Copyright: Copyright (c) 2010-2015, Vladimir Agafonkin, Copyright (c) 2010-2011, CloudMade
License:
-All rights reserved.
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without modification, are
+ permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice, this list of
+ conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ of conditions and the following disclaimer in the documentation and/or other materials
+ provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this list of
- conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice, this list
- of conditions and the following disclaimer in the documentation and/or other materials
- provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/loolwsd.postinst b/debian/loolwsd.postinst
index ad4f7ec..9c2d090 100755
--- a/debian/loolwsd.postinst
+++ b/debian/loolwsd.postinst
@@ -7,20 +7,20 @@ case "$1" in
setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit || true
setcap cap_sys_admin=ep /usr/bin/loolmount || true
- adduser --quiet --system --group --home /opt/lool lool
+ adduser --quiet --system --group --home /var/lib/lool lool
mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
rm -rf /var/cache/loolwsd/*
- # We assume that the LibreOffice to be used is built TDF-style
- # and installs in /opt/collaboraoffice5.1, and that /opt/lool is
+ # We assume that the LibreOffice to be used is built Debian-style
+ # and installs in /usr/lib/libreoffice, and that /var/lib/lool is
# on the same file system
- rm -rf /opt/lool
- mkdir -p /opt/lool/child-roots
- chown lool: /opt/lool
- chown lool: /opt/lool/child-roots
+ rm -rf /var/lib/lool
+ mkdir -p /var/lib/lool/child-roots
+ chown lool: /var/lib/lool
+ chown lool: /var/lib/lool/child-roots
- su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice5.1 >/dev/null 2>&1"
+ su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /var/lib/lool/systemplate /usr/lib/libreoffice >/dev/null 2>&1"
;;
esac
diff --git a/debian/patches/lo-path.diff b/debian/patches/lo-path.diff
new file mode 100644
index 0000000..a3908fa
--- /dev/null
+++ b/debian/patches/lo-path.diff
@@ -0,0 +1,75 @@
+diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
+index 0d30524..48dae3e 100755
+--- a/loolwsd-systemplate-setup
++++ b/loolwsd-systemplate-setup
+@@ -6,7 +6,7 @@ test $# -eq 2 || { echo "Usage: $0 <chroot template directory for system libs to
+
+ CHROOT=$1
+ INSTDIR=$2
+-POCOLIBDIRS="/usr/local/lib /opt/poco/lib"
++POCOLIBDIRS="/usr/lib"
+
+ test -d "$INSTDIR" || { echo "No such directory: $INSTDIR"; exit 1; }
+
+@@ -57,8 +57,7 @@ done |
+ grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)' | sort -u | sed -e 's,^/,,'
+
+ # Poco libraries and their dependencies
+-find $POCOLIBDIRS -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*'
+-find $POCOLIBDIRS /usr/lib64 -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*' |
++find $POCOLIBDIRS -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*' |
+ while read file; do
+ echo $file
+ ldd $file 2>/dev/null
+diff --git a/loolwsd.service b/loolwsd.service
+index 34b1bb8..251305e 100644
+--- a/loolwsd.service
++++ b/loolwsd.service
+@@ -4,7 +4,7 @@ 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
++ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/var/lib/lool/systemplate --o:lo_template_path=/usr/lib/libreoffice --o:child_root_path=/var/lib/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd
+ User=lool
+ KillMode=control-group
+ Restart=always
+diff --git a/loolwsd.xml.in b/loolwsd.xml.in
+index c3a550b..9bf0bd2 100644
+--- a/loolwsd.xml.in
++++ b/loolwsd.xml.in
+@@ -5,7 +5,7 @@
+
+ <tile_cache_path desc="Path to a directory where to keep the tile cache." type="path" relative="false" default="@LOOLWSD_CACHEDIR@"></tile_cache_path>
+ <sys_template_path desc="Path to a template tree with shared libraries etc to be used as source for chroot jails for child processes." type="path" relative="true" default="systemplate"></sys_template_path>
+- <lo_template_path desc="Path to a LibreOffice installation tree to be copied (linked) into the jails for child processes. Should be on the same file system as systemplate." type="path" relative="false" default="/opt/collaboraoffice5.1"></lo_template_path>
++ <lo_template_path desc="Path to a LibreOffice installation tree to be copied (linked) into the jails for child processes. Should be on the same file system as systemplate." type="path" relative="false" default="/usr/lib/libreoffice"></lo_template_path>
+ <child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="true" default="jails"></child_root_path>
+
+ <server_name desc="Hostname:port of the server running loolwsd. If empty, it's derived from the request." type="string" default=""></server_name>
+diff --git a/test/run_unit.sh b/test/run_unit.sh
+index d3cdeb1..4d6d372 100755
+--- a/test/run_unit.sh
++++ b/test/run_unit.sh
+@@ -13,7 +13,7 @@ abs_top_builddir="${DIR}/.."
+ systemplate_path="${abs_top_builddir}/systemplate"
+ enable_debug="true"
+ jails_path="${abs_top_builddir}/jails"
+-lo_path="/opt/libreoffice/cp-5.1/instdir"
++lo_path="/usr/lib/libreoffice"
+ valgrind_cmd="valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes"
+
+ # Note that these options are used by commands in the Makefile that
+diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
+index 64eabf0..b62ce4b 100644
+--- a/wsd/LOOLWSD.cpp
++++ b/wsd/LOOLWSD.cpp
+@@ -1485,7 +1485,7 @@ void LOOLWSD::initialize(Application& self)
+ static const std::map<std::string, std::string> DefAppConfig
+ = { { "tile_cache_path", LOOLWSD_CACHEDIR },
+ { "sys_template_path", "systemplate" },
+- { "lo_template_path", "/opt/collaboraoffice5.1" },
++ { "lo_template_path", "/usr/lib/libreoffice" },
+ { "child_root_path", "jails" },
+ { "lo_jail_subpath", "lo" },
+ { "server_name", "" },
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2ce5be1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lo-path.diff
diff --git a/debian/rules b/debian/rules
index 8a7224d..e28acb2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk
-CONFFLAGS = --prefix=/usr --localstatedir=/var --sysconfdir=/etc --with-lokit-path=`pwd`/bundled/include $(CONFIG_OPTIONS)
+CONFFLAGS = --prefix=/usr --localstatedir=/var --sysconfdir=/etc --with-lokit-path=/usr/include/LibreOfficeKit $(CONFIG_OPTIONS)
# Avoid setcap when doing "make", when building for packaging
# the setcap is done at installation time
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice-online.git
More information about the Pkg-openoffice-commits
mailing list