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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 0af4a9e70c93e36ea15a88f74ee15b227f0ce9da
Author: Modestas Vainius <modax at debian.org>
Date:   Wed Apr 6 17:42:44 2011 +0300

    kwin blacklist script was removed upstream, drop our patch.
    
    See upstream commit:d44c3347cf67ee18c151e747955056036f319a12.
---
 debian/changelog                                   |    2 -
 debian/kde-window-manager.install                  |    2 -
 debian/patches/series                              |    1 -
 .../upstream_kwin_blacklist_add_shebang.diff       |   22 --------------------
 4 files changed, 0 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 432c606..e5396cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -112,8 +112,6 @@ kdebase-workspace (4:4.6.2-0r0) UNRELEASED; urgency=low
   * Disable testsuite.
   * Require debhelper 7.2.7~.
   * Remove executable permissions from klipper.desktop.
-  * Add shebang to the kwin/data/kwin_blacklist.sh script
-    (patch upstream_kwin_blacklist_add_shebang.diff).
   * Override plasma-desktop: postinst-must-call-ldconfig usr/lib/libkickoff.so.
   * Enable DebianABIManager:
     - include DebianABIManager.cmake at the bottom of the main CMakeLists.txt
diff --git a/debian/kde-window-manager.install b/debian/kde-window-manager.install
index dd256f7..a1fee77 100644
--- a/debian/kde-window-manager.install
+++ b/debian/kde-window-manager.install
@@ -60,8 +60,6 @@ usr/share/icons/oxygen/scalable/apps/kwin.svgz
 usr/share/kde4/apps/kconf_update/kwin.upd
 usr/share/kde4/apps/kconf_update/kwin3_plugin.pl
 usr/share/kde4/apps/kconf_update/kwin3_plugin.upd
-usr/share/kde4/apps/kconf_update/kwin_blacklist.sh
-usr/share/kde4/apps/kconf_update/kwin_blacklist.upd
 usr/share/kde4/apps/kconf_update/kwin_focus1.sh
 usr/share/kde4/apps/kconf_update/kwin_focus1.upd
 usr/share/kde4/apps/kconf_update/kwin_focus2.sh
diff --git a/debian/patches/series b/debian/patches/series
index a6ff8b3..b5822a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,5 +13,4 @@ plasma_netbook_fix_autostart.diff
 ksmserver_fadeeffect_use_sse2_free.diff
 qguiplatformplugin_kde_NULL_check.diff
 fix_target_link_libraries.diff
-upstream_kwin_blacklist_add_shebang.diff
 enable_debianabimanager.diff
diff --git a/debian/patches/upstream_kwin_blacklist_add_shebang.diff b/debian/patches/upstream_kwin_blacklist_add_shebang.diff
deleted file mode 100644
index 0ee1696..0000000
--- a/debian/patches/upstream_kwin_blacklist_add_shebang.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: Add shebang to the kwin/data/kwin_blacklist.sh script
-Forwarded: no
-Origin: vendor
-Last-Update: 2011-03-28
-
---- a/kwin/data/kwin_blacklist.sh
-+++ b/kwin/data/kwin_blacklist.sh
-@@ -1,3 +1,5 @@
-+#!/bin/sh
-+
- while read line; do
-     echo $line
- done
-@@ -11,4 +13,5 @@ echo "[Blacklist][Blur]"
- echo "Advanced Micro Devices=DRI R600:-:7.8.1,DRI R600:-:7.8.2"
- echo "Ati=Radeon HD 3650:-:3.3.9901"
- echo "NVIDIA=GeForce 6150/PCI/SSE2:-:195"
--echo ""
-\ No newline at end of file
-+echo ""
-+

-- 
KDE Base Workspace module packaging