* debian/control, debian/screen-profiles.postinst, debian/preinst,

debian/prerm, debian/rules, usr/bin/byobu-janitor:
  - remove more remnants of screen-profiles

debian/changelog

@@ -10,8 +10,9 @@ byobu (2.69) unreleased; urgency=low
   * bin/byobu-janitor, share/byobu/keybindings/f-keys,
     share/byobu/profiles/common, share/man/man1/byobu.1: add a keybinding,
     ctrl-a ~ to write the current window's buffer to a file, LP: #565399
-  * debian/control, debian/screen-profiles.postinst: remove final remnants
+  * debian/control, debian/screen-profiles.postinst, debian/preinst,
-    of screen-profiles
+    debian/prerm, debian/rules, usr/bin/byobu-janitor:
+    - remove more remnants of screen-profiles
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 15 Apr 2010 12:12:39 -0500
 

debian/preinst

@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-# The following two links significantly improve the upgrade
-# experience from screen-profiles to byobu.
-ln -sf /usr/bin/byobu-status /usr/bin/screen-profiles-status
-ln -sf /usr/bin/byobu-launcher /usr/bin/screen-launcher
-
-#DEBHELPER#

debian/prerm

@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-PKG="byobu"
-
-# Remove helper symlinks
-for i in /usr/bin/screen-profiles-status /usr/bin/screen-launcher; do
-	[ -h "$i" ] && rm -f "$i"
-done
-rm -f /etc/profile.d/$PKG.sh
-
-true
-
-#DEBHELPER#

debian/rules

@@ -37,10 +37,6 @@ install: build install-po
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	# These links must be done in the postinst, as screen-profiles might not
-	# be uninstalled yet
-	#dh_link usr/bin/byobu-status usr/bin/screen-profiles-status
-	#dh_link usr/bin/byobu-launcher usr/bin/screen-launcher
 	dh_link usr/share/byobu/keybindings/f-keys usr/share/byobu/keybindings/common
 	for i in black dark dark_blue dark_cyan dark_green dark_purple dark_red dark_yellow light light_blue light_cyan light_green light_purple light_red light_yellow; do dh_link usr/share/byobu/profiles/common usr/share/byobu/profiles/$${i}; done
 	dh_install -X.bzr

usr/bin/byobu-janitor

@@ -30,7 +30,6 @@ if [ "$1" != "--force" ] && [ ! -e "$FLAG" ]; then
 fi
 
 # Set the rest of the variables
-OLDPKG="screen-profiles"
 DEFAULT_PROFILE="light"
 PROFILE="$HOME/.$PKG/profile"
 
@@ -52,16 +51,6 @@ if [ -d "$HOME/.$PKG" ] && [ ! -w "$HOME/.$PKG" ]; then
 	exit 1
 fi
 
-# Affects: Upgrades from screen-profiles
-# If the old config dir exists, but the new one doesn't, provide a migration mechanism.
-if [ -d "$HOME/.$OLDPKG" ] && [ ! -e "$HOME/.$PKG" ]; then
-	# Rename the config dir
-	mv -f "$HOME/.$OLDPKG" "$HOME/.$PKG"
-	ln -sf "$HOME/.$PKG" "$HOME/.$OLDPKG"
-	# Replace all instances of the old package name with the new
-	sed -i "s/$OLDPKG/$PKG/g" "$HOME/.$PKG"/* || true
-fi
-
 # Affects: First runs with no configuration
 # Seed the configuration
 [ -d "$HOME/.$PKG" ] || mkdir -p "$HOME/.$PKG"