[graphite2] 45/69: Imported Debian patch 1.3.0-1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository graphite2.
commit eec3f6a00cf6570c5d72d7b869773803310f8e26
Merge: f24ee91 a3c42da
Author: Rene Engelhard <rene@debian.org>
Date: Sat Aug 8 10:38:42 2015 +0000
Imported Debian patch 1.3.0-1
.hg_archival.txt | 6 +-
.hgignore | 2 +
.hgtags | 2 +
ChangeLog | 12 +-
Graphite.cmake | 11 +
Todo.txt | 12 +-
contrib/C#/NGraphite/FeatureRef.cs | 4 +
contrib/C#/NGraphite/NGraphite.dll.config | 2 +-
contrib/C#/NGraphiteTests/NGraphiteTests.csproj | 6 +-
contrib/perl/Build.PL | 2 +-
debian-src/changelog | 6 +
debian-src/control | 2 +-
debian-src/libgraphite2-dev.install | 1 +
debian-src/rules | 2 +-
debian/changelog | 6 +
debian/control | 2 +-
debian/patches/include-and-libraries.diff | 11 -
debian/patches/no-icons.diff | 20 +-
debian/patches/no-specific-nunit-version.diff | 15 -
debian/patches/non-linux.diff | 42 +-
debian/patches/series | 3 -
debian/patches/soname.diff | 7 -
debian/rules | 1 +
doc/CMakeLists.txt | 16 +-
doc/GTF-docinfo.xml | 139 +
doc/GTF.txt | 907 +
doc/OpCodes.txt | 88 +
doc/building.txt | 34 +-
doc/font.txt | 78 +
doc/graphite.css | 334 +
doc/guardspace.png | Bin 0 -> 58852 bytes
doc/guardspace.svg | 492 +
doc/hacking.txt | 7 +
doc/manual.txt | 1 +
gr2fonttest/gr2FontTest.cpp | 2 +-
include/graphite2/Font.h | 4 +-
include/graphite2/Segment.h | 36 +-
include/graphite2/Types.h | 15 +-
src/Bidi.cpp | 47 +-
src/CMakeLists.txt | 7 +-
src/Code.cpp | 128 +-
src/Collider.cpp | 1080 +
src/Decompressor.cpp | 102 +
src/Face.cpp | 98 +-
src/FeatureMap.cpp | 10 +-
src/GlyphCache.cpp | 167 +-
src/Intervals.cpp | 292 +
src/Justifier.cpp | 13 +-
src/Pass.cpp | 531 +-
src/Position.cpp | 98 +
src/Rule.cpp | 31 -
src/Segment.cpp | 31 +-
src/Silf.cpp | 36 +-
src/Slot.cpp | 124 +-
src/TtfUtil.cpp | 70 +-
src/files.mk | 10 +
src/gr_face.cpp | 2 +-
src/gr_logging.cpp | 24 +
src/gr_segment.cpp | 4 -
src/gr_slot.cpp | 4 +-
src/inc/Code.h | 26 +-
src/inc/Collider.h | 220 +
src/inc/Decompressor.h | 52 +
src/inc/Error.h | 23 +-
src/inc/Face.h | 13 +-
src/inc/FeatureMap.h | 7 +-
src/inc/GlyphCache.h | 137 +-
src/inc/Intervals.h | 231 +
src/inc/List.h | 13 +-
src/inc/Machine.h | 6 +-
src/inc/Main.h | 5 +
src/inc/Pass.h | 41 +-
src/inc/Position.h | 9 +
src/inc/Rule.h | 2 -
src/inc/Segment.h | 25 +-
src/inc/Shrinker.h | 119 +
src/inc/Silf.h | 12 +-
src/inc/Slot.h | 7 +-
src/inc/TtfUtil.h | 4 +-
src/inc/bits.h | 64 +-
src/inc/debug.h | 8 +
src/inc/json.h | 7 +
src/inc/opcode_table.h | 7 +-
src/inc/opcodes.h | 52 +-
src/json.cpp | 16 +-
tests/CMakeLists.txt | 24 +-
tests/bidi/CMakeLists.txt | 2 +-
tests/{bidi => }/biditest | 0
tests/bittwiddling/CMakeLists.txt | 20 +
tests/bittwiddling/bits.cpp | 135 +
tests/comparerenderer/CMakeLists.txt | 105 +-
tests/comparerenderer/CompareRenderer.cpp | 97 +-
tests/comparerenderer/Gr2Renderer.h | 15 +-
tests/comparerenderer/GrRenderer.h | 96 -
tests/comparerenderer/GrUtfTextSrc.cpp | 319 -
tests/comparerenderer/GrUtfTextSrc.h | 143 -
tests/comparerenderer/HbNgRenderer.h | 158 -
tests/comparerenderer/HbRenderer.h | 240 -
tests/comparerenderer/IcuRenderer.h | 131 -
tests/comparerenderer/RenderedLine.h | 22 +-
tests/comparerenderer/UniscribeRenderer.h | 340 -
tests/comparerenderer/icule/FontObject.cpp | 244 -
tests/comparerenderer/icule/FontObject.h | 235 -
tests/comparerenderer/icule/FontTableCache.cpp | 91 -
tests/comparerenderer/icule/FontTableCache.h | 41 -
tests/comparerenderer/icule/Makefile.am | 9 -
.../comparerenderer/icule/PortableFontInstance.cpp | 447 -
tests/comparerenderer/icule/PortableFontInstance.h | 117 -
tests/comparerenderer/icule/cmaps.cpp | 200 -
tests/comparerenderer/icule/cmaps.h | 85 -
tests/comparerenderer/icule/icu-license.html | 51 -
tests/comparerenderer/icule/letest.h | 49 -
tests/comparerenderer/icule/readme | 3 -
tests/comparerenderer/icule/sfnt.h | 449 -
tests/examples/cluster.c | 2 +-
tests/featuremap/CMakeLists.txt | 5 +-
tests/fnttxtrender | 245 +
tests/fonts/Awami_compressed_test.ttf | Bin 0 -> 355072 bytes
tests/fonts/Awami_test.ttf | Bin 0 -> 918668 bytes
tests/fonts/Awami_test/Awami_test.gdx | 182413 ++++++++++++++++++
tests/fonts/Awami_test/awami.gdl | 2366 +
tests/fonts/Awami_test/nastaliq_classes.gdh | 553 +
tests/fonts/Awami_test/nastaliq_cntxlClasses.gdh | 195 +
tests/fonts/Awami_test/nastaliq_complexShapes.gdh | 401 +
tests/fonts/Awami_test/nastaliq_positioning.gdh | 623 +
tests/fonts/Awami_test/nastaliq_rules.gdl | 138 +
tests/fonts/Awami_test/nastaliq_separateNuqtas.gdh | 76 +
tests/fonts/Awami_test/nastaliq_shaping.gdh | 671 +
tests/full-fuzz-test.sh | 8 +-
.../udhr_nep/Corrupted slot index.fuzz | 4 +
.../awami_tests/Compression scheme corruption.fuzz | 5 +
.../Awami_test/awami_tests/fuzzfont-r.fuzz | 30 +
tests/fuzz-tests/CMakeLists.txt | 20 +-
tests/{bidi => }/fuzzbidi | 0
tests/fuzztest | 4 +-
tests/{bidi => }/graphite.py | 43 +-
tests/grlist/CMakeLists.txt | 8 +
tests/grlist/intervalsettest.cpp | 254 +
tests/hbspeeds | 103 +
tests/segcache/CMakeLists.txt | 2 +-
tests/standards/annacmp1.json | 210 +
tests/standards/annapurna_nep.log | 210 +
tests/standards/awamicmp1.json | 569 +
tests/standards/awamicmp2.json | 569 +
tests/standards/charis.log | 342 +
tests/standards/charis_yor.log | 219 +
tests/standards/chariscmp1.json | 342 +
tests/standards/chariscmp2.json | 220 +
tests/standards/padauk.log | 3669 +
tests/standards/padauk_ulon.log | 3669 +
tests/standards/padaukcmp1.json | 3669 +
tests/standards/piglatin.log | 342 +
tests/standards/scheherazade_arb.log | 221 +
tests/standards/schercmp1.json | 222 +
tests/texts/awami_tests.txt | 567 +
tests/vm/basic_test.cpp | 3 +-
156 files changed, 209322 insertions(+), 4103 deletions(-)
diff --cc debian/changelog
index 10d832f,0000000..5f32077
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,203 -1,0 +1,209 @@@
++graphite2 (1.3.0-1) experimental; urgency=medium
++
++ * New upstream release
++
++ -- Rene Engelhard <rene@debian.org> Sat, 08 Aug 2015 10:38:42 +0000
++
+graphite2 (1.2.4-3) unstable; urgency=medium
+
+ * run a2x without --icons to avoid FTBFS (closes: #741845)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 01 Jun 2014 11:12:56 +0200
+
+graphite2 (1.2.4-2) unstable; urgency=low
+
+ * add patch from Pino Toscano to also avoid linking to libstdc++ on
+ kFreeBSD and Hurd (closes: #738353)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 10 Feb 2014 09:47:01 +0100
+
+graphite2 (1.2.4-1) unstable; urgency=low
+
+ * New upstream release
+ * some tests need apparently need python, build-dep on python (>= 2.6)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 29 Nov 2013 20:12:13 +0100
+
+graphite2 (1.2.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Tue, 11 Jun 2013 19:25:25 +0200
+
+graphite2 (1.2.2-2) unstable; urgency=low
+
+ * add patch from Michael Cree <mcree@orcon.net.nz> to fix
+ misaligned memory access - thanks (closes: #710336)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 02 Jun 2013 12:05:28 +0000
+
+graphite2 (1.2.2-1) unstable; urgency=low
+
+ * New upstream release
+ * stop building with -O3 gotten from somewhere and overriding
+ dpkg-buildflags' value, just remove via sed
+ * converto multiarch again... (closes: #689813)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 31 May 2013 18:10:55 +0200
+
+graphite2 (1.2.1-2) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Thu, 18 Apr 2013 23:49:24 +0200
+
+graphite2 (1.2.1-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Mon, 04 Mar 2013 19:44:28 +0100
+
+graphite2 (1.2.0-4) experimental; urgency=low
+
+ * revert multiarch stuff as harfbuzz now doesn't need us
+ anymore... (reopens: #699714)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 02 Mar 2013 14:29:58 +0100
+
+graphite2 (1.2.0-3) experimental; urgency=low
+
+ * apply patch from Daniel Schaal to convert to multiarch
+ as already multiarchified pango now needs us via harfbuzz...
+ (closes: #699714)
+ * clean up (not packaged) perl module packaging
+ * add (not used yet) stuff to build mono binding
+ * split arch-dep and arch-indep (docs...) build
+ * disable the compare renderer stuff - enough compared ;-)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 27 Feb 2013 20:24:34 +0100
+
+graphite2 (1.2.0-2) experimental; urgency=low
+
+ * break libgraphite2-2.0.0 (<< 1.2.0) (closes: #689813)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 06 Oct 2012 18:24:32 +0200
+
+graphite2 (1.2.0-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Fri, 21 Sep 2012 16:41:23 +0200
+
+graphite2 (1.1.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Sat, 02 Jun 2012 01:10:10 +0200
+
+graphite2 (1.1.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Fri, 20 Apr 2012 01:45:47 +0200
+
+graphite2 (1.1.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Mon, 27 Feb 2012 22:32:26 +0100
+
+graphite2 (1.1.0-2) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Tue, 21 Feb 2012 20:41:47 +0100
+
+graphite2 (1.1.0-1) experimental; urgency=low
+
+ * New upstream release
+ * fix copyright syntax
+
+ -- Rene Engelhard <rene@debian.org> Tue, 07 Feb 2012 22:55:08 +0000
+
+graphite2 (1.0.3.real-1) unstable; urgency=low
+
+ * fixup upstream release for 1.0.3
+
+ -- Rene Engelhard <rene@debian.org> Thu, 22 Sep 2011 20:59:53 +0200
+
+graphite2 (1.0.3-1) unstable; urgency=low
+
+ * New upstream release
+ * add libxml2-utils to B-D-I
+
+ -- Rene Engelhard <rene@debian.org> Tue, 20 Sep 2011 00:28:27 +0200
+
+graphite2 (1.0.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Mon, 15 Aug 2011 13:29:41 +0000
+
+graphite2 (1.0.1-3) unstable; urgency=low
+
+ * debian/patches/fix-typedefs.diff: move ...
+ * debian/patches/words-bigendian-fixes.diff: ... here and add additional
+ upstream fix for setting -DWORDS_BIGENDIAN also for the tests...
+ * clean up Build-Depends:
+ + move asciidoc, dblatex, doxygen, docbook-xsl, latex-xcolor to B-D-I
+ + remove libxml2-utils
+
+ -- Rene Engelhard <rene@debian.org> Wed, 10 Aug 2011 15:42:59 +0200
+
+graphite2 (1.0.1-2) unstable; urgency=low
+
+ * debian/patches/fix-typedefs.diff: fix Main.h typedefs for
+ WORDS_BIGENDIAN
+
+ -- Rene Engelhard <rene@debian.org> Tue, 09 Aug 2011 17:47:10 +0000
+
+graphite2 (1.0.1-1) unstable; urgency=low
+
+ * New upstream release
+ - removes -nostdlibs (closes: #634810)
+
+ * build with -DDISABLE_TRACING:bool=1
+ * 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
+
+ -- Rene Engelhard <rene@debian.org> Thu, 28 Jul 2011 12:54:36 +0000
+
+graphite2 (0.9.4.dfsg-4) unstable; urgency=low
+
+ * grr, remove dpkg-source generated patch which readds ppport.h...
+
+ -- Rene Engelhard <rene@debian.org> Thu, 14 Jul 2011 14:50:55 +0200
+
+graphite2 (0.9.4.dfsg-3) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Tue, 12 Jul 2011 16:58:19 +0000
+
+graphite2 (0.9.4.dfsg-2) experimental; urgency=low
+
+ * add missing build-dep on latex-xcolor
+
+ -- Rene Engelhard <rene@debian.org> Sun, 10 Jul 2011 00:05:23 +0200
+
+graphite2 (0.9.4.dfsg-1) experimental; urgency=low
+
+ * remove perl/pport.h and tests/fonts/* from .orig
+
+ * debian/changelog: update
+ * debian/control: build-depend on ttf-sil-padauk, ttf-sil-scheherazade
+ * debian/rules: symlink to Debian's versions pf Padauk and Scheherazade,
+ though....
+ * debian/patches/disable_font_tests.diff: disable them (fail)
+ * debian/rules, debian/control: disable perl build
+
+ -- Rene Engelhard <rene@debian.org> Sat, 09 Jul 2011 16:50:25 +0000
+
+graphite2 (0.9.4-1) experimental; urgency=low
+
+ * Initial release (closes: #617718)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 03 Jun 2011 11:08:48 +0000
diff --cc debian/control
index 542b4dc,0000000..12e8aa3
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,136 -1,0 +1,136 @@@
+Source: graphite2
+Priority: optional
+Section: libs
+Maintainer: Debian LibreOffice Team <debian-openoffice@lists.debian.org>
+Uploaders: Rene Engelhard <rene@debian.org>, Daniel Glassey <wdg@debian.org>
- Build-Depends: debhelper (>= 9), dh-exec (>= 0.3), dpkg-dev (>= 1.16.1), cmake, libfreetype6-dev
++Build-Depends: debhelper (>= 9), dh-exec (>= 0.3), dpkg-dev (>= 1.16.1), cmake, python, fonttools
+# perl: libmodule-build-perl
+# mono: mono-xbuild, mono-gmcs, mono-dmcs, libnunit-cil-dev
+Build-Depends-Indep: asciidoc, dblatex, doxygen, docbook-xsl, latex-xcolor, libxml2-utils
+Standards-Version: 3.9.1
+
+Package: libgraphite2-3
+Section: libs
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: libgraphite2-2.0.0
+Replaces: libgraphite2-2.0.0
+Breaks: libgraphite2-2.0.0 (<< 1.2.0)
+Multi-Arch: same
+Description: Font rendering engine for Complex Scripts -- library
+ Graphite is a system that can be used to create and use "smart fonts" capable
+ of displaying writing systems with various complex behaviors, such as:
+ contextual shaping, ligatures, reordering, split glyphs, bidirectionality,
+ stacking diacritics and complex positioning.
+ .
+ This library was designed and developed by the NRSI (Non-Roman Script
+ Initiative) within SIL International (www.sil.org) to act as a complement to
+ other smart font rendering technologies with limited practical local
+ extensibility. Its purpose is to help meet the needs of a very large number
+ of "minority language" communities for local extensibility of complex script
+ behaviors.
+ .
+ The behavior of the rendering engine for a given writing system is specified
+ through extra tables added to a TrueType font. These tables are generated by
+ compiling a GDL (Graphite Description Language) source file into a font using
+ grcompiler.
+ .
+ This package contains the shared library.
+
+Package: libgraphite2-dev
+Section: libdevel
+Architecture: any
+Depends: libgraphite2-3 (= ${binary:Version}), ${misc:Depends}
+Description: Development files for libgraphite2
+ Graphite is a system that can be used to create and use "smart fonts" capable
+ of displaying writing systems with various complex behaviors, such as:
+ contextual shaping, ligatures, reordering, split glyphs, bidirectionality,
+ stacking diacritics and complex positioning.
+ .
+ This library was designed and developed by the NRSI (Non-Roman Script
+ Initiative) within SIL International (www.sil.org) to act as a complement to
+ other smart font rendering technologies with limited practical local
+ extensibility. Its purpose is to help meet the needs of a very large number
+ of "minority language" communities for local extensibility of complex script
+ behaviors.
+ .
+ The behavior of the rendering engine for a given writing system is specified
+ through extra tables added to a TrueType font. These tables are generated by
+ compiling a GDL (Graphite Description Language) source file into a font using
+ grcompiler.
+ .
+ This package contains the development libraries for libgraphite2
+
+Package: libgraphite2-3-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: libgraphite2-3 (= ${binary:Version}), ${misc:Depends}
+Description: Debug symbols for libgraphite2
+ Graphite is a system that can be used to create and use "smart fonts" capable
+ of displaying writing systems with various complex behaviors, such as:
+ contextual shaping, ligatures, reordering, split glyphs, bidirectionality,
+ stacking diacritics and complex positioning.
+ .
+ This library was designed and developed by the NRSI (Non-Roman Script
+ Initiative) within SIL International (www.sil.org) to act as a complement to
+ other smart font rendering technologies with limited practical local
+ extensibility. Its purpose is to help meet the needs of a very large number
+ of "minority language" communities for local extensibility of complex script
+ behaviors.
+ .
+ The behavior of the rendering engine for a given writing system is specified
+ through extra tables added to a TrueType font. These tables are generated by
+ compiling a GDL (Graphite Description Language) source file into a font using
+ grcompiler.
+ .
+ Debug symbols for libgraphite2
+
+Package: libgraphite2-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Documentation for libgraphite2
+ Graphite is a system that can be used to create and use "smart fonts" capable
+ of displaying writing systems with various complex behaviors, such as:
+ contextual shaping, ligatures, reordering, split glyphs, bidirectionality,
+ stacking diacritics and complex positioning.
+ .
+ This library was designed and developed by the NRSI (Non-Roman Script
+ Initiative) within SIL International (www.sil.org) to act as a complement to
+ other smart font rendering technologies with limited practical local
+ extensibility. Its purpose is to help meet the needs of a very large number
+ of "minority language" communities for local extensibility of complex script
+ behaviors.
+ .
+ The behavior of the rendering engine for a given writing system is specified
+ through extra tables added to a TrueType font. These tables are generated by
+ compiling a GDL (Graphite Description Language) source file into a font using
+ grcompiler.
+ .
+ PDF and HTML documentation for libgraphite2
+
+#Package: libtext-gr2-perl
+#Section: perl
+#Architecture: any
+#Depends: ${shlibs:Depends}, perl, ${perl:Depends}, ${misc:Depends}
+#Description: Perl Interface to SIL's Graphite2 rendering engine
+# Graphite is a system that can be used to create and use "smart fonts" capable
+# of displaying writing systems with various complex behaviors, such as:
+# contextual shaping, ligatures, reordering, split glyphs, bidirectionality,
+# stacking diacritics and complex positioning.
+# .
+# This library was designed and developed by the NRSI (Non-Roman Script
+# Initiative) within SIL International (www.sil.org) to act as a complement to
+# other smart font rendering technologies with limited practical local
+# extensibility. Its purpose is to help meet the needs of a very large number
+# of "minority language" communities for local extensibility of complex script
+# behaviors.
+# .
+# The behavior of the rendering engine for a given writing system is specified
+# through extra tables added to a TrueType font. These tables are generated by
+# compiling a GDL (Graphite Description Language) source file into a font using
+# grcompiler.
+# .
+# This package contains the Text::Graphite2 module.
diff --cc debian/patches/no-icons.diff
index eb4de18,0000000..1bc986b
mode 100644,000000..100644
--- a/debian/patches/no-icons.diff
+++ b/debian/patches/no-icons.diff
@@@ -1,17 -1,0 +1,15 @@@
- --- graphite2-1.2.4.orig/doc/CMakeLists.txt
- +++ graphite2-1.2.4/doc/CMakeLists.txt
- @@ -12,12 +12,12 @@ if(A2X)
++--- graphite2-1.3.0.orig/doc/CMakeLists.txt
+++++ graphite2-1.3.0/doc/CMakeLists.txt
++@@ -12,10 +12,10 @@ if(A2X)
+ if(DBLATEX)
+ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/manual.pdf
- DEPENDS ${PROJECT_SOURCE_DIR}/*.txt
++ DEPENDS ${PROJECT_SOURCE_DIR}/[a-z]*.txt
+- COMMAND ${A2X} --icons -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.txt)
++ COMMAND ${A2X} -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.txt)
- set(DOC_DEPENDS ${PROJECT_BINARY_DIR}/manual.pdf)
++ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/GTF.pdf
++ DEPENDS ${PROJECT_SOURCE_DIR}/GTF.txt
++- COMMAND ${A2X} --icons -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/GTF.txt)
+++ COMMAND ${A2X} -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/GTF.txt)
++ set(DOC_DEPENDS ${PROJECT_BINARY_DIR}/manual.pdf ${PROJECT_BINARY_DIR}/GTF.pdf)
+ endif(DBLATEX)
+ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/manual.html
- DEPENDS ${PROJECT_SOURCE_DIR}/*.txt
- - COMMAND ${A2X} -f xhtml --icons -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.txt)
- + COMMAND ${A2X} -f xhtml -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.txt)
- set(DOC_DEPENDS ${DOC_DEPENDS} ${PROJECT_BINARY_DIR}/manual.html)
- endif(A2X)
-
diff --cc debian/patches/non-linux.diff
index 1c6648e,0000000..62b4725
mode 100644,000000..100644
--- a/debian/patches/non-linux.diff
+++ b/debian/patches/non-linux.diff
@@@ -1,93 -1,0 +1,73 @@@
- --- a/gr2fonttest/CMakeLists.txt
- +++ b/gr2fonttest/CMakeLists.txt
++--- graphite2-1.3.0.orig/gr2fonttest/CMakeLists.txt
+++++ graphite2-1.3.0/gr2fonttest/CMakeLists.txt
+@@ -17,14 +17,14 @@ if (GRAPHITE2_ASAN)
+ set(GRAPHITE_LINK_FLAGS "-fsanitize=address")
+ endif (GRAPHITE2_ASAN)
+
+-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+ # -lgcc LINKER_LANGUAGE C
+ add_definitions(-fno-rtti -fno-exceptions)
+ set_target_properties(gr2fonttest PROPERTIES LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" LINKER_LANGUAGE C)
+ set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+ # This script just fails
+ nolib_test(stdc++ $<TARGET_FILE:gr2fonttest>)
+-endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+
+ # copy the DLL so that gr2fonttest can find it
+ add_custom_target(${PROJECT_NAME}_copy_dll ALL
- --- a/src/CMakeLists.txt
- +++ b/src/CMakeLists.txt
- @@ -110,7 +110,7 @@ else (${CMAKE_BUILD_TYPE} STREQUAL "Clan
++--- graphite2-1.3.0.orig/src/CMakeLists.txt
+++++ graphite2-1.3.0/src/CMakeLists.txt
++@@ -113,7 +113,7 @@ else (${CMAKE_BUILD_TYPE} STREQUAL "Clan
+ set(GRAPHITE_LINK_FLAGS "")
+ endif (${CMAKE_BUILD_TYPE} STREQUAL "ClangASN")
+
+-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+ set_target_properties(graphite2 PROPERTIES
- COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
++ COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector -Wdouble-promotion"
+ LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
- @@ -128,7 +128,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
++@@ -131,7 +131,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
+ endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
+ set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+-endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+
+ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+ set_target_properties(graphite2 PROPERTIES
- --- a/tests/comparerenderer/CMakeLists.txt
- +++ b/tests/comparerenderer/CMakeLists.txt
- @@ -38,7 +38,7 @@ endif (${ICU_INCLUDE} STREQUAL "ICU_INCL
- # set(HB1_LDFLAGS "-L${HB1_INCLUDE}/../../lib -lharfbuzz-1")
- #endif (${HB1_INCLUDE})
-
- -if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- +if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
- find_package(Freetype)
- find_package(PkgConfig)
-
- @@ -63,7 +63,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux
- set(GRAPHITE_LINK_FLAGS "-fsanitize=address")
- endif (GRAPHITE2_ASAN)
-
- -endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- +endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
-
- if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- find_path(GR_INCLUDE graphite/GrClient.h PATHS ENV SILGRAPHITE_HOME ${PROJECT_SOURCE_DIR}/../../../silgraphite-2.3.1 ${PROJECT_SOURCE_DIR}/../../../silgraphite-2.4.0 ${GRAPHITE_INSTALLED_PATH} ${PROJECT_SOURCE_DIR}/../../../graphite-trunk PATH_SUFFIXES engine/include include)
- --- a/tests/examples/CMakeLists.txt
- +++ b/tests/examples/CMakeLists.txt
++--- graphite2-1.3.0.orig/tests/examples/CMakeLists.txt
+++++ graphite2-1.3.0/tests/examples/CMakeLists.txt
+@@ -26,12 +26,12 @@ macro(test_example TESTNAME SRCFILE)
+ set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT 3)
+ endmacro(test_example)
+
+-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+ find_package(Freetype)
+ if (${FREETYPE_FOUND})
+ include_directories(${FREETYPE_INCLUDE_DIRS})
+ endif (${FREETYPE_FOUND})
+-endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+
+ macro(test_freetype TESTNAME SRCFILE)
+ if (${FREETYPE_FOUND})
- --- a/tests/vm/CMakeLists.txt
- +++ b/tests/vm/CMakeLists.txt
++--- graphite2-1.3.0.orig/tests/vm/CMakeLists.txt
+++++ graphite2-1.3.0/tests/vm/CMakeLists.txt
+@@ -38,12 +38,12 @@ if (GRAPHITE2_ASAN)
+ set_target_properties(vm-test-call PROPERTIES LINK_FLAGS "-fsanitize=address")
+ endif (GRAPHITE2_ASAN)
+
+-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+ add_definitions(-fno-rtti -fno-exceptions)
+ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+ add_definitions(-DNDEBUG -fomit-frame-pointer)
+ endif ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+-endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+
+ add_test(vm-test-call-threading vm-test-call ${testing_SOURCE_DIR}/fonts/tiny.ttf 1)
+ set_tests_properties(vm-test-call-threading PROPERTIES
diff --cc debian/patches/series
index 85bb231,0000000..97d0d42
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,2 @@@
- include-and-libraries.diff
- no-specific-nunit-version.diff
- soname.diff
+non-linux.diff
+no-icons.diff
diff --cc debian/rules
index 6fbbb93,0000000..34da2be
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,62 -1,0 +1,63 @@@
+#!/usr/bin/make -f
+
+include /usr/share/dpkg/architecture.mk
+
+%:
+ dh $@ --builddirectory=build
+
+override_dh_strip:
+ dh_strip --dbg-package=libgraphite2-3-dbg
+
+override_dh_auto_build-arch:
+ dh_auto_build
+# echo "Building perl module"
+# cd contrib/perl && \
+# perl Build.PL prefix=/usr && \
+# ./Build
+
+override_dh_auto_build-indep:
+ echo "Building docs"
+ dh_auto_build -- docs
+# echo "Building C# binding"
+# cd contrib/C\# && \
+# mono-xbuild NGraphite.sln
+
+override_dh_auto_install:
+ dh_auto_install
+# cd perl && \
+# ./Build install destdir=$(CURDIR)/debian/libtext-gr2-perl
+# # hack
+# cd $(CURDIR)/debian/libtext-gr2-perl/usr && \
+# mkdir share && mv man share
+# cd $(CURDIR)/debian/libtext-gr2-perl/usr/lib && \
+# mv perl perl5 && cd perl5 && mv 5.*/* . && rm -rf 5.*
+# find debian/libtext-gr2-perl -type f -name .packlist | xargs rm -f
+
+override_dh_auto_test:
+ dh_auto_test
+#ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+# cd contrib/perl && \
+# LD_LIBRARY_PATH=$(CURDIR)/build/src ./Build test
+#endif
+
+override_dh_auto_clean:
+# if [ -e contrib/perl/Build ]; then cd contrib/perl && \
+# ./Build clean; fi
+# rm -rf contrib/perl/Build contrib/perl/_build
+# rm -f /contrib/perl/MYMETA*
+# rm -f contrib/C\#/NGraphite/obj/Debug/NGraphite.csproj.FilesWrittenAbsolute.txt
+# -find contrib/C\# -name "*.dll" | xargs rm
+# -find contrib/C\# -name "*.dll.mdb" | xargs rm
+ -find . -name "CTestCostData.txt" | xargs rm
+ -find . -name "LastTest.log" | xargs rm
++ rm -f tests/graphite.pyc
+ dh_auto_clean
+
+override_dh_auto_configure:
+ dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:bool=1 -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH)
+ find . -type f ! -name "rules" ! -name "changelog" \
+ -exec sed -i -e 's/\-O3//g' {} \;
+
+override_dh_gencontrol:
+ dh_gencontrol -Nlibtext-gr2-perl -O--builddirectory=build
+# dh_gencontrol -plibtext-gr2-perl -- -v`cat perl/META.yml | grep version: | tail -n 1 | awk '{ print $$2 }'`-`dpkg-parsechangelog | grep urgency | awk '{ print $$2 }' | sed -e 's/(//' | sed -e 's/)//' | cut -d- -f2`
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
Reply to: