[SCM] konsole packaging branch, master, updated. debian/16.12.0-1-15-gc4bb01c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit ea10d49bc4d35577afed1a1c6ab2f18780dcbe10
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 27 13:40:13 2017 +0200

    Refresh patches
    
    Gbp-Dch: Ignore
---
 .../patches/Pre-process-the-e-custom-command-argument.patch   |  6 +++---
 .../upstream_render_text_at_primary_fonts_baseline.patch      | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/patches/Pre-process-the-e-custom-command-argument.patch b/debian/patches/Pre-process-the-e-custom-command-argument.patch
index 9fb763c..a6f033c 100644
--- a/debian/patches/Pre-process-the-e-custom-command-argument.patch
+++ b/debian/patches/Pre-process-the-e-custom-command-argument.patch
@@ -11,7 +11,7 @@ command to be executed.
  3 files changed, 35 insertions(+), 16 deletions(-)
 
 diff --git a/src/Application.cpp b/src/Application.cpp
-index 5b352ec..12ffe23 100644
+index 5b352ec9..12ffe230 100644
 --- a/src/Application.cpp
 +++ b/src/Application.cpp
 @@ -45,7 +45,7 @@
@@ -85,7 +85,7 @@ index 5b352ec..12ffe23 100644
      QCommandLineParser *parser = new QCommandLineParser;
      populateCommandLineParser(parser);
 diff --git a/src/Application.h b/src/Application.h
-index 8987d78..8ec7ab6 100644
+index 8987d789..8ec7ab6a 100644
 --- a/src/Application.h
 +++ b/src/Application.h
 @@ -50,9 +50,10 @@ class Application : public QObject
@@ -109,7 +109,7 @@ index 8987d78..8ec7ab6 100644
  }
  #endif  // APPLICATION_H
 diff --git a/src/main.cpp b/src/main.cpp
-index 26d3da9..e77597a 100644
+index 26d3da99..e77597ad 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
 @@ -112,9 +112,13 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* argv[])
diff --git a/debian/patches/upstream_render_text_at_primary_fonts_baseline.patch b/debian/patches/upstream_render_text_at_primary_fonts_baseline.patch
index 0695ad4..5e4c626 100644
--- a/debian/patches/upstream_render_text_at_primary_fonts_baseline.patch
+++ b/debian/patches/upstream_render_text_at_primary_fonts_baseline.patch
@@ -1,3 +1,7 @@
+From: Christoph Feck <cfeck at kde.org>
+Date: Mon, 27 Mar 2017 11:05:41 +0200
+Subject: upstream_render_text_at_primary_fonts_baseline
+
 commit 7e2f9d839f5af447a0fc7fd178dd5d8f58e489bb
 Author: Christoph Feck <cfeck at kde.org>
 Date:   Wed Dec 7 20:12:59 2016 +0100
@@ -15,10 +19,15 @@ Date:   Wed Dec 7 20:12:59 2016 +0100
     
     REVIEW: 129281
     CCBUG: 371687
+---
+ src/TerminalDisplay.cpp | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
 
+diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
+index dd911779..1d70d7c2 100644
 --- a/src/TerminalDisplay.cpp
 +++ b/src/TerminalDisplay.cpp
-@@ -855,18 +855,10 @@
+@@ -855,18 +855,10 @@ void TerminalDisplay::drawCharacters(QPainter& painter,
          // This still allows RTL characters to be rendered in the RTL way.
          painter.setLayoutDirection(Qt::LeftToRight);
  

-- 
konsole packaging