[SCM] KDE Base Applications module packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-21-gcd821f8

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-baseapps.git;a=commitdiff;h=5dd6abd

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 5dd6abdd6609513acbaf3c2a8c7514ff0c23ebb3
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Mar 24 12:41:12 2015 +0100

    Drop unused kf5 packages (they have been split). Affects konsole and kwrite and kate.
---
 debian/changelog                 |  7 +++++++
 debian/control                   |  2 +-
 debian/konsole.install           | 28 ----------------------------
 debian/konsole.lintian-overrides |  3 ---
 debian/konsole.postinst          | 20 --------------------
 debian/konsole.prerm             | 22 ----------------------
 debian/kwrite.install            |  7 -------
 debian/not-installed             |  2 --
 8 files changed, 8 insertions(+), 83 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a80aa9..c791942 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kde-baseapps (4:14.12.3-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Drop unused kf5 packages (they have been split). Affects konsole and
+    kwrite and kate.
+
+ -- Harald Sitter <sitter at kde.org>  Tue, 24 Mar 2015 12:40:44 +0100
+
 kde-baseapps (4:14.12.3-0ubuntu2) vivid; urgency=medium
 
   * Add kubuntu_disable-failing-test.diff to disable test failing due to
diff --git a/debian/control b/debian/control
index 06bb26f..87c2e76 100644
--- a/debian/control
+++ b/debian/control
@@ -313,7 +313,7 @@ Package: kde-baseapps-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: kate-dbg, kde-runtime-dbg, konsole-dbg, ${misc:Depends}
+Depends: dolphin, kde-runtime-dbg, ${misc:Depends}
 Suggests: kde-baseapps (= ${source:Version})
 Breaks: kdebase-dbg (<< 4:4.7.2)
 Replaces: kdebase-dbg (<< 4:4.7.2)
diff --git a/debian/konsole.install b/debian/konsole.install
deleted file mode 100644
index 54b27d6..0000000
--- a/debian/konsole.install
+++ /dev/null
@@ -1,28 +0,0 @@
-usr/bin/konsole
-usr/bin/konsoleprofile
-usr/lib/kde4/libkonsolepart.so
-usr/lib/libkdeinit4_konsole.so
-usr/lib/libkonsoleprivate.so
-usr/share/applications/kde4/konsole.desktop
-usr/share/doc/kde/HTML/en/konsole/common
-usr/share/doc/kde/HTML/en/konsole/index.cache.bz2
-usr/share/doc/kde/HTML/en/konsole/index.docbook
-usr/share/kde4/apps/konsole/BlackOnLightYellow.schema
-usr/share/kde4/apps/konsole/BlackOnRandomLight.colorscheme
-usr/share/kde4/apps/konsole/BlackOnWhite.schema
-usr/share/kde4/apps/konsole/DarkPastels.colorscheme
-usr/share/kde4/apps/konsole/GreenOnBlack.colorscheme
-usr/share/kde4/apps/konsole/Linux.colorscheme
-usr/share/kde4/apps/konsole/README.KeyTab
-usr/share/kde4/apps/konsole/Shell.profile
-usr/share/kde4/apps/konsole/WhiteOnBlack.schema
-usr/share/kde4/apps/konsole/default.keytab
-usr/share/kde4/apps/konsole/konsole.notifyrc
-usr/share/kde4/apps/konsole/konsoleui.rc
-usr/share/kde4/apps/konsole/linux.keytab
-usr/share/kde4/apps/konsole/partui.rc
-usr/share/kde4/apps/konsole/sessionui.rc
-usr/share/kde4/apps/konsole/solaris.keytab
-usr/share/kde4/services/ServiceMenus/konsolehere.desktop
-usr/share/kde4/services/konsolepart.desktop
-usr/share/kde4/servicetypes/terminalemulator.desktop
diff --git a/debian/konsole.lintian-overrides b/debian/konsole.lintian-overrides
deleted file mode 100644
index ed646d5..0000000
--- a/debian/konsole.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-konsole: package-name-doesnt-match-sonames libkonsoleprivate
-konsole: shlib-without-versioned-soname usr/lib/libkonsoleprivate.so libkonsoleprivate.so
-konsole: postinst-must-call-ldconfig usr/lib/libkonsoleprivate.so
diff --git a/debian/konsole.postinst b/debian/konsole.postinst
deleted file mode 100644
index 45ae5ed..0000000
--- a/debian/konsole.postinst
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
-    configure)
-        update-alternatives --install /usr/bin/x-terminal-emulator \
-        x-terminal-emulator /usr/bin/konsole 40
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/konsole.prerm b/debian/konsole.prerm
deleted file mode 100644
index 455ae63..0000000
--- a/debian/konsole.prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
-    remove)
-        update-alternatives --remove x-terminal-emulator /usr/bin/konsole
-    ;;
-
-    upgrade|deconfigure)
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/kwrite.install b/debian/kwrite.install
deleted file mode 100644
index 1b08d0a..0000000
--- a/debian/kwrite.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin/kwrite
-usr/lib/libkdeinit4_kwrite.so
-usr/share/applications/kde4/kwrite.desktop
-usr/share/doc/kde/HTML/en/kwrite/common
-usr/share/doc/kde/HTML/en/kwrite/index.cache.bz2
-usr/share/doc/kde/HTML/en/kwrite/index.docbook
-usr/share/kde4/apps/kwrite/kwriteui.rc
diff --git a/debian/not-installed b/debian/not-installed
index a98524d..115e68f 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,5 +1,4 @@
 # Symlinks of private libraries
-./usr/lib/libdolphinprivate.so
 ./usr/lib/libkbookmarkmodel_private.so
 
 # Only for deveploment and we are not shipping any kdebase-dev
@@ -17,7 +16,6 @@
 ./usr/share/man/man1/kfind.1
 
 # These are moved by dh_movelibkdeinit
-./usr/lib/libkdeinit4_dolphin.so
 ./usr/lib/libkdeinit4_keditbookmarks.so
 ./usr/lib/libkdeinit4_kfmclient.so
 ./usr/lib/libkdeinit4_konqueror.so

-- 
KDE Base Applications module packaging