The following commit has been merged in the master branch:
commit 0e0c8ec4395d7e035c78acc171768e32616f18af
Author: Rene Engelhard <r...@debian.org>
Date: Tue Aug 9 11:28:40 2011 +0000
stop symlinking to Debian's fonts as they are not sufficient for the tests
diff --git a/changelog b/changelog
index d1f7181..a0f2113 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,8 @@ graphite2 (1.0.0~r729-1) UNRELEASED; urgency=low
* new upstream snapshot
* build with -DDISABLE_TRACING:bool=1
- * stop symlinking to ScheherazadeRegOT.ttf as it doesn't have graphite
- tables
+ * stop symlinking to Debian's fonts as they are not sufficient for the
+ tests
* update debian/copyright; mention ppport.h according to
http://pkg-perl.alioth.debian.org/copyright.html#devel__ppport
* fix libgraphite2-2.0.0's short description
diff --git a/control b/control
index 5d4829d..a37f974 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Priority: optional
Section: libs
Maintainer: Debian LibreOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <r...@debian.org>, Daniel Glassey <w...@debian.org>
-Build-Depends: debhelper (>= 8.0), cmake, libfreetype6-dev, libgraphite-dev,
libicu-dev, asciidoc, dblatex, libxml2-utils, doxygen, docbook-xsl,
libmodule-build-perl, ttf-sil-padauk, latex-xcolor
+Build-Depends: debhelper (>= 8.0), cmake, libfreetype6-dev, libgraphite-dev,
libicu-dev, asciidoc, dblatex, libxml2-utils, doxygen, docbook-xsl,
libmodule-build-perl, latex-xcolor
Standards-Version: 3.9.1
Package: libgraphite2-2.0.0
diff --git a/patches/disable_font_tests.diff b/patches/disable_font_tests.diff
deleted file mode 100644
index 7fafea1..0000000
--- a/patches/disable_font_tests.diff
+++ /dev/null
@@ -1,59 +0,0 @@
---- graphite2-0.9.4.orig/tests/CMakeLists.txt
-+++ graphite2-0.9.4/tests/CMakeLists.txt
-@@ -31,28 +31,6 @@ macro(fonttest TESTNAME FONTFILE)
- # add_custom_target(${TESTNAME} DEPENDS ${TESTNAME}.xml)
- endmacro(fonttest)
-
--fonttest(padauk1 Padauk.ttf 1015 102F 100F 1039 100F 1031 1038)
--fonttest(padauk2 Padauk.ttf 1000 103C 102D 102F)
--fonttest(padauk3 Padauk.ttf 101e 1004 103a 1039 1001 103b 102d 102f 1004 103a
1038)
--fonttest(padauk4 Padauk.ttf 1005 1000 1039 1000 1030)
--fonttest(padauk5 Padauk.ttf 1000 103c 1031 102c 1004 1037 103a)
--fonttest(padauk6 Padauk.ttf 1000 102D 1005 1039 1006 102C)
--# padauk7 can cause an infinite loop, though the text is miss-spelt
--fonttest(padauk7 Padauk.ttf 1017 1014 103c 103d 102f)
--fonttest(padauk8 Padauk.ttf 1004 103A 1039 1005)
--fonttest(padauk9 Padauk.ttf 1004 103A 1039)
--fonttest(padauk10 Padauk.ttf 1004 103D 1000 103A -feat kdot=1,wtri=1)
--fonttest(padauk11 Padauk.ttf 100B 1039 100C 1031 102C)
--fonttest(charis1 charis_r_gr.ttf 0069 02E6 02E8 02E5)
--fonttest(scher1 Scheherazadegr.ttf 0628 0628 064E 0644 064E 0654 0627 064E
-rtl)
--fonttest(scher2 Scheherazadegr.ttf 0627 0644 0625 0639 0644 0627 0646 -rtl)
--fonttest(charis2 charis_r_gr.ttf 1D510 0041 1D513)
--fonttest(charis3 charis_r_gr.ttf 0054 0069 1ec3 0075 -feat 'lang=vie')
--fonttest(charis4 charis_r_gr.ttf 006b 0361 070)
--fonttest(magyar1 MagyarLinLibertineG.ttf 0031 0035 -feat 210=36)
--fonttest(magyar2 MagyarLinLibertineG.ttf 0031 0030 -feat 210=200)
--fonttest(magyar3 MagyarLinLibertineG.ttf 0066 0069 0066 0074 0079 002d 0066
0069 0076 0065 -feat 209=3)
--
- macro(feattest TESTNAME FONTFILE)
- if (EXISTS
${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.log)
- set(PLATFORM_TEST_SUFFIX ${CMAKE_SYSTEM_NAME})
-@@ -65,6 +43,3 @@ macro(feattest TESTNAME FONTFILE)
- # add_custom_target(${TESTNAME} DEPENDS ${TESTNAME}.xml)
- endmacro(feattest)
-
--feattest(padauk_feat Padauk.ttf)
--feattest(charis_feat charis_r_gr.ttf)
--feattest(scher_feat Scheherazadegr.ttf)
---- graphite2-0.9.4.orig/tests/comparerenderer/CMakeLists.txt
-+++ graphite2-0.9.4/tests/comparerenderer/CMakeLists.txt
-@@ -123,11 +123,8 @@ macro(comparetest TESTNAME FONTFILE TEXT
- endif (${GR_FOUND})
- endmacro(comparetest)
-
--comparetest(charis charis_r_gr.ttf udhr_eng.txt)
- comparetest(padauk Padauk.ttf my_HeadwordSyllables.txt)
- comparetest(padauk_ulon Padauk.ttf my_HeadwordSyllables.txt --features ulon=1)
--comparetest(charis_yor charis_r_gr.ttf udhr_yor.txt)
--comparetest(piglatin PigLatinBenchmark_v3.ttf udhr_eng.txt)
- # comparerenderer needs a bidi algorithm before it can run this test
- # comparetest(scheherazade_arb Scheherazadegr.ttf udhr_arb.txt --rtl)
-
---- graphite2-0.9.4.orig/tests/examples/CMakeLists.txt
-+++ graphite2-0.9.4/tests/examples/CMakeLists.txt
-@@ -29,4 +29,3 @@ endmacro(test_example)
- test_example(simple simple.c ${PROJECT_SOURCE_DIR}/../fonts/Padauk.ttf "Hello
World!")
- test_example(features features.c ${PROJECT_SOURCE_DIR}/../fonts/Padauk.ttf)
- test_example(clusters cluster.c ${PROJECT_SOURCE_DIR}/../fonts/Padauk.ttf
"စက္ခုန္ဒြေ")
--test_example(linebreak linebreak.c
${PROJECT_SOURCE_DIR}/../fonts/charis_r_gr.ttf 120 "This is a long test line
that goes on and on and on")
diff --git a/patches/series b/patches/series
index f3c59ef..10d55fe 100644
--- a/patches/series
+++ b/patches/series
@@ -1,2 +1 @@
include-and-libraries.diff
-disable_font_tests.diff
diff --git a/rules b/rules
index a354ca9..4ed6b54 100755
--- a/rules
+++ b/rules
@@ -28,8 +28,6 @@ override_dh_auto_install:
# find debian/libtext-graphite2-perl -type f -name .packlist | xargs rm -f
override_dh_auto_test:
- cd tests/fonts && \
- ln -sf /usr/share/fonts/truetype/ttf-sil-padauk/Padauk.ttf
dh_auto_test
#ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
# cd perl && \
@@ -40,7 +38,6 @@ override_dh_auto_clean:
# if [ -e perl/Build ]; then cd perl && \
# ./Build clean; fi
# rm -rf perl/Build perl/_build
- rm -f tests/fonts/Padauk.ttf
-find . -name "CTestCostData.txt" | xargs rm
-find . -name "LastTest.log" | xargs rm
dh_auto_clean
--
graphite2 packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qql9d-00056h...@vasks.debian.org
