This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository graphite2.
commit 7258138d2e3128518b195f4cfa91ad7f17f40e55 Author: Rene Engelhard <[email protected]> Date: Thu Apr 21 14:48:44 2016 +0200 Imported Upstream version 1.1.1 --- .hg_archival.txt | 4 +- .hgtags | 1 + Todo.txt | 5 + contrib/perl/lib/Text/Gr2.xs | 2 +- debian-src/build | 40 ++++ debian-src/changelog | 94 +++++++++- debian-src/compat | 2 +- debian-src/control | 41 +++- debian-src/copyright | 207 ++++++++++++++++++++- .../libgraphite2-2.0.0-dbg.lintian-overrides | 1 + debian-src/libgraphite2-2.0.0.dirs | 1 + debian-src/libgraphite2-2.0.0.install | 1 + debian-src/libgraphite2-2.0.0.lintian-overrides | 1 + debian-src/libgraphite2-dev.install | 1 - debian-src/libgraphite2-dev.lintian-overrides | 1 + debian-src/libgraphite2-doc.lintian-overrides | 1 + debian-src/libtext-graphite2-perl.examples | 1 + debian-src/rules | 39 +++- debian-src/source/format | 2 +- doc/release.txt | 14 ++ include/graphite2/Font.h | 2 +- src/CMakeLists.txt | 1 + 22 files changed, 433 insertions(+), 29 deletions(-) diff --git a/.hg_archival.txt b/.hg_archival.txt index c1102e3..1956d6d 100644 --- a/.hg_archival.txt +++ b/.hg_archival.txt @@ -1,5 +1,5 @@ repo: 999e2033695c3bcf2f65d611737ac9008805bd58 -node: 9e6c32f84674f34ee9619136bb5183de07f505fe +node: f78cf782078fe3bd17cb29344956c44baee4f37f branch: default -latesttag: 1.1.0 +latesttag: 1.1.1 latesttagdistance: 1 diff --git a/.hgtags b/.hgtags index 7cc9c4b..94b4dad 100644 --- a/.hgtags +++ b/.hgtags @@ -21,3 +21,4 @@ f148746a0d99d2f9bc050906ce78815565a0d0b4 1.0.3 afdc9c2e4cf341560dfcb985b66e52793d1987af 1.1.0 afdc9c2e4cf341560dfcb985b66e52793d1987af 1.1.0 22dfbf9cd047667eef87602eacf2ac1e84ec20d7 1.1.0 +e095cd8b635aa985c8054717761555b6d46dbdb6 1.1.1 diff --git a/Todo.txt b/Todo.txt new file mode 100644 index 0000000..369dd01 --- /dev/null +++ b/Todo.txt @@ -0,0 +1,5 @@ +Changes to make to the API when we are forced to change it: + +* add font table deletion function ptr so that the app doesn't have to + manage a collection of font tables + diff --git a/contrib/perl/lib/Text/Gr2.xs b/contrib/perl/lib/Text/Gr2.xs index 36dc924..597b787 100644 --- a/contrib/perl/lib/Text/Gr2.xs +++ b/contrib/perl/lib/Text/Gr2.xs @@ -6,7 +6,7 @@ #include <graphite2/Font.h> #include <graphite2/Segment.h> -#include <graphite2/XmlLog.h> +#include <graphite2/Log.h> typedef gr_face Text_Graphite2_Face; typedef gr_font Text_Graphite2_Font; diff --git a/debian-src/build b/debian-src/build new file mode 100755 index 0000000..e12b80d --- /dev/null +++ b/debian-src/build @@ -0,0 +1,40 @@ +#!/bin/bash +HERE=`pwd` +if [ ! -n "${TARGETS}" ]; then + TARGETS="lucid maverick natty oneiric precise" +fi +#PUBLISH='SIL' +PUBLISH='LINGNET' +#REVISION=`echo $BUILD_NUMBER | sed -e 's/[:-].*$//'` +#VARIANT='lingnet' +PRODUCT='graphite2' +ZIPTYPE='gz' +DEST=${HERE}/../output +BUILDINGDIR=${HERE}/../building + +NO_DPUT=1 + +BASE=$(dpkg-parsechangelog -lchangelog| grep ^Vers | cut -d\ -f2 | cut -d\- -f1 | cut -d\: -f2) + +echo "build archs: $BUILD_ARCHS" + +if [ "${BUILD_ARCHS:0:6}" = "source" ]; then + echo ">> cp tarball to ~/upstream" + cp $1/building/${PRODUCT}-${BASE}.tar.gz ~/upstream/${PRODUCT}_${BASE}.orig.tar.gz || exit $? + rm -rf ${DEST}/results +else + echo ">> non-source build" + rm ${BUILDINGDIR}/*build* +fi + +source /home/bob/pbuilder/build.common + +# create artifacts +if [ "${BUILD_ARCHS:0:6}" = "source" ]; then + echo ">> copying files for artifacts" + mkdir ${DEST}/results || exit $? + cp /home/bob/pbuilder/results/lucid/${PRODUCT}_${BASE}-* ${DEST}/results || exit $? + cp /home/bob/pbuilder/results/lucid/${PRODUCT}_${BASE}.orig.tar.gz ${DEST}/results || exit $? + test -e ${DEST}/results/${PRODUCT}_${BASE}.orig.tar.gz || exit $? +fi + diff --git a/debian-src/changelog b/debian-src/changelog index d2cbad0..b0a1754 100644 --- a/debian-src/changelog +++ b/debian-src/changelog @@ -1,5 +1,93 @@ -graphite2 (0.9) UNRELEASED; urgency=low +graphite2 (1.1.0-1) lucid; urgency=low - * Initial release. (Closes: #XXXXXX) + * New upstream release - -- Martin Hosken <[email protected]> Wed, 22 Dec 2010 10:58:03 +0700 + -- Daniel Glassey <[email protected]> Mon, 06 Feb 2012 17:20:29 +0700 + +graphite2 (1.0.3.real-1) unstable; urgency=low + + * fixup upstream release for 1.0.3 + + -- Rene Engelhard <[email protected]> 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 <[email protected]> Tue, 20 Sep 2011 00:28:27 +0200 + +graphite2 (1.0.2-1) unstable; urgency=low + + * New upstream release + + -- Rene Engelhard <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Thu, 14 Jul 2011 14:50:55 +0200 + +graphite2 (0.9.4.dfsg-3) unstable; urgency=low + + * upload to unstable + + -- Rene Engelhard <[email protected]> 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 <[email protected]> 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 <[email protected]> Sat, 09 Jul 2011 16:50:25 +0000 + +graphite2 (0.9.4-1) experimental; urgency=low + + * Initial release (closes: #617718) + + -- Rene Engelhard <[email protected]> Fri, 03 Jun 2011 11:08:48 +0000 diff --git a/debian-src/compat b/debian-src/compat index 45a4fb7..7f8f011 100644 --- a/debian-src/compat +++ b/debian-src/compat @@ -1 +1 @@ -8 +7 diff --git a/debian-src/control b/debian-src/control index c09bf7f..da4fe40 100644 --- a/debian-src/control +++ b/debian-src/control @@ -1,15 +1,18 @@ Source: graphite2 Priority: optional Section: libs -Maintainer: Martin Hosken <[email protected]> -Build-Depends: debhelper (>= 8.0), cmake, libfreetype6-dev, libgraphite-dev, libicu-dev, asciidoc, dblatex, libxml2-utils, doxygen, docbook-xsl +Maintainer: Debian LibreOffice Team <[email protected]> +Uploaders: Rene Engelhard <[email protected]>, Daniel Glassey <[email protected]> +Build-Depends: debhelper (>= 7.0), cmake, libfreetype6-dev, libgraphite-dev, libicu-dev +# perl: libmodule-build-perl +Build-Depends-Indep: asciidoc, dblatex, doxygen, docbook-xsl, latex-xcolor, libxml2-utils Standards-Version: 3.9.1 Package: libgraphite2-2.0.0 Section: libs Architecture: any -Depends: ${misc:Depends} -Description: a "smart font" rendering engine +Depends: ${shlibs:Depends}, ${misc:Depends} +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, @@ -32,8 +35,8 @@ Description: a "smart font" rendering engine Package: libgraphite2-dev Section: libdevel Architecture: any -Depends: libgraphite2 (= ${source:Version}) -Description: Development libraries for libgraphite2 +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, @@ -57,7 +60,7 @@ Package: libgraphite2-2.0.0-dbg Priority: extra Section: debug Architecture: any -Depends: libgraphite2 (= ${source:Version}), ${Misc:Depends} +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: @@ -101,3 +104,27 @@ Description: Documentation for libgraphite2 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 --git a/debian-src/copyright b/debian-src/copyright index 0ce4945..ab37e84 100644 --- a/debian-src/copyright +++ b/debian-src/copyright @@ -1,11 +1,73 @@ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: graphite2 +Source: http://sf.net/projects/silgraphite -Copyright (C) 2010-2011, SIL International -All rights reserved +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 <[email protected]> +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 <[email protected]> + 2001, Paul Marquess <[email protected]> (Version 2.x) + 1999, Kenneth Albanowski <[email protected]> (Version 1.x) +License: Artistic or GPL-1+ + +Files: debian-src/* +Copyright: 2010 Martin Hosken <[email protected]> +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. -Copyright: + 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 <[email protected]> + 2011 Rene Engelhard <[email protected]> +License: LGPL-2+ This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + 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. @@ -14,9 +76,134 @@ Copyright: 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 Lesser - General Public License in /usr/share/common-licenses/LGPL. If you - downloaded the source you will find it in the file LICENSE; - If not, write to the Free Software Foundation, 51 Franklin Street, - Suite 500, Boston, MA 02110-1335, USA or visit their web page on the - internet at http://www.fsf.org/licenses/lgpl.html. + 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 --git a/debian-src/libgraphite2-2.0.0-dbg.lintian-overrides b/debian-src/libgraphite2-2.0.0-dbg.lintian-overrides new file mode 100644 index 0000000..5cce40f --- /dev/null +++ b/debian-src/libgraphite2-2.0.0-dbg.lintian-overrides @@ -0,0 +1 @@ +libgraphite2-2.0.0-dbg: helper-templates-in-copyright diff --git a/debian-src/libgraphite2-2.0.0.dirs b/debian-src/libgraphite2-2.0.0.dirs new file mode 100644 index 0000000..0bf940b --- /dev/null +++ b/debian-src/libgraphite2-2.0.0.dirs @@ -0,0 +1 @@ +/usr/lib diff --git a/debian-src/libgraphite2-2.0.0.install b/debian-src/libgraphite2-2.0.0.install new file mode 100644 index 0000000..c45ebcf --- /dev/null +++ b/debian-src/libgraphite2-2.0.0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/lib*.so.* diff --git a/debian-src/libgraphite2-2.0.0.lintian-overrides b/debian-src/libgraphite2-2.0.0.lintian-overrides new file mode 100644 index 0000000..bf4e995 --- /dev/null +++ b/debian-src/libgraphite2-2.0.0.lintian-overrides @@ -0,0 +1 @@ +libgraphite2-2.0.0: helper-templates-in-copyright diff --git a/debian-src/libgraphite2-dev.install b/debian-src/libgraphite2-dev.install index 788de74..f9516b5 100644 --- a/debian-src/libgraphite2-dev.install +++ b/debian-src/libgraphite2-dev.install @@ -1,4 +1,3 @@ debian/tmp/usr/include debian/tmp/usr/lib/lib*.so debian/tmp/usr/lib/pkgconfig -debian/tmp/usr/bin/* diff --git a/debian-src/libgraphite2-dev.lintian-overrides b/debian-src/libgraphite2-dev.lintian-overrides new file mode 100644 index 0000000..aaf0027 --- /dev/null +++ b/debian-src/libgraphite2-dev.lintian-overrides @@ -0,0 +1 @@ +libgraphite2-dev: helper-templates-in-copyright diff --git a/debian-src/libgraphite2-doc.lintian-overrides b/debian-src/libgraphite2-doc.lintian-overrides new file mode 100644 index 0000000..33ee9db --- /dev/null +++ b/debian-src/libgraphite2-doc.lintian-overrides @@ -0,0 +1 @@ +libgraphite2-doc: helper-templates-in-copyright diff --git a/debian-src/libtext-graphite2-perl.examples b/debian-src/libtext-graphite2-perl.examples new file mode 100644 index 0000000..6754fb8 --- /dev/null +++ b/debian-src/libtext-graphite2-perl.examples @@ -0,0 +1 @@ +perl/examples/* diff --git a/debian-src/rules b/debian-src/rules index af3aff2..4ed6b54 100755 --- a/debian-src/rules +++ b/debian-src/rules @@ -4,12 +4,47 @@ dh $@ --builddirectory=build override_dh_strip: - dh_strip --dbg-package=libgraphite2-dbg + 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 -- -D CMAKE_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` diff --git a/debian-src/source/format b/debian-src/source/format index 89ae9db..163aaf8 100644 --- a/debian-src/source/format +++ b/debian-src/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff --git a/doc/release.txt b/doc/release.txt new file mode 100644 index 0000000..769e53d --- /dev/null +++ b/doc/release.txt @@ -0,0 +1,14 @@ +== Release Process == + +These notes are not necessarily part of the manual. They are here for code developers to remember to do the right thing when it comes to release day. + +. The first line of the Changelog must be the version number. This is so that packagers can extract the version number from the source. +. Make sure the version numbers in the #defines reflect the release number in includes/graphite2/Font.h +. Make sure the libtool version numbers are correct in src/CMakeLists.txt +. Ensure the builds.palaso.org gives a clear build + +== Anticipated API Changes == + +Here are the things we will probably change in the API once we come to the conclusion that we have got to change the API for some really important reason. + + diff --git a/include/graphite2/Font.h b/include/graphite2/Font.h index 6814ae8..b817c59 100644 --- a/include/graphite2/Font.h +++ b/include/graphite2/Font.h @@ -30,7 +30,7 @@ #define GR2_VERSION_MAJOR 1 #define GR2_VERSION_MINOR 1 -#define GR2_VERSION_BUGFIX 0 +#define GR2_VERSION_BUGFIX 1 #ifdef __cplusplus extern "C" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0255881..3f664d8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,6 +54,7 @@ set(GRAPHITE_HEADERS ../include/graphite2/Font.h ../include/graphite2/Segment.h ../include/graphite2/Types.h + ../include/graphite2/Log.h ) file(GLOB PRIVATE_HEADERS inc/*.h) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
