[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/debian

[Andras Timar]

 loolwsd/debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 5982389b3893ea71c3565b7bcd6311385f4672a8
Author: Andras Timar 
Date:   Tue Oct 25 10:45:47 2016 +0200

Debian changelog

diff --git a/loolwsd/debian/changelog b/loolwsd/debian/changelog
index 56cbc55..95ba80b 100644
--- a/loolwsd/debian/changelog
+++ b/loolwsd/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (1.8.5-1) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool1
+
+ -- Andras Timar   Thu, 25 Oct 2016 10:26:00 +0200
+
 loolwsd (1.8.2-1) unstable; urgency=medium
 
   * Fix crash in Impress.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/debian

[Andras Timar]

 loolwsd/debian/loolwsd.service |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit f4e07073ef36e0efdf5ef94198d7eec63874923a
Author: Andras Timar 
Date:   Wed Oct 12 00:14:29 2016 +0200

loolwsd: re-add debian/loolwsd.service

diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
new file mode 100644
index 000..34b1bb8
--- /dev/null
+++ b/loolwsd/debian/loolwsd.service
@@ -0,0 +1,13 @@
+[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
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/debian

[Andras Timar]

 loolwsd/debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 023f459b2099e68fd25318ae387be5a130dd99e7
Author: Andras Timar 
Date:   Tue Oct 11 23:28:46 2016 +0200

loolwsd: wrong version in debian/control

(cherry picked from commit 32bb382dbd1e8735e9436589d00be148e477c5ca)

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index d06db78..8cb0b4b 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/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, collaboraofficebasis5.1-base (>= 5.1.10.9), collaboraofficebasis5.1-calc 
(>= 5.1.10.9), collaboraofficebasis5.1-core (>= 5.1.10.9), 
collaboraofficebasis5.1-draw (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.9), 
collaboraofficebasis5.1-gnome-integration (>= 5.1.10.9), 
collaboraofficebasis5.1-graphicfilter (>= 5.1.10.9), 
collaboraofficebasis5.1-images (>
 = 5.1.10.9), collaboraofficebasis5.1-impress (>= 5.1.10.9), 
collaboraofficebasis5.1-librelogo (>= 5.1.10.9), collaboraofficebasis5.1-math 
(>= 5.1.10.9), collaboraofficebasis5.1-ogltrans (>= 5.1.10.9), 
collaboraofficebasis5.1-ooofonts (>= 5.1.10.9), 
collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.9), 
collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.9), 
collaboraofficebasis5.1-python-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-pyuno (>= 5.1.10.9), collaboraofficebasis5.1-writer (>= 
5.1.10.9), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.9), collaboraoffice5.1 
(>= 5.1.10.9), collaboraoffice5.1-base (>= 5.1.10.9), collaboraoffice5.1-calc 
(>= 5.1.10.9), collaboraoffice5.1-dict-en (>= 5.1.10.9), 
collaboraoffice5.1-draw (>= 5.1.10.9), collaboraoffice5.1-debian-menus (>= 
5.1.10.9), collaboraoffice5.1-impress (>= 5.1.10.9), collaboraoffice5.1-math 
(>= 5.1.10.9), collaboraoffice5.1-ure (>= 5.1.10.9), collaboraoffice5.1-writer 
(>= 5.1.10.9), collaboraofficebasis5.1-en-us (>= 5.1
 .10.9), collaboraofficebasis5.1-en-us-base (>= 5.1.10.9), 
collaboraofficebasis5.1-en-us-calc (>= 5.1.10.9), 
collaboraofficebasis5.1-en-us-math (>= 5.1.10.9), 
collaboraofficebasis5.1-en-us-res (>= 5.1.10.9), 
collaboraofficebasis5.1-en-us-writer (>= 5.1.10.9), collaboraoffice5.1-en-us 
(>= 5.1.10.9)
+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 (>= 5.1.10.9), collaboraofficebasis5.1-calc 
(>= 5.1.10.9), collaboraofficebasis5.1-core (>= 5.1.10.9), 
collaboraofficebasis5.1-draw (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.9), 
collaboraofficebasis5.1-gnome-integration (>= 5.1.10.9), 
collaboraofficebasis5.1-graphicfilter (>= 5.1.10.9), 
collaboraofficebasis5.1-images (>
 = 5.1.10.9), collaboraofficebasis5.1-impress (>= 5.1.10.9), 
