[SCM] konsole packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit a50e7fdb88a98e9646f10fe10050ee2f53e4c286
Merge: 1e9db14c6549048e25fc64d4d0bffe5609c5f38e ce856ee0487cfab9e6ae853d144d8f224039609b
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Wed Apr 3 20:28:39 2013 +0000

    Update uploaders and such and merge master

 debian/changelog                      |   21 +++++++++++++++++++--
 debian/control                        |    2 +-
 debian/patches/debian-T-addition.diff |    1 +
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 73a7c03,d6449d1..871b2d1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,28 +1,41 @@@
- konsole (4:4.10.1-0r1) UNRELEASED; urgency=low
+ konsole (4:4.10.2-1) experimental; urgency=low
  
 -  * Team upload.
 +  * 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.
  
-  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 11 Jan 2013 23:49:28 +0100
+   [ Sune Vuorela ]
 -  * New upstream release
 -    - Fixes homedir fallback. (Closes: #586030)
 -    - Refresh patches
 -    - Drop patches found at upstream
+   * 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
  
diff --cc debian/control
index 53b4c00,b838d9a..d5a690b
--- a/debian/control
+++ b/debian/control
@@@ -2,12 -2,12 +2,12 @@@ Source: konsol
  Section: kde
  Priority: optional
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Uploaders: José Manuel Santamaría Lema <panfaust at gmail.com>,
+ 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.8.4),
 +Build-Depends: kde-sc-dev-latest (>= 4:4.10.1),
   cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
 - kdelibs5-dev (>= 4:4.8), libkonq5-dev (>=4:4.8), libphonon-dev (>= 4:4.3.0),
 + 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/
diff --cc debian/patches/debian-T-addition.diff
index 8a48e55,f9cd802..4c8900e
--- a/debian/patches/debian-T-addition.diff
+++ b/debian/patches/debian-T-addition.diff
@@@ -1,6 -1,8 +1,7 @@@
+ Index: konsole/src/main.cpp
 -===================================================================
 ---- konsole.orig/src/main.cpp	2013-04-03 19:44:13.305306792 +0000
 -+++ konsole/src/main.cpp	2013-04-03 19:44:13.301306811 +0000
 -@@ -184,6 +184,7 @@
 +--- a/src/main.cpp
 ++++ b/src/main.cpp
 +@@ -184,6 +184,7 @@ void fillCommandLineOptions(KCmdLineOpti
                         " (for use with -p)"));
       options.add("p <property=value>",
                   ki18n("Change the value of a profile property."));

-- 
konsole packaging