[SCM] KDE Base Applications module packaging branch, master, updated. debian/4.6.5-1-6-g7fdc283

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 96497502ef785afd99f87bb3b11cdedaf6cc6c13
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Aug 10 17:40:12 2011 +0200

    Remove konsole.
---
 debian/changelog      |    3 +++
 debian/control        |   26 +++++++++++++-------------
 debian/patches/series |    1 -
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5910958..c5cc6d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ kdebase (4:4.7.0-0r0) UNRELEASED; urgency=low
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.7.0.
   * Bump kdelibs5-dev build dependency to version 4:4.7.
+  * Konsole isn't shipped in kdebase source package anymore:
+    - Disable debian-T-addition.diff (which only changes Konsole).
+    - Comment out konsole binary package in debian/control.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 09 Aug 2011 19:10:00 +0200
 
diff --git a/debian/control b/debian/control
index 6812a5e..107ab50 100644
--- a/debian/control
+++ b/debian/control
@@ -131,19 +131,19 @@ Description: Netscape plugin support for Konqueror
  .
  This package is part of the KDE base applications module.
 
-Package: konsole
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: x-terminal-emulator
-Breaks: yakuake (<< 2.9.0)
-Description: X terminal emulator
- Konsole is a terminal emulator built on the KDE Platform. It can contain
- multiple terminal sessions inside one window using detachable tabs.
- .
- Konsole supports powerful terminal features, such as customizable schemes,
- saved sessions, and output monitoring.
- .
- This package is part of the KDE base applications module.
+#Package: konsole
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}
+#Provides: x-terminal-emulator
+#Breaks: yakuake (<< 2.9.0)
+#Description: X terminal emulator
+# Konsole is a terminal emulator built on the KDE Platform. It can contain
+# multiple terminal sessions inside one window using detachable tabs.
+# .
+# Konsole supports powerful terminal features, such as customizable schemes,
+# saved sessions, and output monitoring.
+# .
+# This package is part of the KDE base applications module.
 
 Package: kwrite
 Section: editors
diff --git a/debian/patches/series b/debian/patches/series
index ab3c614..b3dd74f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-debian-T-addition.diff
 enable_debianabimanager.diff
 enable_dlrestrictions.diff

-- 
KDE Base Applications module packaging