collaboraofficebasis5.1-librelogo (>= 5.1.10.9), collaboraofficebasis5.1-math 
(>= 5.1.10.9), collaboraofficebasis5.1-ogltrans (>= 5.1.10.9), 
collaboraofficebasis5.1-ooofonts (>= 5.1.10.9), 
collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.9), 
collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.9), 
collaboraofficebasis5.1-python-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-pyuno (>= 5.1.10.9), collaboraofficebasis5.1-writer (>= 
5.1.10.9), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.9), collaboraoffice5.1 
(>= 5.1.10.9), collaboraoffice5.1-base (>= 5.1.10.9), collaboraoffice5.1-calc 
(>= 5.1.10.9), collaboraoffice5.1-dict-en (>= 5.1.10.9), 
collaboraoffice5.1-draw (>= 5.1.10.9), collaboraoffice5.1-debian-menus, 
collaboraoffice5.1-impress (>= 5.1.10.9), collaboraoffice5.1-math (>= 
5.1.10.9), collaboraoffice5.1-ure (>= 5.1.10.9), collaboraoffice5.1-writer (>= 
5.1.10.9), collaboraofficebasis5.1-en-us (>= 5.1.10.9), collab
 oraofficebasis5.1-en-us-base (>= 

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/debian loolwsd/loolwsd.spec.in

[Andras Timar]

 loolwsd/debian/control  |2 +-
 loolwsd/loolwsd.spec.in |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 36e952a096e2819b83aa2cab816647e3fae9af87
Author: Andras Timar 
Date:   Fri Oct 7 12:41:49 2016 +0200

loolwsd: packages require exact Collabora Office version

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 80af0eb..d40074a 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/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, 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
+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 (>= 5.1.10.8), collaboraofficebasis5.1-calc 
(>= 5.1.10.8), collaboraofficebasis5.1-core (>= 5.1.10.8), 
collaboraofficebasis5.1-draw (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.8), 
collaboraofficebasis5.1-gnome-integration (>= 5.1.10.8), 
collaboraofficebasis5.1-graphicfilter (>= 5.1.10.8), 
collaboraofficebasis5.1-images (>
 = 5.1.10.8), collaboraofficebasis5.1-impress (>= 5.1.10.8), 
collaboraofficebasis5.1-librelogo (>= 5.1.10.8), collaboraofficebasis5.1-math 
(>= 5.1.10.8), collaboraofficebasis5.1-ogltrans (>= 5.1.10.8), 
collaboraofficebasis5.1-ooofonts (>= 5.1.10.8), 
collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.8), 
collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.8), 
collaboraofficebasis5.1-python-script-provider (>= 5.1.10.8), 
collaboraofficebasis5.1-pyuno (>= 5.1.10.8), collaboraofficebasis5.1-writer (>= 
5.1.10.8), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.8), collaboraoffice5.1 
(>= 5.1.10.8), collaboraoffice5.1-base (>= 5.1.10.8), collaboraoffice5.1-calc 
(>= 5.1.10.8), collaboraoffice5.1-dict-en (>= 5.1.10.8), 
collaboraoffice5.1-draw (>= 5.1.10.8), collaboraoffice5.1-debian-menus (>= 
5.1.10.8), collaboraoffice5.1-impress (>= 5.1.10.8), collaboraoffice5.1-math 
(>= 5.1.10.8), collaboraoffice5.1-ure (>= 5.1.10.8), collaboraoffice5.1-writer 
(>= 5.1.10.8), collaboraofficebasis5.1-en-us (>= 5.1
 .10.8), collaboraofficebasis5.1-en-us-base (>= 5.1.10.8), 
collaboraofficebasis5.1-en-us-calc (>= 5.1.10.8), 
collaboraofficebasis5.1-en-us-math (>= 5.1.10.8), 
collaboraofficebasis5.1-en-us-res (>= 5.1.10.8), 
collaboraofficebasis5.1-en-us-writer (>= 5.1.10.8), collaboraoffice5.1-en-us 
(>= 5.1.10.8)
 Description: LibreOffice On-Line WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 0732ec4..70c80eb 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -27,7 +27,7 @@ BuildRequires:  libcap-progs systemd-rpm-macros
 %endif
 

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/debian

