[SCM] konsole packaging branch, master, updated. debian/4.13.1-1-129-gef8d535
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 31 12:25:34 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/konsole.git;a=commitdiff;h=3bf45c8
The following commit has been merged in the master branch:
commit 3bf45c883d4eff2964be9138498e06fdea8dd036
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date: Tue May 28 13:33:38 2013 +0000
merge
---
debian/changelog | 122 ++++++++++++++++++++++++++++++++++
debian/control | 14 ++--
debian/konsole.lintian-overrides | 1 +
debian/konsole.postinst | 4 +-
debian/konsole.prerm | 4 +-
debian/patches/debian-T-addition.diff | 15 ++---
debian/rules | 3 +
debian/watch | 2 +
8 files changed, 149 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index afd36bd..e0b7c13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+konsole (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 23 May 2013 11:04:49 +0000
+
+konsole (4:4.10.2-2) experimental; urgency=low
+
+ * Fixup uploaders field
+
+ -- Sune Vuorela <sune at debian.org> Thu, 04 Apr 2013 07:13:22 +0000
+
+konsole (4:4.10.2-1) experimental; urgency=low
+
+ * New upstream release.
+ - Fixes homedir fallback. (Closes: #586030)
+
+ [ José Manuel Santamaría Lema ]
+ * Bump kde-sc-dev-latest build dependency to version 4:4.10.1.
+ * Update patches:
+ - drop one_profile_per_window.diff, problem solved upstream.
+ - drop upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch,
+ no longer needed.
+ - refresh debian-T-addition.diff.
+ * Update installed files.
+ * Add a lintian override for no-symbols-control-file.
+
+ [ Josep Febrer ]
+ * Refresh patch debian-T-addition.diff.
+ * Bump kdelibs5-dev and libkonq5-dev to 4:4.10.
+ * Update installed files.
+ * Pass -DKDE4_BUILD_TESTS=false to cmake in order to keep the tests disabled.
+
+ [ Sune Vuorela ]
+ * Update uploaders
+
+ -- Sune Vuorela <sune at debian.org> Wed, 03 Apr 2013 18:25:01 +0000
+
konsole (4:4.10.2-0ubuntu1) raring; urgency=low
* New upstream bugfix release
@@ -99,6 +137,70 @@ konsole (4:4.8.80-0ubuntu1) quantal; urgency=low
-- Jonathan Riddell <jriddell at ubuntu.com> Wed, 06 Jun 2012 14:29:24 +0100
+konsole (4:4.8.4-3) unstable; urgency=low
+
+ * Team upload.
+
+ [ Maximiliano Curia ]
+ * Reduces vertical misalignment (Closes: #672554)
+ - Add drawText-alignBottom.diff, this adds alignBottom flag to the
+ bidirectional renderer.
+ - Add avoid-lineSpacing.diff, this reverts the added linespacing for the
+ unidirectional renderer.
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 19 Feb 2013 12:44:09 +0100
+
+konsole (4:4.8.4-2) unstable; urgency=low
+
+ * Team upload.
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * konsole-dbg now recommends kdelibs5-dbg.
+
+ [ Pino Toscano ]
+ * Backport upstream commit e48cee6cca742a5bdb3daf6fa0b7c76073217faa to avoid
+ looking up executables when an absolute path is specified; patch
+ upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch.
+
+ -- Pino Toscano <pino at debian.org> Sat, 08 Dec 2012 13:18:32 +0100
+
+konsole (4:4.8.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * Team upload.
+
+ [ Eshat Cakar ]
+ * Add watch file.
+ * Bump kde-sc-dev-latest build dependency to version 4:4.8.4.
+ * Fix lintian maintainer-script-without-set-e message.
+
+ [ José Manuel Santamaría Lema ]
+ * Add one_profile_per_window.diff, this allows one to open new tabs
+ with ctrl+shift+t in a remote shell.
+
+ -- Modestas Vainius <modax at debian.org> Sun, 10 Jun 2012 15:13:29 +0300
+
+konsole (4:4.8.3-1) experimental; urgency=low
+
+ * New upstream release:
+ - konsole does not require a restart to use newly installed fonts.
+ (Closes: #457218)
+ - konsole does not fail to draw bright colors in screen when TERM is set
+ to xterm-256colors. (Closes: #531752)
+ - "Show in menu" works even with languages than English. (Closes: #576148)
+ - konsole correctly sets the number of terminal lines and columns.
+ (Closes: #606617)
+ * Team upload.
+
+ [ Eshat Cakar ]
+ * Bump kde-sc-dev-latest build dependency to version 4:4.8.3.
+ * Bump Standards-Version to 3.9.3, no changes needed.
+
+ [ Modestas Vainius ]
+ * Add myself to Uploaders.
+
+ -- Modestas Vainius <modax at debian.org> Sun, 27 May 2012 15:44:15 +0300
+
konsole (4:4.8.3-0ubuntu1) quantal; urgency=low
* New upstream release
@@ -141,6 +243,18 @@ konsole (4:4.7.90-0ubuntu1) precise; urgency=low
-- Jonathan Riddell <jriddell at ubuntu.com> Fri, 16 Dec 2011 13:14:43 +0000
+konsole (4:4.7.4-2) unstable; urgency=low
+
+ * Team upload. Upload to unstable.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Tue, 06 Mar 2012 11:47:50 +0100
+
+konsole (4:4.7.4-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 18 Dec 2011 01:36:53 +0100
+
konsole (4:4.7.3-0ubuntu1) precise; urgency=low
* New upstream release
@@ -148,6 +262,13 @@ konsole (4:4.7.3-0ubuntu1) precise; urgency=low
-- Jonathan Riddell <jriddell at ubuntu.com> Wed, 23 Nov 2011 23:47:03 +0000
+konsole (4:4.7.2-1) experimental; urgency=low
+
+ [ Eshat Cakar ]
+ * Initial release. Start from the Ubuntu packaging, thanks!
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 03 Dec 2011 10:46:16 -0300
+
konsole (4:4.7.2-0r1) raring; urgency=low
* Initial release. Start from the Ubuntu packaging, thanks!
@@ -194,3 +315,4 @@ konsole (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low
* 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 1ca5ce6..e88ec3f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,14 @@ Section: kde
Priority: optional
Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: José Manuel Santamaría Lema <panfaust at gmail.com>,
- Eshat Cakar <info at eshat.de>
-Build-Depends:
+Uploaders: Sune Vuorela <sune at debian.org>,
+ Eshat Cakar <info at eshat.de>,
+ Modestas Vainius <modax at debian.org>
+Build-Depends: kde-sc-dev-latest (>= 4:4.10.1),
cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.10.2), libphonon-dev (>= 4:4.3.0),
- libxkbfile-dev, libkonq5-dev (>= 4:4.10.2)
-Standards-Version: 3.9.2
+ kdelibs5-dev (>= 4:4.10), libkonq5-dev (>=4:4.10), libphonon-dev (>= 4:4.3.0),
+ libxkbfile-dev
+Standards-Version: 3.9.3
Homepage: http://www.kde.org/
Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/konsole
Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/konsole
@@ -36,6 +37,7 @@ Priority: extra
Depends: ${misc:Depends}, konsole (= ${binary:Version})
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.lintian-overrides b/debian/konsole.lintian-overrides
index ed646d5..8a0d209 100644
--- a/debian/konsole.lintian-overrides
+++ b/debian/konsole.lintian-overrides
@@ -1,3 +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
index 45ae5ed..a4f85b8 100644
--- a/debian/konsole.postinst
+++ b/debian/konsole.postinst
@@ -1,4 +1,6 @@
-#! /bin/sh -e
+#! /bin/sh
+
+set -e
case "$1" in
configure)
diff --git a/debian/konsole.prerm b/debian/konsole.prerm
index 455ae63..2de7dd2 100644
--- a/debian/konsole.prerm
+++ b/debian/konsole.prerm
@@ -1,4 +1,6 @@
-#! /bin/sh -e
+#! /bin/sh
+
+set -e
case "$1" in
remove)
diff --git a/debian/patches/debian-T-addition.diff b/debian/patches/debian-T-addition.diff
index 1b63334..4c8900e 100644
--- a/debian/patches/debian-T-addition.diff
+++ b/debian/patches/debian-T-addition.diff
@@ -1,12 +1,11 @@
-Index: konsole-4.8.80/src/main.cpp
-===================================================================
---- konsole-4.8.80.orig/src/main.cpp 2012-05-24 08:12:37.000000000 +0100
-+++ konsole-4.8.80/src/main.cpp 2012-06-06 14:30:31.999789567 +0100
-@@ -176,6 +176,7 @@
- options.add("list-profile-properties",
- ki18n("List all the profile properties names and their type"
+Index: konsole/src/main.cpp
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -184,6 +184,7 @@ void fillCommandLineOptions(KCmdLineOpti
" (for use with -p)"));
-+ options.add("T <value>", ki18n("Debian policy compatibility, not used"));
options.add("p <property=value>",
ki18n("Change the value of a profile property."));
++ options.add("T <value>", ki18n("Debian policy compatibility, not used"));
options.add("!e <cmd>",
+ ki18n("Command to execute. This option will catch all following"
+ " arguments, so use it as the last option."));
diff --git a/debian/rules b/debian/rules
index faa8db7..b45b11f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,9 @@
include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+override_dh_auto_configure:
+ $(overridden_command) -- -DKDE4_BUILD_TESTS=false
+
.PHONY: override_dh_auto_test
override_dh_strip:
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..3b6a535
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kde.org/pub/kde/stable/([\d\.]*)/src/konsole-([\d\.]*).tar.xz
--
konsole packaging
More information about the pkg-kde-commits
mailing list