[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.6.5-1-5-ga33fdc7

[Lisandro D. N. Pérez Meyer]

The following commit has been merged in the master branch:
commit 0bd2e1316eafda20f204e8402c8ec7447352af6a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Aug 22 20:03:43 2011 -0300

    Remove patch dont_show_netattach_outside_kde.diff.
    
    It has been merged upstream.
---
 debian/changelog                                   |    4 ++++
 .../patches/dont_show_netattach_outside_kde.diff   |   13 -------------
 debian/patches/series                              |    1 -
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72024c1..6e59956 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 kdebase-runtime (4:4.7.0-0r0) UNRELEASED; urgency=low
 
+  * New upstream release.
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Remove patch dont_show_netattach_outside_kde.diff, it has been merged
+    upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 22 Aug 2011 19:53:35 -0300
 
diff --git a/debian/patches/dont_show_netattach_outside_kde.diff b/debian/patches/dont_show_netattach_outside_kde.diff
deleted file mode 100644
index 0d9db0f..0000000
--- a/debian/patches/dont_show_netattach_outside_kde.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-knetattach is installed in kde4 libexec dir, and only KDE looks there.
-knetattach desktop file should not be shown outside kde environment.
-Fixes debian bug #582844
-Not yet forwarded.
-Author: Sune Vuorela
---- a/knetattach/knetattach.desktop
-+++ b/knetattach/knetattach.desktop
-@@ -178,4 +178,5 @@
- Terminal=false
- X-KDE-StartupNotify=true
- Categories=Qt;KDE;Network;RemoteAccess;
-+OnlyShowIn=KDE;
- X-DocPath=knetattach/index.html
diff --git a/debian/patches/series b/debian/patches/series
index a282bd7..8ea3a00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 kde4_information_menu.diff
 disable_usr_lib_install_rpath.diff
 khelp_htdig.diff
-dont_show_netattach_outside_kde.diff

-- 
KDE Base Runtime module packaging