[Jan Holesovsky]

 loolwsd/debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 804321d85a090f963191c51a716a030449ed046a
Author: Jan Holesovsky 
Date:   Thu Aug 11 23:08:52 2016 +0100

List the .deb dependencies explicitly.

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index ef91505..9bdbfa7 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, 
collaboraoffice
+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
 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

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/debian

[Jan Holesovsky]

 loolwsd/debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 79df7764f9ad56f2998669dd1a84c7cb196c090b
Author: Jan Holesovsky 
Date:   Thu Aug 11 16:57:47 2016 +0100

Update the changelog.

diff --git a/loolwsd/debian/changelog b/loolwsd/debian/changelog
index 7e18298..56cbc55 100644
--- a/loolwsd/debian/changelog
+++ b/loolwsd/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (1.8.2-1) unstable; urgency=medium
+
+  * Fix crash in Impress.
+
+ -- Jan Holesovsky   Thu, 11 Aug 2016 16:46:00 +0100
+
 loolwsd (1.8.0-1) unstable; urgency=medium
 
   [ Tor Lillqvist ]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/debian

[Jan Holesovsky]

 loolwsd/debian/changelog |8 ++--
 loolwsd/debian/rules |2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 62d277a50281e9aebb9c0f181c0c7ccb51ef4bcd
Author: Jan Holesovsky 
Date:   Fri Aug 5 17:38:42 2016 +0100

Update the .deb changelog, and allow passing params.

diff --git a/loolwsd/debian/changelog b/loolwsd/debian/changelog
index bfb559a..7e18298 100644
--- a/loolwsd/debian/changelog
+++ b/loolwsd/debian/changelog
@@ -1,8 +1,12 @@
-loolwsd (1.0.34-1) UNRELEASED; urgency=medium
+loolwsd (1.8.0-1) unstable; urgency=medium
 
+  [ Tor Lillqvist ]
   * Back to packaging this for Debian.
 
- -- Tor Lillqvist   Wed, 03 Jun 2015 20:24:50 +0300
+  [ Jan Holesovsky ]
+  * Update to match Collabora Office 5.1
+
+ -- Jan Holesovsky   Fri, 05 Aug 2016 16:51:54 +0100
 
 loolwsd (1.0.0-1) unstable; urgency=low
 
diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index 519ac1a..622daf9 100755
--- a/loolwsd/debian/rules
+++ b/loolwsd/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
+CONFFLAGS = --prefix=/usr --localstatedir=/var --sysconfdir=/etc 
--with-lokit-path=`pwd`/bundled/include $(CONFIG_OPTIONS)
 
 # Avoid setcap when doing "make", when building for packaging
 # the setcap is done at installation time
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/debian

[Andras Timar]

 loolwsd/debian/loolwsd.cron.d |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 66eddd34412b48985fbf1497b80d8d0fb5f4a623
Author: Andras Timar 
Date:   Fri Jul 22 14:09:53 2016 +0200

fix loolwsd cache cleanu cron job on Debian

(cherry picked from commit 0bd3e3e109fcd74ab0d4ce294569304eb6035ab8)

diff --git a/loolwsd/debian/loolwsd.cron.d b/loolwsd/debian/loolwsd.cron.d
index 6e8d16b..85a3afc 100644
--- a/loolwsd/debian/loolwsd.cron.d
+++ b/loolwsd/debian/loolwsd.cron.d
@@ -1 +1 @@
-0 0 */1 * * root find /var/cache/loolwsd -name "*.png" -a -atime +10 -exec rm 
{} ;
+0 0 */1 * * root find /var/cache/loolwsd -name "*.png" -a -atime +10 -exec rm 
{} \;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/debian loolwsd/LOOLWSD.cpp loolwsd/loolwsd.service loolwsd/loolwsd.spec.in loolwsd/loolwsd.xml.in

[Andras Timar]

 loolwsd/LOOLWSD.cpp |2 +-
 loolwsd/debian/loolwsd.postinst |4 ++--
 loolwsd/debian/loolwsd.service  |2 +-
 loolwsd/loolwsd.service |2 +-
 loolwsd/loolwsd.spec.in |6 +++---
 loolwsd/loolwsd.xml.in  |2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 59340c127fb335cee308b851dd8db77458e2788c
Author: Andras Timar 
Date:   Mon Jul 18 17:04:25 2016 +0200

