[oce] 03/17: Drop debian/patches/fix-FTBFS-armel.patch, applied upstream

[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 40f76895ce765f1311970ba2b4a9e2b3fc0051a7
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sat Jan 11 12:39:52 2014 +0100

    Drop debian/patches/fix-FTBFS-armel.patch, applied upstream
---
 debian/patches/fix-FTBFS-armel.patch | 27 ---------------------------
 debian/patches/series                |  1 -
 2 files changed, 28 deletions(-)

diff --git a/debian/patches/fix-FTBFS-armel.patch b/debian/patches/fix-FTBFS-armel.patch
deleted file mode 100644
index a6d3511..0000000
--- a/debian/patches/fix-FTBFS-armel.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix FTBFS on Armel
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
-Forwarded: no
-Last-Update: 2013-11-24
-
-This change comes from commit 7495ddcac09e7dcd4601809659df06e12701090c
-
-    Revert f32f5d3, atomic operations are mandatory in multithread
-
-    In monothread, compile with -DIGNORE_NO_ATOMICS flag.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7c13187..14dca15 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -220,6 +220,10 @@ else ()
- 	set_directory_properties(PROPERTIES COMPILE_DEFINITIONS_DEBUG "_DEBUG")
- endif (OCE_ENABLE_DEB_FLAG)
- 
-+if(OCE_MULTITHREAD_LIBRARY STREQUAL "NONE")
-+    add_definitions(-DIGNORE_NO_ATOMICS)
-+endif (OCE_MULTITHREAD_LIBRARY STREQUAL "NONE")
-+
- #
- # Check components dependencies
- #
diff --git a/debian/patches/series b/debian/patches/series
index 1d02e83..af33e05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 split-export.patch
 NCollection-align-64bit.patch
-fix-FTBFS-armel.patch
 speedup-BRepMesh_test.patch

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