[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - 3 commits - configure.ac debian/changelog debian/control loleaflet/Makefile loolwsd.spec.in
Andras Timar
andras.timar at collabora.com
Wed Mar 22 12:12:22 UTC 2017
configure.ac | 2 +-
debian/changelog | 6 ++++++
debian/control | 2 +-
loleaflet/Makefile | 2 +-
loolwsd.spec.in | 2 +-
5 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 44e38a3a941ad083d8e3abdf9cf4e5447bb411f7
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Mar 22 13:11:54 2017 +0100
Bump version to 2.0.5
Change-Id: I445820ea92b82ccafc7e55ae4f942bd09779b7fd
diff --git a/configure.ac b/configure.ac
index b4a94377..20eca8c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [2.0.4], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [2.0.5], [libreoffice at lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
diff --git a/debian/changelog b/debian/changelog
index e74fa7b9..28352d70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.0.5-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool20
+
+ -- Andras Timar <andras.timar at collabora.com> Tue, 22 Mar 2017 13:20:00 +0100
+
loolwsd (2.0.4-1) unstable; urgency=medium
* see the git log: http://col.la/cool20
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 0bc0117f..5b003770 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=2.0.4
+VERSION=2.0.5
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
commit a3bb3d1e706519c048ffcf06b9e27199196aa79d
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Mar 22 13:09:25 2017 +0100
add dependencies for PDF import
Change-Id: I3b264f2e34f301587422d0e0f3ff79c6bff3a576
diff --git a/debian/control b/debian/control
index c5b46b5b..ee629693 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-calc (>= 5.1.10.23), collaboraofficebasis5.1-core (>= 5.1.10.23), collaboraofficebasis5.1-graphicfilter (>= 5.1.10.23), collaboraofficebasis5.1-images (>= 5.1.10.23), collaboraofficebasis5.1-impress (>= 5.1.10.23), collaboraofficebasis5.1-ooofonts (>= 5.1.10.23), collaboraofficebasis5.1-writer (>= 5.1.10.23), collaboraoffice5.1 (>= 5.1.10.23), collaboraoffice5.1-ure (>= 5.1.10.23), collaboraofficebasis5.1-en-us (>= 5.1.10.23), collaboraofficebasis5.1-en-us-calc (>= 5.1.10.23), collaboraofficebasis5.1-en-us-res (>= 5.1.10.23), collaboraofficebasis5.1-noto-fonts (>= 5.1.10.23)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, collaboraofficebasis5.1-calc (>= 5.1.10.23), collaboraofficebasis5.1-core (>= 5.1.10.23), collaboraofficebasis5.1-graphicfilter (>= 5.1.10.23), collaboraofficebasis5.1-images (>= 5.1.10.23), collaboraofficebasis5.1-impress (>= 5.1.10.23), collaboraofficebasis5.1-ooofonts (>= 5.1.10.23), collaboraofficebasis5.1-writer (>= 5.1.10.23), collaboraoffice5.1 (>= 5.1.10.23), collaboraoffice5.1-ure (>= 5.1.10.23), collaboraofficebasis5.1-en-us (>= 5.1.10.23), collaboraofficebasis5.1-en-us-calc (>= 5.1.10.23), collaboraofficebasis5.1-en-us-res (>= 5.1.10.23), collaboraofficebasis5.1-noto-fonts (>= 5.1.10.23), collaboraofficebasis5.1-draw (>= 5.1.10.23), collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.23)
Description: LibreOffice On-Line WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index ebbf2335..0853c6f3 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -27,7 +27,7 @@ BuildRequires: libcap-progs systemd-rpm-macros
%endif
%endif
-Requires: collaboraoffice5.1 >= 5.1.10.23 collaboraoffice5.1-ure >= 5.1.10.23 collaboraofficebasis5.1-core >= 5.1.10.23 collaboraofficebasis5.1-writer >= 5.1.10.23 collaboraofficebasis5.1-impress >= 5.1.10.23 collaboraofficebasis5.1-graphicfilter >= 5.1.10.23 collaboraofficebasis5.1-en-US >= 5.1.10.23 collaboraofficebasis5.1-calc >= 5.1.10.23 collaboraofficebasis5.1-en-US-res >= 5.1.10.23 collaboraofficebasis5.1-en-US-calc >= 5.1.10.23 collaboraofficebasis5.1-ooofonts >= 5.1.10.23 collaboraofficebasis5.1-images >= 5.1.10.23 collaboraofficebasis5.1-noto-fonts >= 5.1.10.23
+Requires: collaboraoffice5.1 >= 5.1.10.23 collaboraoffice5.1-ure >= 5.1.10.23 collaboraofficebasis5.1-core >= 5.1.10.23 collaboraofficebasis5.1-writer >= 5.1.10.23 collaboraofficebasis5.1-impress >= 5.1.10.23 collaboraofficebasis5.1-graphicfilter >= 5.1.10.23 collaboraofficebasis5.1-en-US >= 5.1.10.23 collaboraofficebasis5.1-calc >= 5.1.10.23 collaboraofficebasis5.1-en-US-res >= 5.1.10.23 collaboraofficebasis5.1-en-US-calc >= 5.1.10.23 collaboraofficebasis5.1-ooofonts >= 5.1.10.23 collaboraofficebasis5.1-images >= 5.1.10.23 collaboraofficebasis5.1-noto-fonts >= 5.1.10.23 collaboraofficebasis5.1-draw >= 5.1.10.23 collaboraofficebasis5.1-extension-pdf-import >= 5.1.10.23
Requires: systemd
Requires(post): coreutils grep sed
%if 0%{?fedora} || 0%{?rhel} >= 7
commit fdfa910f6434973513ca27e99d8b464d794a4b2a
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Mar 22 13:05:16 2017 +0100
Requires: Collabora Office 5.1-23
Change-Id: I2a1bb47766e0a648326e9490760cfaddefcc600b
diff --git a/debian/control b/debian/control
index dacb416b..c5b46b5b 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-calc (>= 5.1.10.15), collaboraofficebasis5.1-core (>= 5.1.10.15), collaboraofficebasis5.1-graphicfilter (>= 5.1.10.15), collaboraofficebasis5.1-images (>= 5.1.10.15), collaboraofficebasis5.1-impress (>= 5.1.10.15), collaboraofficebasis5.1-ooofonts (>= 5.1.10.15), collaboraofficebasis5.1-writer (>= 5.1.10.15), collaboraoffice5.1 (>= 5.1.10.15), collaboraoffice5.1-ure (>= 5.1.10.15), collaboraofficebasis5.1-en-us (>= 5.1.10.15), collaboraofficebasis5.1-en-us-calc (>= 5.1.10.15), collaboraofficebasis5.1-en-us-res (>= 5.1.10.15), collaboraofficebasis5.1-noto-fonts (>= 5.1.10.15)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, collaboraofficebasis5.1-calc (>= 5.1.10.23), collaboraofficebasis5.1-core (>= 5.1.10.23), collaboraofficebasis5.1-graphicfilter (>= 5.1.10.23), collaboraofficebasis5.1-images (>= 5.1.10.23), collaboraofficebasis5.1-impress (>= 5.1.10.23), collaboraofficebasis5.1-ooofonts (>= 5.1.10.23), collaboraofficebasis5.1-writer (>= 5.1.10.23), collaboraoffice5.1 (>= 5.1.10.23), collaboraoffice5.1-ure (>= 5.1.10.23), collaboraofficebasis5.1-en-us (>= 5.1.10.23), collaboraofficebasis5.1-en-us-calc (>= 5.1.10.23), collaboraofficebasis5.1-en-us-res (>= 5.1.10.23), collaboraofficebasis5.1-noto-fonts (>= 5.1.10.23)
Description: LibreOffice On-Line WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index a793f746..ebbf2335 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -27,7 +27,7 @@ BuildRequires: libcap-progs systemd-rpm-macros
%endif
%endif
-Requires: collaboraoffice5.1 >= 5.1.10.15 collaboraoffice5.1-ure >= 5.1.10.15 collaboraofficebasis5.1-core >= 5.1.10.15 collaboraofficebasis5.1-writer >= 5.1.10.15 collaboraofficebasis5.1-impress >= 5.1.10.15 collaboraofficebasis5.1-graphicfilter >= 5.1.10.15 collaboraofficebasis5.1-en-US >= 5.1.10.15 collaboraofficebasis5.1-calc >= 5.1.10.15 collaboraofficebasis5.1-en-US-res >= 5.1.10.15 collaboraofficebasis5.1-en-US-calc >= 5.1.10.15 collaboraofficebasis5.1-ooofonts >= 5.1.10.15 collaboraofficebasis5.1-images >= 5.1.10.15 collaboraofficebasis5.1-noto-fonts >= 5.1.10.15
+Requires: collaboraoffice5.1 >= 5.1.10.23 collaboraoffice5.1-ure >= 5.1.10.23 collaboraofficebasis5.1-core >= 5.1.10.23 collaboraofficebasis5.1-writer >= 5.1.10.23 collaboraofficebasis5.1-impress >= 5.1.10.23 collaboraofficebasis5.1-graphicfilter >= 5.1.10.23 collaboraofficebasis5.1-en-US >= 5.1.10.23 collaboraofficebasis5.1-calc >= 5.1.10.23 collaboraofficebasis5.1-en-US-res >= 5.1.10.23 collaboraofficebasis5.1-en-US-calc >= 5.1.10.23 collaboraofficebasis5.1-ooofonts >= 5.1.10.23 collaboraofficebasis5.1-images >= 5.1.10.23 collaboraofficebasis5.1-noto-fonts >= 5.1.10.23
Requires: systemd
Requires(post): coreutils grep sed
%if 0%{?fedora} || 0%{?rhel} >= 7
More information about the Libreoffice-commits
mailing list