new default: Collabora Office 5.1

(cherry picked from commit 5f77a1f611cd45bb26d5b05eb634634ec5ef9511)

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 4aab9ba..e5d41cc 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1247,7 +1247,7 @@ void LOOLWSD::initialize(Application& self)
 static const std::map DefAppConfig = {
 { "tile_cache_path", LOOLWSD_CACHEDIR },
 { "sys_template_path", "systemplate" },
-{ "lo_template_path", "/opt/collaboraoffice5.0" },
+{ "lo_template_path", "/opt/collaboraoffice5.1" },
 { "child_root_path", "jails" },
 { "lo_jail_subpath", "lo" },
 { "server_name", "" },
diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
index 0bc47a0..9606d4c 100755
--- a/loolwsd/debian/loolwsd.postinst
+++ b/loolwsd/debian/loolwsd.postinst
@@ -12,7 +12,7 @@ case "$1" in
rm -rf /var/cache/loolwsd/*
 
# We assume that the LibreOffice to be used is built TDF-style
-   # and installs in /opt/collaboraoffice5.0, and that /opt/lool is
+   # and installs in /opt/collaboraoffice5.1, and that /opt/lool is
# on the same file system
 
rm -rf /opt/lool
@@ -20,7 +20,7 @@ case "$1" in
chown lool: /opt/lool
chown lool: /opt/lool/child-roots
 
-   su lool --shell=/bin/sh -c "loolwsd-systemplate-setup 
/opt/lool/systemplate /opt/collaboraoffice5.0 >/dev/null 2>&1"
+   su lool --shell=/bin/sh -c "loolwsd-systemplate-setup 
/opt/lool/systemplate /opt/collaboraoffice5.1 >/dev/null 2>&1"
;;
 
 esac
diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
index 5124662..34b1bb8 100644
--- a/loolwsd/debian/loolwsd.service
+++ b/loolwsd/debian/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.0 
--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=/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
diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index 5124662..34b1bb8 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/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.0 
--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=/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
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 2b10a82..d298198 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -23,7 +23,7 @@ BuildRequires:  libcap-progs systemd-rpm-macros
 %endif
 %endif
 
-Requires:   collaboraoffice5.0 collaboraoffice5.0-en-US 
collaboraoffice5.0-ure collaboraofficebasis5.0-core 
collaboraofficebasis5.0-writer collaboraofficebasis5.0-impress 
collaboraofficebasis5.0-graphicfilter collaboraofficebasis5.0-en-US 
collaboraofficebasis5.0-calc collaboraofficebasis5.0-en-US-res 
collaboraofficebasis5.0-en-US-calc collaboraofficebasis5.0-ooofonts 
collaboraofficebasis5.0-images collaboraofficebasis5.0-filter-data 
collaboraofficebasis5.0-draw collaboraofficebasis5.0-base 
collaboraofficebasis5.0-en-US-writer collaboraofficebasis5.0-en-US-math 
collaboraofficebasis5.0-en-US-base
+Requires:   collaboraoffice5.1 collaboraoffice5.1-en-US 
collaboraoffice5.1-ure collaboraofficebasis5.1-core 
collaboraofficebasis5.1-writer collaboraofficebasis5.1-impress 
collaboraofficebasis5.1-graphicfilter collaboraofficebasis5.1-en-US 
collaboraofficebasis5.1-calc collaboraofficebasis5.1-en-US-res 
collaboraofficebasis5.1-en-US-calc collaboraofficebasis5.1-ooofonts 
collaboraofficebasis5.1-images collaboraofficebasis5.1-filter-data 
collaboraofficebasis5.1-draw collaboraofficebasis5.1-base 
collaboraofficebasis5.1-en-US-writer 

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/debian

[Andras Timar]

 loolwsd/debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f18532d16c01cc1e7f7c65a3aae5df110db77f69
Author: Andras Timar 
Date:   Tue Jun 28 10:10:23 2016 +0200

loolwsd: remove libmysqlclient18 from deb package dependencies

(cherry picked from commit cdf14cea3e3765cb94896ba3efa1678a4d0d4f6c)

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 08b784c..ef91505 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, 
libmysqlclient18, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, 
libdbus-glib-1-2, cpio, collaboraoffice
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libssl1.0.0, libodbc1, 
libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, 
collaboraoffice
 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