[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - 3 commits - debian/changelog debian/control debian/loolwsd.service loleaflet/dist loolwsd.spec.in
Andras Timar
andras.timar at collabora.com
Mon Nov 28 18:46:34 UTC 2016
debian/changelog | 6 ++++++
debian/control | 2 +-
debian/loolwsd.service | 13 +++++++++++++
loleaflet/dist/toolbar.css | 1 -
loleaflet/dist/toolbar/toolbar.js | 19 ++-----------------
loolwsd.spec.in | 2 +-
6 files changed, 23 insertions(+), 20 deletions(-)
New commits:
commit 496e631dc0fdfb528c9f62ff75faef8300ad7c91
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Nov 28 19:44:15 2016 +0100
Collabora specific packaging bits
diff --git a/debian/changelog b/debian/changelog
index 56cbc55..d761221 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.0.0-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool20
+
+ -- Andras Timar <andras.timar at collabora.com> Thu, 07 Dec 2016 10:26:00 +0200
+
loolwsd (1.8.2-1) unstable; urgency=medium
* Fix crash in Impress.
diff --git a/debian/control b/debian/control
index 80af0eb..122e37f 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, 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.14), collaboraofficebasis5.1-calc (>= 5.1.10.14), collaboraofficebasis5.1-core (>= 5.1.10.14), collaboraofficebasis5.1-draw (>= 5.1.10.14), collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.14), collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.14), collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.14), collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.14), collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.14), collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.14), collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.14), collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.14), collaboraofficebasis5.1-gnome-integration (>= 5.1.10.14), collaboraofficebasis5.1-graphicfilter (>= 5.1.10.14), collaboraofficebasi
s5.1-images (>= 5.1.10.14), collaboraofficebasis5.1-impress (>= 5.1.10.14), collaboraofficebasis5.1-librelogo (>= 5.1.10.14), collaboraofficebasis5.1-math (>= 5.1.10.14), collaboraofficebasis5.1-ogltrans (>= 5.1.10.14), collaboraofficebasis5.1-ooofonts (>= 5.1.10.14), collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.14), collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.14), collaboraofficebasis5.1-python-script-provider (>= 5.1.10.14), collaboraofficebasis5.1-pyuno (>= 5.1.10.14), collaboraofficebasis5.1-writer (>= 5.1.10.14), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.14), collaboraoffice5.1 (>= 5.1.10.14), collaboraoffice5.1-base (>= 5.1.10.14), collaboraoffice5.1-calc (>= 5.1.10.14), collaboraoffice5.1-dict-en (>= 5.1.10.14), collaboraoffice5.1-draw (>= 5.1.10.14), collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress (>= 5.1.10.14), collaboraoffice5.1-math (>= 5.1.10.14), collaboraoffice5.1-ure (>= 5.1.10.14), collaboraoffice5.1-writer (>= 5.1.10.14), collaboraofficeb
asis5.1-en-us (>= 5.1.10.14), collaboraofficebasis5.1-en-us-base (>= 5.1.10.14), collaboraofficebasis5.1-en-us-calc (>= 5.1.10.14), collaboraofficebasis5.1-en-us-math (>= 5.1.10.14), collaboraofficebasis5.1-en-us-res (>= 5.1.10.14), collaboraofficebasis5.1-en-us-writer (>= 5.1.10.14), collaboraoffice5.1-en-us (>= 5.1.10.14), collaboraofficebasis5.1-noto-fonts (>= 5.1.10.14)
Description: LibreOffice On-Line 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 0000000..34b1bb8
--- /dev/null
+++ b/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
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 69204c0..7e794d9 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -27,7 +27,7 @@ BuildRequires: libcap-progs systemd-rpm-macros
%endif
%endif
-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 collaboraofficebasis5.1-en-US-math collaboraofficebasis5.1-en-US-base
+Requires: collaboraoffice5.1 >= 5.1.10.14 collaboraoffice5.1-en-US >= 5.1.10.14 collaboraoffice5.1-ure >= 5.1.10.14 collaboraofficebasis5.1-core >= 5.1.10.14 collaboraofficebasis5.1-writer >= 5.1.10.14 collaboraofficebasis5.1-impress >= 5.1.10.14 collaboraofficebasis5.1-graphicfilter >= 5.1.10.14 collaboraofficebasis5.1-en-US >= 5.1.10.14 collaboraofficebasis5.1-calc >= 5.1.10.14 collaboraofficebasis5.1-en-US-res >= 5.1.10.14 collaboraofficebasis5.1-en-US-calc >= 5.1.10.14 collaboraofficebasis5.1-ooofonts >= 5.1.10.14 collaboraofficebasis5.1-images >= 5.1.10.14 collaboraofficebasis5.1-filter-data >= 5.1.10.14 collaboraofficebasis5.1-draw >= 5.1.10.14 collaboraofficebasis5.1-base >= 5.1.10.14 collaboraofficebasis5.1-en-US-writer >= 5.1.10.14 collaboraofficebasis5.1-en-US-math >= 5.1.10.14 collaboraofficebasis5.1-en-US-base >= 5.1.10.14 collaboraofficebasis5.1-noto-fonts >= 5.1.10.14
Requires: systemd
Requires(post): coreutils grep sed
%if 0%{?fedora} || 0%{?rhel} >= 7
commit 1113debc2ff73cf4bebd751a8f97cef050b0f286
Author: Pranav Kant <pranavk at collabora.co.uk>
Date: Tue Nov 15 18:16:08 2016 +0530
tdf#103641: Hide redundant break after save too
... if save button is hidden. This is not the case in master
as we have additional element, Textwrap, there.
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index fbe7792..e5c2076 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -328,7 +328,7 @@ $(function () {
items: [
{type: 'html', id: 'left'},
{type: 'button', id: 'save', img: 'save', hint: _('Save'), uno: 'Save'},
- {type: 'break'},
+ {type: 'break', id: 'savebreak'},
{type: 'button', id: 'undo', img: 'undo', hint: _('Undo'), uno: 'Undo'},
{type: 'button', id: 'redo', img: 'redo', hint: _('Redo'), uno: 'Redo'},
{type: 'button', id: 'repair', img: 'repair', hint: _('Document repair')},
@@ -719,6 +719,7 @@ function onFormulaBarBlur() {
map.on('wopiprops', function(e) {
if (e.HideSaveOption) {
w2ui['toolbar-up'].hide('save');
+ w2ui['toolbar-up'].hide('savebreak');
}
});
commit 12fa7f0b81cbc184384c0cdcd3ef96a462d874d0
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Nov 28 19:30:23 2016 +0100
Revert "Add footnote and text wrap functions"
This reverts commit 5902700922d110aee29d67be6224094bb521132d.
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 093fc1a..9aa20eb 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -246,7 +246,6 @@ button.leaflet-control-search-next
.w2ui-icon.save{ background: url('../images/lc_save.png') no-repeat center !important; }
.w2ui-icon.saveas{ background: url('../images/lc_saveas.png') no-repeat center !important; }
.w2ui-icon.strikeout{ background: url('../images/lc_strikeout.png') no-repeat center !important; }
-.w2ui-icon.insertfootnote{ background: url('../images/lc_insertfootnote.png') no-repeat center !important; }
.w2ui-icon.underline{ background: url('../images/lc_underline.png') no-repeat center !important; }
.w2ui-icon.undo{ background: url('../images/lc_undo.png') no-repeat center !important; }
.w2ui-icon.zoomin{ background: url('../images/plus.png') no-repeat center !important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 1eb56d4..fbe7792 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -164,11 +164,6 @@ function onClick(id, item, subItem) {
else if (id === 'lastrecord') {
$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').prop('scrollWidth'));
}
- else if (id.startsWith('menu:wrap:wrap-'))
- {
- var wrapType = id.substring('menu:wrap:wrap-'.length);
- map.toggleCommandState(wrapType);
- }
else if (id === 'insertgraphic') {
L.DomUtil.get('insertgraphic').click();
}
@@ -332,15 +327,6 @@ $(function () {
name: 'toolbar-up',
items: [
{type: 'html', id: 'left'},
- {type: 'menu', id: 'writer:menu:wrap', caption: _('Textwrap'), items: [
- { text: _('No wrap'), id: 'wrap-WrapOff' },
- { text: _('Page wrap'), id: 'wrap-WrapOn' },
- { text: _('Wrap anchor only'), id: 'wrap-WrapAnchorOnly' },
- { text: _('Ideal wrap'), id: 'wrap-WrapIdeal' },
- { text: _('Left wrap'), id: 'wrap-WrapLeft' },
- { text: _('Right wrap'), id: 'wrap-WrapRight' },
- { text: _('Wrap through'), id: 'wrap-WrapThrough' }
- ]},
{type: 'button', id: 'save', img: 'save', hint: _('Save'), uno: 'Save'},
{type: 'break'},
{type: 'button', id: 'undo', img: 'undo', hint: _('Undo'), uno: 'Undo'},
@@ -356,8 +342,6 @@ $(function () {
{type: 'button', id: 'underline', img: 'underline', hint: _('Underline'), uno: 'Underline'},
{type: 'button', id: 'strikeout', img: 'strikeout', hint: _('Strikeout'), uno: 'Strikeout'},
{type: 'break'},
- {type: 'button', id: 'insertfootnote', img: 'insertfootnote', hint: _('Insert Footnote'), uno: 'InsertFootnote' },
- {type: 'break' },
{type: 'html', id: 'fontcolor-html', html: '<input id="fontColorPicker" style="display:none;">'},
{type: 'button', id: 'fontcolor', img: 'color', hint: _('Font color')},
{type: 'html', id: 'backcolor-html', html: '<input id="backColorPicker" style="display:none;">'},
More information about the Libreoffice-commits
mailing list