[graphite2] 16/69: Imported Debian patch 1.1.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 8b5c2e2e03c9326a94b9a6439e025462116b9844
Merge: dfcfdd4 cc6b147
Author: Rene Engelhard <rene@debian.org>
Date: Tue Feb 7 22:55:08 2012 +0000
Imported Debian patch 1.1.0-1
.hg_archival.txt | 4 +-
.hgignore | 2 +-
.hgtags | 3 +
CMakeLists.txt | 64 +-
ChangeLog | 22 +
Graphite.cmake | 41 +-
buildtest.bat | 8 -
contrib/android/bin/HelloWorldGraphite.apk | Bin 489841 -> 485771 bytes
contrib/android/jni/Android.mk | 1 +
contrib/android/jni/graphite/Android.mk | 2 +-
.../src/org/sil/palaso/helloworld/HelloWorld.java | 2 +-
contrib/perl/Build.PL | 10 +-
contrib/perl/MANIFEST | 18 +-
contrib/perl/examples/gr2fonttest.pl | 8 +-
contrib/perl/examples/typeset.pl | 4 +-
contrib/perl/lib/Text/{Graphite2.pm => Gr2.pm} | 38 +-
contrib/perl/lib/Text/{Graphite2.xs => Gr2.xs} | 28 +-
.../perl/lib/Text/{Graphite2 => Gr2}/CharInfo.pm | 2 +-
contrib/perl/lib/Text/{Graphite2 => Gr2}/Face.pm | 10 +-
.../perl/lib/Text/{Graphite2 => Gr2}/FeatureRef.pm | 10 +-
contrib/perl/lib/Text/Gr2/FeatureVal.pm | 18 +
contrib/perl/lib/Text/{Graphite2 => Gr2}/Font.pm | 10 +-
.../perl/lib/Text/{Graphite2 => Gr2}/Segment.pm | 8 +-
contrib/perl/lib/Text/{Graphite2 => Gr2}/Slot.pm | 2 +-
contrib/perl/lib/Text/Graphite2/FeatureVal.pm | 18 -
contrib/perl/t/00-load.t | 4 +-
debian/changelog | 7 +
debian/copyright | 54 +-
debian/patches/include-and-libraries.diff | 14 +-
debian/rules | 2 +-
doc/CMakeLists.txt | 6 +-
doc/Segment JSON Schema.json | 311 +++++
doc/hacking.txt | 26 +-
doc/manual.txt | 2 +-
gr2fonttest/CMakeLists.txt | 42 +-
{src => gr2fonttest}/UtfCodec.cpp | 0
{src => gr2fonttest}/UtfCodec.h | 13 +-
gr2fonttest/gr2FontTest.cpp | 232 ++-
include/graphite2/Font.h | 16 +-
include/graphite2/{XmlLog.h => Log.h} | 0
include/graphite2/Segment.h | 9 +-
include/graphite2/Types.h | 8 +-
src/Bidi.cpp | 10 +-
src/CMakeLists.txt | 52 +-
src/CachedFace.cpp | 104 +-
src/CmapCache.cpp | 12 +-
src/Code.cpp | 106 +-
src/Face.cpp | 96 +-
src/FeatureMap.cpp | 71 +-
src/Font.cpp | 2 +-
src/GlyphFace.cpp | 114 +-
src/GlyphFaceCache.cpp | 61 +-
src/NameTable.cpp | 8 +-
src/Pass.cpp | 457 +++---
src/Rule.cpp | 2 +-
src/SegCache.cpp | 33 +-
src/SegCacheEntry.cpp | 105 +-
src/SegCacheStore.cpp | 6 +-
src/Segment.cpp | 318 ++---
src/Silf.cpp | 280 ++--
src/Slot.cpp | 46 +-
src/Sparse.cpp | 4 +-
src/TtfUtil.cpp | 59 +-
src/UtfCodec.cpp | 2 +-
src/XmlTraceLog.cpp | 219 ---
src/XmlTraceLog.h | 268 ----
src/XmlTraceLogTags.cpp | 169 ---
src/XmlTraceLogTags.h | 184 ---
src/call_machine.cpp | 28 +-
src/direct_machine.cpp | 19 +-
src/files.mk | 74 +-
src/gr_char_info.cpp | 2 +-
src/gr_face.cpp | 52 +-
src/gr_features.cpp | 8 +-
src/gr_font.cpp | 2 +-
src/gr_logging.cpp | 112 +-
src/gr_segment.cpp | 17 +-
src/gr_slot.cpp | 10 +-
src/{ => inc}/CachedFace.h | 7 +-
src/{ => inc}/CharInfo.h | 7 +-
src/{ => inc}/CmapCache.h | 2 +-
src/{ => inc}/Code.h | 39 +-
src/{ => inc}/Endian.h | 8 +-
src/{ => inc}/Face.h | 32 +-
src/{ => inc}/FeatureMap.h | 4 +-
src/{ => inc}/FeatureVal.h | 5 +-
src/{ => inc}/Font.h | 4 +-
src/{ => inc}/GlyphFace.h | 20 +-
src/{ => inc}/GlyphFaceCache.h | 35 +-
src/{ => inc}/List.h | 12 +-
src/{ => inc}/Machine.h | 58 +-
src/{ => inc}/Main.h | 3 +
src/{ => inc}/NameTable.h | 4 +-
src/{ => inc}/Pass.h | 30 +-
src/{ => inc}/Position.h | 2 +-
src/{ => inc}/Rule.h | 25 +-
src/{ => inc}/SegCache.h | 16 +-
src/{ => inc}/SegCacheEntry.h | 11 +-
src/{ => inc}/SegCacheStore.h | 8 +-
src/{ => inc}/Segment.h | 82 +-
src/{ => inc}/Silf.h | 18 +-
src/{ => inc}/Slot.h | 51 +-
src/{ => inc}/Sparse.h | 2 +-
src/{ => inc}/TtfTypes.h | 10 +-
src/{ => inc}/TtfUtil.h | 2 +-
src/{ => inc}/UtfCodec.h | 5 +-
src/{CmapCache.h => inc/debug.h} | 70 +-
src/inc/json.h | 139 ++
src/{ => inc}/locale2lcid.h | 0
src/{ => inc}/opcode_table.h | 0
src/{ => inc}/opcodes.h | 41 +-
src/json.cpp | 126 ++
tests/CMakeLists.txt | 59 +-
tests/comparerenderer/CMakeLists.txt | 16 +-
tests/comparerenderer/CompareRenderer.cpp | 18 +-
tests/comparerenderer/Gr2Renderer.h | 4 +-
tests/comparerenderer/RendererOptions.h | 2 +
tests/endian/CMakeLists.txt | 2 +-
tests/endian/endiantest.cpp | 2 +-
tests/examples/CMakeLists.txt | 16 +-
tests/examples/linebreak.c | 4 +-
tests/featuremap/CMakeLists.txt | 15 +-
tests/featuremap/featuremaptest.cpp | 196 +--
tests/fonts/general.ttf | Bin 0 -> 58868 bytes
tests/fonts/general/general.gdl | 30 +
tests/fonts/general/lowerascii.ttf | Bin 0 -> 56212 bytes
tests/fonts/grtest1gr.ttf | Bin 0 -> 58308 bytes
tests/fonts/tiny.ttf | Bin 0 -> 528 bytes
tests/fuzzcharis | 5 -
tests/fuzzcomparerender | 21 +
tests/fuzzpadauk | 4 -
tests/fuzztest | 351 +++--
tests/grlist/CMakeLists.txt | 2 +-
tests/grlist/grlisttest.cpp | 4 +-
tests/json/CMakeLists.txt | 15 +
src/SegCacheStore.cpp => tests/json/jsontest.cpp | 56 +-
tests/jsoncmp | 75 +
tests/nametabletest/CMakeLists.txt | 7 +-
tests/nametabletest/nametabletest.cpp | 10 +-
tests/segcache/CMakeLists.txt | 15 +-
tests/segcache/segcachetest.cpp | 21 +-
tests/standards/charis1.json | 535 +++++++
tests/standards/charis2.json | 280 ++++
tests/standards/charis3.json | 405 ++++++
tests/standards/charis4.json | 321 +++++
tests/standards/charis5.json | 439 ++++++
tests/standards/general1.json | 224 +++
tests/standards/general1.log | 10 +
tests/standards/grtest1.json | 469 +++++++
tests/standards/grtest1.log | 24 +
tests/standards/jsontest.log | 30 +
tests/standards/magyar1.json | 600 ++++++++
tests/standards/magyar2.json | 464 ++++++
tests/standards/magyar3.json | 617 ++++++++
tests/standards/padauk1.json | 1021 ++++++++++++++
tests/standards/padauk10.json | 715 ++++++++++
tests/standards/padauk11.json | 523 +++++++
tests/standards/padauk2.json | 620 ++++++++
tests/standards/padauk3.json | 1416 +++++++++++++++++++
tests/standards/padauk4.json | 648 +++++++++
tests/standards/padauk5.json | 1218 ++++++++++++++++
tests/standards/padauk6.json | 817 +++++++++++
tests/standards/padauk7.json | 766 ++++++++++
tests/standards/padauk8.json | 458 ++++++
tests/standards/padauk9.json | 371 +++++
tests/standards/scher1.json | 1476 ++++++++++++++++++++
tests/standards/scher2.json | 1341 ++++++++++++++++++
tests/standards/scher3.json | 952 +++++++++++++
tests/utftest/CMakeLists.txt | 10 +-
tests/utftest/utftest.cpp | 1 +
tests/vm/CMakeLists.txt | 62 +-
tests/vm/basic_test.cpp | 18 +-
172 files changed, 19625 insertions(+), 3245 deletions(-)
diff --cc debian/changelog
index 1078891,0000000..fee83b7
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,87 -1,0 +1,94 @@@
++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/copyright
index ab37e84,0000000..f9cedf8
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,209 -1,0 +1,209 @@@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: graphite2
+Source: http://sf.net/projects/silgraphite
+
+Files: *
+Copyright: (C) 2010-2011, SIL International
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
-
++ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
-
++ .
+ On Debian systems you should have a local copy of the GNU Library
+ General Public License in /usr/share/common-licenses/LGPL-2. If you
+ downloaded the source you will find it in the file LICENSE; if not,
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Files: contrib/perl/*
+Copyright: Copyright (C) 2011 Simon Cozens <simon@cpan.org>
- License: GPL1+, Artistic
++License: GPL1+ | Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of either:
-
++ .
+ a) the GNU General Public License as published by the Free Software
+ Foundation; either version 1, or (at your option) any later
+ version, or
-
++ .
+ b) the "Artistic License" which comes with Perl.
-
++ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL' and
+ the Artistic Licence in `/usr/share/common-licenses/Artistic'.
+
+Files: contrib/perl/ppport.h
+Copyright: 2004-2010, Marcus Holland-Moritz <mhx-cpan@gmx.net>
+ 2001, Paul Marquess <pmqs@cpan.org> (Version 2.x)
+ 1999, Kenneth Albanowski <kjahds@kjahds.com> (Version 1.x)
+License: Artistic or GPL-1+
+
+Files: debian-src/*
+Copyright: 2010 Martin Hosken <martin_hosken@sil.org>
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
-
++ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
-
++ .
+ On Debian systems you should have a local copy of the GNU Library
+ General Public License in /usr/share/common-licenses/LGPL-2. If you
+ downloaded the source you will find it in the file LICENSE; if not,
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Files: debian*/*
+Copyright: 2010 Martin Hosken <martin_hosken@sil.org>
+ 2011 Rene Engelhard <rene@debian.org>
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
-
++ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
-
++ .
+ On Debian systems you should have a local copy of the GNU Library
+ General Public License in /usr/share/common-licenses/LGPL-2. If you
+ downloaded the source you will find it in the file LICENSE; if not,
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Files: tests/comparerenderer/icule/*
+Copyright: Copyright (c) 1995-2006 International Business Machines Corporation and others
+License: other
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, and/or sell copies of the Software, and to permit persons
+ to whom the Software is furnished to do so, provided that the above
+ copyright notice(s) and this permission notice appear in all copies of
+ the Software and that both the above copyright notice(s) and this
+ permission notice appear in supporting documentation.
-
++ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
++ .
+ Except as contained in this notice, the name of a copyright holder
+ shall not be used in advertising or otherwise to promote the sale, use
+ or other dealings in this Software without prior written authorization
+ of the copyright holder.
+
+Files: gr2fonttest/gr2FontTest.cpp
+Copyright: Copyright (C) 2005 www.thanlwinsoft.org
+License: LGPL | other
+
+Files: tests/comparerenderer/GrUtfTextSrc.*
+Copyright: Copyright (C) 2004 Keith Stribley
+License: MPL-1.1 | GPL-2 | LGPL-2.1
+
+Files: tests/fonts/*
+License: other
+ -----------------------------------------------------------
+ SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+ -----------------------------------------------------------
-
++ .
+ PREAMBLE
+ The goals of the Open Font License (OFL) are to stimulate worldwide
+ development of collaborative font projects, to support the font creation
+ efforts of academic and linguistic communities, and to provide a free and
+ open framework in which fonts may be shared and improved in partnership
+ with others.
-
++ .
+ The OFL allows the licensed fonts to be used, studied, modified and
+ redistributed freely as long as they are not sold by themselves. The
+ fonts, including any derivative works, can be bundled, embedded,
+ redistributed and/or sold with any software provided that any reserved
+ names are not used by derivative works. The fonts and derivatives,
+ however, cannot be released under any other type of license. The
+ requirement for fonts to remain under this license does not apply
+ to any document created using the fonts or their derivatives.
-
++ .
+ DEFINITIONS
+ "Font Software" refers to the set of files released by the Copyright
+ Holder(s) under this license and clearly marked as such. This may
+ include source files, build scripts and documentation.
-
++ .
+ "Reserved Font Name" refers to any names specified as such after the
+ copyright statement(s).
-
++ .
+ "Original Version" refers to the collection of Font Software components as
+ distributed by the Copyright Holder(s).
-
++ .
+ "Modified Version" refers to any derivative made by adding to, deleting,
+ or substituting -- in part or in whole -- any of the components of the
+ Original Version, by changing formats or by porting the Font Software to a
+ new environment.
-
++ .
+ "Author" refers to any designer, engineer, programmer, technical
+ writer or other person who contributed to the Font Software.
-
++ .
+ PERMISSION & CONDITIONS
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of the Font Software, to use, study, copy, merge, embed, modify,
+ redistribute, and sell modified and unmodified copies of the Font
+ Software, subject to the following conditions:
-
++ .
+ 1) Neither the Font Software nor any of its individual components,
+ in Original or Modified Versions, may be sold by itself.
-
++ .
+ 2) Original or Modified Versions of the Font Software may be bundled,
+ redistributed and/or sold with any software, provided that each copy
+ contains the above copyright notice and this license. These can be
+ included either as stand-alone text files, human-readable headers or
+ in the appropriate machine-readable metadata fields within text or
+ binary files as long as those fields can be easily viewed by the user.
-
++ .
+ 3) No Modified Version of the Font Software may use the Reserved Font
+ Name(s) unless explicit written permission is granted by the corresponding
+ Copyright Holder. This restriction only applies to the primary font name as
+ presented to the users.
-
++ .
+ 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+ Software shall not be used to promote, endorse or advertise any
+ Modified Version, except to acknowledge the contribution(s) of the
+ Copyright Holder(s) and the Author(s) or with their explicit written
+ permission.
-
++ .
+ 5) The Font Software, modified or unmodified, in part or in whole,
+ must be distributed entirely under this license, and must not be
+ distributed under any other license. The requirement for fonts to
+ remain under this license does not apply to any document created
+ using the Font Software.
-
++ .
+ TERMINATION
+ This license becomes null and void if any of the above conditions are
+ not met.
-
++ .
+ DISCLAIMER
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+ OTHER DEALINGS IN THE FONT SOFTWARE.
+
diff --cc debian/patches/include-and-libraries.diff
index 0aedf5a,0000000..33befb6
mode 100644,000000..100644
--- a/debian/patches/include-and-libraries.diff
+++ b/debian/patches/include-and-libraries.diff
@@@ -1,13 -1,0 +1,11 @@@
- --- graphite2-0.9.3.orig/contrib/perl/Build.PL
- +++ graphite2-0.9.3/contrib/perl/Build.PL
- @@ -8,8 +8,8 @@ my $builder = Module::Build->new(
- dist_author => 'Simon Cozens <simon@cpan.org>',
- dist_version_from => 'lib/Text/Graphite2.pm',
- extra_compiler_flags => '-Wall -Wno-unused-variable',
- - extra_linker_flags => '-lgraphite2',
++--- graphite2-1.1.0.orig/contrib/perl/Build.PL
+++++ graphite2-1.1.0/contrib/perl/Build.PL
++@@ -9,7 +9,7 @@
++ dist_version_from => 'lib/Text/Gr2.pm',
++ extra_compiler_flags => $^O ne 'MSWin32' ? '-Wall -Wno-unused-variable' : '',
++ extra_linker_flags => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib' : '-lgraphite2',
+- include_dirs => ['.'],
- + extra_linker_flags => '-L ../build/src -lgraphite2',
++ include_dirs => ['.', '../include'],
+ requires => {
+ 'Test::More' => 0,
+ },
diff --cc debian/rules
index 4ed6b54,0000000..c361ba6
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,50 -1,0 +1,50 @@@
+#!/usr/bin/make -f
+
+%:
+ dh $@ --builddirectory=build
+
+override_dh_strip:
+ dh_strip --dbg-package=libgraphite2-2.0.0-dbg
+
+override_dh_auto_build:
+ dh_auto_build
+ echo "Building docs"
+ dh_auto_build -- docs
+# echo "Building perl module"
+# cd perl && \
+# perl Build.PL prefix=/usr && \
+# ./Build
+
+override_dh_auto_install:
+ dh_auto_install
+ rm -rf debian/tmp/usr/bin
+# cd perl && \
+# ./Build install destdir=$(CURDIR)/debian/libtext-graphite2-perl
+# # hack
+# cd $(CURDIR)/debian/libtext-graphite2-perl/usr && \
+# mkdir share && mv man share
+# cd $(CURDIR)/debian/libtext-graphite2-perl/usr/lib && \
+# mv perl perl5 && cd perl5 && mv 5.*/* . && rm -rf 5.*
+# find debian/libtext-graphite2-perl -type f -name .packlist | xargs rm -f
+
+override_dh_auto_test:
+ dh_auto_test
+#ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+# cd perl && \
+# LD_LIBRARY_PATH=$(CURDIR)/build/src ./Build test
+#endif
+
+override_dh_auto_clean:
+# if [ -e perl/Build ]; then cd perl && \
+# ./Build clean; fi
+# rm -rf perl/Build perl/_build
+ -find . -name "CTestCostData.txt" | xargs rm
+ -find . -name "LastTest.log" | xargs rm
+ dh_auto_clean
+
+override_dh_auto_configure:
- dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DDISABLE_TRACING:bool=1
++ dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:bool=1
+
+override_dh_gencontrol:
+ dh_gencontrol -Nlibtext-graphite2-perl -O--builddirectory=build
+# dh_gencontrol -plibtext-graphite2-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: