[SCM] konsole packaging branch, master, updated. debian/16.12.0-1-74-g5fbd59b

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 522a6f5cf22bdf71caf9bad458865cae1cf1001e
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jun 28 10:23:15 2016 +0200

    refresh debian-T-addition.diff and hide noop -T option
    
    also propose this to konsole devs as a permanent addition to konsole
---
 debian/patches/debian-T-addition.diff | 45 +++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/debian/patches/debian-T-addition.diff b/debian/patches/debian-T-addition.diff
index a3df596..45c25a7 100644
--- a/debian/patches/debian-T-addition.diff
+++ b/debian/patches/debian-T-addition.diff
@@ -1,14 +1,39 @@
+Description: add a debian compat option
+ debian policy for reasons beyond my apprehension wants a -T option to
+ set the window title (like in xterm).
+ to make debian's (and derivate's) life easier let's support a no-op
+ -T option but hide it. this option will not appear in --help output
+ but be accepted by the parser all the same.
+ 
+ this enables Debian and friends to drop a long standing useless patch
+ and at the same time prevents us from introducing a conflicting -T in
+ the future.
+Author: Harald Sitter <sitter at kde.org>
+Origin: vendor
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532029
+Forwarded: https://git.reviewboard.kde.org/r/128299/
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: konsole/src/main.cpp
 ===================================================================
 --- konsole.orig/src/main.cpp
 +++ konsole/src/main.cpp
-@@ -282,6 +282,9 @@ void fillCommandLineOptions(QCommandLine
-     parser.addOption(QCommandLineOption(QStringList() << "p",
-                                         i18nc("@info:shell", "Change the value of a profile property."),
-                                         QStringLiteral("property=value")));
-+    parser.addOption(QCommandLineOption(QStringList() << "T",
-+                                        i18nc("@info:shell", "Debian policy compatibility, not used."),
-+                                        QStringLiteral("value")));
-     parser.addOption(QCommandLineOption(QStringList() << "e",
-                                         i18nc("@info:shell", "Command to execute. This option will catch all following"
-                                               " arguments, so use it as the last option."),
+@@ -292,6 +292,18 @@ void fillCommandLineOptions(QCommandLine
+     parser.addPositionalArgument(QStringLiteral("[args]"),
+                                  i18nc("@info:shell", "Arguments passed to command"));
+ 
++    // Add a no-op compatibility option to make Konsole compatible with
++    // Debian's policy on X terminal emulators.
++    // -T is technically meant to set a title, that is not really meaningful
++    // for Konsole as we have multiple user-facing options controlling
++    // the title and overriding whatever is set elsewhere.
++    // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532029
++    // https://www.debian.org/doc/debian-policy/ch-customized-programs.html#s11.8.3
++    auto titleOption = QCommandLineOption(QStringList() << QStringLiteral("T"),
++                                          QStringLiteral("Debian policy compatibility, not used"),
++                                          QStringLiteral("value"));
++    titleOption.setHidden(true);
++    parser.addOption(titleOption);
+ }
+ 
+ void fillAboutData(KAboutData& aboutData)

-- 
konsole packaging