[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[graphite2] 07/69: Imported Debian patch 1.0.1-1



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository graphite2.

commit 456de34fa0db6533d555eca2f7ebce083139b109
Merge: 20164a7 3ea8f8e
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Jul 28 12:54:36 2011 +0000

    Imported Debian patch 1.0.1-1

 .hg_archival.txt                                   |     4 +-
 .hgignore                                          |     3 +
 .hgtags                                            |     6 +
 CMakeLists.txt                                     |    56 +-
 ChangeLog                                          |    11 +
 Graphite.cmake                                     |   103 +
 contrib/android/AndroidManifest.xml                |    18 +
 contrib/android/README                             |    20 +
 contrib/android/assets/Padauk.ttf                  |   Bin 0 -> 517496 bytes
 contrib/android/assets/Scheherazadegr.ttf          |   Bin 0 -> 335880 bytes
 contrib/android/bin/HelloWorldGraphite.apk         |   Bin 0 -> 489841 bytes
 contrib/android/build.properties                   |    17 +
 contrib/android/build.xml                          |    79 +
 contrib/android/default.properties                 |    11 +
 contrib/android/jni/Android.mk                     |    71 +
 contrib/android/jni/Application.mk                 |     4 +
 contrib/android/jni/_linker.h                      |   239 +
 contrib/android/jni/gdb.setup                      |     3 +
 contrib/android/jni/graphite/Android.mk            |    20 +
 contrib/android/jni/graphite_layer.cpp             |   458 +
 contrib/android/jni/load.cpp                       |   245 +
 src/CachedFace.h => contrib/android/jni/load.h     |    46 +-
 src/CachedFace.h => contrib/android/jni/load_gr.h  |    44 +-
 contrib/android/jni/loadgr_jni.cpp                 |   244 +
 contrib/android/proguard.cfg                       |    36 +
 contrib/android/res/drawable-hdpi/icon.png         |   Bin 0 -> 4147 bytes
 contrib/android/res/drawable-ldpi/icon.png         |   Bin 0 -> 1723 bytes
 contrib/android/res/drawable-mdpi/icon.png         |   Bin 0 -> 2574 bytes
 contrib/android/res/layout/main.xml                |    18 +
 contrib/android/res/values/strings.xml             |     5 +
 .../android/src/org/sil/palaso/Graphite.java       |    43 +-
 .../src/org/sil/palaso/helloworld/HelloWorld.java  |    63 +
 contrib/envsetup.sh                                |     6 +
 {perl => contrib/perl}/Build.PL                    |     0
 {perl => contrib/perl}/Changes                     |     0
 {perl => contrib/perl}/MANIFEST                    |     0
 {perl => contrib/perl}/META.yml                    |     0
 {perl => contrib/perl}/examples/gr2fonttest.pl     |     0
 {perl => contrib/perl}/examples/typeset.pl         |     0
 {perl => contrib/perl}/lib/Text/Graphite2.pm       |    34 +
 {perl => contrib/perl}/lib/Text/Graphite2.xs       |     0
 .../perl}/lib/Text/Graphite2/CharInfo.pm           |     0
 {perl => contrib/perl}/lib/Text/Graphite2/Face.pm  |     0
 .../perl}/lib/Text/Graphite2/FeatureRef.pm         |     0
 .../perl}/lib/Text/Graphite2/FeatureVal.pm         |     0
 {perl => contrib/perl}/lib/Text/Graphite2/Font.pm  |     0
 .../perl}/lib/Text/Graphite2/Segment.pm            |     0
 {perl => contrib/perl}/lib/Text/Graphite2/Slot.pm  |     0
 {perl => contrib/perl}/lib/Text/typemap            |     0
 contrib/perl/ppport.h                              |  7063 ++
 {perl => contrib/perl}/t/00-load.t                 |     0
 {perl => contrib/perl}/t/pod-coverage.t            |     0
 {perl => contrib/perl}/t/pod.t                     |     0
 debian/changelog                                   |    21 +-
 debian/control                                     |     4 +-
 debian/copyright                                   |    97 +-
 debian/libgraphite2-2.0.0-dbg.lintian-overrides    |     1 +
 debian/libgraphite2-2.0.0.lintian-overrides        |     1 +
 debian/libgraphite2-dev.lintian-overrides          |     1 +
 debian/libgraphite2-doc.lintian-overrides          |     1 +
 debian/patches/disable_font_tests.diff             |    59 -
 debian/patches/include-and-libraries.diff          |     4 +-
 debian/patches/series                              |     1 -
 debian/rules                                       |     9 +-
 doc/android.txt                                    |    26 +
 doc/calling.txt                                    |    14 +
 doc/hacking.txt                                    |    50 +-
 doc/intro.txt                                      |    54 +
 doc/manual.txt                                     |     2 +
 gr2fonttest/CMakeLists.txt                         |     2 +-
 gr2fonttest/gr2FontTest.cpp                        |    37 +-
 include/graphite2/Font.h                           |    17 +-
 include/graphite2/Segment.h                        |    12 +-
 perl/README                                        |    51 -
 src/Bidi.cpp                                       |   582 +
 src/CMakeLists.txt                                 |   115 +-
 src/CachedFace.cpp                                 |     2 +-
 src/CachedFace.h                                   |     2 +-
 src/Code.cpp                                       |    35 +-
 src/Face.cpp                                       |   129 +-
 src/Face.h                                         |    34 +-
 src/FeatureMap.cpp                                 |    43 +-
 src/FeatureMap.h                                   |     6 +-
 src/Font.h                                         |     5 +-
 src/GlyphFace.cpp                                  |   187 +-
 src/GlyphFace.h                                    |    10 +-
 src/GlyphFaceCache.cpp                             |    31 +-
 src/GlyphFaceCache.h                               |    17 +-
 src/Machine.h                                      |     2 -
 src/Main.h                                         |     2 -
 src/NameTable.cpp                                  |    18 +-
 src/NameTable.h                                    |     6 +-
 src/Pass.cpp                                       |    10 +-
 src/Rule.h                                         |    31 +-
 src/SegCache.cpp                                   |     2 +-
 src/SegCache.h                                     |     2 +-
 src/SegCacheEntry.cpp                              |     4 +-
 src/SegCacheEntry.h                                |     6 +-
 src/SegCacheStore.cpp                              |     4 +-
 src/SegCacheStore.h                                |     2 +-
 src/Segment.cpp                                    |    82 +-
 src/Segment.h                                      |     9 +-
 src/Silf.cpp                                       |    23 +-
 src/Silf.h                                         |     3 +-
 src/Slot.cpp                                       |   165 +-
 src/Slot.h                                         |    12 +-
 src/{gr_font.cpp => Sparse.cpp}                    |    50 +-
 src/Sparse.h                                       |   139 +
 src/TtfUtil.cpp                                    |    86 +-
 src/TtfUtil.h                                      |    57 +-
 src/XmlTraceLog.h                                  |    25 +-
 src/XmlTraceLogTags.h                              |    12 +-
 src/files.mk                                       |     3 +
 src/gr_face.cpp                                    |     9 +-
 src/gr_font.cpp                                    |     6 +
 src/gr_segment.cpp                                 |    16 +-
 src/locale2lcid.h                                  |     6 +-
 src/opcodes.h                                      |    20 +-
 tests/CMakeLists.txt                               |    30 +-
 tests/comparerenderer/CMakeLists.txt               |     2 +-
 tests/comparerenderer/CompareRenderer.cpp          |     4 +-
 tests/comparerenderer/Gr2Renderer.h                |     2 +-
 tests/comparerenderer/GrRenderer.h                 |     7 +-
 tests/comparerenderer/HbNgRenderer.h               |     4 +-
 tests/comparerenderer/UniscribeRenderer.h          |     6 +-
 tests/comparerenderer/icule/FontObject.cpp         |    10 +-
 .../comparerenderer/icule/PortableFontInstance.cpp |    23 +-
 tests/corrupt.py                                   |     8 +-
 tests/examples/cluster.c                           |     2 +-
 tests/featuremap/CMakeLists.txt                    |    14 +-
 tests/featuremap/featuremaptest.cpp                |     9 +-
 tests/fonts/Annapurnarc2.ttf                       |   Bin 0 -> 449040 bytes
 tests/fonts/Annapurnarc2/annapurna.gdl             |  2651 +
 tests/fonts/Annapurnarc2/annapurna_features.gdh    |   177 +
 tests/fonts/Annapurnarc2/annapurna_main.gdh        |  1359 +
 tests/fonts/Annapurnarc2/dbg_classes.txt           |   472 +
 tests/fonts/Annapurnarc2/dbg_cmap.txt              |   793 +
 tests/fonts/Annapurnarc2/dbg_enginecode.txt        | 16631 +++++
 tests/fonts/Annapurnarc2/dbg_fsm.txt               |  8522 +++
 tests/fonts/Annapurnarc2/dbg_glyphattrs.txt        |  8190 +++
 tests/fonts/Annapurnarc2/dbg_parsetree.txt         |  6072 ++
 tests/fonts/Annapurnarc2/dbg_ruleprec.txt          |  1709 +
 tests/fonts/Annapurnarc2/stddef.gdh                |    60 +
 tests/fonts/MagyarLinLibertineG.ttf                |   Bin 0 -> 1552000 bytes
 tests/fonts/MagyarLinLibertineG/ChangeLog          |    85 +
 tests/fonts/MagyarLinLibertineG/GPL.txt            |   343 +
 tests/fonts/MagyarLinLibertineG/LICENCE.txt        |     7 +
 tests/fonts/MagyarLinLibertineG/OFL.txt            |    98 +
 tests/fonts/MagyarLinLibertineG/README             |    59 +
 tests/fonts/MagyarLinLibertineG/dbg_classes.txt    | 18590 +++++
 tests/fonts/MagyarLinLibertineG/dbg_cmap.txt       |  4869 ++
 tests/fonts/MagyarLinLibertineG/dbg_enginecode.txt | 47564 +++++++++++++
 tests/fonts/MagyarLinLibertineG/dbg_fsm.txt        | 11392 ++++
 tests/fonts/MagyarLinLibertineG/dbg_glyphattrs.txt | 11857 ++++
 tests/fonts/MagyarLinLibertineG/dbg_parsetree.txt  |    75 +
 tests/fonts/MagyarLinLibertineG/dbg_ruleprec.txt   |  4174 ++
 tests/fonts/MagyarLinLibertineG/doc/FEATURES.txt   |   236 +
 .../fonts/MagyarLinLibertineG/doc/fontfeatures.odt |   Bin 0 -> 17748 bytes
 .../fonts/MagyarLinLibertineG/doc/fontfeatures.pdf |   Bin 0 -> 63672 bytes
 .../doc/hu/magyarlinuxlibertine.pdf                |   Bin 0 -> 99827 bytes
 tests/fonts/MagyarLinLibertineG/mg.gdl             |  1995 +
 tests/fonts/MagyarLinLibertineG/origfiles/Bugs     |    12 +
 .../MagyarLinLibertineG/origfiles/ChangeLog.txt    |  1681 +
 tests/fonts/MagyarLinLibertineG/origfiles/Readme   |    28 +
 .../MagyarLinLibertineG/origfiles/Readme-TEX.txt   |     5 +
 tests/fonts/Padauk.ttf                             |   Bin 0 -> 448096 bytes
 tests/fonts/Padauk/Padauk.pdf                      |   Bin 0 -> 157809 bytes
 tests/fonts/Padauk/dbg_classes.txt                 |   462 +
 tests/fonts/Padauk/dbg_cmap.txt                    |   605 +
 tests/fonts/Padauk/dbg_enginecode.txt              | 11818 ++++
 tests/fonts/Padauk/dbg_fsm.txt                     |  9238 +++
 tests/fonts/Padauk/dbg_glyphattrs.txt              |  4892 ++
 tests/fonts/Padauk/dbg_parsetree.txt               |  4692 ++
 tests/fonts/Padauk/dbg_ruleprec.txt                |  1709 +
 tests/fonts/PigLatinBenchmark_v3.ttf               |   Bin 0 -> 59216 bytes
 tests/fonts/PigLatinBenchmark_v3/dbg_classes.txt   |    35 +
 tests/fonts/PigLatinBenchmark_v3/dbg_cmap.txt      |   439 +
 .../fonts/PigLatinBenchmark_v3/dbg_enginecode.txt  |   269 +
 tests/fonts/PigLatinBenchmark_v3/dbg_fsm.txt       |   128 +
 .../fonts/PigLatinBenchmark_v3/dbg_glyphattrs.txt  |  1041 +
 tests/fonts/PigLatinBenchmark_v3/dbg_parsetree.txt |    12 +
 tests/fonts/PigLatinBenchmark_v3/dbg_ruleprec.txt  |    33 +
 tests/fonts/Scheherazadegr.ttf                     |   Bin 0 -> 336084 bytes
 tests/fonts/Scheherazadegr/dbg_classes.txt         |   347 +
 tests/fonts/Scheherazadegr/dbg_cmap.txt            |  1151 +
 tests/fonts/Scheherazadegr/dbg_enginecode.txt      |  4204 ++
 tests/fonts/Scheherazadegr/dbg_fsm.txt             |  3841 ++
 tests/fonts/Scheherazadegr/dbg_glyphattrs.txt      | 10979 +++
 tests/fonts/Scheherazadegr/dbg_parsetree.txt       |    12 +
 tests/fonts/Scheherazadegr/dbg_ruleprec.txt        |   575 +
 tests/fonts/charis_r_gr.ttf                        |   Bin 0 -> 1379072 bytes
 tests/fonts/charis_r_gr/charis_r_gr.pdf            |   Bin 0 -> 662166 bytes
 tests/fonts/charis_r_gr/dbg_classes.txt            |  1299 +
 tests/fonts/charis_r_gr/dbg_cmap.txt               |  4353 ++
 tests/fonts/charis_r_gr/dbg_enginecode.txt         | 11312 ++++
 tests/fonts/charis_r_gr/dbg_fsm.txt                | 28237 ++++++++
 tests/fonts/charis_r_gr/dbg_glyphattrs.txt         | 45025 ++++++++++++
 tests/fonts/charis_r_gr/dbg_parsetree.txt          | 67735 +++++++++++++++++++
 tests/fonts/charis_r_gr/dbg_ruleprec.txt           |  1536 +
 tests/fonts/charis_r_gr/features.gdh               |   744 +
 tests/fonts/charis_r_gr/main.gdh                   |   970 +
 tests/fonts/charis_r_gr/pitches.gdh                |   667 +
 tests/fonts/charis_r_gr/pua.gdh                    |   583 +
 tests/fuzzcharis                                   |     5 +
 tests/fuzzpadauk                                   |     4 +
 tests/fuzztest                                     |    59 +-
 tests/nametabletest/CMakeLists.txt                 |    13 +-
 tests/segcache/CMakeLists.txt                      |    34 +-
 tests/segcache/segcachetest.cpp                    |     2 +-
 tests/standards/charis5.log                        |    14 +
 tests/standards/magyar1.log                        |    12 +-
 tests/standards/magyar2.log                        |     6 +-
 tests/standards/scher3.log                         |    20 +
 tests/texts/udhr_hin.txt                           |     8 +-
 tests/texts/udhr_nep.txt                           |     8 +-
 tests/vm/CMakeLists.txt                            |    53 +-
 216 files changed, 379401 insertions(+), 1051 deletions(-)

