From b27480f7a1a9e5455dd0c35924c006dd6e502dc0 Mon Sep 17 00:00:00 2001 From: Ross Gammon Date: Sat, 12 Feb 2022 19:05:14 +0100 Subject: [PATCH 1/4] Update Debian folder after 5.1.5 release --- debian/changelog | 8 +++++++ debian/copyright | 2 +- debian/patches/fix-probably_alive_test.patch | 22 -------------------- debian/patches/series | 1 - 4 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 debian/patches/fix-probably_alive_test.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 951372468..5a901c55e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gramps (5.1.5-1) unstable; urgency=medium + + * New release + * Update copyright file + * Drop patch, incorporated upstream + + -- Ross Gammon Sat, 12 Feb 2022 17:01:21 +0100 + gramps (5.1.4-1) unstable; urgency=medium * New release diff --git a/debian/copyright b/debian/copyright index 10ff8b324..a67fe84a2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -46,7 +46,7 @@ Copyright: 2000-2007, Alex Roitman 2009, Florian Heinle 2009, Gerald W. Britton 2009, Igal Shapira - 2009-2018, Nick Hall + 2009-2022, Nick Hall 2009, Pander Musubi 2009, Robert Ham 2009, Swoon on bug tracker diff --git a/debian/patches/fix-probably_alive_test.patch b/debian/patches/fix-probably_alive_test.patch deleted file mode 100644 index 9c3dc5405..000000000 --- a/debian/patches/fix-probably_alive_test.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: Fix probably alive test - The probably alive funtion was fixed just prior to the Gramps 5.1.4 - release. It appears the relevant unit test was not updated to match. - The relevant commit: - https://github.com/gramps-project/gramps/commit/a685b96f700dcfc6b953413cb3adc8be61d87438 -Author: Ross Gammon -Forwarded: no -Applied-Upstream: no -Last-Update: 2021-08-09 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/gramps/gen/filters/rules/test/person_rules_test.py -+++ b/gramps/gen/filters/rules/test/person_rules_test.py -@@ -347,7 +347,7 @@ - """ - rule = ProbablyAlive(['1900']) - res = self.filter_with_rule(rule) -- self.assertEqual(len(res), 766) -+ self.assertEqual(len(res), 733) - - def test_RegExpName(self): - """ diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 1ee1833c6..000000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-probably_alive_test.patch From 99ec8e876bde46423e995880ecad7f9dd0006247 Mon Sep 17 00:00:00 2001 From: Sam Manzi Date: Mon, 9 Dec 2019 14:38:21 +1100 Subject: [PATCH 2/4] Update INCOMPLETE_TRANSLATIONS * Remove: he * Add: zh_HK, zh_TW --- gramps/gen/utils/grampslocale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gramps/gen/utils/grampslocale.py b/gramps/gen/utils/grampslocale.py index cbad01494..e39b22cf4 100644 --- a/gramps/gen/utils/grampslocale.py +++ b/gramps/gen/utils/grampslocale.py @@ -117,7 +117,7 @@ _LOCALE_NAMES = { _RTL_LOCALES = ('ar', 'he') # locales with less than 70% currently translated -INCOMPLETE_TRANSLATIONS = ('ar', 'bg', 'he', 'sq', 'ta', 'tr') +INCOMPLETE_TRANSLATIONS = ('ar', 'bg', 'sq', 'ta', 'tr', 'zh_HK', 'zh_TW') def _check_mswin_locale(locale): msloc = None From 66cac5e852aaef8865ec7367a28d179a3d9e038d Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Wed, 16 Mar 2022 22:21:22 +0000 Subject: [PATCH 3/4] Fix package installation failures in CI --- .github/workflows/gramps-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gramps-ci.yml b/.github/workflows/gramps-ci.yml index 28a5c940f..a75def62d 100644 --- a/.github/workflows/gramps-ci.yml +++ b/.github/workflows/gramps-ci.yml @@ -34,6 +34,7 @@ jobs: - uses: actions/checkout@v2 - name: Install dependencies run: | + sudo apt-get update sudo apt-get install gir1.2-pango-1.0 sudo apt-get install gir1.2-gtk-3.0 sudo apt-get install xdg-utils From 2ca3839904d0d089be1e6e8a16f7cfa25d8be504 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Tue, 8 Mar 2022 19:31:49 +0000 Subject: [PATCH 4/4] Fix spouse's name and underlined call names in records Fixes #12391 --- gramps/plugins/lib/librecords.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gramps/plugins/lib/librecords.py b/gramps/plugins/lib/librecords.py index 69462346a..d8906e0b9 100644 --- a/gramps/plugins/lib/librecords.py +++ b/gramps/plugins/lib/librecords.py @@ -314,13 +314,16 @@ def find_records(db, filter, top_size, callname, if mother is None: continue - name = StyledText(trans_text("%(father)s and %(mother)s")) % { - 'father': _get_styled_primary_name(father, callname, - trans_text=trans_text, - name_format=name_format), - 'mother': _get_styled_primary_name(mother, callname, - trans_text=trans_text, - name_format=name_format)} + father_name = _get_styled_primary_name(father, callname, + trans_text=trans_text, + name_format=name_format) + mother_name = _get_styled_primary_name(mother, callname, + trans_text=trans_text, + name_format=name_format) + + name = StyledText(trans_text("%(father)s and %(mother)s")) + name = name.replace('%(father)s', father_name) + name = name.replace('%(mother)s', mother_name) if (living_mode == LivingProxyDb.MODE_INCLUDE_ALL or (not probably_alive(unfil_father, db) and