[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - configure.ac debian/changelog debian/control loolwsd.spec.in

2018-02-15 Thread Andras Timar 
 configure.ac |2 +-
 debian/changelog |6 ++
 debian/control   |2 +-
 loolwsd.spec.in  |4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 414020eebadbd4b32d59c64b72fc2e68a02a20b1
Author: Andras Timar 
Date:   Thu Feb 15 22:26:24 2018 +0100

Bump version to 3.1.0

Change-Id: I4cfe386fda07aa3073decf0e56fda2fccc79a8b5

diff --git a/configure.ac b/configure.ac
index 94d05087..4921f953 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [3.0.0], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [3.1.0], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index fa54fdcc..cd7ee9d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.1.0-1) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool30
+
+ -- Andras Timar   Thu, 15 Feb 2018 22:00:00 +0100
+
 loolwsd (3.0.0-7) unstable; urgency=medium
 
   * see the git log: http://col.la/cool30
diff --git a/debian/control b/debian/control
index e442d6ee..d6c67ca1 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, 
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, 
libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.39), 
collaboraofficebasis5.3-core (>= 5.3.10.39), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.39), 
collaboraofficebasis5.3-images (>= 5.3.10.39), collaboraofficebasis5.3-impress 
(>= 5.3.10.39), collaboraofficebasis5.3-ooofonts (>= 5.3.10.39), 
collaboraofficebasis5.3-writer (>= 5.3.10.39), collaboraoffice5.3 (>= 
5.3.10.39), collaboraoffice5.3-ure (>= 5.3.10.39), 
collaboraofficebasis5.3-en-us (>= 5.3.10.39), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.39), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.39), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.39), collaboraofficebasis5.3-draw 
(>= 5.3.10.39), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.39), 
collaboraofficebasis5.3-filter-data (>= 5.3.10.39)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, 
libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.40), 
collaboraofficebasis5.3-core (>= 5.3.10.40), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.40), 
collaboraofficebasis5.3-images (>= 5.3.10.40), collaboraofficebasis5.3-impress 
(>= 5.3.10.40), collaboraofficebasis5.3-ooofonts (>= 5.3.10.40), 
collaboraofficebasis5.3-writer (>= 5.3.10.40), collaboraoffice5.3 (>= 
5.3.10.40), collaboraoffice5.3-ure (>= 5.3.10.40), 
collaboraofficebasis5.3-en-us (>= 5.3.10.40), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.40), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.40), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.40), collaboraofficebasis5.3-draw 
(>= 5.3.10.40), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.40), 
collaboraofficebasis5.3-filter-data (>= 5.3.10.40)
 Conflicts: collaboraofficebasis5.3-gnome-integration, 
collaboraofficebasis5.3-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 a1524fc3..ae110121 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:7%{?dist}
+Release:1%{?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:   collaboraoffice5.3 >= 5.3.10.39 collaboraoffice5.3-ure >= 
5.3.10.39 collaboraofficebasis5.3-core >= 5.3.10.39 
collaboraofficebasis5.3-writer >= 5.3.10.39 collaboraofficebasis5.3-impress >= 
5.3.10.39 collaboraofficebasis5.3-graphicfilter >= 5.3.10.39 
collaboraofficebasis5.3-en-US >= 5.3.10.39 collaboraofficebasis5.3-calc >= 
5.3.10.39 collaboraofficebasis5.3-en-US-res >= 5.3.10.39 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.39 
collaboraofficebasis5.3-ooofonts >= 5.3.10.39 collaboraofficebasis5.3-images >= 
5.3.10.39 collaboraofficebasis5.3-noto-fonts >= 5.3.10.39 
collaboraofficebasis5.3-draw >= 5.3.10.39 
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.39 
collaboraofficebasis5.3-filter-data >= 5.3.10.39
+Requires:   collaboraoffice5.3 >= 5.3.10.40 collaboraoffice5.3-ure >= 
5.3.10.40 collaboraofficebasis5.3-core >= 5.3.10.40

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - configure.ac

2018-02-09 Thread Miklos Vajna 
 configure.ac |   17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 58d472b73c3f05eecabaa25e0d76287219556f4c
Author: Miklos Vajna 
Date:   Thu Feb 8 15:27:12 2018 +0100

configure: allow disable werror with --disable-werror

Change-Id: Ie614ce2143669008c38ecf4b267d6fec78337be6
Reviewed-on: https://gerrit.libreoffice.org/49434
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
(cherry picked from commit b8926baa1809300410783fc9991a02162767a374)
Reviewed-on: https://gerrit.libreoffice.org/49440
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/configure.ac b/configure.ac
index d3cefbb7..94d05087 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,6 +113,10 @@ AC_ARG_WITH([compiler-plugins],
 [Experimental! Unlikely to work for anyone except Noel! Enable 
compiler plugins that will perform additional checks during
  building.]))
 
