loolwsd/ChildSession.cpp | 2 +- loolwsd/debian/control | 2 +- loolwsd/loolwsd.spec.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 46807a1d64b6c84b771c7627cba98e9248740236 Author: Andras Timar <andras.ti...@collabora.com> Date: Tue Nov 1 22:28:26 2016 +0100 require Collabora Office 5.1-11 diff --git a/loolwsd/debian/control b/loolwsd/debian/control index 8cb0b4b..85d467d 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, 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 (>= 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.11), collaboraofficebasis5.1-calc (>= 5.1.10.11), collaboraofficebasis5.1-core (>= 5.1.10.11), collaboraofficebasis5.1-draw (>= 5.1.10.11), collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.11), collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.11), collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.11), collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.11), collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.11), collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.11), collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.11), collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.11), collaboraofficebasis5.1-gnome-integration (>= 5.1.10.11), collaboraofficebasis5.1-graphicfilter (>= 5.1.10.11), collaboraofficebasi s5.1-images (>= 5.1.10.11), collaboraofficebasis5.1-impress (>= 5.1.10.11), collaboraofficebasis5.1-librelogo (>= 5.1.10.11), collaboraofficebasis5.1-math (>= 5.1.10.11), collaboraofficebasis5.1-ogltrans (>= 5.1.10.11), collaboraofficebasis5.1-ooofonts (>= 5.1.10.11), collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.11), collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.11), collaboraofficebasis5.1-python-script-provider (>= 5.1.10.11), collaboraofficebasis5.1-pyuno (>= 5.1.10.11), collaboraofficebasis5.1-writer (>= 5.1.10.11), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.11), collaboraoffice5.1 (>= 5.1.10.11), collaboraoffice5.1-base (>= 5.1.10.11), collaboraoffice5.1-calc (>= 5.1.10.11), collaboraoffice5.1-dict-en (>= 5.1.10.11), collaboraoffice5.1-draw (>= 5.1.10.11), collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress (>= 5.1.10.11), collaboraoffice5.1-math (>= 5.1.10.11), collaboraoffice5.1-ure (>= 5.1.10.11), collaboraoffice5.1-writer (>= 5.1.10.11), collaboraofficeb asis5.1-en-us (>= 5.1.10.11), collaboraofficebasis5.1-en-us-base (>= 5.1.10.11), collaboraofficebasis5.1-en-us-calc (>= 5.1.10.11), collaboraofficebasis5.1-en-us-math (>= 5.1.10.11), collaboraofficebasis5.1-en-us-res (>= 5.1.10.11), collaboraofficebasis5.1-en-us-writer (>= 5.1.10.11), collaboraoffice5.1-en-us (>= 5.1.10.11) 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 e332d77..8e5a3d6 100644 --- a/loolwsd/loolwsd.spec.in +++ b/loolwsd/loolwsd.spec.in @@ -27,7 +27,7 @@ BuildRequires: libcap-progs systemd-rpm-macros %endif %endif -Requires: collaboraoffice5.1 >= 5.1.10.9 collaboraoffice5.1-en-US >= 5.1.10.9 collaboraoffice5.1-ure >= 5.1.10.9 collaboraofficebasis5.1-core >= 5.1.10.9 collaboraofficebasis5.1-writer >= 5.1.10.9 collaboraofficebasis5.1-impress >= 5.1.10.9 collaboraofficebasis5.1-graphicfilter >= 5.1.10.9 collaboraofficebasis5.1-en-US >= 5.1.10.9 collaboraofficebasis5.1-calc >= 5.1.10.9 collaboraofficebasis5.1-en-US-res >= 5.1.10.9 collaboraofficebasis5.1-en-US-calc >= 5.1.10.9 collaboraofficebasis5.1-ooofonts >= 5.1.10.9 collaboraofficebasis5.1-images >= 5.1.10.9 collaboraofficebasis5.1-filter-data >= 5.1.10.9 collaboraofficebasis5.1-draw >= 5.1.10.9 collaboraofficebasis5.1-base >= 5.1.10.9 collaboraofficebasis5.1-en-US-writer >= 5.1.10.9 collaboraofficebasis5.1-en-US-math >= 5.1.10.9 collaboraofficebasis5.1-en-US-base >= 5.1.10.9 +Requires: collaboraoffice5.1 >= 5.1.10.11 collaboraoffice5.1-en-US >= 5.1.10.11 collaboraoffice5.1-ure >= 5.1.10.11 collaboraofficebasis5.1-core >= 5.1.10.11 collaboraofficebasis5.1-writer >= 5.1.10.11 collaboraofficebasis5.1-impress >= 5.1.10.11 collaboraofficebasis5.1-graphicfilter >= 5.1.10.11 collaboraofficebasis5.1-en-US >= 5.1.10.11 collaboraofficebasis5.1-calc >= 5.1.10.11 collaboraofficebasis5.1-en-US-res >= 5.1.10.11 collaboraofficebasis5.1-en-US-calc >= 5.1.10.11 collaboraofficebasis5.1-ooofonts >= 5.1.10.11 collaboraofficebasis5.1-images >= 5.1.10.11 collaboraofficebasis5.1-filter-data >= 5.1.10.11 collaboraofficebasis5.1-draw >= 5.1.10.11 collaboraofficebasis5.1-base >= 5.1.10.11 collaboraofficebasis5.1-en-US-writer >= 5.1.10.11 collaboraofficebasis5.1-en-US-math >= 5.1.10.11 collaboraofficebasis5.1-en-US-base >= 5.1.10.11 Requires: systemd Requires(post): coreutils grep sed %if 0%{?fedora} || 0%{?rhel} >= 7 commit 2273709cae2275bd7fefcd53b4f2b4c0c62575f5 Author: Henry Castro <hcas...@collabora.com> Date: Tue Nov 1 09:37:50 2016 -0400 fix typo (cherry picked from commit 09cb79affd3958f9ce0c4daac4d4b59497de2633) diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp index ede393e..6603433 100644 --- a/loolwsd/ChildSession.cpp +++ b/loolwsd/ChildSession.cpp @@ -120,7 +120,7 @@ bool ChildSession::_handleInput(const char *buffer, int length) for (const auto& pair : _lastDocStates) { - LOG_TRC("Replaying missed state-change: STATE_CHANED: " << pair.second); + LOG_TRC("Replaying missed state-change: STATE_CHANGED: " << pair.second); loKitCallback(LOK_CALLBACK_STATE_CHANGED, pair.second); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits