diff -Nru gramps-5.1.5/debian/changelog gramps-5.1.5/debian/changelog --- gramps-5.1.5/debian/changelog 2022-02-22 20:53:06.000000000 +0000 +++ gramps-5.1.5/debian/changelog 2022-08-29 23:38:19.000000000 +0000 @@ -1,3 +1,22 @@ +gramps (5.1.5-1ubuntu1) kinetic; urgency=medium + + [ IOhannes m zmölnig ] + * d/rules: make blhc ignore some false-positives + * [ci] re-enable blhc + * skip broken dir-tests + * [ci] re-enable reprotest + * Patch to skip some tests if system language is not English + + [ Ross Gammon ] + * Refresh patches, drop skip_language patch and try upstream fix instead. + * Update patch description and switch to upstream patch + + [ Jeremy Bicha ] + * Add patch to switch to geocode-glib-2.0 + * debian/control: Update gir1.2-geocode-glib-2.0 Recommends + + -- Jeremy Bicha Mon, 29 Aug 2022 19:38:19 -0400 + gramps (5.1.5-1) unstable; urgency=medium * New upstream release diff -Nru gramps-5.1.5/debian/control gramps-5.1.5/debian/control --- gramps-5.1.5/debian/control 2022-02-22 20:53:06.000000000 +0000 +++ gramps-5.1.5/debian/control 2022-08-29 23:38:19.000000000 +0000 @@ -1,7 +1,8 @@ Source: gramps Section: gnome Priority: optional -Maintainer: Ross Gammon +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ross Gammon Build-Depends-Indep: dh-python, gettext, @@ -42,7 +43,7 @@ gir1.2-gexiv2-0.10, gir1.2-osmgpsmap-1.0, python3-icu, - gir1.2-geocodeglib-1.0 + gir1.2-geocodeglib-2.0 Suggests: fonts-freefont-ttf, gir1.2-goocanvas-2.0, diff -Nru gramps-5.1.5/debian/gitlab-ci.yml gramps-5.1.5/debian/gitlab-ci.yml --- gramps-5.1.5/debian/gitlab-ci.yml 2022-02-22 20:53:06.000000000 +0000 +++ gramps-5.1.5/debian/gitlab-ci.yml 2022-08-29 23:38:19.000000000 +0000 @@ -2,10 +2,3 @@ include: - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml - -blhc: - allow_failure: true - -# Temporarily drop reprotest, help to fix properly is welcome -variables: - SALSA_CI_DISABLE_REPROTEST: 1 diff -Nru gramps-5.1.5/debian/patches/0001-Fix-unit-tests-requiring-English-locale.patch gramps-5.1.5/debian/patches/0001-Fix-unit-tests-requiring-English-locale.patch --- gramps-5.1.5/debian/patches/0001-Fix-unit-tests-requiring-English-locale.patch 1970-01-01 00:00:00.000000000 +0000 +++ gramps-5.1.5/debian/patches/0001-Fix-unit-tests-requiring-English-locale.patch 2022-08-29 23:38:19.000000000 +0000 @@ -0,0 +1,182 @@ +Description: Fix unit tests requiring English locale + Patch cherry-picked from upstream as alternative to IOhannes's PR to + skip the failing tests. +Author: Nick Hall +Origin: Upstream +From: https://github.com/gramps-project/gramps/pull/1352/commits/2a9525c9429c2f7076393db3fbf26c09c6baee31 +Last-Update: 2022-03-21 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + .../filters/rules/test/event_rules_test.py | 4 +- + .../filters/rules/test/family_rules_test.py | 4 +- + .../filters/rules/test/person_rules_test.py | 14 ++++-- + gramps/gen/utils/unittest.py | 46 +++++++++++++++++++ + po/POTFILES.skip | 1 + + 5 files changed, 62 insertions(+), 7 deletions(-) + create mode 100644 gramps/gen/utils/unittest.py + +diff --git a/gramps/gen/filters/rules/test/event_rules_test.py b/gramps/gen/filters/rules/test/event_rules_test.py +index 010706996..98dd227df 100644 +--- a/gramps/gen/filters/rules/test/event_rules_test.py ++++ b/gramps/gen/filters/rules/test/event_rules_test.py +@@ -28,6 +28,7 @@ from ....db.utils import import_as_dict + from ....filters import GenericFilterFactory + from ....const import DATA_DIR + from ....user import User ++from ....utils.unittest import localize_date + + from ..event import ( + AllEvents, HasType, HasIdOf, HasGallery, RegExpIdOf, HasCitation, HasNote, +@@ -171,7 +172,8 @@ class BaseTest(unittest.TestCase): + """ + Test HasData rule. + """ +- rule = HasData(['Burial', 'before 1800', 'USA', '']) ++ date_str = localize_date('before 1800') ++ rule = HasData(['Burial', date_str, 'USA', '']) + self.assertEqual(self.filter_with_rule(rule), set([ + 'a5af0ed4211095487d2', 'a5af0ed36793c1d3e05', + 'a5af0ecfcc16ce7a96a'])) +diff --git a/gramps/gen/filters/rules/test/family_rules_test.py b/gramps/gen/filters/rules/test/family_rules_test.py +index 7b626e788..7ff0b6e8d 100644 +--- a/gramps/gen/filters/rules/test/family_rules_test.py ++++ b/gramps/gen/filters/rules/test/family_rules_test.py +@@ -28,6 +28,7 @@ from ....db.utils import import_as_dict + from ....filters import GenericFilterFactory + from ....const import DATA_DIR + from ....user import User ++from ....utils.unittest import localize_date + + from ..family import ( + AllFamilies, HasRelType, HasGallery, HasIdOf, HasLDS, HasNote, RegExpIdOf, +@@ -176,7 +177,8 @@ class BaseTest(unittest.TestCase): + """ + Test HasEvent rule. + """ +- rule = HasEvent(['Marriage', 'before 1900', 'USA', '', 'Garner']) ++ date_str = localize_date('before 1900') ++ rule = HasEvent(['Marriage', date_str, 'USA', '', 'Garner']) + self.assertEqual(self.filter_with_rule(rule), set([ + 'KSFKQCP4V0YXGM1LR9', '8ZFKQC3FRSHACOJBOU', '3XFKQCE7QUDJ99AVNV', + 'OVFKQC51DX0OQUV3JB', '9OUJQCBOHW9UEK9CNV'])) +diff --git a/gramps/gen/filters/rules/test/person_rules_test.py b/gramps/gen/filters/rules/test/person_rules_test.py +index beb982f22..84f772579 100644 +--- a/gramps/gen/filters/rules/test/person_rules_test.py ++++ b/gramps/gen/filters/rules/test/person_rules_test.py +@@ -32,6 +32,7 @@ from ....db.utils import import_as_dict + from ....filters import GenericFilter, CustomFilters + from ....const import DATA_DIR + from ....user import User ++from ....utils.unittest import localize_date + + from ..person import ( + Disconnected, Everyone, FamilyWithIncompleteEvent, HasAddress, +@@ -238,7 +239,8 @@ class BaseTest(unittest.TestCase): + """ + Test rule. + """ +- rule = HasBirth(['between 1600 and 1700', 'akron', '']) ++ date_str = localize_date('between 1600 and 1700') ++ rule = HasBirth([date_str, 'akron', '']) + res = self.filter_with_rule(rule) + self.assertEqual(len(res), 2) + +@@ -246,7 +248,8 @@ class BaseTest(unittest.TestCase): + """ + Test HasDeath rule. + """ +- rule = HasDeath(['between 1600 and 1700', 'ashtabula', '']) ++ date_str = localize_date('between 1600 and 1700') ++ rule = HasDeath([date_str, 'ashtabula', '']) + res = self.filter_with_rule(rule) + self.assertEqual(len(res), 2) + +@@ -254,8 +257,8 @@ class BaseTest(unittest.TestCase): + """ + Test rule. + """ +- rule = HasEvent(['Birth', 'between 1600 and 1700', 'akron', +- '', '', 1]) ++ date_str = localize_date('between 1600 and 1700') ++ rule = HasEvent(['Birth', date_str, 'akron', '', '', 1]) + res = self.filter_with_rule(rule) + self.assertEqual(len(res), 2) + +@@ -271,7 +274,8 @@ class BaseTest(unittest.TestCase): + """ + Test rule. + """ +- rule = HasFamilyEvent(['Marriage', 'after 1900', 'craw', '']) ++ date_str = localize_date('after 1900') ++ rule = HasFamilyEvent(['Marriage', date_str, 'craw', '']) + res = self.filter_with_rule(rule) + self.assertEqual(len(res), 4) + +diff --git a/gramps/gen/utils/unittest.py b/gramps/gen/utils/unittest.py +new file mode 100644 +index 000000000..f2c89dc26 +--- /dev/null ++++ b/gramps/gen/utils/unittest.py +@@ -0,0 +1,46 @@ ++# ++# Gramps - a GTK+/GNOME based genealogy program ++# ++# Copyright (C) 2022 Nick Hall ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++ ++""" ++Utilities used in unit tests. ++""" ++ ++#------------------------------------------------------------------------- ++# ++# Gramps classes ++# ++#------------------------------------------------------------------------- ++from ..utils.grampslocale import GrampsLocale ++ ++#------------------------------------------------------------------------- ++# ++# Unit test utilities ++# ++#------------------------------------------------------------------------- ++ ++parser = GrampsLocale(lang='en').date_parser ++displayer = GrampsLocale().date_displayer ++ ++def localize_date(date_str): ++ """ ++ Translate a date into the current locale. ++ """ ++ date = parser.parse(date_str) ++ return displayer.display(date) +diff --git a/po/POTFILES.skip b/po/POTFILES.skip +index 5237f422e..17747b8bb 100644 +--- a/po/POTFILES.skip ++++ b/po/POTFILES.skip +@@ -280,6 +280,7 @@ gramps/gen/utils/lru.py + gramps/gen/utils/maclocale.py + gramps/gen/utils/resourcepath.py + gramps/gen/utils/thumbnails.py ++gramps/gen/utils/unittest.py + # + # gen.utils.docgen + # +-- +2.32.0 + diff -Nru gramps-5.1.5/debian/patches/maps-Switch-to-geocode-glib-2.0.patch gramps-5.1.5/debian/patches/maps-Switch-to-geocode-glib-2.0.patch --- gramps-5.1.5/debian/patches/maps-Switch-to-geocode-glib-2.0.patch 1970-01-01 00:00:00.000000000 +0000 +++ gramps-5.1.5/debian/patches/maps-Switch-to-geocode-glib-2.0.patch 2022-08-29 23:38:19.000000000 +0000 @@ -0,0 +1,21 @@ +From: Jeremy Bicha +Date: Thu, 4 Aug 2022 17:05:40 -0400 +Subject: maps: Switch to geocode-glib-2.0 + +--- + gramps/plugins/lib/maps/placeselection.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gramps/plugins/lib/maps/placeselection.py b/gramps/plugins/lib/maps/placeselection.py +index 08f2a1d..7f4c967 100644 +--- a/gramps/plugins/lib/maps/placeselection.py ++++ b/gramps/plugins/lib/maps/placeselection.py +@@ -46,7 +46,7 @@ _LOG = logging.getLogger("maps.placeselection") + import gi + from gi.repository import Gtk + try: +- gi.require_version('GeocodeGlib', '1.0') ++ gi.require_version('GeocodeGlib', '2.0') + from gi.repository import GeocodeGlib + GEOCODEGLIB = True + except: diff -Nru gramps-5.1.5/debian/patches/series gramps-5.1.5/debian/patches/series --- gramps-5.1.5/debian/patches/series 2022-02-22 20:53:06.000000000 +0000 +++ gramps-5.1.5/debian/patches/series 2022-08-29 23:38:19.000000000 +0000 @@ -0,0 +1,3 @@ +skip_faulty_deletetree_test.patch +0001-Fix-unit-tests-requiring-English-locale.patch +maps-Switch-to-geocode-glib-2.0.patch diff -Nru gramps-5.1.5/debian/patches/skip_faulty_deletetree_test.patch gramps-5.1.5/debian/patches/skip_faulty_deletetree_test.patch --- gramps-5.1.5/debian/patches/skip_faulty_deletetree_test.patch 1970-01-01 00:00:00.000000000 +0000 +++ gramps-5.1.5/debian/patches/skip_faulty_deletetree_test.patch 2022-08-29 23:38:19.000000000 +0000 @@ -0,0 +1,23 @@ +Description: skip test3b_delete_tree_constraint + which fails if the test is run in /tmp +Author: IOhannes m zmölnig +Origin: Debian +Bug: https://gramps-project.org/bugs/view.php?id=12577 +Last-Update: 2022-02-24 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: gramps/gramps/test/test/test_util_test.py +=================================================================== +--- gramps.orig/gramps/test/test/test_util_test.py ++++ gramps/gramps/test/test/test_util_test.py +@@ -175,6 +175,10 @@ class Test3(U.TestCase): + + def test3b_delete_tree_constraint(self): + if self.home: ++ sep = os.path.sep ++ tmp = tempfile.gettempdir() + sep ++ if ((self.home + sep).startswith(tmp)): ++ self.skipTest("skipping delete_tree_constraint test") + err = None + try: + tu.delete_tree(self.home_junk) diff -Nru gramps-5.1.5/debian/rules gramps-5.1.5/debian/rules --- gramps-5.1.5/debian/rules 2022-02-22 20:53:06.000000000 +0000 +++ gramps-5.1.5/debian/rules 2022-08-29 23:38:19.000000000 +0000 @@ -22,6 +22,10 @@ gramps endif +execute_before_dh_auto_build: + @echo "blhc: ignore-line-regexp: ^.*Compiling\\s+po/\\S+\\.po\\s.*" + @echo "blhc: ignore-line-regexp: ^.*Compiling\\s+data/\\S+\\.in\\s.*" + # Override of auto_install to remove information from package override_dh_auto_install: dh_installchangelogs NEWS