From c9c8f894c39250c0543f9a7de94b2a537701f96f Mon Sep 17 00:00:00 2001 From: Graham Inggs Date: Wed, 22 Dec 2021 18:14:21 +0200 Subject: [PATCH] Use GraphemeBreakTest.txt as is, re-enable graphemetest --- debian/changelog | 6 ++++++ debian/patches/series | 1 - debian/patches/skip-graphemetest.patch | 16 ---------------- debian/patches/use-unicode-data.patch | 4 ++-- 4 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 debian/patches/skip-graphemetest.patch diff --git a/debian/changelog b/debian/changelog index 44faf44..4ccc1e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +utf8proc (2.7.0-2) UNRELEASED; urgency=medium + + * Use GraphemeBreakTest.txt as is, re-enable graphemetest + + -- Graham Inggs Wed, 22 Dec 2021 16:12:17 +0000 + utf8proc (2.7.0-1) unstable; urgency=medium [ Debian Janitor ] diff --git a/debian/patches/series b/debian/patches/series index f924265..6216540 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ use-unicode-data.patch -skip-graphemetest.patch diff --git a/debian/patches/skip-graphemetest.patch b/debian/patches/skip-graphemetest.patch deleted file mode 100644 index eb2ca9e..0000000 --- a/debian/patches/skip-graphemetest.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: skip graphemetest that never completes -Forwarded: no -Author: Graham Inggs -Last-Update: 2021-12-21 - ---- a/Makefile -+++ b/Makefile -@@ -171,7 +171,7 @@ - check: test/normtest data/NormalizationTest.txt data/Lowercase.txt data/Uppercase.txt test/graphemetest data/GraphemeBreakTest.txt test/printproperty test/case test/iscase test/custom test/charwidth test/misc test/valid test/iterate bench/bench.c bench/util.c bench/util.h utf8proc.o - $(MAKE) -C bench - test/normtest data/NormalizationTest.txt -- test/graphemetest data/GraphemeBreakTest.txt -+# test/graphemetest data/GraphemeBreakTest.txt - test/charwidth - test/misc - test/valid diff --git a/debian/patches/use-unicode-data.patch b/debian/patches/use-unicode-data.patch index 13848d0..52aabae 100644 --- a/debian/patches/use-unicode-data.patch +++ b/debian/patches/use-unicode-data.patch @@ -3,7 +3,7 @@ Description: Use unicode-data instead of downloading external files provided by the packages unicode-data and ttf-unifont, respectively. Author: Peter Colberg Forwarded: not-needed -Last-Update: 2021-12-21 +Last-Update: 2021-12-22 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/data/Makefile @@ -41,7 +41,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ GraphemeBreakTest.txt: - $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/auxiliary/GraphemeBreakTest.txt -+ $(PERL) -pe 's,÷,/,g;s,×,+,g' < /usr/share/unicode/auxiliary/GraphemeBreakTest.txt > $@ ++ cp /usr/share/unicode/auxiliary/GraphemeBreakTest.txt $@ emoji-data.txt: - $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://unicode.org/Public/$(UNICODE_VERSION)/ucd/emoji/emoji-data.txt -- 2.30.2