From 65eb2f075c9b458899ce3a46501e3efc8c38728c Mon Sep 17 00:00:00 2001 From: gitlost Date: Thu, 21 Jul 2022 23:10:39 +0100 Subject: [PATCH] update_version.php: fix README.linux replacement regex various .rc: http -> https, 2021 -> 2022 GUI: Sourceforge -> SourceForge --- README.linux | 2 +- backend/libzint.rc | 4 ++-- frontend/zint.rc | 4 ++-- frontend_qt/mainwindow.cpp | 2 +- tools/update_version.php | 2 +- win32/zint_cmdline_vc6/zint.rc | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.linux b/README.linux index af5d1544..aaad1c4e 100644 --- a/README.linux +++ b/README.linux @@ -22,7 +22,7 @@ or Fedora Then either download the source code tarball wget -O zint-2.11.0-src.tar.gz \ - https://sourceforge2.11.0net/projects/zint/files/zint/2.11.0/zint-2.11.0-src.tar.gz/download + https://sourceforge.net/projects/zint/files/zint/2.11.0/zint-2.11.0-src.tar.gz/download tar xf zint-2.11.0-src.tar.gz cd zint-2.11.0-src diff --git a/backend/libzint.rc b/backend/libzint.rc index 4b62792b..2153c8bf 100644 --- a/backend/libzint.rc +++ b/backend/libzint.rc @@ -30,12 +30,12 @@ BEGIN VALUE "FileDescription", "libzint barcode library\0" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "zint.dll\0" - VALUE "LegalCopyright", "Copyright © 2021 Robin Stuart & BogDan Vatra\0" + VALUE "LegalCopyright", "Copyright © 2022 Robin Stuart & BogDan Vatra\0" VALUE "OriginalFilename", "zint.dll\0" VALUE "ProductName", "libzint\0" VALUE "ProductVersion", VER_FILEVERSION_STR VALUE "License", "BSD-3-Clause\0" - VALUE "WWW", "http://www.sourceforge.net/projects/zint\0" + VALUE "WWW", "https://www.sourceforge.net/projects/zint\0" END END BLOCK "VarFileInfo" diff --git a/frontend/zint.rc b/frontend/zint.rc index 31e5fdd7..633b3550 100644 --- a/frontend/zint.rc +++ b/frontend/zint.rc @@ -30,12 +30,12 @@ BEGIN VALUE "FileDescription", "zint barcode generator\0" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "zint.exe\0" - VALUE "LegalCopyright", "Copyright © 2021 Robin Stuart & BogDan Vatra\0" + VALUE "LegalCopyright", "Copyright © 2022 Robin Stuart & BogDan Vatra\0" VALUE "OriginalFilename", "zint.exe\0" VALUE "ProductName", "zint\0" VALUE "ProductVersion", VER_FILEVERSION_STR VALUE "License", "GNU General Public License version 3\0" - VALUE "WWW", "http://www.sourceforge.net/projects/zint\0" + VALUE "WWW", "https://www.sourceforge.net/projects/zint\0" END END BLOCK "VarFileInfo" diff --git a/frontend_qt/mainwindow.cpp b/frontend_qt/mainwindow.cpp index 35638261..ef47c430 100644 --- a/frontend_qt/mainwindow.cpp +++ b/frontend_qt/mainwindow.cpp @@ -722,7 +722,7 @@ void MainWindow::about() "\"Telepen\" is a Registered Trademark of SB Electronics.
" "\"Mailmark\" is a Registered Trademark of Royal Mail.

" "

With thanks to Harald Oehlmann, Norbert Szabó, Robert Elliott, Milton Neal, " - "Git Lost, Alonso Schaich, Andre Maute and many others at Sourceforge.

" + "Git Lost, Alonso Schaich, Andre Maute and many others at SourceForge.

" "

" #ifndef Q_OS_MACOS "" diff --git a/tools/update_version.php b/tools/update_version.php index ffd7deb9..1238ec41 100644 --- a/tools/update_version.php +++ b/tools/update_version.php @@ -154,7 +154,7 @@ if (!file_put_contents($file, implode("\n", $lines))) { // README.linux -version_replace(3, $data_dirname . 'README.linux', '/zint-[0-9]/', '/[0-9.]+/', $v_base_str); +version_replace(3, $data_dirname . 'README.linux', '/zint-[0-9]/', '/[0-9][0-9.]+/', $v_base_str); // zint.spec diff --git a/win32/zint_cmdline_vc6/zint.rc b/win32/zint_cmdline_vc6/zint.rc index 2435c6e6..11ececf1 100644 --- a/win32/zint_cmdline_vc6/zint.rc +++ b/win32/zint_cmdline_vc6/zint.rc @@ -55,7 +55,7 @@ BEGIN VALUE "FileDescription", "zint barcode generator\0" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "zint.exe\0" - VALUE "LegalCopyright", "Copyright © 2021 Robin Stuart\0" + VALUE "LegalCopyright", "Copyright © 2022 Robin Stuart\0" VALUE "LegalTrademarks", "\0" VALUE "License", "GNU General Public License version 3\0" VALUE "OriginalFilename", "zint.exe\0" @@ -63,7 +63,7 @@ BEGIN VALUE "ProductName", "zint\0" VALUE "ProductVersion", VER_FILEVERSION_STR VALUE "SpecialBuild", "\0" - VALUE "WWW", "http://www.sourceforge.net/projects/zint\0" + VALUE "WWW", "https://www.sourceforge.net/projects/zint\0" END END BLOCK "VarFileInfo"