From b4b47bfe0108487ef3fe10c4e581edfb332a9c98 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 22 Jun 2009 22:36:35 -0500 Subject: [PATCH] * debian/control: trying to fix upgrade issues, add provides/replaces/conflicts screen-profiles (<< 2.0), LP: #390808 NOTE: we can't provide a dummy screen-profiles package, as we must have screen-profiles uninstall Signed-off-by: Dustin Kirkland --- debian/changelog | 14 ++++++++------ debian/control | 25 ++++++------------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 14d3b1b6..00ae469f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,16 @@ -byobu (2.15) unreleased; urgency=low +byobu (2.15~ppa8) jaunty; urgency=low * profiles/common: defutf8 on seems like a sane default, at this point, LP: #301447 - * debian/control: trying to fix upgrade issues, add replaces and - conflicts clauses back + * debian/control: trying to fix upgrade issues, add + provides/replaces/conflicts screen-profiles (<< 2.0), LP: #390808 + NOTE: we can't provide a dummy screen-profiles package, as we + must have screen-profiles uninstalled first, to remove the + dpkg-diversion of /usr/bin/screen * byobu: must force the janitor to run on startup - * debian/screen-profiles.postinst: make absolutely sure that the dpkg - diversion goes away + * byobu-status: fix --detail, detect script dir - -- Dustin Kirkland Mon, 22 Jun 2009 14:24:41 -0500 + -- Dustin Kirkland Mon, 22 Jun 2009 22:32:00 -0500 byobu (2.14-0ubuntu1) karmic; urgency=low diff --git a/debian/control b/debian/control index 685f22a9..3b4baeb2 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,9 @@ Architecture: all Depends: ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, screen, gettext-base, python, python-newt (>= 0.52.2-11) Recommends: update-notifier-common, lsb-release Suggests: byobu-extras, vim -Replaces: screen-profiles -Conflicts: screen-profiles +Provides: screen-profiles +Replaces: screen-profiles (<< 2.0) +Conflicts: screen-profiles (<< 2.0) Enhances: screen Description: a set of useful profiles and a profile-switcher for GNU screen byobu includes a set of profiles for the GNU screen window manager. @@ -23,28 +24,14 @@ Description: a set of useful profiles and a profile-switcher for GNU screen provide features such as status bars, clocks, notifiers (reboot required, updates available), etc. The profile-switcher allows users to quickly switch their .screenrc to any of the available profiles. - . - update-notifier-common provides a more efficient and standard mechanism for - calculating the number of updates available in the status panel. Package: byobu-extras Architecture: all Depends: ${misc:Depends}, byobu -Replaces: screen-profiles-extras -Conflicts: screen-profiles-extras +Provides: screen-profiles-extras +Replaces: screen-profiles-extras (<< 2.0) +Conflicts: screen-profiles-extras (<< 2.0) Description: additional colored profiles for the byobu package The byobu contains a basic set of light and dark screen profiles. The byobu-extras package provides additional profiles of various different light and dark colors. - -Package: screen-profiles -Architecture: all -Recommends: ${misc:Depends}, byobu -Description: this package has been renamed 'byobu' - The screen-profiles package has been renamed 'byobu'. - -Package: screen-profiles-extras -Architecture: all -Recommends: ${misc:Depends}, byobu-extras -Description: this package has been renamed 'byobu-extras' - The screen-profiles-extras package has been renamed 'byobu-extras'.