This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository graphite2.
commit 5245f447a2c506c9ce9f75302d8243027020fee6 Author: Rene Engelhard <[email protected]> Date: Tue Aug 9 17:47:10 2011 +0000 Imported Debian patch 1.0.1-2 --- debian/changelog | 8 +++++++- debian/patches/fix-typedefs.diff | 19 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ede5eab..e265522 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ +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) - * new upstream snapshot * build with -DDISABLE_TRACING:bool=1 * stop symlinking to Debian's fonts as they are not sufficient for the tests diff --git a/debian/patches/fix-typedefs.diff b/debian/patches/fix-typedefs.diff new file mode 100644 index 0000000..97d9513 --- /dev/null +++ b/debian/patches/fix-typedefs.diff @@ -0,0 +1,19 @@ +--- graphite2-1.0.1.orig/src/Main.h ++++ graphite2-1.0.1/src/Main.h +@@ -29,8 +29,6 @@ of the License or (at your option) any l + #include <cstdlib> + #include "graphite2/Types.h" + +-#if !defined WORDS_BIGENDIAN || defined PC_OS +- + namespace graphite2 { + + typedef gr_uint8 uint8; +@@ -42,6 +40,7 @@ typedef gr_int16 int16; + typedef gr_int32 int32; + typedef size_t uintptr; + ++#if !defined WORDS_BIGENDIAN || defined PC_OS + inline uint16 swap16(uint16 x) { return (x << 8) | (x >> 8); } + inline int16 swap16(int16 x) { return int16(swap16(uint16(x))); } + inline uint32 swap32(uint32 x) { return (uint32(swap16(uint16(x))) << 16) | swap16(uint16(x >> 16)); } diff --git a/debian/patches/series b/debian/patches/series index 10d55fe..b1e88a2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ include-and-libraries.diff +fix-typedefs.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
