configure.ac | 2 +- solenv/bin/modules/installer/epmfile.pm | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
New commits: commit 8b92c8b4983d4b885998b558e0b9674d11cf4318 Author: Andras Timar <[email protected]> AuthorDate: Mon Jun 12 14:56:47 2023 +0200 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 12 14:56:47 2023 +0200 Bump version to 23.05.0.5 Change-Id: Ic39be0834ad1b187901e37a7362f7bae1c8c1d3a diff --git a/configure.ac b/configure.ac index ab38d98228c2..a0b917047383 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([Collabora Office],[23.05.0.3],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[23.05.0.5],[],[],[https://collaboraoffice.com/]) 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 commit 79b1841e494cc28d4ba9a7e149f3232ccaa50dc3 Author: Andras Timar <[email protected]> AuthorDate: Fri Jun 9 18:26:57 2023 +0200 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 12 14:56:30 2023 +0200 improve package descriptions Adding PRODUCTEXTENSION made only sense when the description ended with the version number. It was not always the case, and the following examples looked ugly: - Calc module for Collabora Office 23.05 (debug info).0.20230609 - Language module for Collabora Office 23.05, language de.0.20230609 - UNO Runtime Environment.0.20230609 We have the info in the package version number anyway. Change-Id: I8ed5a735d2b8664315fc9612e8e42d6805e329f2 diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 4a24e6ab2089..2eeae2cb202c 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -299,7 +299,6 @@ sub create_epm_header my $productnamestring = $onepackage->{'description'}; installer::packagelist::resolve_packagevariables(\$productnamestring, $variableshashref, 0); - if ( $variableshashref->{'PRODUCTEXTENSION'} ) { $productnamestring = $productnamestring . $variableshashref->{'PRODUCTEXTENSION'}; } $line = "%product" . " " . $productnamestring . "\n"; push(@epmheader, $line);
