[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-7-63-gee88030

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit af1145ffcd2abad9204e9c00fcf1a460208a57c8
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Jan 26 22:03:34 2011 +0100

    Add 98_remove_malloc_check_r1217284.diff
---
 debian/changelog                                   |    2 +
 .../patches/98_remove_malloc_check_r1217284.diff   |   25 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e1b787..581fdb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -91,6 +91,8 @@ kdebase-workspace (4:4.6.0-0r1) UNRELEASED; urgency=low
     - 28_backport_bug156475_dualhead_support.diff - applied upstream
     - 29_backport_fix_krandr_support_in_startkde.diff - applied upstream
     - 99_solid_network_use_ntrack.diff - applied upstream
+  * Added patches:
+    - 98_remove_malloc_check_r1217284.diff
   * TODO:
     - 30_plasma_netbook_fix_autostart.diff - check if the issue still exists
     - 31_kdm_vt_switching_on_kfreebsd.diff - should be refreshed/reworked
diff --git a/debian/patches/98_remove_malloc_check_r1217284.diff b/debian/patches/98_remove_malloc_check_r1217284.diff
new file mode 100644
index 0000000..ae26f3d
--- /dev/null
+++ b/debian/patches/98_remove_malloc_check_r1217284.diff
@@ -0,0 +1,25 @@
+From: Will Stephenson <wstephenson at kde.org>
+Subject: Remove MALLOC_CHECK_ from 4.6 branch
+Origin: backport http://websvn.kde.org/?view=rev&revision=1217284
+Applied-Upstream: 4.6.1
+--- a/startkde.cmake
++++ b/startkde.cmake
+@@ -46,18 +46,6 @@
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+ unset DYLD_FORCE_FLAT_NAMESPACE
+ 
+-# Enable lightweight memory corruption checker if not already set
+-# -- this is for trunk only, we remove it for releases
+-if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then
+-    # Extract the first two components of the version from the output.
+-    glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q')
+-
+-    MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
+-    test $glibc_version \> 2.08 && MALLOC_CHECK_=3
+-
+-    export MALLOC_CHECK_
+-fi
+-
+ # in case we have been started with full pathname spec without being in PATH
+ bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+ if [ -n "$bindir" ]; then
diff --git a/debian/patches/series b/debian/patches/series
index faf18ca..0e7fab2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 32_ksmserver_fadeeffect_use_sse2_free.diff
 33_qguiplatformplugin_kde_NULL_check.diff
 97_fix_target_link_libraries.diff
+98_remove_malloc_check_r1217284.diff

-- 
KDE Base Workspace module packaging