From 2a8240b26d5eb48ede19679f573806e694df7053 Mon Sep 17 00:00:00 2001 From: RossGammon Date: Thu, 5 Jul 2018 23:58:39 +0200 Subject: [PATCH] Update Debian directory after Gramps 5.0.0-rc1 release. (#634) --- debian/changelog | 8 +++++++ debian/copyright | 2 +- .../hardcoded_path_person_rules_test.patch | 24 ------------------- debian/patches/series | 1 - 4 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 debian/patches/hardcoded_path_person_rules_test.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index d21b4802c..26b6c2b14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gramps (5.0.0~rc1-1) unstable; urgency=medium + + * First release candidate for Gramps 5.0 + * Drop patch applied upstream + * Update copyrights + + -- Ross Gammon Sun, 01 Jul 2018 21:57:10 +0200 + gramps (5.0.0~beta1-1) unstable; urgency=medium * First beta release of gramps 5.0 diff --git a/debian/copyright b/debian/copyright index c16d81c8c..0abdae2be 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,7 +12,7 @@ Copyright: 2000-2007, Alex Roitman 2001-2017, Free Software Foundation, Inc. 2001, Graham J. Williams 2001, Jesper Zedlitz - 2001-2017, The Gramps Project + 2001-2018, The Gramps Project 2002, Gary Shao 2003-2006, Josiah Carlson 2004-2006, Eero Tamminen diff --git a/debian/patches/hardcoded_path_person_rules_test.patch b/debian/patches/hardcoded_path_person_rules_test.patch deleted file mode 100644 index b3345b312..000000000 --- a/debian/patches/hardcoded_path_person_rules_test.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: Remove hard coded build path from import - gramps/gen/filters/rules/test/person_rules_test.py contains an import - that hard codes the normal build path when working in the source tree. - This causes the test to fail when building the Debian package, which - happens out of the source tree. - This patch imports using .... instead of build/lib for the path for the - MatchIdOf function (the same as the other imports in the file). -Author: Ross Gammon -Forwarded: not-yet -Applied-Upstream: not-yet -Last-Update: 2018-02-19 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- gramps.orig/gramps/gen/filters/rules/test/person_rules_test.py -+++ gramps/gramps/gen/filters/rules/test/person_rules_test.py -@@ -17,7 +17,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - # --from build.lib.gramps.gen.filters.rules.person._matchidof import MatchIdOf -+from ....filters.rules.person._matchidof import MatchIdOf - - """ - Unittest that tests person-specific filter rules diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index f8d01ef93..000000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -hardcoded_path_person_rules_test.patch