Merge lp:~cosmos-door/byobu/lp1845485 into lp:byobu

[Mitsuya Shibata]

* debian/postinst:
  - update gnome-terminal-server path for libexec migration: LP: #1845845
* usr/share/byobu/desktop/byobu.desktop:
  - use '--' instead of deprecated option '-e'.

FYI, deprecated message is hear

https://gitlab.gnome.org/GNOME/gnome-terminal/blob/master/src/terminal-options.c#L1037-1044

https://gitlab.gnome.org/GNOME/gnome-terminal/blob/master/src/terminal-options.c#L282-290

[lp:~cosmos-door/byobu/lp1845485]

2627. By Mitsuya Shibata on 2019-10-06

* debian/postinst:
  - support the old path for backward compatibility (thanks pdecat)

Unmerged revisions

2627. By Mitsuya Shibata on 2019-10-06

* debian/postinst:
  - support the old path for backward compatibility (thanks pdecat)

2626. By Mitsuya Shibata on 2019-09-29

* usr/share/byobu/desktop/byobu.desktop:
  - use '--' instead of deprecated option '-e'.

2625. By Mitsuya Shibata on 2019-09-29

* debian/postinst:
  - update gnome-terminal-server path for libexec migration: LP: #1845845

2624. By Mitsuya Shibata on 2019-09-29

* debian/rules
  - use autoreconf addon to make call dh_auto_configure.
* usr/lib/byobu/include/config.py.in,
  usr/lib/byobu/include/select-session.py:
  - fix ftbfs: LP: #1843729
  - during pep8 verification due to the newly
    introduced E117 - ie. hard tab as over-indented spaces.

=== modified file 'debian/changelog'
--- debian/changelog	2019-10-06 07:09:24 +0000
+++ debian/changelog	2019-10-06 07:09:25 +0000
@@ -10,6 +10,10 @@
     - fix ftbfs: LP: #1843729
     - during pep8 verification due to the newly
       introduced E117 - ie. hard tab as over-indented spaces.
+  * debian/postinst:
+    - update gnome-terminal-server path for libexec migration: LP: #1845845
+  * usr/share/byobu/desktop/byobu.desktop:
+    - use '--' instead of deprecated option '-e'.
 
  -- Dustin Kirkland <[e-mail]>  Wed, 12 Jun 2019 18:41:09 -0500
 
 
=== modified file 'debian/postinst'
--- debian/postinst	2015-12-02 19:35:05 +0000
+++ debian/postinst	2019-10-06 07:09:25 +0000
@@ -13,7 +13,7 @@
 fi
 
 # Install correct .desktop file
-if [ -x /usr/lib/gnome-terminal/gnome-terminal-server ]; then
+if [ -x /usr/lib/gnome-terminal/gnome-terminal-server -o -x /usr/libexec/gnome-terminal-server ]; then
 	ln -sf /usr/share/$PKG/desktop/$PKG.desktop /usr/share/applications/$PKG.desktop
 else
 	ln -sf /usr/share/$PKG/desktop/$PKG.desktop.old /usr/share/applications/$PKG.desktop
 
=== modified file 'usr/share/byobu/desktop/byobu.desktop'
--- usr/share/byobu/desktop/byobu.desktop	2018-08-12 14:10:27 +0000
+++ usr/share/byobu/desktop/byobu.desktop	2019-10-06 07:09:25 +0000
@@ -2,7 +2,7 @@
 Name=Byobu Terminal
 Comment=Advanced Command Line and Text Window Manager
 Icon=byobu
-Exec=gnome-terminal --app-id us.kirkland.terminals.byobu --class=us.kirkland.terminals.byobu -e byobu
+Exec=gnome-terminal --app-id us.kirkland.terminals.byobu --class=us.kirkland.terminals.byobu -- byobu
 Type=Application
 Categories=GNOME;GTK;System;Utility;TerminalEmulator;
 StartupWMClass=us.kirkland.terminals.byobu