[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:40 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/konsole.git;a=commitdiff;h=e039d94
The following commit has been merged in the master branch:
commit e039d94b447d5f27f1fc93909013e0a484ef5b6c
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date: Tue Jun 17 16:57:28 2014 +0100
merge with debian
---
debian/.gitattributes | 1 +
debian/changelog | 195 ++++++++++++++++++++++++++++++++++
debian/compat | 2 +-
debian/control | 28 +++--
debian/konsole.install | 5 +-
debian/patches/debian-T-addition.diff | 8 +-
debian/rules | 2 +-
debian/source/local-options | 1 +
debian/tests/control | 4 +
debian/tests/testsuite | 4 +
debian/tests/testsuite.xsession | 8 ++
11 files changed, 237 insertions(+), 21 deletions(-)
diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 5926415..71edf4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,198 @@
+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.
+ * Update install files.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 26 May 2014 13:32:55 +0200
+
+konsole (4:4.12.4-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 28 Apr 2014 12:25:35 +0200
+
+konsole (4:4.12.3-1) experimental; urgency=medium
+
+ [ Pino Toscano ]
+ * Drop patch hurd.diff, obsolete in konsole >= 4.12.
+
+ [ Maximiliano Curia ]
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 04 Mar 2014 00:06:34 +0100
+
+konsole (4:4.12.2-1) experimental; urgency=medium
+
+ * Build the unit tests.
+ * Add autopkgtests.
+ * Bump Standards-Version to 3.9.5, no changes needed.
+ * New upstream release.
+ * Update install files.
+ * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 10 Feb 2014 11:32:36 +0100
+
+konsole (4:4.11.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 08 Nov 2013 14:07:19 +0100
+
+konsole (4:4.11.2-1) experimental; urgency=low
+
+ * New upstream release.
+ * Refresh patches.
+ * Update install files.
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 08 Oct 2013 18:18:17 +0200
+
+konsole (4:4.10.5-2) unstable; urgency=low
+
+ * Team upload.
+ * Fix build failure on Hurd; patch hurd.diff.
+
+ -- Pino Toscano <pino at debian.org> Tue, 16 Jul 2013 15:40:20 +0200
+
+konsole (4:4.10.5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 12 Jul 2013 16:25:28 +0200
+
+konsole (4:4.10.4-1) experimental; urgency=low
+
+ * New upstream release.
+ * Bump debhelper build-dep and compat to 9.
+ * Bump Standards-Version to 3.9.4.
+ * Update vcs fields.
+ * Add myself to uploaders.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 14 Jun 2013 14:07:32 +0200
+
+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.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.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.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.13.0-0ubuntu1) trusty; urgency=medium
* New upstream KDE Software Compilation release
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 4167165..9fae9f8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,22 +4,28 @@ 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: 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.13.0), libkonq5-dev (>= 4:4.13.0), libphonon-dev (>= 4:4.3.0),
- libxkbfile-dev
-Standards-Version: 3.9.3
+ Eshat Cakar <info at eshat.de>,
+ Modestas Vainius <modax at debian.org>,
+ Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake,
+ debhelper (>= 9),
+ kde-sc-dev-latest (>= 4:4.12),
+ kdelibs5-dev (>= 4:4.11),
+ libkonq5-dev (>= 4:4.11),
+ libphonon-dev (>= 4:4.3.0),
+ libxkbfile-dev,
+ pkg-kde-tools (>= 0.12)
+Standards-Version: 3.9.5
+XS-Testsuite: autopkgtest
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
-X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/konsole.git
-X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/konsole.git
+X-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/konsole.git
+X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/konsole.git
Package: konsole
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+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
@@ -34,7 +40,7 @@ Package: konsole-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: ${misc:Depends}, konsole (= ${binary:Version})
+Depends: konsole (= ${binary:Version}), ${misc:Depends}
Breaks: kdebase-dbg (<< 4:4.6.80)
Replaces: kdebase-dbg (<< 4:4.6.80)
Recommends: kdelibs5-dbg
diff --git a/debian/konsole.install b/debian/konsole.install
index 9039a93..5f41648 100644
--- a/debian/konsole.install
+++ b/debian/konsole.install
@@ -4,10 +4,7 @@ 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/en/konsole/common
-usr/share/doc/kde/HTML/en/konsole/draganddrop-contextmenu.png
-usr/share/doc/kde/HTML/en/konsole/index.cache.bz2
-usr/share/doc/kde/HTML/en/konsole/index.docbook
+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
diff --git a/debian/patches/debian-T-addition.diff b/debian/patches/debian-T-addition.diff
index 3000338..fb61327 100644
--- a/debian/patches/debian-T-addition.diff
+++ b/debian/patches/debian-T-addition.diff
@@ -1,8 +1,8 @@
-Index: b/src/main.cpp
+Index: konsole/src/main.cpp
===================================================================
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -184,6 +184,7 @@ void fillCommandLineOptions(KCmdLineOpti
+--- konsole.orig/src/main.cpp 2013-09-26 13:02:46.456857435 +0000
++++ konsole/src/main.cpp 2013-09-26 13:03:25.331385762 +0000
+@@ -184,6 +184,7 @@
" (for use with -p)"));
options.add("p <property=value>",
ki18nc("@info:shell", "Change the value of a profile property."));
diff --git a/debian/rules b/debian/rules
index b45b11f..4496f59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
override_dh_auto_configure:
- $(overridden_command) -- -DKDE4_BUILD_TESTS=false
+ $(overridden_command)
.PHONY: override_dh_auto_test
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..34cd609
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Tests: testsuite
+Depends: @, @builddeps@, build-essential,
+ xvfb, xauth, dbus-x11
+Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
new file mode 100755
index 0000000..fa0feb1
--- /dev/null
+++ b/debian/tests/testsuite
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+xvfb-run -a --server-args="-screen 0 1024x768x24" \
+ dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
new file mode 100755
index 0000000..7e49196
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,8 @@
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+kdeinit4
+dh_auto_test
+ret=$?
+kdeinit4_shutdown
+exit $ret
--
konsole packaging
More information about the pkg-kde-commits
mailing list