[freecad] 01/04: Update and re-enable disable_memory_check.patch.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository freecad.

commit 2aab6f0fe0bf81a98c44651777525193589a3e2c
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Sep 30 18:45:26 2013 +0200

    Update and re-enable disable_memory_check.patch.
---
 debian/patches/disable_memory_check.patch |    5 +++--
 debian/patches/series                     |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/patches/disable_memory_check.patch b/debian/patches/disable_memory_check.patch
index 97a3c5e..0ca34de 100644
--- a/debian/patches/disable_memory_check.patch
+++ b/debian/patches/disable_memory_check.patch
@@ -27,8 +27,8 @@ Last-Update: 2011-09-24
  int SMDS_Mesh::CheckMemory(const bool doNotRaise) throw (std::bad_alloc)
  {
 -#if (defined(__MACH__) && defined(__APPLE__))
-   return 1000;
--#else
+-	return 1000;
+-#else	
 -#ifndef WIN32
 -  struct sysinfo si;
 -  int err = sysinfo( &si );
@@ -69,6 +69,7 @@ Last-Update: 2011-09-24
 -  return -1;
 -#endif
 -#endif
++return 1000;
  }
  
  ///////////////////////////////////////////////////////////////////////////////
diff --git a/debian/patches/series b/debian/patches/series
index 052c69a..eb138b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-#disable_memory_check.patch
 fix_armel_FTBFS.patch
 fix_FTBFS_on_precise.patch
 set_install_rpath.patch
@@ -9,3 +8,4 @@ use_share.patch
 do_not_install_binary_examples.patch
 exclude_ply.patch
 fix_syntax_importOca.patch
+disable_memory_check.patch

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