[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - configure.ac distro-configs/NISZ_32.conf distro-configs/NISZ_64.conf
Gabor Kelemen (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 4 06:26:40 UTC 2020
configure.ac | 2 +-
distro-configs/NISZ_32.conf | 2 +-
distro-configs/NISZ_64.conf | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8a9054b4049630a38d5ed17c5353492514d88f7f
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Tue Aug 4 08:11:59 2020 +0200
Commit: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
CommitDate: Tue Aug 4 08:26:07 2020 +0200
Move custom version numbering to configure.ac
Change-Id: I3c3642723e27c7071d9877971ee3a7b6c6fdfeb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100037
Tested-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
Reviewed-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
diff --git a/configure.ac b/configure.ac
index af38a8cb14a7..5f86863d841e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
-AC_INIT([LibreOffice],[6.4.4.2.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.4.4.2-N4],[],[],[http://documentfoundation.org/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
diff --git a/distro-configs/NISZ_32.conf b/distro-configs/NISZ_32.conf
index 92d1e34d0c09..d6fa8762e8d2 100644
--- a/distro-configs/NISZ_32.conf
+++ b/distro-configs/NISZ_32.conf
@@ -20,7 +20,7 @@
--without-helppack-integration
# NISZ build
---with-vendor=NISZ Zrt. (Kiadás száma: N4)
+--with-vendor=NISZ Zrt.
--with-lang=en-US hu de fr it ru hr sk pl ro
--with-visual-studio=2017
diff --git a/distro-configs/NISZ_64.conf b/distro-configs/NISZ_64.conf
index 30cd0301ebcb..90386bc8cb3a 100644
--- a/distro-configs/NISZ_64.conf
+++ b/distro-configs/NISZ_64.conf
@@ -21,7 +21,7 @@
--enable-64-bit
# NISZ build
---with-vendor=NISZ Zrt. (Kiadás száma: N4)
+--with-vendor=NISZ Zrt.
--with-lang=en-US hu de fr it ru hr sk pl ro
--with-visual-studio=2017
More information about the Libreoffice-commits
mailing list