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

[graphite2] 33/69: Imported Debian patch 1.2.2-1



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

rene pushed a commit to branch master
in repository graphite2.

commit c1f7bdcdff296ccd42903e4b792ae9e1cd04ad4f
Merge: a03330b 026d3e6
Author: Rene Engelhard <rene@debian.org>
Date:   Fri May 31 18:10:55 2013 +0200

    Imported Debian patch 1.2.2-1

 .hg_archival.txt                                   |    5 +-
 .hgtags                                            |    1 +
 CMakeLists.txt                                     |    1 +
 ChangeLog                                          |   10 +
 debian-src/changelog                               |    6 +
 debian/changelog                                   |    9 +-
 debian/control                                     |    4 +-
 debian/libgraphite2-3.install                      |    2 +-
 debian/libgraphite2-3.links                        |    3 +-
 debian/libgraphite2-3.shlibs                       |    1 +
 debian/libgraphite2-dev.install                    |    4 +-
 debian/patches/foo                                 |   68 ++
 debian/patches/series                              |    1 +
 debian/rules                                       |    8 +-
 include/graphite2/Font.h                           |    2 +-
 src/Bidi.cpp                                       |    4 +-
 src/CMakeLists.txt                                 |    3 +
 src/CmapCache.cpp                                  |    3 +
 src/Code.cpp                                       |   13 +-
 src/Face.cpp                                       |    9 +-
 src/FileFace.cpp                                   |    4 +-
 src/NameTable.cpp                                  |    2 +-
 src/Pass.cpp                                       |  112 +-
 src/Segment.cpp                                    |    5 +
 src/Silf.cpp                                       |    6 +-
 src/Slot.cpp                                       |    6 +-
 src/gr_face.cpp                                    |    3 +
 src/gr_logging.cpp                                 |   44 +-
 src/inc/Face.h                                     |    5 +
 src/inc/Main.h                                     |   44 +-
 src/inc/Pass.h                                     |   15 +-
 src/inc/Rule.h                                     |   38 +-
 src/inc/Segment.h                                  |    5 +-
 src/inc/Silf.h                                     |    3 +-
 src/inc/debug.h                                    |    3 +
 tests/CMakeLists.txt                               |   13 +-
 tests/comparerenderer/CompareRenderer.cpp          |    6 +-
 tests/comparerenderer/HbNgRenderer.h               |   11 +-
 tests/comparerenderer/RendererOptions.h            |    2 +
 tests/fonts/charis_fast.ttf                        |  Bin 0 -> 1373356 bytes
 .../fuzz-tests/Padauk/my_Headwords/Bad Action.fuzz |    1 +
 .../fuzz-tests/charis_r_gr/udhr_eng/Bad cmap.fuzz  |    1 +
 tests/jsoncmp                                      |    8 +
 tests/segcache/CMakeLists.txt                      |    8 +-
 tests/standards/charis1.json                       |  158 +--
 tests/standards/charis2.json                       |   56 +-
 tests/standards/charis3.json                       |   88 +-
 tests/standards/charis4.json                       |   70 +-
 tests/standards/charis5.json                       |  114 +-
 tests/standards/charis6.json                       |  190 ++--
 tests/standards/charis7.json                       |  520 +++++++++
 tests/standards/charis7.log                        |   17 +
 tests/standards/general1.json                      |   48 +-
 tests/standards/grtest1.json                       |  128 ++-
 tests/standards/magyar1.json                       |  304 ++---
 tests/standards/magyar2.json                       |  236 ++--
 tests/standards/magyar3.json                       |  222 ++--
 tests/standards/padauk1.json                       |  305 ++---
 tests/standards/padauk10.json                      |  226 ++--
 tests/standards/padauk11.json                      |  133 ++-
 tests/standards/padauk12.json                      | 1163 ++++++++++++++++++++
 tests/standards/padauk12.log                       |   25 +
 tests/standards/padauk2.json                       |  204 ++--
 tests/standards/padauk3.json                       |  434 ++++----
 tests/standards/padauk4.json                       |  186 ++--
 tests/standards/padauk5.json                       |  383 +++----
 tests/standards/padauk6.json                       |  246 +++--
 tests/standards/padauk7.json                       |  237 ++--
 tests/standards/padauk8.json                       |  130 ++-
 tests/standards/padauk9.json                       |  102 +-
 tests/standards/scher1.json                        |  370 ++++---
 tests/standards/scher2.json                        |  312 +++---
 tests/standards/scher3.json                        |  168 +--
 tests/standards/scher4.json                        |  557 ++++++++++
 tests/standards/scher4.log                         |   13 +
 75 files changed, 5318 insertions(+), 2529 deletions(-)

diff --cc debian/changelog
index 86e8208,0000000..ec3865c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,167 -1,0 +1,170 @@@
- graphite2 (1.2.1-2+powerpcspe1) unreleased; urgency=low
++graphite2 (1.2.2-1) unstable; urgency=low
 +
-   * Fix build on powerpcspe
++  * New upstream release
++  * stop building with  gotten from somewhere and overriding
++    dpkg-buildflags' value, just remove  via sed
++  * converto multiarch again... (closes: #689813)
 +
-  -- Roland Stigge <stigge@antcom.de>  Sun, 05 May 2013 15:36:39 +0200
++ -- 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 ddbcca7,0000000..542b4dc
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,134 -1,0 +1,136 @@@
 +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 (>= 9), cmake, libfreetype6-dev
++Build-Depends: debhelper (>= 9), dh-exec (>= 0.3), dpkg-dev (>= 1.16.1), cmake, libfreetype6-dev
 +# 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
 +Standards-Version: 3.9.1
 +
 +Package: libgraphite2-3
 +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)
