[SCM] konsole packaging branch, kubuntu_unstable, updated. debian/4.14.2-1-15-g722ba2b
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Tue Dec 2 11:12:12 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/konsole.git;a=commitdiff;h=cf19145
The following commit has been merged in the kubuntu_unstable branch:
commit cf19145b41b8f91f7d61de2ee2022096b0bd1e89
Author: Harald Sitter <sitter at kde.org>
Date: Tue Dec 2 11:50:53 2014 +0100
sync vivid_archive
---
debian/changelog | 80 ++++++++++++++++++++++++++++----
debian/control | 38 ++++++---------
debian/konsole.install | 39 ++++++++++++++++
debian/konsole.lintian-overrides | 4 ++
debian/konsole.postinst | 22 +++++++++
debian/{konsole5.prerm => konsole.prerm} | 13 +-----
debian/konsole5.install | 1 -
debian/konsole5.lintian-overrides | 5 --
debian/konsole5.postinst | 33 -------------
debian/not-installed | 2 +
debian/rules | 9 +---
debian/watch | 4 +-
12 files changed, 157 insertions(+), 93 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6a07c2c..4599f91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-konsole (4:4.50.0-0ubuntu1) UNRELEASED; urgency=medium
+konsole (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
- * KDE Framworks 5 Port
+ * New upstream RC release
+ * Merge with Debian, no changes
+ - removes the kpart splitting which is KDE 4 packaging only
- -- Harald Sitter <apachelogger at kubuntu.org> Fri, 31 Oct 2014 12:19:32 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 28 Nov 2014 19:23:42 +0100
konsole (4:4.14.2-1) unstable; urgency=medium
@@ -35,6 +37,65 @@ konsole (4:4.13.2-0ubuntu1) utopic; urgency=medium
-- Jonathan Riddell <jriddell at ubuntu.com> Tue, 17 Jun 2014 10:41:55 +0100
+konsole (4:4.14.2-0ubuntu1) vivid; urgency=medium
+
+ [ Scarlett Clark ]
+ * New upstream release
+
+ [ Harald Sitter ]
+ * Split kpart into its own package
+ + With konsole5 on the horizon we need to enable the installation of
+ the konsole4 kpart alongside the konsole5 package to ensure that
+ 4.x applications relying on the kpart still have access to it.
+ + New package konsole4-kpart
+ + konsole depends binary:Version of konsole4-kpart
+ + konsole4-kpart contains libkonsolepart.so and libkonsoleprivate.so
+ along with the relevant kpart desktop file.
+ All other files remain in konsole package.
+ + konsole4-kpart breaks and replaces old versions of konsole
+ + Once the konsole frameworks 5 port gets released this source should then
+ be renamed to konsole4 and loose the konsole package (i.e. only produce
+ konsole4-kpart)
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Oct 2014 05:53:49 -0700
+
+konsole (4:4.14.1-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com> Mon, 22 Sep 2014 17:26:14 +0200
+
+konsole (4:4.14.0-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 20 Aug 2014 13:18:06 +0200
+
+konsole (4:4.13.97-0ubuntu1) utopic; urgency=medium
+
+ * New upstream beta release RC
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com> Fri, 01 Aug 2014 17:00:57 +0200
+
+konsole (4:4.13.95-0ubuntu1) utopic; urgency=medium
+
+ * New upstream beta release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com> Wed, 30 Jul 2014 18:27:45 +0200
+
+konsole (4:4.13.90-0ubuntu1) utopic; urgency=medium
+
+ * New upstream beta release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com> Thu, 24 Jul 2014 23:21:14 +0200
+
+konsole (4:4.13.2-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release
+ * Merge with Debian, no changes
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 17 Jun 2014 10:41:55 +0100
+
konsole (4:4.13.1-1) unstable; urgency=medium
* New upstream release.
@@ -337,7 +398,7 @@ konsole (4:4.10.90-0ubuntu1) saucy; urgency=low
* New upstream beta release
[ Philip Muškovac ]
- * Add doc picture to konsole.install
+ * Add doc picture to konsole.install
-- Michał Zając <quintasan at kubuntu.org> Fri, 28 Jun 2013 18:19:44 +0100
@@ -347,8 +408,8 @@ konsole (4:4.10.80-0ubuntu1) saucy; urgency=low
* New upstream release
[ Philip Muškovac ]
- * Refresh debian-T-addition.diff
- * Update konsole.install
+ * Refresh debian-T-addition.diff
+ * Update konsole.install
-- Rohan Garg <rohangarg at kubuntu.org> Fri, 21 Jun 2013 01:28:57 +0100
@@ -575,7 +636,7 @@ konsole (4:4.8.2-0ubuntu1) precise; urgency=low
konsole (4:4.8.1-0ubuntu1) precise; urgency=low
- * New upstream release
+ * New upstream release
-- Philip Muškovac <yofel at kubuntu.org> Sun, 04 Mar 2012 20:39:13 +0100
@@ -641,7 +702,7 @@ konsole (4:4.7.2-0ubuntu1) oneiric-proposed; urgency=low
* New upstream release (LP: #872506)
[ Philip Muškovac ]
- * Add libx11-dev to build-deps so XKB is found.
+ * Add libx11-dev to build-deps so XKB is found.
-- Philip Muškovac <yofel at kubuntu.org> Tue, 18 Oct 2011 07:28:12 +0200
@@ -670,8 +731,9 @@ konsole (4:4.7.0-0ubuntu1) oneiric; urgency=low
konsole (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low
- * New upstream release candidate
+ * New upstream release candidate
- update for split packaging
* Repack upstream tar to include COPYING files
-- Philip Muškovac <yofel at kubuntu.org> Fri, 08 Jul 2011 12:41:10 +0200
+
diff --git a/debian/control b/debian/control
index 695258c..c6cc665 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: konsole
Section: kde
Priority: optional
-Maintainer: Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Maintainer: Debian/Kubuntu/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
X-Ubuntu-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
Uploaders: Sune Vuorela <sune at debian.org>,
Eshat Cakar <info at eshat.de>,
@@ -9,39 +9,26 @@ Uploaders: Sune Vuorela <sune at debian.org>,
Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake,
debhelper (>= 9),
- extra-cmake-modules (>= 1.3.0~),
+ kdoctools-dev,
kinit-dev,
- kio-dev,
- libkf5bookmarks-dev,
- libkf5completion-dev,
- libkf5config-dev,
- libkf5configwidgets-dev,
- libkf5coreaddons-dev,
- libkf5guiaddons-dev,
- libkf5i18n-dev,
- libkf5iconthemes-dev,
libkf5kdelibs4support-dev,
- libkf5notifications-dev,
libkf5notifyconfig-dev,
libkf5parts-dev,
libkf5pty-dev,
- libkf5service-dev,
- libkf5textwidgets-dev,
- libkf5widgetsaddons-dev,
- libkf5windowsystem-dev,
- libkf5xmlgui-dev,
- pkg-kde-tools (>= 0.15.15ubuntu1~),
- qtbase5-dev,
+ libxkbfile-dev,
+ pkg-kde-tools (>= 0.12),
qtscript5-dev
Standards-Version: 3.9.5
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
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/konsole.git/
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/konsole.git
+X-Ubuntu-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/konsole.git/
+X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/konsole
-Package: konsole5
+Package: konsole
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, konsole
+Depends: ${misc:Depends}, ${shlibs:Depends}
Provides: x-terminal-emulator
Description: X terminal emulator
Konsole is a terminal emulator built on the KDE Platform. It can contain
@@ -52,13 +39,14 @@ Description: X terminal emulator
.
This package is part of the KDE base applications module.
-Package: konsole5-dbg
+Package: konsole-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: konsole5 (= ${binary:Version}), ${misc:Depends}
+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.
diff --git a/debian/konsole.install b/debian/konsole.install
new file mode 100644
index 0000000..5440b09
--- /dev/null
+++ b/debian/konsole.install
@@ -0,0 +1,39 @@
+usr/bin/konsole
+usr/bin/konsoleprofile
+usr/lib/*/libkdeinit5_konsole.so
+usr/lib/*/libkonsoleprivate.so.3.0.0
+usr/lib/*/libkonsoleprivate.so.3
+usr/lib/*/qt5/plugins/konsolepart.so
+usr/share/knotifications5/konsole.notifyrc
+usr/share/kxmlgui5/konsole/sessionui.rc
+usr/share/kxmlgui5/konsole/partui.rc
+usr/share/kxmlgui5/konsole/konsoleui.rc
+usr/share/kservices5/konsolepart.desktop
+usr/share/kservices5/ServiceMenus/konsolehere.desktop
+usr/share/kservices5/ServiceMenus/konsolerun.desktop
+usr/share/doc/HTML/en/konsole/draganddrop-contextmenu.png
+usr/share/doc/HTML/en/konsole/index.docbook
+usr/share/doc/HTML/en/konsole/index.cache.bz2
+usr/share/applications/org.kde.konsole.desktop
+usr/share/konsole/linux.keytab
+usr/share/konsole/default.keytab
+usr/share/konsole/Linux.colorscheme
+usr/share/konsole/Solarized.colorscheme
+usr/share/konsole/WhiteOnBlack.colorscheme
+usr/share/konsole/solaris.keytab
+usr/share/konsole/README.KeyTab
+usr/share/konsole/DarkPastels.colorscheme
+usr/share/konsole/BlackOnLightYellow.colorscheme
+usr/share/konsole/Shell.profile
+usr/share/konsole/BlackOnWhite.colorscheme
+usr/share/konsole/BlackOnRandomLight.colorscheme
+usr/share/konsole/BlueOnBlack.colorscheme
+usr/share/konsole/GreenOnBlack.colorscheme
+usr/share/konsole/SolarizedLight.colorscheme
+usr/share/konsole/RedOnBlack.colorscheme
+usr/share/kservicetypes5/terminalemulator.desktop
+usr/share/kconf_update/konsole.upd
+usr/share/kconf_update/konsole_remove_background_mode.upd
+usr/share/kconf_update/konsole-2.9.0-global-options.sh
+usr/share/kconf_update/konsole-2.9.0-colorscheme-bold-key.sh
+usr/share/kconf_update/konsole-2.10.0-remove-menuindex-from-profiles.sh
diff --git a/debian/konsole.lintian-overrides b/debian/konsole.lintian-overrides
new file mode 100644
index 0000000..8a0d209
--- /dev/null
+++ b/debian/konsole.lintian-overrides
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000..a4f85b8
--- /dev/null
+++ b/debian/konsole.postinst
@@ -0,0 +1,22 @@
+#! /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/konsole5.prerm b/debian/konsole.prerm
similarity index 52%
rename from debian/konsole5.prerm
rename to debian/konsole.prerm
index a1958de..2de7dd2 100644
--- a/debian/konsole5.prerm
+++ b/debian/konsole.prerm
@@ -1,21 +1,10 @@
#! /bin/sh
-set -ex
-
-undivert() {
- binary=$1
- if [ -L ${binary} ]; then
- rm ${binary}
- fi
- dpkg-divert --remove --package konsole5 --rename \
- --divert ${binary}4 ${binary}
-}
+set -e
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/konsole5.install b/debian/konsole5.install
deleted file mode 100644
index 1b91047..0000000
--- a/debian/konsole5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/
diff --git a/debian/konsole5.lintian-overrides b/debian/konsole5.lintian-overrides
deleted file mode 100644
index 741bc7e..0000000
--- a/debian/konsole5.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-konsole5: package-name-doesnt-match-sonames libkdeinit5-konsole libkonsoleprivate3
-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
deleted file mode 100644
index 7016d01..0000000
--- a/debian/konsole5.postinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /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/not-installed b/debian/not-installed
new file mode 100644
index 0000000..585f562
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,2 @@
+# moved by pkg-kde-tools
+./usr/lib/libkdeinit4_konsole.so
diff --git a/debian/rules b/debian/rules
index 5cd21ec..a1d26dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,7 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
override_dh_auto_configure:
$(overridden_command)
-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
+.PHONY: override_dh_auto_test
override_dh_strip:
- $(overridden_command) --dbg-package=konsole5-dbg
-
-.PHONY: override_dh_auto_test
+ $(overridden_command) --dbg-package=konsole-dbg
diff --git a/debian/watch b/debian/watch
index d65e7cb..41750ee 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
version=3
-http://download.kde.org/stable/([\d.]+)/src/konsole-([\d.]+).tar.xz
+http://download.kde.org/stable/applications/([\d.]+)/src/konsole-([\d.]+).tar.xz
+
+http://download.kde.org/unstable/applications/([\d.]+)/src/konsole-([\d.]+).tar.xz
--
konsole packaging
More information about the pkg-kde-commits
mailing list