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

2020-09-17 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 debian/changelog |6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 847e8f6150d9ebc49ad30917d10a806e8ed4af20
Author: Andras Timar 
AuthorDate: Thu Sep 17 21:55:50 2020 +0200
Commit: Andras Timar 
CommitDate: Thu Sep 17 21:55:50 2020 +0200

Bump package version to 4.2.9-1

Change-Id: I352bd574a155a09a53507d630b69dc52bb1d7e9c

diff --git a/configure.ac b/configure.ac
index bf20c0dba..f1ca594b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [4.2.8], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.2.9], [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 a20c53e8c..21ef22a5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.9-1) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.9-1
+
+ -- Andras Timar   Wed, 17 Sep 2020 21:20:00 +0200
+
 loolwsd (4.2.8-1) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.8-1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - configure.ac debian/changelog ios/Mobile

2020-09-03 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 debian/changelog |6 ++
 ios/Mobile/Info.plist.in |2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 5eaed44a5a5dd18657e3cb7eb1b3d06184d75d15
Author: Andras Timar 
AuthorDate: Wed Sep 2 13:25:03 2020 +0200
Commit: Andras Timar 
CommitDate: Thu Sep 3 09:03:13 2020 +0200

Bump package version to 4.2.8-1

Change-Id: Idb02a08e5d596fd85b09079f59a59ae0357e182c

diff --git a/configure.ac b/configure.ac
index fcfd432e4..bf20c0dba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [4.2.7], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.2.8], [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 2364fab83..a20c53e8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.8-1) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.8-1
+
+ -- Andras Timar   Wed, 02 Sep 2020 12:20:00 +0200
+
 loolwsd (4.2.7-1) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.7-1
diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index 1b97d9a05..ae9f5b51a 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -214,7 +214,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
-   4.2.5
+   4.2.8
CFBundleVersion
@IOSAPP_BUNDLE_VERSION@
LSRequiresIPhoneOS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-08-05 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 debian/changelog |6 ++
 loolwsd.spec.in  |2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit f8af9c8aeee84572310c791946e9f8c6a1cc9290
Author: Andras Timar 
AuthorDate: Wed Aug 5 10:58:04 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 5 17:27:08 2020 +0200

Bump package version to 4.2.7-1

Change-Id: I324478883290b675d9e0fa3274d8b729c48ec182

diff --git a/configure.ac b/configure.ac
index d02b515e1..fcfd432e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [4.2.6], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.2.7], [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 2d9a577cd..2364fab83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.7-1) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.7-1
+
+ -- Andras Timar   Wed, 04 Aug 2020 10:20:00 +0200
+
 loolwsd (4.2.6-2) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.6-2
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 2da566289..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:2%{?dist}
+Release:1%{?dist}
 Vendor: %{vendor}
 Summary:LibreOffice Online WebSocket Daemon
 License:EULA
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-07-05 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 debian/changelog |   42 ++
 loolwsd.spec.in  |2 +-
 3 files changed, 44 insertions(+), 2 deletions(-)

New commits:
commit 67245614fa44b654b26514ec9264b6edad3e8045
Author: Andras Timar 
AuthorDate: Fri Jun 19 12:27:54 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jul 6 06:41:49 2020 +0200

Bump package version to 4.2.5

Change-Id: I0c087b3519f3087006346d648e55fd3e06cc3053

diff --git a/configure.ac b/configure.ac
index c1595a9dd..27b8d887b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [4.2.4], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.2.5], [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 a3139c31b..183e1e830 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,45 @@
+loolwsd (4.2.5-5) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.5-5
+
+ -- Andras Timar   Thu, 02 Jul 2020 10:20:00 +0200
+
+loolwsd (4.2.5-4) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.5-4
+
+ -- Andras Timar   Wed, 01 Jul 2020 07:20:00 +0200
+
+loolwsd (4.2.5-3) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.5-3
+
+ -- Andras Timar   Mon, 29 Jun 2020 22:20:00 +0200
+
+loolwsd (4.2.5-2) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.5-2
+
+ -- Andras Timar   Fri, 26 Jun 2020 21:20:00 +0200
+
+loolwsd (4.2.5-1) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.5-1
+
+ -- Andras Timar   Wed, 24 Jun 2020 18:20:00 +0200
+
+loolwsd (4.2.4-6) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-6
+
+ -- Andras Timar   Sun, 21 Jun 2020 16:20:00 +0200
+
+loolwsd (4.2.4-5) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-5
+
+ -- Andras Timar   Fri, 19 Jun 2020 12:30:00 +0200
+
 loolwsd (4.2.4-4) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-4
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 67b759986..3918d5d1b 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:5%{?dist}
 Vendor: %{vendor}
 Summary:LibreOffice Online WebSocket Daemon
 License:EULA
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - configure.ac

2020-07-02 Thread Jan Holesovsky (via logerrit) 
 configure.ac |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 80a9ff7e7c9d6f0162cb73fbef8b1e52dae21835
Author: Jan Holesovsky 
AuthorDate: Thu Jul 2 09:28:31 2020 +0200
Commit: Andras Timar 
CommitDate: Thu Jul 2 10:12:58 2020 +0200

android: Default to building just the simple case: armeabi-v7a...

... unless more builddirs are provided in --with-lo-builddir, separated
by colons.

Change-Id: I49946cd932ec22804ecb51aba86f3dae2aba05f5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97719
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/configure.ac b/configure.ac
index 99607beac..c1595a9dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -368,7 +368,7 @@ fi
 # to the Mac.
 # Android: We need these to setup the CMakeLists.txt properly.
 LOBUILDDIR=
-ANDROID_ABI=
+ANDROID_ABI="armeabi-v7a"
 LOBUILDDIR_ARM64_V8A=
 LOBUILDDIR_X86=
 LOBUILDDIR_X86_64=
@@ -385,10 +385,12 @@ CORE_VERSION_HASH=""
 if test \( "$enable_iosapp" = "yes" -a `uname -s` = "Darwin" \) -o \( 
"$enable_androidapp" = "yes" \); then
if test "$enable_androidapp" = "yes" ; then
   AC_MSG_CHECKING([for Android ABI to build for])
-  if test -z "$with_android_abi" ; then
- ANDROID_ABI="armeabi-v7a arm64-v8a x86 x86_64"
-  else
+  if test -n "$with_android_abi" ; then
  ANDROID_ABI=`echo $with_android_abi | sed 's/:/ /g'`
+  else
+ if echo "$with_lo_builddir" | grep -qs ':' ; then
+ANDROID_ABI="armeabi-v7a arm64-v8a x86 x86_64"
+ fi
   fi
   AC_MSG_RESULT([$ANDROID_ABI])
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits