[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-7+squeeze1-87-g7b9dfdd
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Thu Mar 3 23:11:37 UTC 2011
The following commit has been merged in the master branch:
commit a00c212ee3151d19d5ea3fef178a4499583f2e1e
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Wed Mar 2 21:20:42 2011 +0100
Refresh patches.
---
debian/changelog | 2 -
...12_be_better_at_honouring_user_kdm_theming.diff | 8 ++----
debian/patches/20_use_dejavu_as_default_font.diff | 2 +-
.../patches/98_remove_malloc_check_r1217284.diff | 25 --------------------
debian/patches/series | 1 -
5 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4891f49..34c6b35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -82,8 +82,6 @@ kdebase-workspace (4:4.6.1-0r0) 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/12_be_better_at_honouring_user_kdm_theming.diff b/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
index 46edf93..e45c2a2 100644
--- a/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
+++ b/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
@@ -1,12 +1,10 @@
-Index: kdebase-workspace/kdm/config.def
-===================================================================
---- kdebase-workspace.orig/kdm/config.def 2010-12-18 20:45:45.790819514 +0100
-+++ kdebase-workspace/kdm/config.def 2010-12-18 21:00:40.918568853 +0100
+--- a/kdm/config.def
++++ b/kdm/config.def
@@ -2679,7 +2679,7 @@
Type: string
Default: ""
User: greeter
--Instance: */KDMDATA "/themes/oxygen-air"
+-Instance: */KDMDATA "/themes/horos"
+Instance: */ "@@@ToBeReplacedByDesktopBase@@@"
Comment: &
Description:
diff --git a/debian/patches/20_use_dejavu_as_default_font.diff b/debian/patches/20_use_dejavu_as_default_font.diff
index a19c9fe..2dbd349 100644
--- a/debian/patches/20_use_dejavu_as_default_font.diff
+++ b/debian/patches/20_use_dejavu_as_default_font.diff
@@ -1,6 +1,6 @@
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
-@@ -510,12 +510,12 @@
+@@ -514,12 +514,12 @@
// NOTE: keep in sync with kdelibs/kdeui/kernel/kglobalsettings.cpp
diff --git a/debian/patches/98_remove_malloc_check_r1217284.diff b/debian/patches/98_remove_malloc_check_r1217284.diff
deleted file mode 100644
index ae26f3d..0000000
--- a/debian/patches/98_remove_malloc_check_r1217284.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-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 0e7fab2..faf18ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,3 @@
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
More information about the pkg-kde-commits
mailing list