[graphite2] 63/69: Imported Debian patch 1.3.6-1~deb7u1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository graphite2.
commit 657c7b0b95125aaf4ca390f6377d54a966d4b75d
Merge: c8eaf64 4b2cedc
Author: Rene Engelhard <rene@debian.org>
Date: Wed Mar 9 12:12:25 2016 +0100
Imported Debian patch 1.3.6-1~deb7u1
ChangeLog | 3 ++
debian-src/changelog | 6 ++++
debian/changelog | 26 ++++++++++++++++
debian/control | 35 ++++++++++++++++++----
...es => libgraphite2-2.0.0-dbg.lintian-overrides} | 0
...phite2-3.install => libgraphite2-2.0.0.install} | 0
...rrides => libgraphite2-2.0.0.lintian-overrides} | 0
debian/libgraphite2-2.0.0.shlibs | 1 +
debian/libgraphite2-3-dbg.substvars | 2 --
debian/libgraphite2-3.links | 2 --
debian/libgraphite2-3.shlibs | 1 -
debian/patches/revert-to-old-SONAME.diff | 17 +++++++++++
debian/patches/series | 1 +
debian/rules | 9 ++----
include/graphite2/Font.h | 2 +-
src/CmapCache.cpp | 16 +++++-----
src/Code.cpp | 17 +++++++----
src/Face.cpp | 2 +-
src/FileFace.cpp | 8 +++--
src/GlyphCache.cpp | 2 +-
src/Pass.cpp | 15 ++++++++--
src/Segment.cpp | 9 ++++--
src/Slot.cpp | 8 +++--
src/TtfUtil.cpp | 14 +++++----
src/call_machine.cpp | 4 ++-
src/direct_machine.cpp | 28 +++++++++--------
src/inc/Code.h | 2 +-
src/inc/GlyphCache.h | 1 +
src/inc/Machine.h | 3 +-
src/inc/TtfUtil.h | 4 +--
src/inc/opcodes.h | 10 +++----
31 files changed, 176 insertions(+), 72 deletions(-)
diff --cc debian/changelog
index 9b0d76f,0000000..e8083ce
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,282 -1,0 +1,308 @@@
++graphite2 (1.3.6-1~deb7u1) oldstable-security; urgency=high
++
++ * rebuild for oldstable-security
++ * revert ddeb-migration
++ * revert package rename to -3 and go back to -2.0.0 to avoid changing
++ the package name (ABI compatibility is there). Also dd patch to revert
++ back to .so.2.0.0 as SONAME.
++
++ -- Rene Engelhard <rene@debian.org> Wed, 09 Mar 2016 12:12:25 +0100
++
++graphite2 (1.3.6-1) unstable; urgency=medium
++
++ * New upstream release
++
++ -- Rene Engelhard <rene@debian.org> Mon, 29 Feb 2016 20:52:55 +0100
++
+graphite2 (1.3.5-1) unstable; urgency=medium
+
+ * New upstream release
++ - fixes Bidirectional Font BracketPairStack Code Execution Vulnerability
++ (TALOS-2016-0057/CVE-2016-1522)
++ - fixes directrun Opcode Handling Code Execution Vulnerability
++ (TALOS-2016-0058/CVE-2016-1521)
++ - fixes Context Item Code Execution Vulnerability
++ (TALOS-2016-0059/CVE-2016-1523)
++ - fixes Bidirectional Font mFeatureMap Denial of Service Vulnerability
++ (TALOS-2016-0060/CVE-2016-1522)
++ - fixes LocaLookup Denial of Service Vulnerability"
++ (TALOS-2016-0061/CVE-2016-1521)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 20 Jan 2016 23:39:14 +0100
+
+graphite2 (1.3.4-2) unstable; urgency=medium
+
+ * debian/patches/revert-collision-info-refactoring-to-fix-alignment.diff:
+ add from upstream git, thanks Tim Eves (closes: #805323)
+ * debian/patches/reproducible-build.diff: tell dblatex to use a static
+ path to make build reproduceable, thanks Reiner Herrmann
+ (closes: #807838)
+ * use -DGRAPHITE2_NTRACING:BOOL=ON (instead of :bool=1)
+ * fix Maintainer:
+ * migrate from manual -dbg to ddeb
+
+ -- Rene Engelhard <rene@debian.org> Tue, 05 Jan 2016 17:12:01 +0000
+
+graphite2 (1.3.4-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Sat, 31 Oct 2015 16:11:37 +0100
+
+graphite2 (1.3.3-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Tue, 22 Sep 2015 09:07:46 +0200
+
+graphite2 (1.3.2-4) unstable; urgency=medium
+
+ * upload to unstable
+
+ * add graphviz to B-D-I...
+
+ -- Rene Engelhard <rene@debian.org> Fri, 18 Sep 2015 11:12:41 +0200
+
+graphite2 (1.3.2-3) experimental; urgency=medium
+
+ * don't run dh_auto_install when ./build/src/libgraphite2.so.3 doesn't exist
+ (as for dh_auto_test) so that we don't run a graphite build after building
+ the docs (as make install of course requires that). Install the docs
+ manually using .install
+
+ -- Rene Engelhard <rene@debian.org> Wed, 16 Sep 2015 11:52:49 +0200
+
+graphite2 (1.3.2-2) experimental; urgency=medium
+
+ * check for existence of ./build/src/libgraphite2.so.3 before running
+ dh_auto_test to skip the tests on "all" builds
+
+ -- Rene Engelhard <rene@debian.org> Tue, 15 Sep 2015 08:13:13 +0200
+
+graphite2 (1.3.2-1) experimental; urgency=medium
+
+ * New upstream release
+
+ * use --parallel in dh_auto_build (not in docs build and tests; the former
+ doesn't build with parallelism)
+ * Standards-Versions: 3.9.1 -> 3.9.6, no changes needed
+
+ -- Rene Engelhard <rene@debian.org> Mon, 14 Sep 2015 21:20:32 +0200
+
+graphite2 (1.3.0-2) experimental; urgency=medium
+
+ * backport fixes from http://hg.palaso.org/graphitedev/raw-rev/cfab7499b46b:
+ - fix tests on !linux (closes: #79499)
+ - increase test timeout from 10s to 120s to make them succeed on mips(el)
+
+ -- Rene Engelhard <rene@rene-engelhard.de> Wed, 12 Aug 2015 17:12:57 +0200
+
+graphite2 (1.3.0-1) experimental; urgency=medium
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Sat, 08 Aug 2015 10:38:42 +0000
+
+graphite2 (1.2.4-3) unstable; urgency=medium
+
+ * run a2x without --icons to avoid FTBFS (closes: #741845)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 01 Jun 2014 11:12:56 +0200
+
+graphite2 (1.2.4-2) unstable; urgency=low
+
+ * add patch from Pino Toscano to also avoid linking to libstdc++ on
+ kFreeBSD and Hurd (closes: #738353)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 10 Feb 2014 09:47:01 +0100
+
+graphite2 (1.2.4-1) unstable; urgency=low
+
+ * New upstream release
+ * some tests need apparently need python, build-dep on python (>= 2.6)
+
+ -- 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/control
index 5b50109,0000000..ace369b
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,111 -1,0 +1,134 @@@
+Source: graphite2
+Priority: optional
+Section: libs
+Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
+Uploaders: Rene Engelhard <rene@debian.org>, Daniel Glassey <wdg@debian.org>
- Build-Depends: debhelper (>= 9.20151219), dh-exec (>= 0.3), dpkg-dev (>= 1.18.2~), cmake, python, fonttools
++Build-Depends: debhelper (>= 9), dh-exec (>= 0.3), dpkg-dev (>= 1.16.1~), cmake, python, fonttools
+# perl: libmodule-build-perl
+# mono: mono-xbuild, mono-gmcs, mono-dmcs, libnunit-cil-dev
+Build-Depends-Indep: asciidoc, dblatex, doxygen, docbook-xsl, latex-xcolor, libxml2-utils, graphviz
+Standards-Version: 3.9.6
+
- Package: libgraphite2-3
++Package: libgraphite2-2.0.0
+Section: libs
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
- Provides: libgraphite2-2.0.0
- Replaces: libgraphite2-2.0.0
- Breaks: libgraphite2-2.0.0 (<< 1.2.0)
++Provides: libgraphite2-3
+Multi-Arch: same
+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
+ extensibility. 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-3 (= ${binary:Version}), ${misc:Depends}
++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
+ extensibility. 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
++ extensibility. 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
+ extensibility. 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-gr2-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
+# extensibility. 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/libgraphite2-2.0.0-dbg.lintian-overrides
index f802584,0000000..f802584
mode 100644,000000..100644
--- a/debian/libgraphite2-2.0.0-dbg.lintian-overrides
+++ b/debian/libgraphite2-2.0.0-dbg.lintian-overrides
diff --cc debian/libgraphite2-2.0.0.install
index 3ddde58,0000000..3ddde58
mode 100644,000000..100644
--- a/debian/libgraphite2-2.0.0.install
+++ b/debian/libgraphite2-2.0.0.install
diff --cc debian/libgraphite2-2.0.0.lintian-overrides
index d719db4,0000000..d719db4
mode 100644,000000..100644
--- a/debian/libgraphite2-2.0.0.lintian-overrides
+++ b/debian/libgraphite2-2.0.0.lintian-overrides
diff --cc debian/libgraphite2-2.0.0.shlibs
index 0000000,0000000..cbf5aec
new file mode 100644
--- /dev/null
+++ b/debian/libgraphite2-2.0.0.shlibs
@@@ -1,0 -1,0 +1,1 @@@
++libgraphite2 3 libgraphite2-2.0.0
diff --cc debian/patches/revert-to-old-SONAME.diff
index 0000000,0000000..614e47e
new file mode 100644
--- /dev/null
+++ b/debian/patches/revert-to-old-SONAME.diff
@@@ -1,0 -1,0 +1,17 @@@
++--- graphite2/src/CMakeLists.txt-old 2016-01-26 10:07:00.154163999 +0100
+++++ graphite2/src/CMakeLists.txt 2016-01-26 10:08:28.667467827 +0100
++@@ -24,11 +24,11 @@
++ cmake_policy(SET CMP0012 NEW)
++ INCLUDE(CheckCXXSourceCompiles)
++
++-set(GRAPHITE_API_CURRENT 3)
+++set(GRAPHITE_API_CURRENT 2)
++ set(GRAPHITE_API_REVISION 0)
++-set(GRAPHITE_API_AGE 1)
+++set(GRAPHITE_API_AGE 0)
++ set(GRAPHITE_VERSION ${GRAPHITE_API_CURRENT}.${GRAPHITE_API_REVISION}.${GRAPHITE_API_AGE})
++-set(GRAPHITE_SO_VERSION ${GRAPHITE_API_CURRENT})
+++set(GRAPHITE_SO_VERSION ${GRAPHITE_API_CURRENT}.${GRAPHITE_API_REVISION}.${GRAPHITE_API_AGE})
++
++ include(TestBigEndian)
++
diff --cc debian/patches/series
index ba9444d,0000000..a26311e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
+non-linux.diff
+no-icons.diff
+test-timeout.diff
+reproducible-build.diff
++revert-to-old-SONAME.diff
diff --cc debian/rules
index b83bbce,0000000..1c6d56c
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,73 -1,0 +1,70 @@@
+#!/usr/bin/make -f
+
+export DPKG_EXPORT_BUILDFLAGS = 0
+include /usr/share/dpkg/architecture.mk
+
+%:
+ dh $@ --builddirectory=build
+
+override_dh_strip:
- dh_strip --dbg-package=libgraphite2-3-dbg
++ dh_strip --dbg-package=libgraphite2-2.0.0-dbg
+
+override_dh_auto_build-arch:
+ dh_auto_build --parallel
+# 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:
- if [ -f ./build/src/libgraphite2.so.3 ]; then \
++ if [ -f ./build/src/libgraphite2.so.2.0.0 ]; then \
+ dh_auto_install; \
+ else \
+ dh_install -plibgraphite2-doc --sourcedir=$(CURDIR); \
+ fi
+# 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:
- if [ -f ./build/src/libgraphite2.so.3 ]; then \
++ if [ -f ./build/src/libgraphite2.so.2.0.0 ]; then \
+ dh_auto_test; \
+ fi
+#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
+ rm -f tests/graphite.pyc
+ dh_auto_clean
+
+override_dh_auto_configure:
+ dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:BOOL=ON -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`
-
- override_dh_strip:
- dh_strip --ddeb-migration="libgraphite2-3-dbg (<= 1.3.4-1)"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
Reply to: