Merge ~cosmos-door/ubuntu/+source/byobu:fix-1845845-and-1843729 into ubuntu/+source/byobu:ubuntu/devel

[Mitsuya Shibata]

a2af5a2... by Mitsuya Shibata on 2019-10-11

just ignore pep/E117 instead of quilt patch

ref. https://bugs.launchpad.net/ubuntu/+source/byobu/+bug/1843729/comments/4

[Bryce Harrington (bryce)]

Shibatasan, I would recommend retargeting this MP to upstream byobu, it would be better to get their review and/or land it upstream. Thanks for working on this.

review: Abstain

[Lucas Kanashiro (lucaskanashiro)]

Hi Mitsuya Shibata,

Apparently the upstream git repository is more active on Github now [1]. Maybe you should try to submit the changes you proposed here [2] there.

After taking a look at the open PR I noticed the replacement of '-e' to '--' in byobu.desktop file was already proposed here [3]. You might want to +1 that change. The only missing part is the one you proposed to fix LP: #1845845 (the FTBFS was already fixed, so no need to change debian/rules).

[1] https://github.com/dustinkirkland/byobu
[2] https://code.launchpad.net/~cosmos-door/byobu/lp1845485/+merge/373378
[3] https://github.com/dustinkirkland/byobu/pull/46

Unmerged commits

a2af5a2... by Mitsuya Shibata on 2019-10-11

just ignore pep/E117 instead of quilt patch

ref. https://bugs.launchpad.net/ubuntu/+source/byobu/+bug/1843729/comments/4

1e2c2a3... by Mitsuya Shibata on 2019-10-09

update changelog

02fdabd... by Mitsuya Shibata on 2019-10-09

update gnome-terminal-server path for libexec migration

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

5411d36... by Mitsuya Shibata on 2019-10-09

fix gnome-terminal deprecated option

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

0b5721a... by Mitsuya Shibata on 2019-10-09

fix ftbfs: LP: #1843729

* 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.

6c9be19... by Dustin Kirkland  on 2019-06-12

Import patches-unapplied version 5.129-0ubuntu1 to ubuntu/eoan-proposed

Imported using git-ubuntu import.

Changelog parent: 31fa249953a3dad048c582e80deff78021f556ca

New changelog entries:
  * debian/control:
    - recommend less package, for BYOBU_PAGER

31fa249... by Dustin Kirkland  on 2018-08-12

Import patches-unapplied version 5.128-0ubuntu1 to ubuntu/eoan-proposed

Imported using git-ubuntu import.

Changelog parent: 02fbfeb3f900b9e7af799b4f0abfe0740b8ac18f

