diff --git a/debian/changelog b/debian/changelog index 0995bf53..d47f78ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ -screen-profiles (1.39) unreleased; urgency=low +screen-profiles (1.39-0ubuntu1) jaunty; urgency=low - * + * debian/screen-profiles-extras.install: new package, providing the + additional, color profiles, LP: #342244 + * debian/control: suggest screen-profiles-extra, and create the package + * screen: recommend the screen-profiles-extras package, if the user's + chosen profile isn't readable + * select-screen-profile: silence stderr on ls - -- Dustin Kirkland Fri, 13 Mar 2009 00:20:36 -0500 + -- Dustin Kirkland Fri, 13 Mar 2009 12:36:59 -0500 screen-profiles (1.38-0ubuntu1) jaunty; urgency=low diff --git a/debian/control b/debian/control index 4d2c0deb..a2805693 100644 --- a/debian/control +++ b/debian/control @@ -24,3 +24,12 @@ Description: a set of useful profiles and a profile-switcher for GNU screen . update-notifier-common provides a more efficient and standard mechanism for calculating the number of updates available in the status panel. + +Package: screen-profiles-extras +Architecture: all +Depends: ${misc:Depends}, screen-profiles +Description: additional colored profiles for the screen-profiles package + The screen-profiles package profiles package contains a basic set of + light and dark profiles. The screen-profiles-extras package provides + additional profiles of various different colors, plus profiles for other + distributions. diff --git a/debian/install b/debian/install index 7c5ad2f6..b63d4146 100644 --- a/debian/install +++ b/debian/install @@ -1,10 +1,9 @@ bin/* var/lib/screen-profiles profiles/common usr/share/screen-profiles/profiles profiles/plain usr/share/screen-profiles/profiles -profiles/ubuntu-* usr/share/screen-profiles/profiles -profiles/debian-* usr/share/screen-profiles/profiles/misc -profiles/fedora-* usr/share/screen-profiles/profiles/misc -profiles/redhat-* usr/share/screen-profiles/profiles/misc +profiles/ubuntu-black usr/share/screen-profiles/profiles +profiles/ubuntu-dark usr/share/screen-profiles/profiles +profiles/ubuntu-light usr/share/screen-profiles/profiles keybindings/common usr/share/screen-profiles/keybindings keybindings/none usr/share/screen-profiles/keybindings windows/common usr/share/screen-profiles/windows diff --git a/screen b/screen index 67b4214c..8c5cb0e8 100755 --- a/screen +++ b/screen @@ -33,13 +33,25 @@ done # If $HOME/.screenrc exists but $HOME/.screen-profiles/profile does not, # this shows that the user has an existing custom screen configuration, # and thus we will not bother them with a select-screen-profile prompt. -if [ -r "$HOME/.screenrc" -a ! -e "$HOME/.screen-profiles/profile" ]; then +if [ -r "$HOME/.screenrc" -a ! -e "$HOME/.screen-profiles/profile" -a ! -h "$HOME/.screen-profiles/profile" ]; then exec /usr/bin/screen.real -c "$HOME/.screenrc" "$@" exit $? fi # Ensure that the user has selected a screen profile -[ -r "$HOME/.screen-profiles/profile" ] || /usr/bin/select-screen-profile +[ -h "$HOME/.screen-profiles/profile" ] || /usr/bin/select-screen-profile +if [ ! -r "$HOME/.screen-profiles/profile" ]; then + echo + echo "Your selected profile is not accessible." + echo + echo "Either select a different profile:" + echo " $ select-screen-profile" + echo + echo "Or install the extras package:" + echo " $ sudo apt-get install screen-profiles-extras" + echo + exit 1 +fi # Ensure that their keybindings are seeded [ -s "$HOME/.screen-profiles/keybindings" ] || echo "source /usr/share/screen-profiles/keybindings/common" > "$HOME/.screen-profiles/keybindings"