github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-07-05 12:36:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnome-terminal-server, LP: #1512498

Browse source 
* === added directory usr/share/byobu/desktop, === added directory
  usr/share/dbus-1, === added directory usr/share/dbus-1/services,
  configure.ac, debian/control, debian/postinst, debian/postrm,
  Makefile.am, usr/share/applications/byobu.desktop =>
  usr/share/byobu/desktop/byobu.desktop,
  usr/share/applications/Makefile.am =>
  usr/share/byobu/desktop/Makefile.am,
  usr/share/byobu/desktop/byobu.desktop.old, usr/share/dbus-
  1/services/Makefile.am, usr/share/dbus-
  1/services/us.kirkland.terminals.byobu.service: LP: #1512498, #1503418
  - huge work around the mess that is gnome-terminal-server
  - install two different desktop files to /usr/share/byobu/desktops/*
  - in postinst, symlink the correct one into /usr/share/applications
  - clean up that conditionally installed symlink in postinst
  - suggest gnome-terminal package, as our new desktop file hardcodes
    gnome-terminal (this kind of sucks)
  - in byobu.desktop, exec gnome-terminal with a --app-id hint, and
    drop the Terminal=true, as gnome-terminal will take care of that
  - install a dbus service, as new gnome-terminal expects to launch
    via dbus
  - fqdn namespace that service to us.kirkland.terminals.byobu
    + this is stupid, btw
This commit is contained in:
Dustin Kirkland 2015-12-02 13:35:05 -06:00
parent 3da5660439
commit dcebea76d2
12 changed files with 54 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile.am
View file

@ -1,12 +1,13 @@
SUBDIRS = etc/byobu \
etc/profile.d \
usr/share/applications \
usr/share/byobu/desktop \
usr/share/byobu/keybindings \
usr/share/byobu/pixmaps \
usr/share/byobu/profiles \
usr/share/byobu/status \
usr/share/byobu/tests \
usr/share/byobu/windows \
usr/share/dbus-1/services \
usr/share/doc/byobu \
usr/lib/byobu \
usr/lib/byobu/include \

3
configure.ac
View file

@ -20,7 +20,6 @@ AC_OUTPUT(Makefile \
etc/byobu/Makefile \
etc/profile.d/Makefile \
etc/profile.d/Z97-byobu.sh \
usr/share/applications/Makefile \
usr/bin/byobu \
usr/bin/byobu-config \
usr/bin/byobu-ctrl-a \
@ -51,12 +50,14 @@ AC_OUTPUT(Makefile \
usr/lib/byobu/include/dirs \
usr/lib/byobu/include/toggle-utf8 \
usr/share/byobu/tests/byobu-time-notifications \
usr/share/byobu/desktop/Makefile \
usr/share/byobu/keybindings/Makefile \
usr/share/byobu/pixmaps/Makefile \
usr/share/byobu/profiles/Makefile \
usr/share/byobu/status/Makefile \
usr/share/byobu/tests/Makefile \
usr/share/byobu/windows/Makefile \
usr/share/dbus-1/services/Makefile \
usr/share/doc/byobu/Makefile \
usr/lib/byobu/Makefile \
usr/lib/byobu/include/Makefile \

24
debian/changelog vendored
View file

@ -10,7 +10,29 @@ byobu (5.100) unreleased; urgency=medium
[ Dustin Kirkland ]
* usr/share/applications/byobu.desktop:
- Revert upstream .desktop changes to match against
gnome-terminal-server
gnome-terminal-server, LP: #1512498
* === added directory usr/share/byobu/desktop, === added directory
usr/share/dbus-1, === added directory usr/share/dbus-1/services,
configure.ac, debian/control, debian/postinst, debian/postrm,
Makefile.am, usr/share/applications/byobu.desktop =>
usr/share/byobu/desktop/byobu.desktop,
usr/share/applications/Makefile.am =>
usr/share/byobu/desktop/Makefile.am,
usr/share/byobu/desktop/byobu.desktop.old, usr/share/dbus-
1/services/Makefile.am, usr/share/dbus-
1/services/us.kirkland.terminals.byobu.service: LP: #1512498, #1503418
- huge work around the mess that is gnome-terminal-server
- install two different desktop files to /usr/share/byobu/desktops/*
- in postinst, symlink the correct one into /usr/share/applications
- clean up that conditionally installed symlink in postinst
- suggest gnome-terminal package, as our new desktop file hardcodes
gnome-terminal (this kind of sucks)
- in byobu.desktop, exec gnome-terminal with a --app-id hint, and
drop the Terminal=true, as gnome-terminal will take care of that
- install a dbus service, as new gnome-terminal expects to launch
via dbus
- fqdn namespace that service to us.kirkland.terminals.byobu
+ this is stupid, btw
-- Dustin Kirkland <kirkland@ubuntu.com> Sat, 14 Nov 2015 16:59:57 -0600

1
debian/control vendored
View file

@ -25,6 +25,7 @@ Recommends:
Suggests:
apport,
ccze,
gnome-terminal,
gnupg,
lsb-release,
po-debconf,

7
debian/postinst vendored
View file

@ -12,6 +12,13 @@ else
rm -f /etc/$PKG/autolaunch
fi
# Install correct .desktop file
if [ -x /usr/lib/gnome-terminal/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
fi
# Clean up any old-school screen-profiles diversions of /usr/bin/screen
if [ -f /usr/bin/screen ] && [ -f /usr/bin/screen.real ]; then
divertpkg=$(dpkg-divert --listpackage /usr/bin/screen || true)

3
debian/postrm vendored
View file

@ -5,6 +5,9 @@ PKG="byobu"
# Clean-up obsolete config file
rm -f /etc/byobu/statusrc || true
# Clean-up linked desktop file
rm -rf /usr/share/applications/$PKG.desktop
#DEBHELPER#
# vi: syntax=sh ts=4 noexpandtab

2
usr/share/applications/Makefile.am
View file

@ -1,2 +0,0 @@
applicationdir = $(datadir)/applications/
application_SCRIPTS = byobu.desktop

2
usr/share/byobu/desktop/Makefile.am Normal file
View file

@ -0,0 +1,2 @@
desktopdir = $(datadir)/@PACKAGE@/desktop
desktop_SCRIPTS = byobu.desktop byobu.desktop.old

8
usr/share/byobu/desktop/byobu.desktop Normal file
View file

@ -0,0 +1,8 @@
[Desktop Entry]
Name=Byobu Terminal
Comment=Advanced Command Line and Text Window Manager
Icon=byobu
Exec=gnome-terminal --app-id us.kirkland.terminals.byobu -e byobu
Type=Application
Categories=GNOME;GTK;Utility;
X-GNOME-Gettext-Domain=byobu

2
usr/share/applications/byobu.desktop → usr/share/byobu/desktop/byobu.desktop.old
View file

@ -3,7 +3,7 @@ Name=Byobu Terminal
Comment=Advanced Command Line and Text Window Manager
Icon=byobu
Exec=env TERM=xterm-256color byobu
Type=Application
Terminal=true
Type=Application
Categories=GNOME;GTK;Utility;
X-GNOME-Gettext-Domain=byobu

2
usr/share/dbus-1/services/Makefile.am Normal file
View file

@ -0,0 +1,2 @@
servicedir = $(datadir)/dbus-1/services
service_DATA = us.kirkland.terminals.byobu.service

3
usr/share/dbus-1/services/us.kirkland.terminals.byobu.service Normal file
View file

@ -0,0 +1,3 @@
[D-BUS Service]
Name=byobu
Exec=/usr/lib/gnome-terminal/gnome-terminal-server --app-id us.kirkland.terminals.byobu