This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository graphite2.
commit 6b42761bb01b281f52b335056919efa26d38d1e6 Merge: e2dc68a 5369173 Author: Rene Engelhard <[email protected]> Date: Sat Jun 2 01:10:10 2012 +0200 Imported Debian patch 1.1.3-1 .hg_archival.txt | 4 +- .hgtags | 2 + CMakeLists.txt | 4 +- ChangeLog | 15 + Graphite.cmake | 11 +- contrib/android.README | 5 + contrib/android/AndroidManifest.xml | 18 - contrib/android/README | 20 - contrib/android/assets/Padauk.ttf | Bin 517496 -> 0 bytes contrib/android/assets/Scheherazadegr.ttf | Bin 335880 -> 0 bytes contrib/android/bin/HelloWorldGraphite.apk | Bin 485771 -> 0 bytes contrib/android/build.properties | 17 - contrib/android/build.xml | 79 ---- contrib/android/default.properties | 11 - contrib/android/jni/Android.mk | 72 --- 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 ---------- contrib/android/jni/load.h | 46 -- contrib/android/jni/load_gr.h | 42 -- contrib/android/jni/loadgr_jni.cpp | 245 ---------- contrib/android/proguard.cfg | 36 -- contrib/android/res/drawable-hdpi/icon.png | Bin 4147 -> 0 bytes contrib/android/res/drawable-ldpi/icon.png | Bin 1723 -> 0 bytes contrib/android/res/drawable-mdpi/icon.png | Bin 2574 -> 0 bytes contrib/android/res/layout/main.xml | 18 - contrib/android/res/values/strings.xml | 5 - contrib/android/src/org/sil/palaso/Graphite.java | 39 -- .../src/org/sil/palaso/helloworld/HelloWorld.java | 63 --- contrib/perl/META.yml | 18 +- contrib/perl/lib/Text/Gr2.xs | 112 ++--- contrib/perl/lib/Text/typemap | 14 +- debian-src/build | 2 +- debian-src/changelog | 12 + debian/changelog | 12 + debian/rules | 2 +- doc/Segment JSON Schema.json | 18 +- doc/android.txt | 26 - doc/building.txt | 31 +- doc/calling.txt | 4 +- doc/manual.txt | 1 - doc/release.txt | 12 +- gr2fonttest/CMakeLists.txt | 2 +- include/graphite2/Font.h | 2 +- src/CMakeLists.txt | 15 +- src/Code.cpp | 1 + src/Face.cpp | 2 +- src/GlyphFaceCache.cpp | 4 +- src/Pass.cpp | 136 +++--- src/Silf.cpp | 160 +++---- src/Slot.cpp | 2 +- src/TtfUtil.cpp | 13 +- src/call_machine.cpp | 2 - src/direct_machine.cpp | 1 - src/gr_face.cpp | 10 +- src/inc/Code.h | 3 +- src/inc/Machine.h | 17 +- src/inc/Pass.h | 2 +- src/inc/Silf.h | 2 +- src/json.cpp | 4 +- tests/CMakeLists.txt | 2 +- tests/comparerenderer/CompareRenderer.cpp | 5 + tests/comparerenderer/FeatureParser.h | 2 + tests/comparerenderer/HbNgRenderer.h | 12 +- tests/comparerenderer/RendererOptions.h | 4 +- tests/featuremap/featuremaptest.cpp | 2 +- tests/fuzzcomparerender | 7 +- tests/fuzztest | 117 +++-- tests/jsoncmp | 2 +- tests/segcache/segcachetest.cpp | 6 +- tests/standards/charis1.json | 172 ++++--- tests/standards/charis2.json | 44 +- tests/standards/charis3.json | 98 ++-- tests/standards/charis4.json | 71 ++- tests/standards/charis5.json | 123 +++-- tests/standards/general1.json | 41 +- tests/standards/grtest1.json | 140 +++--- tests/standards/magyar1.json | 329 +++++++------ tests/standards/magyar2.json | 248 +++++----- tests/standards/magyar3.json | 248 +++++----- tests/standards/padauk1.json | 372 +++++++-------- tests/standards/padauk10.json | 269 ++++++----- tests/standards/padauk11.json | 151 +++--- tests/standards/padauk2.json | 242 +++++----- tests/standards/padauk3.json | 525 +++++++++++---------- tests/standards/padauk4.json | 217 ++++----- tests/standards/padauk5.json | 459 +++++++++--------- tests/standards/padauk6.json | 290 ++++++------ tests/standards/padauk7.json | 287 +++++------ tests/standards/padauk8.json | 153 +++--- tests/standards/padauk9.json | 113 ++--- tests/standards/scher1.json | 385 +++++++-------- tests/standards/scher2.json | 329 ++++++------- tests/standards/scher3.json | 156 +++--- 97 files changed, 3260 insertions(+), 4724 deletions(-) diff --cc debian/changelog index 9b8cf5f,0000000..d5de82d mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,106 -1,0 +1,118 @@@ ++graphite2 (1.1.3-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Rene Engelhard <[email protected]> Sat, 02 Jun 2012 01:10:10 +0200 ++ ++graphite2 (1.1.2-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Rene Engelhard <[email protected]> Fri, 20 Apr 2012 01:45:47 +0200 ++ +graphite2 (1.1.1-1) unstable; urgency=low + + * New upstream release + + -- Rene Engelhard <[email protected]> Mon, 27 Feb 2012 22:32:26 +0100 + +graphite2 (1.1.0-2) unstable; urgency=low + + * upload to unstable + + -- Rene Engelhard <[email protected]> Tue, 21 Feb 2012 20:41:47 +0100 + +graphite2 (1.1.0-1) experimental; urgency=low + + * New upstream release + * fix copyright syntax + + -- Rene Engelhard <[email protected]> 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 <[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 --cc debian/rules index c361ba6,0000000..d792b8f 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 -DGRAPHITE2_NTRACING:bool=1 ++ dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:bool=1 -DGRAPHITE2_COMPARE_RENDERER=ON -DICU_LIBRARY_PATH=/usr/lib + +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
