diff options
author | Andras Timar <andras.timar@collabora.com> | 2018-12-16 11:47:00 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2018-12-16 11:47:00 +0100 |
commit | 3c3bc88cf491cf3b30183002905ef4ac6ed35c0f (patch) | |
tree | 109432e64d74d50306f07673a8e2905212953092 | |
parent | fbc48743e15d1a5c97d1f3cee942b78ba5eb693d (diff) |
Bump package version to 4.0.0-2CODE-4-RC1p
Change-Id: Ic983ef65bf13df321b595436f4ec1c2c645ff953
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | loolwsd.spec.in | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 4c2eb01c6..0a966df74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +loolwsd (4.0.0-2) unstable; urgency=medium + + * see the git log: http://col.la/cool4 + + -- Andras Timar <andras.timar@collabora.com> Sun, 16 Dec 2018 11:00:00 +0100 + loolwsd (4.0.0-1) unstable; urgency=medium * see the git log: http://col.la/cool4 diff --git a/debian/control b/debian/control index cf64111c8..fa8e5576e 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, fontconfig, libsm6, libssl1.0.0, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis6.0-calc (>= 6.0.10.17), collaboraofficebasis6.0-core (>= 6.0.10.17), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.17), collaboraofficebasis6.0-images (>= 6.0.10.17), collaboraofficebasis6.0-impress (>= 6.0.10.17), collaboraofficebasis6.0-ooofonts (>= 6.0.10.17), collaboraofficebasis6.0-writer (>= 6.0.10.17), collaboraoffice6.0 (>= 6.0.10.17), collaboraoffice6.0-ure (>= 6.0.10.17), collaboraofficebasis6.0-en-us (>= 6.0.10.17), collaboraofficebasis6.0-draw (>= 6.0.10.17), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.17), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.17), collaboraoffice6.0-dict-en (>= 6.0.10.17) +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libssl1.0.0, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis6.0-calc (>= 6.0.10.18), collaboraofficebasis6.0-core (>= 6.0.10.18), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.18), collaboraofficebasis6.0-images (>= 6.0.10.18), collaboraofficebasis6.0-impress (>= 6.0.10.18), collaboraofficebasis6.0-ooofonts (>= 6.0.10.18), collaboraofficebasis6.0-writer (>= 6.0.10.18), collaboraoffice6.0 (>= 6.0.10.18), collaboraoffice6.0-ure (>= 6.0.10.18), collaboraofficebasis6.0-en-us (>= 6.0.10.18), collaboraofficebasis6.0-draw (>= 6.0.10.18), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.18), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.18), collaboraoffice6.0-dict-en (>= 6.0.10.18) Conflicts: collaboraofficebasis6.0-gnome-integration, collaboraofficebasis6.0-kde-integration Description: LibreOffice Online WebSocket Daemon LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice diff --git a/loolwsd.spec.in b/loolwsd.spec.in index 9289821bf..19ebc6b26 100644 --- a/loolwsd.spec.in +++ b/loolwsd.spec.in @@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix} Name: loolwsd %endif Version: @PACKAGE_VERSION@ -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?suse_version} == 1110 Group: Productivity/Office/Suite BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,7 +38,7 @@ BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros BuildRequires: libcap-progs %endif -Requires: collaboraoffice6.0 >= 6.0.10.17 collaboraoffice6.0-ure >= 6.0.10.17 collaboraofficebasis6.0-core >= 6.0.10.17 collaboraofficebasis6.0-writer >= 6.0.10.17 collaboraofficebasis6.0-impress >= 6.0.10.17 collaboraofficebasis6.0-graphicfilter >= 6.0.10.17 collaboraofficebasis6.0-en-US >= 6.0.10.17 collaboraofficebasis6.0-calc >= 6.0.10.17 collaboraofficebasis6.0-ooofonts >= 6.0.10.17 collaboraofficebasis6.0-images >= 6.0.10.17 collaboraofficebasis6.0-draw >= 6.0.10.17 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.17 collaboraofficebasis6.0-ooolinguistic >= 6.0.10.17 collaboraoffice6.0-dict-en >= 6.0.10.17 +Requires: collaboraoffice6.0 >= 6.0.10.18 collaboraoffice6.0-ure >= 6.0.10.18 collaboraofficebasis6.0-core >= 6.0.10.18 collaboraofficebasis6.0-writer >= 6.0.10.18 collaboraofficebasis6.0-impress >= 6.0.10.18 collaboraofficebasis6.0-graphicfilter >= 6.0.10.18 collaboraofficebasis6.0-en-US >= 6.0.10.18 collaboraofficebasis6.0-calc >= 6.0.10.18 collaboraofficebasis6.0-ooofonts >= 6.0.10.18 collaboraofficebasis6.0-images >= 6.0.10.18 collaboraofficebasis6.0-draw >= 6.0.10.18 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.18 collaboraofficebasis6.0-ooolinguistic >= 6.0.10.18 collaboraoffice6.0-dict-en >= 6.0.10.18 Conflicts: collaboraofficebasis6.0-kde-integration collaboraofficebasis6.0-gnome-integration Requires(post): coreutils grep sed %if 0%{?rhel} == 6 |