[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - 2 commits - debian/changelog loolwsd.spec.in Makefile.am

[Andras Timar]

 Makefile.am      |    1 +
 debian/changelog |    6 ++++++
 loolwsd.spec.in  |    2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit ebedb6f5d66e15b8c49e01099e9d4cf6660fb19b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Sep 27 16:01:02 2017 +0200

    Bump version for packages 2.1.2-14
    
    Change-Id: I317e6ac9eec56eb6b64309a87539c0a7d1673af4

diff --git a/debian/changelog b/debian/changelog
index 7838c628..5ff49e71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.1.2-14) unstable; urgency=medium
+
+  * see the git log: http://col.la/coolcd
+
+ -- Andras Timar <andras.timar at collabora.com>  Thu, 27 Sep 2017 15:40:00 +0200
+
 loolwsd (2.1.2-13) unstable; urgency=medium
 
   * see the git log: http://col.la/coolcd
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index a9ca698f..939e82bb 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:           loolwsd%{name_suffix}
 Name:           loolwsd
 %endif
 Version:        @PACKAGE_VERSION@
-Release:        13%{?dist}
+Release:        14%{?dist}
 Vendor:         Collabora
 Summary:        LibreOffice On-Line WebSocket Daemon
 License:        MPL
commit 7c0c92e6cfcd3c2c9dba9503157ee2fb6d399b8c
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Sep 27 15:55:44 2017 +0200

    add test/WopiTestServer.hpp to Makefile.am
    
    Change-Id: I9a4b10f0d1f12ed85d31f3dbbc1deb747ff35a2d

diff --git a/Makefile.am b/Makefile.am
index 4d2e10e7..d5d59014 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -181,6 +181,7 @@ noinst_HEADERS = $(wsd_headers) $(shared_headers) $(kit_headers) \
                  bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
                  bundled/include/LibreOfficeKit/LibreOfficeKitInit.h \
                  bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h \
+                 test/WopiTestServer.hpp \
                  test/countloolkits.hpp \
                  test/helpers.hpp