[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-7+squeeze1-110-g4ad8b69

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 2b48c151a1662bcc047453960c4246edaca8af23
Author: Modestas Vainius <modax at debian.org>
Date:   Tue Mar 29 00:42:27 2011 +0300

    Drop kaboom support.
    
    Remove depend and run_kaboom_when_starting_kde.diff patch.
---
 debian/changelog                                 |    2 ++
 debian/control                                   |    2 +-
 debian/patches/run_kaboom_when_starting_kde.diff |   19 -------------------
 debian/patches/series                            |    1 -
 4 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f56bb2..aa0ba67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -137,6 +137,8 @@ kdebase-workspace (4:4.6.1-0r2) UNRELEASED; urgency=low
       + restart symbol confirmation process at 4:4.6.1;
   * Add symbol file for libweather-ion6.
   * Strip sequence numbers from the debian/patches/*.
+  * Drop kaboom support: remove depend and run_kaboom_when_starting_kde.diff
+    patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 31 Jul 2010 16:41:50 +0300
 
diff --git a/debian/control b/debian/control
index 948218e..c67f199 100644
--- a/debian/control
+++ b/debian/control
@@ -90,7 +90,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, iso-codes,
  plasma-desktop (= ${binary:Version}) | plasma-netbook (= ${binary:Version}),
  kdebase-workspace-data (= ${source:Version}), x11-utils, x11-xserver-utils,
- kaboom (>= 1.0.5), kdebase-workspace-kgreet-plugins (= ${binary:Version})
+ kdebase-workspace-kgreet-plugins (= ${binary:Version})
 Recommends: plasma-scriptengines, polkit-kde-1 | policykit-1-gnome,
  upower [linux-any]
 Suggests: x11-xkb-utils
diff --git a/debian/patches/run_kaboom_when_starting_kde.diff b/debian/patches/run_kaboom_when_starting_kde.diff
deleted file mode 100644
index faa627e..0000000
--- a/debian/patches/run_kaboom_when_starting_kde.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/startkde.cmake
-+++ b/startkde.cmake
-@@ -13,6 +13,16 @@
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
- 
-+if [ ! -f $HOME/.local/kaboom ] 
-+then 
-+	kaboom -style plastique
-+	RET=$? 
-+	if [ "$RET" != "0" ]
-+	then 
-+		exit $RET 
-+	fi
-+fi
-+
- # Check if a KDE session already is running and whether it's possible to connect to X
- kcheckrunning
- kcheckrunning_result=$?
diff --git a/debian/patches/series b/debian/patches/series
index 878075a..a6ff8b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@ kdm_override_docs.diff
 use_dejavu_as_default_font.diff
 place_global_config_in_etc.diff
 kdm_xreset_hook_framework.diff
-run_kaboom_when_starting_kde.diff
 plasma_netbook_fix_autostart.diff
 ksmserver_fadeeffect_use_sse2_free.diff
 qguiplatformplugin_kde_NULL_check.diff

-- 
KDE Base Workspace module packaging