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

Andras Timar (via logerrit) logerrit at kemper.freedesktop.org
Wed Jul 29 09:41:06 UTC 2020


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

New commits:
commit fca27ab1147e5ca059a33d1fad0c511e65825247
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Jul 29 11:40:33 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Jul 29 11:40:33 2020 +0200

    Bump package version to 4.2.6-1
    
    Change-Id: I78ec2d15a54b11fc55febb52645f251692823fc2

diff --git a/configure.ac b/configure.ac
index 27b8d887b..d02b515e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [4.2.5], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [4.2.6], [libreoffice at 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 183e1e830..05a8ea70d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.6-1) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.6-1
+
+ -- Andras Timar <andras.timar at collabora.com>  Wed, 29 Jul 2020 10:20:00 +0200
+
 loolwsd (4.2.5-5) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.5-5
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 3918d5d1b..b9667a7a8 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:           loolwsd%{name_suffix}
 Name:           loolwsd
 %endif
 Version:        @PACKAGE_VERSION@
-Release:        5%{?dist}
+Release:        1%{?dist}
 Vendor:         %{vendor}
 Summary:        LibreOffice Online WebSocket Daemon
 License:        EULA
commit 97caf24f99768b3421fd99c8790840aaaaf1a487
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Jul 2 10:06:57 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Jul 29 11:35:30 2020 +0200

    set .gitreview
    
    Change-Id: Icc5306ea06b9152544aaef980fe9d334b470972f

diff --git a/.gitreview b/.gitreview
index 71d55941e..4dd3e098f 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=gerrit.libreoffice.org
 port=29418
 project=online
 defaultremote=logerrit
-defaultbranch=distro/collabora/co-4-2
+defaultbranch=distro/collabora/co-4-2-6
 


More information about the Libreoffice-commits mailing list