+AC_ARG_ENABLE([werror],
+AS_HELP_STRING([--disable-werror],
+  [Do not turn warnings into errors.]))
+
 # Handle options
 AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
   [POCO_DEBUG_SUFFIX=d],
@@ -166,8 +170,17 @@ AC_SUBST(MAX_DOCUMENTS)
 # Test for build environment
 
 CXXFLAGS="$CXXFLAGS -std=c++11"
-CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror -Wshadow"
-CFLAGS="$CFLAGS -Wall -Wextra -Werror"
+CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wshadow"
+CFLAGS="$CFLAGS -Wall -Wextra"
+
+AC_MSG_CHECKING([whether to turn warnings to errors])
+if test -z "$enable_werror" -o "$enable_werror" = "yes"; then
+AC_MSG_RESULT([yes])
+CXXFLAGS="$CXXFLAGS -Werror"
+CFLAGS="$CFLAGS -Werror"
+else
+AC_MSG_RESULT([no])
+fi
 
 # check for C++11 support
 HAVE_CXX11=
___
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-3-0' - configure.ac

2018-01-06 Thread Fabian Jucker 
 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit be40492e24bc8b54600d8304085ca567b5ee24e6
Author: Fabian Jucker 
Date:   Wed Oct 4 10:59:04 2017 +0200

correct help message for with-max-connections, with-max-documents

Change-Id: Ib7244a6ee55284b36d874a101505e2fe04377c9c
Reviewed-on: https://gerrit.libreoffice.org/43121
Reviewed-by: Fabian Jucker 
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 3b82f62084689c97d737cc9e606e1ae6d9fbaaba)
Reviewed-on: https://gerrit.libreoffice.org/47472
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/configure.ac b/configure.ac
index 081a17a9..d3cefbb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,11 +101,11 @@ AC_ARG_WITH([support-public-key],
 [Implements signed key with expiration required for support. 
Almost certainly you don not want to use this.]))
 
 AC_ARG_WITH([max-connections],
-AS_HELP_STRING([--max-connections],
+AS_HELP_STRING([--with-max-connections],
[Set the limit on the total number of client 
connections. Def: 20, Min: 3.]))
 
 AC_ARG_WITH([max-documents],
- AS_HELP_STRING([--max-documents],
+ AS_HELP_STRING([--with-max-documents],
[Set the limit on the total number of documents. 
Def: 10, Min: 2.]))
 
 AC_ARG_WITH([compiler-plugins],
___
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-3-0' - configure.ac

2017-11-16 Thread Andras Timar 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit be1a1d10435d796b4b66ffe1146ea928442463fb
Author: Andras Timar 
Date:   Thu Nov 16 17:15:52 2017 +0100

Bump version to 3.0.0

Change-Id: I46334f0ed75aee36a229072c2eb80f881758fe0c

diff --git a/configure.ac b/configure.ac
index 5d458fa4..081a17a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [3.0.0], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits