[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:41 UTC 2014


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

The following commit has been merged in the master branch:
commit be823a29ada570029bc86b0e44d378ec620a886a
Merge: 296fdfaf3f8a592647e8240132d4d8468bc2a55e e039d94b447d5f27f1fc93909013e0a484ef5b6c
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jul 31 11:44:18 2014 +0200

    Merge commit 'e039d94b447d5f27f1fc93909013e0a484ef5b6c'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/watch

 debian/changelog | 460 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/control   |   5 +-
 2 files changed, 464 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 856aefc,71edf4c..042a175
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +konsole (4:4.13.3-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:05:10 +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.
@@@ -191,3 -192,457 +198,456 @@@ konsole (4:4.7.2-1) experimental; urgen
    * 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
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 10 Apr 2014 22:10:34 +0100
+ 
+ konsole (4:4.12.97-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 02 Apr 2014 11:35:18 +0200
+ 
+ konsole (4:4.12.95-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Sun, 23 Mar 2014 12:36:42 +0100
+ 
+ konsole (4:4.12.90-0ubuntu1) trusty; urgency=medium
+ 
+   [ Rohan Garg ]
+   * Update install file
+ 
+   [ Jonathan Riddell ]
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 11:07:26 +0000
+ 
+ konsole (4:4.12.3-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 04 Mar 2014 20:57:08 +0100
+ 
+ konsole (4:4.12.2-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 05 Feb 2014 00:09:10 +0000
+ 
+ konsole (4:4.12.1-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 16 Jan 2014 08:24:58 +0000
+ 
+ konsole (4:4.12.0-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Dec 2013 17:18:28 +0000
+ 
+ konsole (4:4.11.97-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 29 Nov 2013 13:18:45 +0000
+ 
+ konsole (4:4.11.95-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 25 Nov 2013 18:16:08 +0100
+ 
+ konsole (4:4.11.80-0ubuntu1) trusty; urgency=low
+ 
+   [ Rohan Garg ]
+   * New upstream beta release
+ 
+   [ Jacky Alciné ]
+   * Update konsole.install with missing color scheme.
+ 
+  -- Jacky Alciné <me at jalcine.me>  Sat, 23 Nov 2013 17:46:20 +0100
+ 
+ konsole (4:4.11.2-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 30 Sep 2013 14:34:02 +0100
+ 
+ konsole (4:4.11.1-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bugfix release.
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Fri, 06 Sep 2013 22:28:16 +0100
+ 
+ konsole (4:4.11.0-0ubuntu1) saucy; urgency=low
+ 
+   [ Howard Chan ]
+   * New upstream release
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 14 Aug 2013 00:23:37 +0100
+ 
+ konsole (4:4.10.97-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream RC 2 release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 26 Jul 2013 19:44:40 +0100
+ 
+ konsole (4:4.10.95-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 19 Jul 2013 12:32:50 +0000
+ 
+ konsole (4:4.10.90-0ubuntu1) saucy; urgency=low
+ 
+   [ Michał Zając ]
+   * 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
+ 
+ konsole (4:4.10.80-0ubuntu1) saucy; urgency=low
+ 
+   [ Rohan Garg ]
+   * 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
+ 
+ konsole (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 07 Jun 2013 00:39:06 +0100
+ 
+ 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
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 31 Mar 2013 14:54:08 +0200
+ 
+ konsole (4:4.10.1-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 05 Mar 2013 16:35:14 +0000
+ 
+ konsole (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+ 
+   [ Rohan Garg ]
+   * New upstream release
+ 
+   [ Philip Muškovac ]
+   * Update konsole.install and sort it
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 12:00:15 +0000
+ 
+ konsole (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 18 Jan 2013 15:48:29 +0000
+ 
+ konsole (4:4.9.97-0ubuntu1) raring; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Thu, 03 Jan 2013 22:40:13 +0100
+ 
+ konsole (4:4.9.95-0ubuntu1) raring; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Dec 2012 23:36:34 +0000
+ 
+ konsole (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 18:02:30 +0000
+ 
+ konsole (4:4.9.80-0ubuntu1) raring; urgency=low
+ 
+   * New upstream beta release
+   * Remove ControlDragSettings.diff now upstream
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 19 Nov 2012 16:01:56 +0000
+ 
+ konsole (4:4.9.3-0ubuntu1) raring; urgency=low
+ 
+   * New upstream release (LP: #1074747)
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 06 Nov 2012 22:39:18 +0100
+ 
+ konsole (4:4.9.2-0ubuntu1) quantal-proposed; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 02 Oct 2012 15:30:51 +0100
+ 
+ konsole (4:4.9.1-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <apachelogger at ubuntu.com>  Mon, 10 Sep 2012 18:35:48 +0530
+ 
+ konsole (4:4.9.0-0ubuntu1) quantal; urgency=low
+ 
+   * Use direct build-depends versions rather than kde-sc-dev-latest
+   * New upstream release
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 26 Jul 2012 22:29:34 +0100
+ 
+ konsole (4:4.8.90-0ubuntu2) quantal; urgency=low
+ 
+   * Backport Git commit ed31a8b0aa6fcd45177202a60db7167e2498c80f from master
+     (to be KDE SC 4.10)
+     - Adds a GUI checkbox per profile to enable/disable requiring the
+       CTRL key to drag-n-drop text.
+       The default is to require the CTRL key as before.
+ 
+  -- Scott Kitterman <scott at kitterman.com>  Fri, 06 Jul 2012 17:21:45 -0400
+ 
+ konsole (4:4.8.90-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream beta release.
+ 
+  -- Felix Geyer <debfx at ubuntu.com>  Mon, 11 Jun 2012 23:34:57 +0200
+ 
+ konsole (4:4.8.80-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream release
+ 
+  -- 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
+ 
+  -- Jonathan Kolberg <bulldog98 at kubuntu.org>  Thu, 03 May 2012 20:46:30 +0200
+ 
+ konsole (4:4.8.2-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Mon, 02 Apr 2012 18:49:48 +0200
+ 
+ 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
+ 
+ konsole (4:4.8.0-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 20 Jan 2012 12:10:32 +0000
+ 
+ konsole (4:4.7.97-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 05 Jan 2012 12:18:30 +0000
+ 
+ konsole (4:4.7.95-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sat, 24 Dec 2011 20:44:01 +0100
+ 
+ konsole (4:4.7.90-0ubuntu1) precise; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- 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
+   * Merge with Debian Git, no changes
+ 
+  -- 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!
+ 
+  -- Eshat Cakar <info at eshat.de>  Tue, 04 Oct 2011 17:46:40 +0200
+ 
+ konsole (4:4.7.2-0ubuntu1) oneiric-proposed; urgency=low
+ 
+   [ Rohan Garg ]
+   * 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
+ 
+ konsole (4:4.7.1-0ubuntu2) oneiric; urgency=low
+ 
+   * No-change rebuild so translations aren't stripped from .desktop
+     files anymore.
+ 
+  -- Felix Geyer <debfx-pkg at fobos.de>  Fri, 16 Sep 2011 01:01:47 +0200
+ 
+ konsole (4:4.7.1-0ubuntu1) oneiric; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Kolberg <bulldog98 at kubuntu-de.org>  Thu, 08 Sep 2011 13:18:47 -0400
+ 
+ konsole (4:4.7.0-0ubuntu1) oneiric; urgency=low
+ 
+   [ Jonathan Thomas ]
+   * New upstream release
+ 
+   [ Felix Geyer ]
+   * Fix dependency from konsole-dbg on konsole.
+ 
+  -- Felix Geyer <debfx-pkg at fobos.de>  Fri, 29 Jul 2011 11:21:21 +0200
+ 
+ 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 --cc debian/control
index fb2a94e,9fae9f8..328dd9a
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
  Source: konsole
  Section: kde
  Priority: optional
- Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 -Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 -XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
++Maintainer: Debian/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>,
             Modestas Vainius <modax at debian.org>,
@@@ -17,8 -18,10 +18,10 @@@ Build-Depends: cmake
  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://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
 +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
  Architecture: any

-- 
konsole packaging



More information about the pkg-kde-commits mailing list