[SCM] konsole packaging branch, master, updated. debian/4.14.2-1-6-g3c57657

Maximiliano Curia maxy at moszumanska.debian.org
Wed Jul 22 23:59:24 UTC 2015 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/konsole.git;a=commitdiff;h=71882f8

The following commit has been merged in the master branch:
commit 71882f8e0b9a6cb2132af77d41e48a245713bc1d
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jul 22 19:20:52 2015 +0200

    Keep only the kpart needed by other (kde4) packages.
---
 debian/changelog                                   |  2 +-
 debian/control                                     | 30 ++++++++++------------
 debian/konsole.lintian-overrides                   |  4 ---
 debian/konsole.postinst                            | 22 ----------------
 debian/konsole.prerm                               | 24 -----------------
 debian/{konsole.install => konsole4-kpart.install} | 14 ----------
 debian/konsole4-kpart.lintian-overrides            |  4 +++
 debian/rules                                       |  7 +++--
 8 files changed, 23 insertions(+), 84 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5988c9f..4096b5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 konsole (4:4.14.2-2~) UNRELEASED; urgency=medium
 
-  * 
+  * Keep only the kpart needed by other (kde4) packages.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 22 Jul 2015 18:42:41 +0200
 
diff --git a/debian/control b/debian/control
index 328dd9a..c8a594f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,19 +15,17 @@ Build-Depends: cmake,
                libphonon-dev (>= 4:4.3.0),
                libxkbfile-dev,
                pkg-kde-tools (>= 0.12)
-Standards-Version: 3.9.5
-XS-Testsuite: autopkgtest
+Standards-Version: 3.9.6
 Homepage: http://www.kde.org/
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/konsole.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-sc/konsole.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/konsole.git
 X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/konsole
 X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/konsole
 
-Package: konsole
+Package: konsole4-kpart
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Provides: x-terminal-emulator
-Description: X terminal emulator
+Description: X terminal emulator - KPart plugin
  Konsole is a terminal emulator built on the KDE Platform. It can contain
  multiple terminal sessions inside one window using detachable tabs.
  .
@@ -36,14 +34,12 @@ Description: X terminal emulator
  .
  This package is part of the KDE base applications module.
 
-Package: konsole-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: konsole (= ${binary:Version}), ${misc:Depends}
-Breaks: kdebase-dbg (<< 4:4.6.80)
-Replaces: kdebase-dbg (<< 4:4.6.80)
-Recommends: kdelibs5-dbg
-Description: debugging symbols for the KDE X terminal emulator
- This package contains debugging files used to investigate problems with
- binaries included in the KDE X terminal emulator.
+Package: konsole
+Architecture: all
+Depends: konsole4-kpart (>= ${source:Version}), konsole5
+Description: transitional package for the Konsole5 package
+ Konsole is a terminal emulator built on the KDE Platform.
+ .
+ This transional package allows one to migrate to konsole5 and konsole4-kpart.
+ .
+ It can be safely removed after the installation.
diff --git a/debian/konsole.lintian-overrides b/debian/konsole.lintian-overrides
deleted file mode 100644
index 8a0d209..0000000
--- a/debian/konsole.lintian-overrides
+++ /dev/null
@@ -1,4 +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
-konsole: no-symbols-control-file usr/lib/libkonsoleprivate.so
diff --git a/debian/konsole.postinst b/debian/konsole.postinst
deleted file mode 100644
index a4f85b8..0000000
--- a/debian/konsole.postinst
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-
-set -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 2de7dd2..0000000
--- a/debian/konsole.prerm
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-set -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/konsole.install b/debian/konsole4-kpart.install
similarity index 59%
rename from debian/konsole.install
rename to debian/konsole4-kpart.install
index 5f41648..f5b0267 100644
--- a/debian/konsole.install
+++ b/debian/konsole4-kpart.install
@@ -1,15 +1,6 @@
-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/*/konsole/
-usr/share/kde4/apps/kconf_update/konsole-2.10.0-remove-menuindex-from-profiles.sh
-usr/share/kde4/apps/kconf_update/konsole-2.9.0-colorscheme-bold-key.sh
-usr/share/kde4/apps/kconf_update/konsole-2.9.0-global-options.sh
-usr/share/kde4/apps/kconf_update/konsole.upd
-usr/share/kde4/apps/kconf_update/konsole_remove_background_mode.upd
 usr/share/kde4/apps/konsole/BlackOnLightYellow.colorscheme
 usr/share/kde4/apps/konsole/BlackOnRandomLight.colorscheme
 usr/share/kde4/apps/konsole/BlackOnWhite.colorscheme
@@ -24,13 +15,8 @@ usr/share/kde4/apps/konsole/Solarized.colorscheme
 usr/share/kde4/apps/konsole/SolarizedLight.colorscheme
 usr/share/kde4/apps/konsole/WhiteOnBlack.colorscheme
 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/ServiceMenus/konsolerun.desktop
 usr/share/kde4/services/konsolepart.desktop
-usr/share/kde4/servicetypes/terminalemulator.desktop
diff --git a/debian/konsole4-kpart.lintian-overrides b/debian/konsole4-kpart.lintian-overrides
new file mode 100644
index 0000000..7764d36
--- /dev/null
+++ b/debian/konsole4-kpart.lintian-overrides
@@ -0,0 +1,4 @@
+konsole4-kpart: package-name-doesnt-match-sonames libkonsoleprivate
+konsole4-kpart: shlib-without-versioned-soname usr/lib/libkonsoleprivate.so libkonsoleprivate.so
+konsole4-kpart: postinst-must-call-ldconfig usr/lib/libkonsoleprivate.so
+konsole4-kpart: no-symbols-control-file usr/lib/libkonsoleprivate.so
diff --git a/debian/rules b/debian/rules
index 4496f59..55131c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,13 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
+BINARY_VERSION_NO_EPOCH := $(shell dpkg-parsechangelog -S Version | sed 's/^[[:digit:]]\+\://')
+
 override_dh_auto_configure:
 	$(overridden_command)
 
 .PHONY: override_dh_auto_test
 
-override_dh_strip:
-	$(overridden_command) --dbg-package=konsole-dbg
+override_dh_gencontrol:
+	$(overridden_command) -pkonsole -- -v'4:15.04.3+$(BINARY_VERSION_NO_EPOCH)'
+	$(overridden_command) --remaining-packages

-- 
konsole packaging

More information about the pkg-kde-commits mailing list