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

[Andras Timar]

 configure.ac     |    2 +-
 debian/changelog |    6 ++++++
 loolwsd.spec.in  |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 0b737df46642d0162dd7d2cb197e48c5b3155ced
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue May 23 15:03:03 2017 +0200

    Bump version to 2.1.2
    
    Change-Id: I8a7d5c95b57d87ccd04c317fa279142bc34b7068

diff --git a/configure.ac b/configure.ac
index 949c6915..6a437dd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [2.1.1], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [2.1.2], [libreoffice at lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index c83fa7d2..36f542e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.1.2-1) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool21
+
+ -- Andras Timar <andras.timar at collabora.com>  Tue, 23 May 2017 14:00:00 +0100
+
 loolwsd (2.1.1-4) unstable; urgency=medium
 
   * see the git log: http://col.la/cool21
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index fd8e71bc..2acdb563 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:           loolwsd%{name_suffix}
 Name:           loolwsd
 %endif
 Version:        @PACKAGE_VERSION@
-Release:        4%{?dist}
+Release:        1%{?dist}
 Vendor:         Collabora
 Summary:        LibreOffice On-Line WebSocket Daemon
 License:        MPL