diff --cc debian/changelog
index fcb3f8d,0000000..ede5eab
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,36 -1,0 +1,51 @@@
++graphite2 (1.0.1-1) unstable; urgency=low
++
++  * New upstream release
++    - removes -nostdlibs (closes: #634810)
++
++  * new upstream snapshot
++  * 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... 
++  * 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 
++  * 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 
++  * 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 7cd10bb,0000000..a37f974
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,128 -1,0 +1,128 @@@
 +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 (>= 8.0), cmake, libfreetype6-dev, libgraphite-dev, libicu-dev, asciidoc, dblatex, libxml2-utils, doxygen, docbook-xsl, libmodule-build-perl, ttf-sil-padauk, ttf-sil-scheherazade, 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
 +Section: libs
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: a "smart font" rendering engine -- library
++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
 + extensability. 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-2.0.0 (= ${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
 + extensability. 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-2.0.0-dbg
 +Priority: extra
 +Section: debug
 +Architecture: any
 +Depends: libgraphite2-2.0.0 (= ${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
 + extensability. 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
 + extensability. 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-graphite2-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
 +# extensability. 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/copyright
index f29e704,0000000..ab37e84
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,114 -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: perl/*
++Files: contrib/perl/*
 +Copyright: Copyright (C) 2011 Simon Cozens <simon@cpan.org>
 +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/libgraphite2-2.0.0-dbg.lintian-overrides
index 0000000,0000000..5cce40f
new file mode 100644
--- /dev/null
+++ b/debian/libgraphite2-2.0.0-dbg.lintian-overrides
@@@ -1,0 -1,0 +1,1 @@@
++libgraphite2-2.0.0-dbg: helper-templates-in-copyright
diff --cc debian/libgraphite2-2.0.0.lintian-overrides
index 0000000,0000000..bf4e995
new file mode 100644
--- /dev/null
+++ b/debian/libgraphite2-2.0.0.lintian-overrides
@@@ -1,0 -1,0 +1,1 @@@
++libgraphite2-2.0.0: helper-templates-in-copyright
diff --cc debian/libgraphite2-dev.lintian-overrides
index 0000000,0000000..aaf0027
new file mode 100644
--- /dev/null
+++ b/debian/libgraphite2-dev.lintian-overrides
@@@ -1,0 -1,0 +1,1 @@@
++libgraphite2-dev: helper-templates-in-copyright
diff --cc debian/libgraphite2-doc.lintian-overrides
index 0000000,0000000..33ee9db
new file mode 100644
--- /dev/null
+++ b/debian/libgraphite2-doc.lintian-overrides
@@@ -1,0 -1,0 +1,1 @@@
++libgraphite2-doc: helper-templates-in-copyright
diff --cc debian/patches/include-and-libraries.diff
index a3e83f0,0000000..0aedf5a
mode 100644,000000..100644
--- a/debian/patches/include-and-libraries.diff
+++ b/debian/patches/include-and-libraries.diff
@@@ -1,13 -1,0 +1,13 @@@
- --- graphite2-0.9.3.orig/perl/Build.PL
- +++ graphite2-0.9.3/perl/Build.PL
++--- 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',
 +-    include_dirs        => ['.'],
 ++    extra_linker_flags  => '-L ../build/src -lgraphite2',
 ++    include_dirs        => ['.', '../include'],
 +     requires => {
 +         'Test::More' => 0,
 +     },
diff --cc debian/patches/series
index f3c59ef,0000000..10d55fe
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +include-and-libraries.diff
- disable_font_tests.diff
diff --cc debian/rules
index ba0c796,0000000..4ed6b54
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,53 -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:
- 	cd tests/fonts && \
- 		ln -sf /usr/share/fonts/truetype/ttf-sil-padauk/Padauk.ttf; \
- 		ln -sf /usr/share/fonts/truetype/ttf-sil-scheherazade/ScheherazadeRegOT.ttf Scheherazadegr.ttf
 +	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
- 	rm -f tests/fonts/Padauk.ttf
- 	rm -f tests/fonts/Scheherazadegr.ttf
++	-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
++	dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DDISABLE_TRACING: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: