[SCM] konsole packaging branch, master, updated. debian/16.12.0-1-24-g209481c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b7a0c25a8cd4e1f209eab833921135f358cca32a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu May 11 14:49:00 2017 +0200

    Add patch: Update-release-date-scripting-and-command-line-help.patch
    
    Cherry-Picked from "Update release/date, scripting and command line
    help" (792eda5).
    Update manpage. KDE#373905
    
    Gbp-Dch: Full
---
 ...ease-date-scripting-and-command-line-help.patch | 112 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 2 files changed, 113 insertions(+)

diff --git a/debian/patches/Update-release-date-scripting-and-command-line-help.patch b/debian/patches/Update-release-date-scripting-and-command-line-help.patch
new file mode 100644
index 0000000..35d33d4
--- /dev/null
+++ b/debian/patches/Update-release-date-scripting-and-command-line-help.patch
@@ -0,0 +1,112 @@
+From: Kurt Hindenburg <kurt.hindenburg at gmail.com>
+Date: Sat, 28 Jan 2017 12:43:26 -0500
+Subject: Update release/date, scripting and command line help
+
+Add more info about using dbus with Konsole's envirnomental variables
+and re-add --nofork help
+
+BUG: 373905
+---
+ doc/manual/index.docbook | 55 ++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 44 insertions(+), 11 deletions(-)
+
+diff --git a/doc/manual/index.docbook b/doc/manual/index.docbook
+index 964a6bb7..d9fc5d1e 100644
+--- a/doc/manual/index.docbook
++++ b/doc/manual/index.docbook
+@@ -38,14 +38,14 @@
+ <holder>&Jonathan.Singer;</holder>
+ </copyright>
+ <copyright>
+-    <year>2005</year><year>2008</year><year>2009</year><year>2010</year><year>2011</year><year>2014</year><year>2016</year>
++    <year>2005</year><year>2008</year><year>2009</year><year>2010</year><year>2011</year><year>2014</year><year>2016</year><year>2017</year>
+ <holder>&Kurt.Hindenburg;</holder>
+ </copyright>
+ 
+ <legalnotice>&FDLNotice;</legalnotice>
+ 
+-<date>2016-07-09</date>
+-<releaseinfo>Applications 16.08</releaseinfo>
++<date>2017-01-28</date>
++<releaseinfo>Applications 17.04</releaseinfo>
+ 
+ <abstract><para>&konsole; is &kde;'s terminal emulator.</para></abstract>
+ 
+@@ -1137,6 +1137,7 @@ Empty lines or lines with <userinput>#</userinput> at the beginning are ignored,
+ 
+ <varlistentry>
+ <term><option>--separate</option></term>
++<term><option>--nofork</option></term>
+ <listitem><para><action>Run</action> the new instance of &konsole; in a separate process.
+ </para></listitem>
+ </varlistentry>
+@@ -1254,17 +1255,54 @@ will display methods for controlling window 1.
+ <listitem><para>
+ <prompt>%</prompt>
+ <command>qdbus</command>
++<option>org.kde.konsole $KONSOLE_DBUS_WINDOW</option>
++will display methods for controlling the current window.
++</para></listitem>
++
++<listitem><para>
++<prompt>%</prompt>
++<command>qdbus</command>
+ <option>org.kde.konsole /Sessions/1</option>
+ will display methods for controlling session 1.
+ </para></listitem>
+ 
++<listitem><para>
++<prompt>%</prompt>
++<command>qdbus</command>
++<option>org.kde.konsole $KONSOLE_DBUS_SESSION</option>
++will display methods for controlling the current session.
++</para></listitem>
++
++<listitem><para>
++<prompt>%</prompt>
++<command>qdbus</command>
++<option>$KONSOLE_DBUS_SERVICE $KONSOLE_DBUS_SESSION</option>
++will display methods for controlling the current &konsole;'s session.
++</para></listitem>
++
+ </itemizedlist>
+ </para>
+ 
+ <para>
+-If you start &konsole; from a terminal you may need to change
+-<option>org.kde.konsole</option> to
+-<option>org.kde.konsole-`pidof -s konsole`</option>.
++If any of the above commands outputs:
++Service 'org.kde.konsole' does not exist, change
++<option>org.kde.konsole</option> to one of the following:
++
++<itemizedlist>
++
++<listitem><para>
++<option>org.kde.konsole-`pidof -s konsole`</option>
++(will select first pid)
++</para></listitem>
++<listitem><para>
++<option>$KONSOLE_DBUS_SERVICE</option>
++(this can be used from the current &konsole;)
++</para></listitem>
++<listitem><para>
++<option>select one from the output of 'qdbus | grep konsole'</option>
++</para></listitem>
++
++</itemizedlist>
+ </para>
+ 
+ <para>
+@@ -1413,11 +1451,6 @@ CommonDirNames=name1,name2,name3...
+ <title>Common Issues</title>
+ <itemizedlist>
+ 
+-<listitem><para>
+-Starting with version 16.08 (August 2016), &konsole; no longer uses KDE4's KUniqueApplication and thus <option>--nofork</option> no longer exists.
+-</para>
+-</listitem>
+-
+ <listitem>
+ <para>Some fonts might be unavailable for usage in &konsole;, although they are available in other applications. That doesn't mean there is a bug in &konsole;. &konsole; requires monospaced fonts to provide the best visual result, so it asks &Qt; to only list monospaced fonts.</para>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8ce772e..2e00283 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ Don-t-include-newlines-in-selection-if-trimming-is-on.patch
 Limit-ourselves-to-3-combining-characters.patch
 Fix-opening-of-new-tabs-with-multiple-processes.patch
 Allow-ANSI-string-terminator-to-work.patch
+Update-release-date-scripting-and-command-line-help.patch

-- 
konsole packaging