From 83ebc278f634a4644f00ac41f18c1278cf7f9277 Mon Sep 17 00:00:00 2001 From: "Serg V. Zhdanovskih (Norseman)" Date: Wed, 13 Apr 2022 09:28:17 +0300 Subject: [PATCH] Preparing for the release of v2.20.1 --- CHANGELOG.md | 10 ++++++++++ appveyor.yml | 2 +- deploy/DEBIAN/changelog | 4 ++-- deploy/DEBIAN/control | 2 +- deploy/Manjaro/PKGBUILD | 2 +- deploy/gedkeeper.appdata.xml | 2 +- deploy/gk2_linux_deb_package.sh | 2 +- deploy/gk2_linux_pkg_manjaro_package.sh | 2 +- deploy/gk2_linux_rpm_fedora_package.sh | 2 +- deploy/gk2_win_installer.cmd | 2 +- deploy/gk2_win_portable.cmd | 2 +- deploy/gk2_win_setup.nsi | 2 +- deploy/rpm/gedkeeper.spec | 4 ++-- locales/help_enu/gkhHistory.html | 2 +- locales/help_rus/gkhHistory.html | 2 +- projects/GKv2/GEDKeeper2/GKProgram.cs | 4 ++-- 16 files changed, 28 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9d5e1422..e08118d79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,14 @@ +## 14.04.2022 [v2.20.1] +- Fixed support for negative coordinates in FTB files. +- Added option to display surnames in capital letters. +- Fixed error resetting name in person edit dialog when adding father/mother. +- Fixed double display of the surname in the person page in the generated site. +- Fixed an error in determining the kinship of cousins. +- Added the feature to display age in a person's card in the tree. +- Fixed a bug with displaying dialogs relative to the main window. +- Fixed issue with typing Return in note editor. + ## 28.03.2022 [v2.20.0] - Fixed declension of partial names in birthday message. - Fixed a bug with calling the log and help in Linux. diff --git a/appveyor.yml b/appveyor.yml index 569b80044..71c7687f7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ image: Visual Studio 2015 -version: 2.20.0.{build} +version: 2.20.1.{build} configuration: Debug platform: x86 skip_tags: true diff --git a/deploy/DEBIAN/changelog b/deploy/DEBIAN/changelog index 40d44f543..6a34ca12e 100644 --- a/deploy/DEBIAN/changelog +++ b/deploy/DEBIAN/changelog @@ -1,6 +1,6 @@ -gedkeeper (2.20.0-1~rc1) unstable; urgency=low +gedkeeper (2.20.1-1~rc1) unstable; urgency=low * Packaged release * See changelog.md for changes - -- Sergey V. Zhdanovskih (aka Norseman) 28 Mar 2022 00:00:00 +0300 + -- Sergey V. Zhdanovskih (aka Norseman) 14 Apr 2022 00:00:00 +0300 diff --git a/deploy/DEBIAN/control b/deploy/DEBIAN/control index 989ffc10e..d9354b3f2 100644 --- a/deploy/DEBIAN/control +++ b/deploy/DEBIAN/control @@ -1,5 +1,5 @@ Package: gedkeeper -Version: 2.20.0-1 +Version: 2.20.1-1 Architecture: all Depends: mono-complete (>=5.12), sqlite3 Maintainer: Sergey V. Zhdanovskih (aka Norseman) diff --git a/deploy/Manjaro/PKGBUILD b/deploy/Manjaro/PKGBUILD index 35c077c4d..a6dbd94b0 100644 --- a/deploy/Manjaro/PKGBUILD +++ b/deploy/Manjaro/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Sergey V. Zhdanovskih (aka Norseman) pkgname=gedkeeper -pkgver=2.20.0 +pkgver=2.20.1 pkgrel=1 pkgdesc="Personal genealogical database editor" arch=('i386' 'x86_64') diff --git a/deploy/gedkeeper.appdata.xml b/deploy/gedkeeper.appdata.xml index 05c715da3..34e4ac960 100644 --- a/deploy/gedkeeper.appdata.xml +++ b/deploy/gedkeeper.appdata.xml @@ -40,7 +40,7 @@ Sergey V. Zhdanovskih - + diff --git a/deploy/gk2_linux_deb_package.sh b/deploy/gk2_linux_deb_package.sh index ae502d732..9976e8fdd 100644 --- a/deploy/gk2_linux_deb_package.sh +++ b/deploy/gk2_linux_deb_package.sh @@ -1,6 +1,6 @@ #!/bin/sh -APP_VER="2.20.0" +APP_VER="2.20.1" DEV_PATH="/home/norseman/share/gkdev/GEDKeeper" PACK_PATH="gedkeeper-$APP_VER" diff --git a/deploy/gk2_linux_pkg_manjaro_package.sh b/deploy/gk2_linux_pkg_manjaro_package.sh index d66728979..0eaf3126a 100644 --- a/deploy/gk2_linux_pkg_manjaro_package.sh +++ b/deploy/gk2_linux_pkg_manjaro_package.sh @@ -1,6 +1,6 @@ #!/bin/sh -APP_VER="2.20.0" +APP_VER="2.20.1" DEV_PATH="/home/norseman/share/gkdev/GEDKeeper" PACK_PATH="gedkeeper-$APP_VER" diff --git a/deploy/gk2_linux_rpm_fedora_package.sh b/deploy/gk2_linux_rpm_fedora_package.sh index a8ad90dde..2f2daec39 100644 --- a/deploy/gk2_linux_rpm_fedora_package.sh +++ b/deploy/gk2_linux_rpm_fedora_package.sh @@ -1,6 +1,6 @@ #!/bin/sh -APP_VER="2.20.0" +APP_VER="2.20.1" DIR="$( cd "$( dirname "$0" )" && pwd )" rm -rf ~/rpmbuild/ diff --git a/deploy/gk2_win_installer.cmd b/deploy/gk2_win_installer.cmd index 1eddcedf2..fdec97d57 100644 --- a/deploy/gk2_win_installer.cmd +++ b/deploy/gk2_win_installer.cmd @@ -1,7 +1,7 @@ @echo off cls -set GKVER=2.20.0 +set GKVER=2.20.1 del .\*.exe /q del .\*.zip /q diff --git a/deploy/gk2_win_portable.cmd b/deploy/gk2_win_portable.cmd index 56b332a9f..312d09d95 100644 --- a/deploy/gk2_win_portable.cmd +++ b/deploy/gk2_win_portable.cmd @@ -1,7 +1,7 @@ @echo off cls -set GKVER=2.20.0 +set GKVER=2.20.1 set lstfile=".\listfile.txt" set out_fn="gedkeeper_%GKVER%_win_portable" diff --git a/deploy/gk2_win_setup.nsi b/deploy/gk2_win_setup.nsi index 443b3a0a6..38f80e134 100644 --- a/deploy/gk2_win_setup.nsi +++ b/deploy/gk2_win_setup.nsi @@ -9,7 +9,7 @@ Unicode true Name "GEDKeeper" -OutFile "gedkeeper_2.20.0_winsetup.exe" +OutFile "gedkeeper_2.20.1_winsetup.exe" InstallDir $PROGRAMFILES\GEDKeeper2 CRCCheck on diff --git a/deploy/rpm/gedkeeper.spec b/deploy/rpm/gedkeeper.spec index 32070295f..ed365a6ea 100644 --- a/deploy/rpm/gedkeeper.spec +++ b/deploy/rpm/gedkeeper.spec @@ -2,7 +2,7 @@ %define summary GEDKeeper - program for work with personal genealogical database Name: gedkeeper -Version: 2.20.0 +Version: 2.20.1 Release: 1 Summary: %{summary} License: GPLv3 @@ -55,5 +55,5 @@ cp -r bin \ rm -rf %{buildroot}%{_libdir}/%{name}/scripts/readme.txt %changelog -* Mon Mar 28 2022 GEDKeeper - 2.20.0 +* Apr 14 2022 GEDKeeper - 2.20.1 - New upstream release diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html index 10fa81334..02485e3c8 100644 --- a/locales/help_enu/gkhHistory.html +++ b/locales/help_enu/gkhHistory.html @@ -11,7 +11,7 @@

