[SCM] konsole packaging branch, kubuntu_unstable_utopic, updated. debian/4.14.2-1-24-g2e19384
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Thu Dec 4 16:03:51 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/konsole.git;a=commitdiff;h=2e19384
The following commit has been merged in the kubuntu_unstable_utopic branch:
commit 2e193847bfd6d6af09456ae06a6b633d96192f9f
Merge: 8048cb399a45e7c08e2013f9a3da95d210e63fa0 4a1273a75162eddd464d396fac0e7e3b9d13d64a
Author: Harald Sitter <sitter at kde.org>
Date: Thu Dec 4 17:03:44 2014 +0100
Merge branch 'kubuntu_unstable' into kubuntu_unstable_utopic
Conflicts:
debian/control
debian/changelog | 1 -
debian/control | 17 +++++++++++------
debian/konsole-kpart.install | 2 ++
debian/konsole.install | 5 ++++-
debian/konsole5.install | 5 ++++-
5 files changed, 21 insertions(+), 9 deletions(-)
diff --cc debian/control
index bf99094,8e73073..d593021
--- a/debian/control
+++ b/debian/control
@@@ -38,12 -37,10 +37,10 @@@ XS-Testsuite: autopkgtes
Homepage: http://www.kde.org/
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: konsole
+Package: konsole5
Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}, konsole
-Depends: ${misc:Depends}, ${shlibs:Depends}, konsole-kpart (= ${binary:Version})
++Depends: ${misc:Depends}, ${shlibs:Depends}, konsole, konsole-kpart (= ${binary:Version})
Provides: x-terminal-emulator
Description: X terminal emulator
Konsole is a terminal emulator built on the KDE Platform. It can contain
@@@ -51,10 -48,18 +48,18 @@@
.
Konsole supports powerful terminal features, such as customizable schemes,
saved sessions, and output monitoring.
+
+ Package: konsole-kpart
+ Architecture: any
+ Depends: ${misc:Depends}, ${shlibs:Depends}
+ Description: Konsole plugin for Qt applications
+ Konsole is a terminal emulator built on the KDE Platform. It can contain
+ multiple terminal sessions inside one window using detachable tabs.
.
- This package is part of the KDE base applications module.
+ Konsole supports powerful terminal features, such as customizable schemes,
+ saved sessions, and output monitoring.
-Package: konsole-dbg
+Package: konsole5-dbg
Section: debug
Architecture: any
Priority: extra
diff --cc debian/konsole5.install
index 1b91047,d5f17f9..5475077
--- a/debian/konsole5.install
+++ b/debian/konsole5.install
@@@ -1,1 -1,4 +1,4 @@@
- usr/
+ usr/share/
+ usr/lib/*/libkdeinit5_konsole.so
-usr/bin/konsoleprofile
-usr/bin/konsole
++usr/bin/konsoleprofile5
++usr/bin/konsole5
--
konsole packaging
More information about the pkg-kde-commits
mailing list