[SCM] konsole packaging branch, kubuntu_unstable, updated. debian/4.14.2-1-3-g061a2b8

Mon Nov 3 16:25:21 UTC 2014

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

The following commit has been merged in the kubuntu_unstable branch:
commit 061a2b8f4d8bb7fe696fbdd94bf74da4503f8d11
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Nov 3 17:25:13 2014 +0100

    workaround not being able to properly migrate 14.10 to konsole4-kpart
    
    we need to offer konsole4-kpart at the same time as konsole(5), this
    requires dependency adjustments in various applications using the kpart.
    since we can not do this migration in 14.10 (what with being released)
    we instead resort to fancy trickery using dpkg-divert.
    
    - the binary package is called konsole5
    - bin/konsole and bin/konsoleprofile are intalled with a 5 suffix
    - postinst and prerm manage diversion of the two binaries in konsole(4) to
      the versions in this package
    - in kubuntu 15.04 we BreakReplaceProvide konsole5 to migrate unstable
      users back to the regular konsole package which at that point should be
      the 5.x version
    - konsole4-kpart will be the only package produced by konsole4, also the
      source should be renamed
---
 debian/control                               |  8 +++----
 debian/konsole.lintian-overrides             |  4 ----
 debian/konsole.postinst                      | 22 -------------------
 debian/{konsole.install => konsole5.install} |  0
 debian/konsole5.lintian-overrides            |  5 +++++
 debian/konsole5.postinst                     | 33 ++++++++++++++++++++++++++++
 debian/{konsole.prerm => konsole5.prerm}     | 13 ++++++++++-
 debian/rules                                 |  9 ++++++--
 8 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/debian/control b/debian/control
index a9bbe32..eb8c4e8 100644
--- a/debian/control
+++ b/debian/control
@@ -38,10 +38,8 @@ XS-Testsuite: autopkgtest
 Homepage: http://www.kde.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=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: konsole5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: x-terminal-emulator
@@ -54,11 +52,11 @@ Description: X terminal emulator
  .
  This package is part of the KDE base applications module.
 
-Package: konsole-dbg
+Package: konsole5-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: konsole (= ${binary:Version}), ${misc:Depends}
+Depends: konsole5 (= ${binary:Version}), ${misc:Depends}
 Breaks: kdebase-dbg (<< 4:4.6.80)
 Replaces: kdebase-dbg (<< 4:4.6.80)
 Description: debugging symbols for the KDE X terminal emulator
diff --git a/debian/konsole.lintian-overrides b/debian/konsole.lintian-overrides
deleted file mode 100644
index 2bfb44b..0000000
--- a/debian/konsole.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-konsole: package-name-doesnt-match-sonames libkdeinit5-konsole libkonsoleprivate2
-konsole: binary-without-manpage usr/bin/konsole
-konsole: binary-without-manpage usr/bin/konsoleprofile
-konsole: shlib-without-versioned-soname usr/lib/*/libkdeinit5_konsole.so libkdeinit5_konsole.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.install b/debian/konsole5.install
similarity index 100%
rename from debian/konsole.install
rename to debian/konsole5.install
diff --git a/debian/konsole5.lintian-overrides b/debian/konsole5.lintian-overrides
new file mode 100644
index 0000000..dca0d0a
--- /dev/null
+++ b/debian/konsole5.lintian-overrides
@@ -0,0 +1,5 @@
+konsole5: package-name-doesnt-match-sonames libkdeinit5-konsole libkonsoleprivate2
+konsole5: binary-without-manpage usr/bin/konsole5
+konsole5: binary-without-manpage usr/bin/konsoleprofile5
+konsole5: shlib-without-versioned-soname usr/lib/*/libkdeinit5_konsole.so libkdeinit5_konsole.so
+konsole5: desktop-command-not-in-package usr/share/applications/org.kde.konsole.desktop konsole
diff --git a/debian/konsole5.postinst b/debian/konsole5.postinst
new file mode 100644
index 0000000..7016d01
--- /dev/null
+++ b/debian/konsole5.postinst
@@ -0,0 +1,33 @@
+#! /bin/sh
+
+set -ex
+
+divert() {
+    binary=$1
+    dpkg-divert --add --package konsole5 --rename \
+        --divert ${binary}4 ${binary}
+    if [ ! -e ${binary} -o -L ${binary} ]; then
+        ln -sf ${binary}5 ${binary}
+    fi
+}
+
+case "$1" in
+    configure)
+        update-alternatives --install /usr/bin/x-terminal-emulator \
+            x-terminal-emulator /usr/bin/konsole 40
+        divert "/usr/bin/konsole"
+        divert "/usr/bin/konsoleprofile"
+    ;;
+
+    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/konsole5.prerm
similarity index 52%
rename from debian/konsole.prerm
rename to debian/konsole5.prerm
index 2de7dd2..a1958de 100644
--- a/debian/konsole.prerm
+++ b/debian/konsole5.prerm
@@ -1,10 +1,21 @@
 #! /bin/sh
 
-set -e
+set -ex
+
+undivert() {
+    binary=$1
+    if [ -L ${binary} ]; then
+        rm ${binary}
+    fi
+    dpkg-divert --remove --package konsole5 --rename \
+        --divert ${binary}4 ${binary}
+}
 
 case "$1" in
     remove)
         update-alternatives --remove x-terminal-emulator /usr/bin/konsole
+        undivert "/usr/bin/konsole"
+        undivert "/usr/bin/konsoleprofile"
     ;;
 
     upgrade|deconfigure)
diff --git a/debian/rules b/debian/rules
index a1d26dd..5cd21ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,12 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 override_dh_auto_configure:
 	$(overridden_command)
 
-.PHONY: override_dh_auto_test
+override_dh_auto_install:
+	$(overridden_command)
+	mv debian/tmp/usr/bin/konsole debian/tmp/usr/bin/konsole5
+	mv debian/tmp/usr/bin/konsoleprofile debian/tmp/usr/bin/konsoleprofile5
 
 override_dh_strip:
-	$(overridden_command) --dbg-package=konsole-dbg
+	$(overridden_command) --dbg-package=konsole5-dbg
+
+.PHONY: override_dh_auto_test

-- 
konsole packaging

