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

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 21 15:06:26 UTC 2017


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

The following commit has been merged in the master branch:
commit 4b772967a87037d30523a363fa8c1fd84a4dc55e
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jul 7 10:11:36 2016 +0100

    remove debian-T-addition.diff now in konsole git
---
 debian/patches/debian-T-addition.diff | 39 -----------------------------------
 1 file changed, 39 deletions(-)

diff --git a/debian/patches/debian-T-addition.diff b/debian/patches/debian-T-addition.diff
deleted file mode 100644
index 45c25a7..0000000
--- a/debian/patches/debian-T-addition.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-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
-@@ -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



More information about the pkg-kde-commits mailing list