debian/changelog | 6 ++++++
debian/control | 2 +-
debian/loolwsd.service | 13 +++++++++++++
debian/rules | 4 ----
loleaflet/src/admin/AdminSocketSettings.js | 4 ++--
loleaflet/src/core/Socket.js | 4 ++--
loolwsd.spec.in | 14 +++++++-------
7 files changed, 31 insertions(+), 16 deletions(-)
New commits:
commit b5a7d436285690c606b65dc1cb65067fe5191076
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Mar 27 20:40:09 2017 +0200
Revert "Use hub link for git log"
This reverts commit 460da71ce23639b275e95f53fd2a5c8a1ddc2901.
hub link does not work for me
diff --git a/loleaflet/src/admin/AdminSocketSettings.js
b/loleaflet/src/admin/AdminSocketSettings.js
index 537d1487..5a7ec207 100644
--- a/loleaflet/src/admin/AdminSocketSettings.js
+++ b/loleaflet/src/admin/AdminSocketSettings.js
@@ -70,7 +70,7 @@ var AdminSocketSettings = AdminSocketBase.extend({
var loolwsdVersionObj =
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = loolwsdVersionObj.Hash;
if (parseInt(h,16).toString(16) ===
h.toLowerCase().replace(/^0+/, '')) {
- h = '<a target="_blank"
href="https://hub.libreoffice.org/git-online/' + h + '">' + h + '</a>';
+ h = '<a target="_blank"
href="https://gerrit.libreoffice.org/gitweb?p=online.git;a=log;h=' + h + '">' +
h + '</a>';
$('#loolwsd-version').html(loolwsdVersionObj.Version + ' (git hash: ' + h +
')');
}
else {
@@ -81,7 +81,7 @@ var AdminSocketSettings = AdminSocketBase.extend({
var lokitVersionObj =
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = lokitVersionObj.BuildId.substring(0, 7);
if (parseInt(h,16).toString(16) ===
h.toLowerCase().replace(/^0+/, '')) {
- h = '<a target="_blank"
href="https://hub.libreoffice.org/git-core/' + h + '">' + h + '</a>';
+ h = '<a target="_blank"
href="https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=' + h + '">' + h
+ '</a>';
}
$('#lokit-version').html(lokitVersionObj.ProductName +
' ' +
lokitVersionObj.ProductVersion
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 787a487e..ea8f15e9 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -176,7 +176,7 @@ L.Socket = L.Class.extend({
var loolwsdVersionObj =
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = loolwsdVersionObj.Hash;
if (parseInt(h,16).toString(16) ===
h.toLowerCase().replace(/^0+/, '')) {
- h = '<a target="_blank"
href="https://hub.libreoffice.org/git-online/' + h + '">' + h + '</a>';
+ h = '<a target="_blank"
href="https://gerrit.libreoffice.org/gitweb?p=online.git;a=log;h=' + h + '">' +
h + '</a>';
$('#loolwsd-version').html(loolwsdVersionObj.Version + ' (git hash: ' + h +
')');
}
else {
@@ -192,7 +192,7 @@ L.Socket = L.Class.extend({
var lokitVersionObj =
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = lokitVersionObj.BuildId.substring(0, 7);
if (parseInt(h,16).toString(16) ===
h.toLowerCase().replace(/^0+/, '')) {
- h = '<a target="_blank"
href="https://hub.libreoffice.org/git-core/' + h + '">' + h + '</a>';
+ h = '<a target="_blank"
href="https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=' + h + '">' + h
+ '</a>';
}
$('#lokit-version').html(lokitVersionObj.ProductName +
' ' +
lokitVersionObj.ProductVersion
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
commit 43aea3642b77fb75b04ed6cb490168361e5f55a5
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Mar 27 20:35:04 2017 +0200
Collabora Online packaging
Change-Id: Iecf3620d8b4d780aa095ebd4b823e5260b92db6f
diff --git a/debian/changelog b/debian/changelog
index 56cbc556..42db8d80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.1.0-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool21
+
+ -- Andras Timar <andras.ti...@collabora.com> Wed, 29 Mar 2017 11:40:00 +0200
+
loolwsd (1.8.2-1) unstable; urgency=medium
* Fix crash in Impress.
diff --git a/debian/control b/debian/control
index c4dc9c60..c4c841ec 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ 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, ${lo:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0,
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2,
cpio, collaboraofficebasis5.3-calc (>= 5.3.10.3), collaboraofficebasis5.3-core
(>= 5.3.10.3), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.3),
collaboraofficebasis5.3-images (>= 5.3.10.3), collaboraofficebasis5.3-impress
(>= 5.3.10.3), collaboraofficebasis5.3-ooofonts (>= 5.3.10.3),
collaboraofficebasis5.3-writer (>= 5.3.10.3), collaboraoffice5.3 (>= 5.3.10.3),
collaboraoffice5.3-ure (>= 5.3.10.3), collaboraofficebasis5.3-en-us (>=
5.3.10.3), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.3),
collaboraofficebasis5.3-en-us-res (>= 5.3.10.3),
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.3), collaboraofficebasis5.3-draw
(>= 5.3.10.3), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.3)
Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
diff --git a/debian/loolwsd.service b/debian/loolwsd.service
new file mode 100644
index 00000000..d43d5907
--- /dev/null
+++ b/debian/loolwsd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=LibreOffice Online WebSocket Daemon
+After=network.target
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/loolwsd
+ExecStart=/usr/bin/loolwsd --version
--o:sys_template_path=/opt/lool/systemplate
--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/debian/rules b/debian/rules
index b725d6a6..d4fa6539 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,3 @@ override_dh_auto_test:
override_dh_installinit:
# no init.d scripts here, assume systemd
-
-override_dh_gencontrol:
- # put package names of LibreOffice here
- # dh_gencontrol -- -Vlo:Depends=""
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index ebb934f5..5b6d89de 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -13,8 +13,8 @@ Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
Release: 1%{?dist}
-Vendor: %{vendor}
-Summary: LibreOffice Online WebSocket Daemon
+Vendor: Collabora
+Summary: LibreOffice On-Line WebSocket Daemon
License: MPL
Source0: loolwsd-@package_vers...@.tar.gz
BuildRequires: libcap-devel libpng-devel poco-devel >= 1.7.5
@@ -26,14 +26,14 @@ BuildRequires: libcap-progs systemd-rpm-macros
%endif
%endif
-Requires: %{lo_rpm_list}
+Requires: collaboraoffice5.3 >= 5.3.10.3 collaboraoffice5.3-ure >=
5.3.10.3 collaboraofficebasis5.3-core >= 5.3.10.3
collaboraofficebasis5.3-writer >= 5.3.10.3 collaboraofficebasis5.3-impress >=
5.3.10.3 collaboraofficebasis5.3-graphicfilter >= 5.3.10.3
collaboraofficebasis5.3-en-US >= 5.3.10.3 collaboraofficebasis5.3-calc >=
5.3.10.3 collaboraofficebasis5.3-en-US-res >= 5.3.10.3
collaboraofficebasis5.3-en-US-calc >= 5.3.10.3 collaboraofficebasis5.3-ooofonts
>= 5.3.10.3 collaboraofficebasis5.3-images >= 5.3.10.3
collaboraofficebasis5.3-noto-fonts >= 5.3.10.3 collaboraofficebasis5.3-draw >=
5.3.10.3 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.3
Requires: systemd
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.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
-# LibreOffice dependencies (unfortunately upstream LibreOffice RPM packages
(from TDF) do not have real dependencies)
+# Collabora Office dependencies (unfortunately Collabora Office RPM packages
do 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
%if 0%{?suse_version}
@@ -41,7 +41,7 @@ Requires: atk avahi-glib avahi-libs bzip2-libs cairo
cups-libs dbus-glib d
Requires(post): libcap-progs
Requires: libcap2 libopenssl1_0_0 libpng12-0 libpcre1 libz1
%{?systemd_requires} %{fillup_prereq}
Requires: libPocoCrypto48 >= 1.7.8 libPocoFoundation48 >= 1.7.8
libPocoJSON48 >= 1.7.8 libPocoNet48 >= 1.7.8 libPocoNetSSL48 >= 1.7.8
libPocoUtil48 >= 1.7.8 libPocoXML48 >= 1.7.8
-# LibreOffice dependencies (unfortunately upstream LibreOffice RPM packages
(from TDF) do not have real dependencies)
+# Collabora Office dependencies (unfortunately Collabora Office RPM packages
do 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
%endif
@@ -63,7 +63,7 @@ Obsoletes: loleaflet <= 1.5.8
%build
%configure \
--with-lokit-path=bundled/include \
- --with-lo-path=%{loroot} \
+ --with-lo-path=/opt/collaboraoffice5.3 \
%if 0%{?config_options:1}
%{config_options}
%endif
@@ -132,7 +132,7 @@ rm -rf /var/cache/loolwsd/*
# Figure out where LO is installed, let's hope it is not a mount point
# Create a directory for loolwsd on the same file system
-loroot=%{loroot}
+loroot=/opt/collaboraoffice5.3
loolparent=`cd ${loroot} && cd .. && /bin/pwd`
rm -rf ${loolparent}/lool
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
