byobu

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

  1. lp1845485
  2. Merge into trunk
Proposed by Mitsuya Shibata
Status: Needs review
Proposed branch: lp:~cosmos-door/byobu/lp1845485
Merge into: lp:byobu
Prerequisite: lp:~cosmos-door/byobu/lp1843729
Diff against target: 40 lines (+6/-2)
3 files modified
debian/changelog (+4/-0)
debian/postinst (+1/-1)
usr/share/byobu/desktop/byobu.desktop (+1/-1)
To merge this branch: bzr merge lp:~cosmos-door/byobu/lp1845485
Reviewer Review Type Date Requested Status
Dustin Kirkland  Pending
Review via email: mp+373378@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
pdecat (pdecat) :
Reply
Revision history for this message
Mitsuya Shibata (cosmos-door) :
Reply
lp:~cosmos-door/byobu/lp1845485 updated
2627. By Mitsuya Shibata

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

Unmerged revisions

2627. By Mitsuya Shibata

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

2626. By Mitsuya Shibata

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

2625. By Mitsuya Shibata

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

2624. By Mitsuya Shibata

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2019-10-06 07:09:24 +0000
3+++ debian/changelog 2019-10-06 07:09:25 +0000
4@@ -10,6 +10,10 @@
5 - fix ftbfs: LP: #1843729
6 - during pep8 verification due to the newly
7 introduced E117 - ie. hard tab as over-indented spaces.
8+ * debian/postinst:
9+ - update gnome-terminal-server path for libexec migration: LP: #1845845
10+ * usr/share/byobu/desktop/byobu.desktop:
11+ - use '--' instead of deprecated option '-e'.
12
13 -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 12 Jun 2019 18:41:09 -0500
14
15
16=== modified file 'debian/postinst'
17--- debian/postinst 2015-12-02 19:35:05 +0000
18+++ debian/postinst 2019-10-06 07:09:25 +0000
19@@ -13,7 +13,7 @@
20 fi
21
22 # Install correct .desktop file
23-if [ -x /usr/lib/gnome-terminal/gnome-terminal-server ]; then
24+if [ -x /usr/lib/gnome-terminal/gnome-terminal-server -o -x /usr/libexec/gnome-terminal-server ]; then
25 ln -sf /usr/share/$PKG/desktop/$PKG.desktop /usr/share/applications/$PKG.desktop
26 else
27 ln -sf /usr/share/$PKG/desktop/$PKG.desktop.old /usr/share/applications/$PKG.desktop
28
29=== modified file 'usr/share/byobu/desktop/byobu.desktop'
30--- usr/share/byobu/desktop/byobu.desktop 2018-08-12 14:10:27 +0000
31+++ usr/share/byobu/desktop/byobu.desktop 2019-10-06 07:09:25 +0000
32@@ -2,7 +2,7 @@
33 Name=Byobu Terminal
34 Comment=Advanced Command Line and Text Window Manager
35 Icon=byobu
36-Exec=gnome-terminal --app-id us.kirkland.terminals.byobu --class=us.kirkland.terminals.byobu -e byobu
37+Exec=gnome-terminal --app-id us.kirkland.terminals.byobu --class=us.kirkland.terminals.byobu -- byobu
38 Type=Application
39 Categories=GNOME;GTK;System;Utility;TerminalEmulator;
40 StartupWMClass=us.kirkland.terminals.byobu

Subscribers

People subscribed via source and target branches