New changelog entries:
  [ Dustin Kirkland ]
  * usr/bin/ctail:
    - Quotes are needed around "$@" to keep parameters from splitting
      on spaces.
    - https://github.com/dustinkirkland/byobu/pull/31
  * usr/lib/byobu/logo:
    - "SuSE" name is an outdated version of it. Use the modern one: SUSE
  * usr/lib/byobu/include/config.py.in, usr/lib/byobu/include/select-
    session.py:
    - use env python3 for portability to other Linux and Mac systems
      (hopefully that's still okay for Debian / Ubuntu?)
    - https://github.com/dustinkirkland/byobu/pull/29
  * usr/share/byobu/profiles/bashrc:
    - Unescaping colors in bash prompt causes problems with scrolling
      history in bash prompt. you can see leftovers from previous
      commands when going back by history.
      All colors in command prompt should be escaped with [ ]
    - https://github.com/dustinkirkland/byobu/pull/30
  * usr/lib/byobu/wifi_quality:
    - prefer iwconfig over iw for now, iw is not working for me
  * usr/share/byobu/profiles/tmux:
    - flatten some of our color configuration to match the new tmux format
  * usr/lib/byobu/disk_io:
    - ensure some values are set to zero, if unreadable
    - fixes a bug where disk_io causes the rest of the status line to fail
  * usr/lib/byobu/include/select-session.py: LP: #1750430
    - fix bug creating a mess of sessions, where cycling through a bunch
      of copies of the same session
  [ Fede Luzzi ]
  * usr/lib/byobu/include/mondrian, usr/share/byobu/profiles/tmux:
    - On tmux version 1.9 all the styles *-bg/fg/attr were deprecated and
      replaced with *-style bg=/ fg=/ attribute
      In the upcoming version 2.9, this commands are gone and will break
      byobu style. this fix that issue and mantain compatibility with upcoming
      tmux versions.
  [ Paride Legovini ]
  * debian/source_byobu.py:
    - Do not include the user's .screenrc in the apport generated crash report
  [ Jeffery To ]
  * usr/bin/byobu-disable-prompt.in,
    usr/bin/byobu-janitor.in:
    - Test if $HOME/.bashrc exists before modifying it (and potentially
      creating it)
  * usr/bin/byobu-export.in:
    - Use echo if the gettext command is not available
  * usr/bin/byobu.in:
    - Use readlink if the tty command is not available
  * usr/bin/byobu-janitor.in:
    - Add fallback if the install command is not available
  * usr/bin/byobu-launch.in:
    - Don't autolaunch for ARM serial consoles
  * usr/lib/byobu/disk_io:
    - Ensure the detected mount point device exists
  * usr/lib/byobu/hostname:
    - Read from /proc/sys/kernel/hostname if the hostname command is not
      available
  * usr/lib/byobu/logo:
    - Add logo for OpenWrt
  * usr/lib/byobu/processes:
    - Handle stderr for ps, e.g. unsupported options
    - Remove unnecessary awk call; wc -l only outputs one value
  * usr/lib/byobu/raid:
    - Ensure /proc/mdstat is readable
  * usr/lib/byobu/release:
    - Fix typo
  * usr/lib/byobu/services:
    - Fix reading services from $BYOBU_CONFIG_DIR/statusrc
  * usr/lib/byobu/session:
    - Fix screen session regex
  * usr/lib/byobu/updates_available:
    - Add support for opkg (OpenWrt)
  * usr/lib/byobu/users:
    - Handle stderr for ps, e.g. unsupported options
    - Fix trailing '#' sign
  * usr/lib/byobu/whoami:
    - Use id if the whoami command is not available
    - Read from /etc/passwd if the getent command is not available
  * usr/lib/byobu/wifi_quality:
    - Add support for iw (preferred over iwconfig)
    - Make logic more similar to other status notifications
  * usr/share/byobu/keybindings/f-keys.tmux:
    - Remove -k for new-window. In older versions of tmux, -k without
      -t <target-window> had no effect. In tmux 2.8, -k without -t will
      not trigger a new window; the given command is executed in the
      current window instead.
    - Rename the new window created after adding a new session

02fbfeb... by Dustin Kirkland  on 2018-05-27

Import patches-unapplied version 5.127-0ubuntu1 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: d02277fdc52cdd4797d373f9d4291ecb14f709ce

New changelog entries:
  * usr/share/byobu/profiles/bashrc:
    - Googley PS1 for non-Ubuntu distros
  * usr/lib/byobu/logo, usr/share/byobu/profiles/bashrc:
    - use Google lego logo for gLinux
  * usr/lib/byobu/logo: LP: #1769676
    - don't use the Ubuntu logo in the status line, as this breaks ssh
      clients coming to Ubuntu from other OSes without the Ubuntu font
  * usr/lib/byobu/include/shutil, usr/lib/byobu/Makefile.am,
    usr/lib/byobu/rcs_cost, usr/share/byobu/status/status,
    usr/share/man/man1/byobu.1,
    usr/lib/byobu/ec2_cost,
    usr/lib/byobu/include/ec2instancespricing.py,
    usr/lib/byobu/include/Makefile.am, usr/lib/byobu/include/shutil,
    usr/lib/byobu/Makefile.am, usr/share/byobu/status/status,
    usr/share/man/man1/byobu.1,
  * usr/bin/byobu-janitor.in:
    - deprecate unmaintained ec2/rcs pricing functionality
    - this never really worked well, and these prices are constantly changing
    - clear out stale status cache
  * debian/control, usr/lib/byobu/ip_address, usr/lib/byobu/network,
    usr/share/man/man1/wifi-status.1: LP: #1748956
    - switch entirely to iproute2, away from net-tools and ifconfig
    - only remaining ifconfig is fall-back logic, in case /sbin/ip is
      not found
  * usr/share/byobu/desktop/byobu.desktop: LP: #1739708
    - update categories so that Byobu can show up in Cinnamon/Mint's
      preferred applications list
  * usr/share/byobu/pixmaps/byobu.14.png,
    usr/share/byobu/pixmaps/byobu.192.png,
    usr/share/byobu/pixmaps/byobu.64.png,
    usr/share/byobu/pixmaps/byobu.png:
    - re-render png's, as Chrome started rendering middle color wrong
  * usr/bin/byobu-select-profile.in, usr/share/man/man1/byobu-select-
    profile.1: LP: #1717746
    - deprecate interactive mode for byobu-select-profile
  * usr/lib/byobu/include/toggle-utf8.in: LP: #1696546
    - try to support zsh and other shells in addition to bash
  * usr/bin/byobu-shell.in:
    - update getting started to byobu.org
  * usr/share/byobu/profiles/tmux: LP: #1617689
    - add a comment about motd printing
  * usr/share/man/man1/byobu.1: LP: #1618185
    - update documentation on setting a logo
  * debian/compat, debian/control:
  * debian/compat, debian/control, usr/lib/byobu/include/config.py.in,
    usr/lib/byobu/include/select-session.py:
    - neverending fight with lintian
    - hardcode python3 as our interpreter
  * usr/lib/byobu/include/shutil:
    - check for lsb-release before using (not present on Debian)
  * usr/share/byobu/profiles/bashrc:
    - fix missing bash 256 ps1 colors

d02277f... by Dustin Kirkland  on 2018-03-16

Import patches-unapplied version 5.126-0ubuntu1 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: d1cfb1c8eacb2fd5cfef8a4f8abb38e1f25b0403

New changelog entries:
  [ Dustin Kirkland ]
  * usr/lib/byobu/include/constants, usr/share/byobu/keybindings/f-
    keys.screen, usr/share/byobu/keybindings/f-keys.tmux:
    - create a $BYOBU_EDITOR variable, using "sensible-editor" if found
      (it will be on Debian/Ubuntu systems), or $EDITOR if not, and falling
      back to "vim" in the case where none are found
    - use $BYOBU_EDITOR with Shift-F7 to open the printscreen buffer in
      a new window; this fixes a bug on some distros where $EDITOR might
      be undefined
  * usr/lib/byobu/session:
    - don't count sessions that start with _
    - BUG: #892489
  * usr/lib/byobu/include/shutil, usr/lib/byobu/logo:
    - add a logo for gLinux
  [ Mark Kelly ]
  * usr/lib/byobu/updates_available:
    - Fix rare race condition for update_needed and cache file (#26)
    - https://github.com/dustinkirkland/byobu/pull/26
  [ Didier Roche ]
  * byobu.desktop:
    - give some hints for GNOME Shell to correctly match byobu desktop file
      (LP: #1718482); partial fix, not entirely working yet

d1cfb1c... by Dustin Kirkland  on 2017-12-04

Import patches-unapplied version 5.125-0ubuntu1 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: a8309fc2fdeab5d748e67be72385458703d6a2fe

New changelog entries:
  [ Jean-Baptiste Lallement ]
  * usr/share/byobu/profiles/dircolors: LP: #1752352
    - fix blinking symlinks
  [ Chow Loong Jin ]
  * usr/lib/byobu/include/select-session.py:
   - Fix cull_zombies() so that we properly cull zombies of sessions that
     have non-numeric session names
   - Allow the dynamic session-creation behaviour to be disabled by
     creating ~/.byobu/.reuse-session
  [ Dustin Kirkland ]
  * debian/control:
    - need sensible-utils

diff --git a/debian/changelog b/debian/changelog
index a12847e..4413d55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+byobu (5.129-0ubuntu2) eoan; urgency=medium
+
+  * debian/rules:
+    - use autoreconf addon to make call dh_auto_configure.
+  * debian/rules:
+    - ignoring E117 of pep8 to avoid ftbfs: LP: #1843729
+  * usr/share/byobu/desktop/byobu.desktop:
+    - use '--' instead of deprecated option '-e'.
+  * debian/postinst:
+    - update gnome-terminal-server path for libexec migration: LP: #1845845
+
+ -- Mitsuya Shibata <[e-mail]>  Fri, 11 Oct 2019 21:12:23 +0900
+
 byobu (5.129-0ubuntu1) eoan; urgency=medium
 
   * debian/control:
diff --git a/debian/patches/fix-deprecated-temrinal-option.patch b/debian/patches/fix-deprecated-temrinal-option.patch
new file mode 100644
index 0000000..47c7911
--- /dev/null
+++ b/debian/patches/fix-deprecated-temrinal-option.patch
@@ -0,0 +1,16 @@
+Description: fix deprecated gnome-terminal option
+Author: Mitsuya Shibata <[e-mail]>
+Origin: https://code.launchpad.net/~cosmos-door/byobu/lp1845485
+Index: byobu/usr/share/byobu/desktop/byobu.desktop
+===================================================================
+--- byobu.orig/usr/share/byobu/desktop/byobu.desktop
++++ byobu/usr/share/byobu/desktop/byobu.desktop
+@@ -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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..40dc836
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-deprecated-temrinal-option.patch
diff --git a/debian/postinst b/debian/postinst
index 20f30db..b45d1b9 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -13,7 +13,7 @@ else
 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
diff --git a/debian/rules b/debian/rules
index 51deb5d..f651eae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,11 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --with python3
+	dh $@ --with autoreconf,python3
 
 override_dh_auto_build:
 	# Check python syntax
-	pep8 --verbose --repeat --ignore W191,E501 usr/lib/byobu/include/config.py usr/lib/byobu/include/select-session.py
+	## Note: ignoring E117 is workaround for LP: #1843729
+	pep8 --verbose --repeat --ignore W191,E501,E117 usr/lib/byobu/include/config.py usr/lib/byobu/include/select-session.py
 	# Check shell syntax
 	sh -n `find . -type f -exec grep -l "^\#\!/bin/sh" '{}' \;`
 	# Check for bashisms in shell scripts