[graphite2] 40/69: Imported Debian patch 1.2.4-1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository graphite2.
commit 1889dc4bc679ddbf90912a4d3c0f6eb029fb6c9e
Merge: 439cfbf 0063d17
Author: Rene Engelhard <rene@debian.org>
Date: Fri Nov 29 20:12:13 2013 +0100
Imported Debian patch 1.2.4-1
.hg_archival.txt | 6 +-
.hgtags | 2 +
CMakeLists.txt | 17 +-
ChangeLog | 19 +
Graphite.cmake | 3 +
Todo.txt | 5 +-
debian-src/control | 6 +-
debian/changelog | 7 +-
debian/rules | 2 +-
doc/building.txt | 11 +
doc/hacking.txt | 23 +-
doc/release.txt | 1 +
gr2fonttest/CMakeLists.txt | 6 +-
gr2fonttest/gr2FontTest.cpp | 83 +-
include/graphite2/Font.h | 5 +-
include/graphite2/Segment.h | 14 +-
src/Bidi.cpp | 641 +-
src/CMakeLists.txt | 14 +-
src/CachedFace.cpp | 26 +-
src/CmapCache.cpp | 8 +-
src/Code.cpp | 47 +-
src/Face.cpp | 78 +-
src/FeatureMap.cpp | 120 +-
src/FileFace.cpp | 2 +-
src/Font.cpp | 6 +-
src/GlyphCache.cpp | 82 +-
src/Justifier.cpp | 11 +-
src/NameTable.cpp | 46 +-
src/Pass.cpp | 284 +-
src/Rule.cpp | 2 +-
src/SegCacheEntry.cpp | 18 +-
src/Segment.cpp | 214 +-
src/Silf.cpp | 266 +-
src/Slot.cpp | 96 +-
src/Sparse.cpp | 24 +-
src/TtfUtil.cpp | 2775 +-
src/UtfCodec.cpp | 10 +-
src/call_machine.cpp | 2 +-
src/files.mk | 5 +-
src/gr_face.cpp | 46 +-
src/gr_features.cpp | 6 +-
src/gr_font.cpp | 4 +-
src/gr_logging.cpp | 191 +-
src/gr_segment.cpp | 62 +-
src/inc/Bidi.h | 126 +
src/inc/CharInfo.h | 6 +-
src/inc/CmapCache.h | 22 +-
src/inc/Code.h | 2 +-
src/inc/Endian.h | 129 +-
src/inc/Error.h | 127 +
src/inc/Face.h | 25 +-
src/inc/FeatureMap.h | 28 +-
src/inc/FeatureVal.h | 2 +-
src/inc/FileFace.h | 2 +-
src/inc/Font.h | 6 +-
src/inc/GlyphCache.h | 14 +-
src/inc/Machine.h | 16 +-
src/inc/Main.h | 6 +-
src/inc/Pass.h | 31 +-
src/inc/Rule.h | 10 +-
src/inc/SegCache.h | 4 -
src/inc/Segment.h | 10 +-
src/inc/Silf.h | 10 +-
src/inc/Slot.h | 30 +-
src/inc/Sparse.h | 145 +-
src/inc/TtfTypes.h | 704 +-
src/inc/TtfUtil.h | 260 +-
src/inc/UtfCodec.h | 228 +-
src/inc/bits.h | 34 +-
src/inc/debug.h | 16 +-
src/inc/json.h | 126 +-
src/inc/locale2lcid.h | 12 +-
src/inc/opcodes.h | 36 +-
src/json.cpp | 90 +-
tests/CMakeLists.txt | 19 +-
tests/bidi/BidiCharacterTest.txt | 96243 ++++
tests/bidi/BidiTest.txt | 497230 ++++++++++++++++++
tests/bidi/CMakeLists.txt | 5 +
tests/bidi/biditest | 187 +
tests/bidi/fuzzbidi | 131 +
tests/bidi/graphite.py | 384 +
tests/comparerenderer/CMakeLists.txt | 9 +-
tests/comparerenderer/FeatureParser.h | 2 +-
tests/endian/CMakeLists.txt | 3 +
tests/examples/CMakeLists.txt | 6 +
tests/examples/cluster.c | 2 +-
tests/featuremap/CMakeLists.txt | 5 +-
tests/fonts/Scheherazadegr.ttf | Bin 336084 -> 475864 bytes
tests/fonts/Scheherazadegr_noglyfs.ttf | Bin 0 -> 257520 bytes
tests/fuzz-tests/CMakeLists.txt | 7 +-
.../my_Headwords/Corrupted Glat offset array.fuzz | 49 +
tests/fuzzcomparerender | 10 +-
tests/fuzztest | 6 +-
tests/grlist/CMakeLists.txt | 3 +
tests/json/CMakeLists.txt | 5 +-
tests/nametabletest/CMakeLists.txt | 5 +-
tests/segcache/CMakeLists.txt | 3 +
tests/sparsetest/CMakeLists.txt | 3 +
tests/sparsetest/sparsetest.cpp | 56 +-
tests/standards/charis3.json | 108 +-
tests/standards/charis3.log | 2 +-
tests/standards/{charis3.json => charis8.json} | 108 +-
tests/standards/{charis3.log => charis8.log} | 2 +-
tests/standards/scher1.json | 733 +-
tests/standards/scher1.log | 18 +-
tests/standards/scher2.json | 805 +-
tests/standards/scher2.log | 18 +-
tests/standards/scher3.json | 303 +-
tests/standards/scher3.log | 4 +-
tests/standards/scher4.json | 312 +-
tests/standards/scher4.log | 8 +-
tests/standards/{scher4.json => scher5.json} | 312 +-
tests/standards/scher5.log | 13 +
tests/standards/scher_feat.log | 95 +-
tests/utftest/CMakeLists.txt | 3 +
tests/vm/CMakeLists.txt | 3 +
116 files changed, 599720 insertions(+), 5053 deletions(-)
diff --cc debian/changelog
index 2e59b08,0000000..0bcfb17
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,189 -1,0 +1,190 @@@
- graphite2 (1.2.3-1+powerpcspe1) unreleased; urgency=low
++graphite2 (1.2.4-1) unstable; urgency=low
+
- * Fix build on powerpcspe by ignoring 0.0 -0.0 issue
++ * New upstream release
++ * some tests need apparently need python, build-dep on python (>= 2.6)
+
- -- Roland Stigge <stigge@antcom.de> Thu, 13 Jun 2013 09:48:17 +0200
++ -- Rene Engelhard <rene@debian.org> Fri, 29 Nov 2013 20:12:13 +0100
+
+graphite2 (1.2.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Tue, 11 Jun 2013 19:25:25 +0200
+
+graphite2 (1.2.2-2) unstable; urgency=low
+
+ * add patch from Michael Cree <mcree@orcon.net.nz> to fix
+ misaligned memory access - thanks (closes: #710336)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 02 Jun 2013 12:05:28 +0000
+
+graphite2 (1.2.2-1) unstable; urgency=low
+
+ * New upstream release
+ * stop building with -O3 gotten from somewhere and overriding
+ dpkg-buildflags' value, just remove via sed
+ * converto multiarch again... (closes: #689813)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 31 May 2013 18:10:55 +0200
+
+graphite2 (1.2.1-2) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Thu, 18 Apr 2013 23:49:24 +0200
+
+graphite2 (1.2.1-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Mon, 04 Mar 2013 19:44:28 +0100
+
+graphite2 (1.2.0-4) experimental; urgency=low
+
+ * revert multiarch stuff as harfbuzz now doesn't need us
+ anymore... (reopens: #699714)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 02 Mar 2013 14:29:58 +0100
+
+graphite2 (1.2.0-3) experimental; urgency=low
+
+ * apply patch from Daniel Schaal to convert to multiarch
+ as already multiarchified pango now needs us via harfbuzz...
+ (closes: #699714)
+ * clean up (not packaged) perl module packaging
+ * add (not used yet) stuff to build mono binding
+ * split arch-dep and arch-indep (docs...) build
+ * disable the compare renderer stuff - enough compared ;-)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 27 Feb 2013 20:24:34 +0100
+
+graphite2 (1.2.0-2) experimental; urgency=low
+
+ * break libgraphite2-2.0.0 (<< 1.2.0) (closes: #689813)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 06 Oct 2012 18:24:32 +0200
+
+graphite2 (1.2.0-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Fri, 21 Sep 2012 16:41:23 +0200
+
+graphite2 (1.1.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Sat, 02 Jun 2012 01:10:10 +0200
+
+graphite2 (1.1.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Fri, 20 Apr 2012 01:45:47 +0200
+
+graphite2 (1.1.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Mon, 27 Feb 2012 22:32:26 +0100
+
+graphite2 (1.1.0-2) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Tue, 21 Feb 2012 20:41:47 +0100
+
+graphite2 (1.1.0-1) experimental; urgency=low
+
+ * New upstream release
+ * fix copyright syntax
+
+ -- Rene Engelhard <rene@debian.org> Tue, 07 Feb 2012 22:55:08 +0000
+
+graphite2 (1.0.3.real-1) unstable; urgency=low
+
+ * fixup upstream release for 1.0.3
+
+ -- Rene Engelhard <rene@debian.org> Thu, 22 Sep 2011 20:59:53 +0200
+
+graphite2 (1.0.3-1) unstable; urgency=low
+
+ * New upstream release
+ * add libxml2-utils to B-D-I
+
+ -- Rene Engelhard <rene@debian.org> Tue, 20 Sep 2011 00:28:27 +0200
+
+graphite2 (1.0.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Mon, 15 Aug 2011 13:29:41 +0000
+
+graphite2 (1.0.1-3) unstable; urgency=low
+
+ * debian/patches/fix-typedefs.diff: move ...
+ * debian/patches/words-bigendian-fixes.diff: ... here and add additional
+ upstream fix for setting -DWORDS_BIGENDIAN also for the tests...
+ * clean up Build-Depends:
+ + move asciidoc, dblatex, doxygen, docbook-xsl, latex-xcolor to B-D-I
+ + remove libxml2-utils
+
+ -- Rene Engelhard <rene@debian.org> Wed, 10 Aug 2011 15:42:59 +0200
+
+graphite2 (1.0.1-2) unstable; urgency=low
+
+ * debian/patches/fix-typedefs.diff: fix Main.h typedefs for
+ WORDS_BIGENDIAN
+
+ -- Rene Engelhard <rene@debian.org> Tue, 09 Aug 2011 17:47:10 +0000
+
+graphite2 (1.0.1-1) unstable; urgency=low
+
+ * New upstream release
+ - removes -nostdlibs (closes: #634810)
+
+ * build with -DDISABLE_TRACING:bool=1
+ * stop symlinking to Debian's fonts as they are not sufficient for the
+ tests
+ * update debian/copyright; mention ppport.h according to
+ http://pkg-perl.alioth.debian.org/copyright.html#devel__ppport
+ * fix libgraphite2-2.0.0's short description
+
+ -- Rene Engelhard <rene@debian.org> Thu, 28 Jul 2011 12:54:36 +0000
+
+graphite2 (0.9.4.dfsg-4) unstable; urgency=low
+
+ * grr, remove dpkg-source generated patch which readds ppport.h...
+
+ -- Rene Engelhard <rene@debian.org> Thu, 14 Jul 2011 14:50:55 +0200
+
+graphite2 (0.9.4.dfsg-3) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Tue, 12 Jul 2011 16:58:19 +0000
+
+graphite2 (0.9.4.dfsg-2) experimental; urgency=low
+
+ * add missing build-dep on latex-xcolor
+
+ -- Rene Engelhard <rene@debian.org> Sun, 10 Jul 2011 00:05:23 +0200
+
+graphite2 (0.9.4.dfsg-1) experimental; urgency=low
+
+ * remove perl/pport.h and tests/fonts/* from .orig
+
+ * debian/changelog: update
+ * debian/control: build-depend on ttf-sil-padauk, ttf-sil-scheherazade
+ * debian/rules: symlink to Debian's versions pf Padauk and Scheherazade,
+ though....
+ * debian/patches/disable_font_tests.diff: disable them (fail)
+ * debian/rules, debian/control: disable perl build
+
+ -- Rene Engelhard <rene@debian.org> Sat, 09 Jul 2011 16:50:25 +0000
+
+graphite2 (0.9.4-1) experimental; urgency=low
+
+ * Initial release (closes: #617718)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 03 Jun 2011 11:08:48 +0000
diff --cc debian/rules
index bab5247,0000000..6fbbb93
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,62 -1,0 +1,62 @@@
+#!/usr/bin/make -f
+
+include /usr/share/dpkg/architecture.mk
+
+%:
+ dh $@ --builddirectory=build
+
+override_dh_strip:
+ dh_strip --dbg-package=libgraphite2-3-dbg
+
+override_dh_auto_build-arch:
+ dh_auto_build
+# echo "Building perl module"
+# cd contrib/perl && \
+# perl Build.PL prefix=/usr && \
+# ./Build
+
+override_dh_auto_build-indep:
+ echo "Building docs"
+ dh_auto_build -- docs
+# echo "Building C# binding"
+# cd contrib/C\# && \
+# mono-xbuild NGraphite.sln
+
+override_dh_auto_install:
+ dh_auto_install
+# cd perl && \
+# ./Build install destdir=$(CURDIR)/debian/libtext-gr2-perl
+# # hack
+# cd $(CURDIR)/debian/libtext-gr2-perl/usr && \
+# mkdir share && mv man share
+# cd $(CURDIR)/debian/libtext-gr2-perl/usr/lib && \
+# mv perl perl5 && cd perl5 && mv 5.*/* . && rm -rf 5.*
+# find debian/libtext-gr2-perl -type f -name .packlist | xargs rm -f
+
+override_dh_auto_test:
- #dh_auto_test
++ dh_auto_test
+#ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+# cd contrib/perl && \
+# LD_LIBRARY_PATH=$(CURDIR)/build/src ./Build test
+#endif
+
+override_dh_auto_clean:
+# if [ -e contrib/perl/Build ]; then cd contrib/perl && \
+# ./Build clean; fi
+# rm -rf contrib/perl/Build contrib/perl/_build
+# rm -f /contrib/perl/MYMETA*
+# rm -f contrib/C\#/NGraphite/obj/Debug/NGraphite.csproj.FilesWrittenAbsolute.txt
+# -find contrib/C\# -name "*.dll" | xargs rm
+# -find contrib/C\# -name "*.dll.mdb" | xargs rm
+ -find . -name "CTestCostData.txt" | xargs rm
+ -find . -name "LastTest.log" | xargs rm
+ dh_auto_clean
+
+override_dh_auto_configure:
+ dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:bool=1 -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH)
+ find . -type f ! -name "rules" ! -name "changelog" \
+ -exec sed -i -e 's/\-O3//g' {} \;
+
+override_dh_gencontrol:
+ dh_gencontrol -Nlibtext-gr2-perl -O--builddirectory=build
+# dh_gencontrol -plibtext-gr2-perl -- -v`cat perl/META.yml | grep version: | tail -n 1 | awk '{ print $$2 }'`-`dpkg-parsechangelog | grep urgency | awk '{ print $$2 }' | sed -e 's/(//' | sed -e 's/)//' | cut -d- -f2`
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
Reply to: