diff --git a/debian/changelog b/debian/changelog index f0f5c6c1..be32dce8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,10 @@ byobu (2.40) unreleased; urgency=low flexibility * byobu-config, byobu-select-profile: rework to independently select background color and foreground color, rather than profile; improve text + * debian/install, debian/rules, profiles/common, + profiles_generator/generate, profiles_generator/profile.skel, + rpm/byobu.spec: get rid of the generated profiles; now, everything is + handled by FOREGROUND and BACKGROUND colors, dynamically -- Dustin Kirkland Tue, 10 Nov 2009 10:18:20 -0600 diff --git a/debian/install b/debian/install index 1d0b5fae..a1236e90 100644 --- a/debian/install +++ b/debian/install @@ -4,11 +4,6 @@ desktop/byobu.desktop usr/share/applications/ po/locale/* usr/share/locale profiles/byoburc usr/share/byobu/profiles profiles/common usr/share/byobu/profiles -profiles/NONE usr/share/byobu/profiles -profiles/black usr/share/byobu/profiles -profiles/dark usr/share/byobu/profiles -profiles/light usr/share/byobu/profiles -profiles/*_* usr/share/byobu/profiles keybindings/* usr/share/byobu/keybindings statusrc etc/byobu windows/common usr/share/byobu/windows diff --git a/debian/rules b/debian/rules index c55efb16..ea6b0fb9 100755 --- a/debian/rules +++ b/debian/rules @@ -29,12 +29,9 @@ update-pot: prebuild: build: - # auto-generate the logo'd light/dark profiles - ./profiles_generator/generate clean: dh_clean - ./profiles_generator/generate --clean for po in po/*.po ; do \ lang=$${po#po/}; lang=$${lang%.po}; \ rm -f po/locale/$${lang}/LC_MESSAGES/${PKG}.mo ; \ diff --git a/profiles/common b/profiles/common index 18f78c41..733c5563 100644 --- a/profiles/common +++ b/profiles/common @@ -3,6 +3,9 @@ # This configuration profile is intended to be a common header of useful # functionality, included by other profiles. # +# It is intended to roughly approximate graphical desktop within 'screen'; +# inspired by the Ubuntu Gnome Desktop. +# # Copyright (C) 2008 Canonical Ltd. # # Authors: Dustin Kirkland @@ -87,3 +90,16 @@ defscrollback 10000 setenv SSH_AUTH_SOCK /var/run/screen/S-$USER/byobu.ssh-agent source $HOME/.byobu/keybindings + +# Window tabs, second to last line +caption always "%12`%?%-Lw%50L>%?%{=r }%{+b }%n*%f %t%?(%u)%?%12`%?%+Lw%?%11` %=%12`%110`%109`%122`%111`%10`%<" + +# Status string, last line +hardstatus string '%99`%12` %100`%112`%= %102`%101`%129`%127`%114`%115`%108`%128`%125`%126`%113`%119`%117`%116`%106`%104`%103`%105`%107`%123`%120`%121`' + +# NOTE: Older version of screen have an arbitrary limit of only being able +# to change colors 16 times in this 'hardstatus string'. +# Ubuntu (fixed in Jaunty): +# * https://bugs.launchpad.net/bugs/315871 +# Upstream: +# * http://savannah.gnu.org/bugs/?22146 diff --git a/profiles_generator/generate b/profiles_generator/generate deleted file mode 100755 index 45f7e8f6..00000000 --- a/profiles_generator/generate +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# generate: dynamically generate all profiles -# Copyright (C) 2008 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# This script should be run during in the './debian/rules get-orig-source' -# step. - -rm -f profiles/light profiles/dark profiles/black profiles/*_* -if [ "$1" = "--clean" ]; then - echo "Removing generated profiles" - exit 0 -fi -echo "Generating profiles" -cat profiles_generator/profile.skel > profiles/light -cp profiles/light profiles/dark -sed -i "s/ Wk/ Kw/g" profiles/dark -sed -i "s/kW/wK/g" profiles/dark -for j in "B-light_blue" "b-dark_blue" "C-light_cyan" "c-dark_cyan" "G-light_green" "g-dark_green" "M-light_purple" "m-dark_purple" "R-light_red" "r-dark_red" "Y-light_yellow" "y-dark_yellow" "k-black"; do - x=$(echo "$j" | awk -F"-" '{print $1}') - desc=$(echo "$j" | awk -F"-" '{print $2}') - y="w" - if echo "$desc" | grep -qs "light"; then - y="k" - fi - cp profiles/light profiles/$desc - sed -i "s/ Wk/ $x$y/g" profiles/$desc - sed -i "s/kW/$y$x/g" profiles/$desc -done diff --git a/profiles_generator/profile.skel b/profiles_generator/profile.skel deleted file mode 100644 index 8c8b39c4..00000000 --- a/profiles_generator/profile.skel +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Screen Profile -# This configuration profile is intended to roughly approximate graphical -# desktop within 'screen'; inspired by the Ubuntu Gnome Desktop. -# -# Copyright (C) 2008 Canonical Ltd. -# -# Authors: Dustin Kirkland -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -############################################################################### - -source /usr/share/byobu/profiles/common - -# Window tabs, second to last line -caption always "%12`%?%-Lw%50L>%?%{=r }%{+b }%n*%f %t%?(%u)%?%12`%?%+Lw%?%11` %=%12`%110`%109`%122`%111`%10`%<" - -# Status string, last line -hardstatus string '%99`%12` %100`%112`%= %102`%101`%129`%127`%114`%115`%108`%128`%125`%126`%113`%119`%117`%116`%106`%104`%103`%105`%107`%123`%120`%121`' - -# NOTE: Older version of screen have an arbitrary limit of only being able -# to change colors 16 times in this 'hardstatus string'. -# Ubuntu (fixed in Jaunty): -# * https://bugs.launchpad.net/bugs/315871 -# Upstream: -# * http://savannah.gnu.org/bugs/?22146 diff --git a/rpm/byobu.spec b/rpm/byobu.spec index f9f4ae8a..552def3b 100644 --- a/rpm/byobu.spec +++ b/rpm/byobu.spec @@ -28,8 +28,6 @@ screen window manager, such as toggle-able system status notifications. %build -profiles_generator/generate - %install rm -rf $RPM_BUILD_ROOT