diff --git a/debian/changelog b/debian/changelog index 1829bcf9..9de0c59f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ screen-profiles (1.42) unreleased; urgency=low * added logo for Arch linux - * bin/cpu-freq: fix cpu freq for powerpc hardware, use 2 decimals for GHz + * bin/cpu-freq: fix cpu freq for powerpc hardware, LP: #352286; + use 2 decimals for GHz (bring this down to 1 decimal when cpus hit 10GHz) + * debian/postinst, debian/prerm, screen: remove some maintainer hacks + that should be cleaned up before Jaunty GA, LP: #352291 - -- Dustin Kirkland Tue, 31 Mar 2009 05:23:13 -0500 + -- Dustin Kirkland Tue, 31 Mar 2009 06:00:10 -0500 screen-profiles (1.41-0ubuntu1) jaunty; urgency=low diff --git a/debian/postinst b/debian/postinst index b029002b..07fe0c20 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,11 +1,3 @@ #!/bin/sh -e -if [ "$1" = "configure" ]; then - # This is a hack that should be removed just before Jaunty goes GA. - # We have moved these helper scripts from /usr/share to /var/lib, but if the - # user is upgrading from within an existing screen session depending on the old - # paths, we're going to break their status bar. - [ -d /usr/share/screen-profiles/bin ] || ln -sf /var/lib/screen-profiles /usr/share/screen-profiles/bin -fi - #DEBHELPER# diff --git a/debian/prerm b/debian/prerm index 475ea18b..07fe0c20 100644 --- a/debian/prerm +++ b/debian/prerm @@ -1,8 +1,3 @@ #!/bin/sh -e -if [ "$1" = "remove" ]; then - # This is a hack that should be removed just before Jaunty goes GA. - [ -L /usr/share/screen-profiles/bin ] && rm -f /usr/share/screen-profiles/bin -fi - #DEBHELPER# diff --git a/screen b/screen index 8c5cb0e8..277b5b78 100755 --- a/screen +++ b/screen @@ -20,16 +20,6 @@ # Create the screen-profiles directory, if it doesn't already exist [ -d "$HOME/.screen-profiles" ] || mkdir -p "$HOME/.screen-profiles" -########################################################################## -# The following hack should be removed after Jaunty goes GA -# (should only affect upgrading Alpha users) -# See LP: #335275 -# Collapse $HOME/.screenrc-* into $HOME/.screen-profiles/* -for i in ec2-cost keybindings profile updates-available windows; do - mv -f "$HOME/.screenrc-$i" "$HOME/.screen-profiles/$i" 2>/dev/null -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. @@ -62,14 +52,5 @@ fi # Ensure that the user's .screenrc at least exists [ -r "$HOME/.screenrc" ] || touch "$HOME/.screenrc" -########################################################################## -# The following hacks should be removed when Jaunty goes GA -# (should only affect upgrading Alpha users) -# Prevent recursion; .screenrc should no longer source .screenrc-profile -sed -i '/^source .*\.screen.*-.*profile$/d' $HOME/.screenrc -# .screenrc-windows should no longer reference screen-profiles-helper -sed -i 's/screen-profiles-helper/screen-profiles/' $HOME/.screen-profiles/windows -########################################################################## - # Now let's execute screen! exec /usr/bin/screen.real -c "$HOME/.screen-profiles/profile" "$@"