[oce] 04/17: Add debian/patches/options and refresh patches

[Denis Barbier]

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

barbier-guest pushed a commit to branch debian
in repository oce.

commit 7bc1934d315855b803e2a7904d388ec45c4557b0
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sat Jan 11 12:40:59 2014 +0100

    Add debian/patches/options and refresh patches
    
    Patches are refreshed by the command:
      quilt --quiltrc debian/patches/options  refresh  --sort
---
 debian/patches/NCollection-align-64bit.patch | 13 ++++++++-----
 debian/patches/options                       |  2 ++
 debian/patches/split-export.patch            |  6 +++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/debian/patches/NCollection-align-64bit.patch b/debian/patches/NCollection-align-64bit.patch
index a1d44c0..4b5eb76 100644
--- a/debian/patches/NCollection-align-64bit.patch
+++ b/debian/patches/NCollection-align-64bit.patch
@@ -10,21 +10,24 @@ Index: oce/src/NCollection/NCollection_IncAllocator.hxx
 ===================================================================
 --- oce.orig/src/NCollection/NCollection_IncAllocator.hxx
 +++ oce/src/NCollection/NCollection_IncAllocator.hxx
-@@ -24,6 +24,8 @@
+@@ -33,6 +33,8 @@
+ #endif
  
- #include <NCollection_BaseAllocator.hxx>
  
 +#include <inttypes.h>
 +
  /**
   *  Class NCollection_IncAllocator - incremental memory  allocator. This class
   *  allocates  memory  on  request  returning  the  pointer  to  an  allocated
-@@ -43,7 +45,7 @@
+@@ -52,11 +54,7 @@ class NCollection_IncAllocator : public
  {
   public:
    // The type defining the alignement of allocated objects
+-#if defined(__hpux)
+   typedef uint64_t aligned_t;
+-#else
 -  typedef void * aligned_t;
-+  typedef uint64_t aligned_t;
- 
+-#endif
+   
    // ---------- PUBLIC METHODS ----------
  
diff --git a/debian/patches/options b/debian/patches/options
new file mode 100644
index 0000000..363b87a
--- /dev/null
+++ b/debian/patches/options
@@ -0,0 +1,2 @@
+QUILT_NO_DIFF_TIMESTAMPS=1
+QUILT_DIFF_OPTS=-p
diff --git a/debian/patches/split-export.patch b/debian/patches/split-export.patch
index 19e365a..2f4574b 100644
--- a/debian/patches/split-export.patch
+++ b/debian/patches/split-export.patch
@@ -29,7 +29,7 @@ Index: oce/CMakeLists.txt
 ===================================================================
 --- oce.orig/CMakeLists.txt
 +++ oce/CMakeLists.txt
-@@ -1029,6 +1029,19 @@ configure_file (${CMAKE_CURRENT_SOURCE_D
+@@ -1134,6 +1134,19 @@ configure_file (${CMAKE_CURRENT_SOURCE_D
  set ( OCE_WIN32_RES_FILE ${CMAKE_CURRENT_BINARY_DIR}/Version.rc )
  endif(NOT OCE_NO_LIBRARY_VERSION)
  
@@ -49,7 +49,7 @@ Index: oce/CMakeLists.txt
  macro(process_module modulename modules_std)
  	set(modules ${modules_std})
  	if(NOT OCE_DISABLE_X11)
-@@ -1098,7 +1111,12 @@ configure_file( ${CMAKE_CURRENT_SOURCE_D
+@@ -1203,7 +1216,12 @@ configure_file( ${CMAKE_CURRENT_SOURCE_D
  install(FILES ${PROJECT_BINARY_DIR}/OCEConfig.cmake ${PROJECT_BINARY_DIR}/OCEConfigVersion.cmake
  	DESTINATION ${OCE_INSTALL_CMAKE_DATA_DIR} COMPONENT Development )
  
@@ -67,7 +67,7 @@ Index: oce/adm/cmake/BuildToolkit.cmake
 ===================================================================
 --- oce.orig/adm/cmake/BuildToolkit.cmake
 +++ oce/adm/cmake/BuildToolkit.cmake
-@@ -284,7 +284,7 @@ install(FILES ${TOOLKIT_HEADER_FILES}
+@@ -355,7 +355,7 @@ install(FILES ${TOOLKIT_HEADER_FILES}
  )
  
  install(TARGETS ${TOOLKIT}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/oce.git