From b27480f7a1a9e5455dd0c35924c006dd6e502dc0 Mon Sep 17 00:00:00 2001 From: Ross Gammon Date: Sat, 12 Feb 2022 19:05:14 +0100 Subject: [PATCH] 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