++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}
 +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-3-dbg
 +Priority: extra
 +Section: debug
 +Architecture: any
 +Depends: libgraphite2-3 (= ${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-3.install
index d0dbfd1,0000000..3ddde58
mode 100644,000000..100644
--- a/debian/libgraphite2-3.install
+++ b/debian/libgraphite2-3.install
@@@ -1,1 -1,0 +1,1 @@@
- usr/lib/lib*.so.*
++usr/lib/*/lib*.so.*
diff --cc debian/libgraphite2-3.links
index d59ce53,0000000..e6784d8
mode 100644,000000..100755
--- a/debian/libgraphite2-3.links
+++ b/debian/libgraphite2-3.links
@@@ -1,1 -1,0 +1,2 @@@
- usr/lib/libgraphite2.so.3 usr/lib/libgraphite2.so.2.0.0
++#! /usr/bin/dh-exec
++usr/lib/${DEB_HOST_MULTIARCH}/libgraphite2.so.3 usr/lib/${DEB_HOST_MULTIARCH}/libgraphite2.so.2.0.0
diff --cc debian/libgraphite2-3.shlibs
index 0000000,0000000..90ae7f3
new file mode 100644
--- /dev/null
+++ b/debian/libgraphite2-3.shlibs
@@@ -1,0 -1,0 +1,1 @@@
++libgraphite2	3	libgraphite2-3 (>= 1.2.2)
diff --cc debian/libgraphite2-dev.install
index 148a3ea,0000000..d413661
mode 100644,000000..100644
--- a/debian/libgraphite2-dev.install
+++ b/debian/libgraphite2-dev.install
@@@ -1,3 -1,0 +1,3 @@@
 +usr/include
- usr/lib/lib*.so
- usr/lib/pkgconfig
++usr/lib/*/lib*.so
++usr/lib/*/pkgconfig
diff --cc debian/patches/foo
index 0000000,0000000..a89375f
new file mode 100644
--- /dev/null
+++ b/debian/patches/foo
@@@ -1,0 -1,0 +1,68 @@@
++Description: <short summary of the patch>
++ TODO: Put a short summary on the line above and replace this paragraph
++ with a longer explanation of this change. Complete the meta-information
++ with other relevant fields (see below for details). To make it easier, the
++ information below has been extracted from the changelog. Adjust it or drop
++ it.
++ .
++ 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
++Author: Rene Engelhard <rene@debian.org>
++Bug-Debian: http://bugs.debian.org/699714
++
++---
++The information above should follow the Patch Tagging Guidelines, please
++checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
++are templates for supplementary fields that you might want to add:
++
++Origin: <vendor|upstream|other>, <url of original patch>
++Bug: <url in upstream bugtracker>
++Bug-Debian: http://bugs.debian.org/<bugnumber>
++Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
++Forwarded: <no|not-needed|url proving that it has been forwarded>
++Reviewed-By: <name and email of someone who approved the patch>
++Last-Update: <YYYY-MM-DD>
++
++--- /dev/null
+++++ graphite2-1.2.0/contrib/C#/NGraphite/obj/Debug/NGraphite.csproj.FilesWrittenAbsolute.txt
++@@ -0,0 +1,5 @@
+++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphite/bin/Debug/NGraphite.dll.config
+++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphite/bin/Debug/NGraphite.dll.mdb
+++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphite/bin/Debug/NGraphite.dll
+++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphite/obj/Debug/NGraphite.dll
+++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphite/obj/Debug/NGraphite.dll.mdb
++--- /dev/null
+++++ graphite2-1.2.0/contrib/C#/NGraphite/bin/Debug/NGraphite.dll.config
++@@ -0,0 +1,3 @@
+++<configuration>
+++  <dllmap dll="graphite2.dll" target="libgraphite2.so.3" os="!windows"/>  
+++</configuration>
++--- graphite2-1.2.0.orig/contrib/C#/NGraphiteTests/NGraphiteTests.csproj
+++++ graphite2-1.2.0/contrib/C#/NGraphiteTests/NGraphiteTests.csproj
++@@ -56,4 +56,4 @@
++       <Name>NGraphite</Name>
++     </ProjectReference>
++   </ItemGroup>
++-</Project>
++\ No newline at end of file
+++</Project>
++--- /dev/null
+++++ graphite2-1.2.0/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.csproj.FilesWrittenAbsolute.txt
++@@ -0,0 +1,5 @@
+++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll.config
+++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll.mdb
+++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphiteTests/bin/Debug/NGraphiteTests.dll
+++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll
+++/home/rene/Debian/Pakete/graphite2/graphite2-1.2.0/contrib/C#/NGraphiteTests/obj/Debug/NGraphiteTests.dll.mdb
++--- /dev/null
+++++ graphite2-1.2.0/contrib/C#/NGraphiteTests/bin/Debug/NGraphite.dll.config
++@@ -0,0 +1,3 @@
+++<configuration>
+++  <dllmap dll="graphite2.dll" target="libgraphite2.so.3" os="!windows"/>  
+++</configuration>
diff --cc debian/patches/series
index 1588913,0000000..1931d2b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +include-and-libraries.diff
 +no-specific-nunit-version.diff
 +soname.diff
++foo
diff --cc debian/rules
index 295ffcc,0000000..e81458a
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,59 -1,0 +1,61 @@@
 +#!/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:
- 	# Removed because of failed but ok 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
++	dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:bool=1 -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH)
++	find . -type f ! -name "rules" -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: