From 5779364ef73cf6687490f7089b2f68915ade2b85 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 21 Apr 2009 16:18:16 -0500 Subject: [PATCH] * screen-profiles: drop special ubuntu handling * screen-profiles-export: drop ubuntu prepending Signed-off-by: Dustin Kirkland --- debian/changelog | 7 +++++-- screen-profiles | 5 +---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53044e72..9839bf1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -screen-profiles (1.48) unreleased; urgency=low +screen-profiles (1.48-0ubuntu1) jaunty; urgency=low Drop the distro name in generated profiles * debian/install: fix installation of profiles @@ -9,6 +9,8 @@ screen-profiles (1.48) unreleased; urgency=low prepended * select-screen-profile: remove the ubuntu specific profile handling * screen: fix broken symlinks to ubuntu-* profiles + * screen-profiles: drop special ubuntu handling + * screen-profiles-export: drop ubuntu prepending * screen: default to the light profile, if unspecified; this should be acceptable now that the F9:Menu prompt is always shown, and from there, @@ -22,8 +24,9 @@ screen-profiles (1.48) unreleased; urgency=low * bin/mem-available: fix subtle bug where whitespace is printed if in a totally default (no status file) configuration * screen-profiles-status.1, debian/rules: manpage added + * screen-profiles-export: randomly generate tarball name, if unspecified - -- Dustin Kirkland Tue, 21 Apr 2009 15:35:34 -0500 + -- Dustin Kirkland Tue, 21 Apr 2009 16:14:37 -0500 screen-profiles (1.47-0ubuntu1) jaunty; urgency=low diff --git a/screen-profiles b/screen-profiles index b2442b32..354735cb 100755 --- a/screen-profiles +++ b/screen-profiles @@ -126,10 +126,7 @@ def profile(screen, size): li = Listbox(height = 8, width = 60, scroll = 1, returnExit = 1) for choice in commands.getoutput('select-screen-profile -l').splitlines(): - if choice == "ubuntu": - li.append(choice+("-light"), choice) - else: - li.append(choice, choice) + li.append(choice, choice) bb = ButtonBar(screen, ((_("Apply"), "apply"), (_("Cancel"), "cancel")), compact = 1)