Change log

- ??.??.2022 [v2.20.1]

    + 14.04.2022 [v2.20.1]
    • (*) Fixed support for negative coordinates in FTB files.
    • (+) Added option to display surnames in capital letters.
    • (*) Fixed error resetting name in person edit dialog when adding father/mother. diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html index e837074e4..dd32e8a67 100644 --- a/locales/help_rus/gkhHistory.html +++ b/locales/help_rus/gkhHistory.html @@ -11,7 +11,7 @@

      История версий

      - ??.??.2022 [v2.20.1]

        + 14.04.2022 [v2.20.1]
        • (*) Исправлена поддержка отрицательных координат в файлах FTB.
        • (+) Добавлена опция вывода фамилий заглавными буквами.
        • (*) Исправлена ошибка сброса имени в диалоге редактирования человека при добавлении отца/матери. diff --git a/projects/GKv2/GEDKeeper2/GKProgram.cs b/projects/GKv2/GEDKeeper2/GKProgram.cs index f07bdd9e1..15551efa7 100644 --- a/projects/GKv2/GEDKeeper2/GKProgram.cs +++ b/projects/GKv2/GEDKeeper2/GKProgram.cs @@ -1,6 +1,6 @@ /* * "GEDKeeper", the personal genealogical database editor. - * Copyright (C) 2009-2021 by Sergey V. Zhdanovskih. + * Copyright (C) 2009-2022 by Sergey V. Zhdanovskih. * * This file is part of "GEDKeeper". * @@ -31,7 +31,7 @@ [assembly: AssemblyDescription("")] [assembly: AssemblyProduct("GEDKeeper")] [assembly: AssemblyCopyright(GKData.APP_COPYRIGHT)] -[assembly: AssemblyVersion("2.20.0.0")] +[assembly: AssemblyVersion("2.20.1.0")] [assembly: AssemblyCulture("")] [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile("")]