diff --git a/debian/changelog b/debian/changelog index 1045757c..660e12aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,14 +2,15 @@ byobu (2.18) unreleased; urgency=low * debian/screen-profiles.postinst: try to remove the dpkg-divert, but if it fails, let the installation proceed, since we've copied - screen.real back into place now, LP: #393204 + screen.real back into place now, (much hate shall descend upon + dpkg-divert!!!), LP: #393204 * byobu-launcher-uninstall, byobu-janitor: byobu-launcher is no longer fully qualified, update the remove to account for this; clean out old screen-launcher entries as a janitor item LP: #392978 * keybindings/f-keys, keybindings/screen-escape-keys: call the byobu-config window 'config', rather than 'help' - -- Dustin Kirkland Tue, 30 Jun 2009 16:02:38 -0700 + -- Dustin Kirkland Tue, 30 Jun 2009 16:08:47 -0700 byobu (2.17-0ubuntu1) karmic; urgency=low diff --git a/debian/screen-profiles.postinst b/debian/screen-profiles.postinst index 8a0f66e7..97f8d2c4 100644 --- a/debian/screen-profiles.postinst +++ b/debian/screen-profiles.postinst @@ -8,8 +8,8 @@ if dpkg --compare-versions "$2" lt-nl 2.0; then # we don't want that to happen cp -a /usr/bin/screen.real /usr/bin/screen fi - # clean up old screen diversion - dpkg-divert --package screen-profiles --rename --remove /usr/bin/screen || true + # clean up old screen diversion, but don't fail on its removal + dpkg-divert --package screen-profiles --rename --remove /usr/bin/screen 2>/dev/null || true fi fi