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

[SCM] graphite2 packaging repository branch, master, updated. graphite2_1.0.1-3-2-g3eae177



The following commit has been merged in the master branch:
commit 6ddc44ebfda7ebf40c0c13ba5df5d009d409a927
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Aug 19 19:20:37 2011 +0000

    update to 1.0.2

diff --git a/changelog b/changelog
index bf8ec0e..ef8b646 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+graphite2 (1.0.2-1) UNRELEASED; 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 ...
diff --git a/patches/series b/patches/series
index a35961c..10d55fe 100644
--- a/patches/series
+++ b/patches/series
@@ -1,2 +1 @@
 include-and-libraries.diff
-words-bigendian-fixes.diff
diff --git a/patches/words-bigendian-fixes.diff b/patches/words-bigendian-fixes.diff
deleted file mode 100644
index 21abf42..0000000
--- a/patches/words-bigendian-fixes.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -r 72f15ef32493 -r 565ef2e926ef CMakeLists.txt
---- a/CMakeLists.txt	Wed Aug 10 10:29:41 2011 +0700
-+++ b/CMakeLists.txt	Wed Aug 10 15:50:45 2011 +0700
-@@ -1,6 +1,7 @@
- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
- cmake_policy(SET CMP0012 NEW)
- include(CMakeDependentOption)
-+include(TestBigEndian)
- 
- project(graphite2)
- set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
-@@ -50,6 +51,12 @@
- endif (VM_MACHINE_TYPE STREQUAL "direct" AND NOT CMAKE_COMPILER_IS_GNUCXX)
- message(STATUS "Using vm machine type: ${VM_MACHINE_TYPE}")
- 
-+TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
-+if (WORDS_BIGENDIAN)
-+    add_definitions(-DWORDS_BIGENDIAN)
-+endif (WORDS_BIGENDIAN)
-+
-+
- add_subdirectory(src)
- add_subdirectory(gr2fonttest)
- add_subdirectory(tests)
-diff -r 72f15ef32493 -r 565ef2e926ef src/Main.h
---- a/src/Main.h	Wed Aug 10 10:29:41 2011 +0700
-+++ b/src/Main.h	Wed Aug 10 15:50:45 2011 +0700
-@@ -29,7 +29,6 @@
- #include <cstdlib>
- #include "graphite2/Types.h"
- 
--#if !defined WORDS_BIGENDIAN || defined PC_OS
- 
- namespace graphite2 {
- 
-@@ -42,10 +41,11 @@
- 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)); }
--inline  int32 swap32(int32 x)  { return int16(swap16(uint16(x))); }
-+inline  int32 swap32(int32 x)  { return int32(swap32(uint32(x))); }
- #else
- #define swap16(x) (x)
- #define swap32(x) (x)

-- 
graphite2 packaging repository


Reply to: