From 42ef481674bf11117f9ba70c163692bad8daf92f Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 22 Jun 2009 14:25:14 -0500 Subject: [PATCH] * debian/control: trying to fix upgrade issues, add replaces and conflicts clauses back Signed-off-by: Dustin Kirkland --- debian/changelog | 7 +++++-- debian/control | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8830fc5..14d3b1b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,13 @@ byobu (2.15) unreleased; urgency=low * profiles/common: defutf8 on seems like a sane default, at this point, LP: #301447 - * debian/control: trying to fix upgrade issues + * debian/control: trying to fix upgrade issues, add replaces and + conflicts clauses back * byobu: must force the janitor to run on startup + * debian/screen-profiles.postinst: make absolutely sure that the dpkg + diversion goes away - -- Dustin Kirkland Mon, 22 Jun 2009 14:23:02 -0500 + -- Dustin Kirkland Mon, 22 Jun 2009 14:24:41 -0500 byobu (2.14-0ubuntu1) karmic; urgency=low diff --git a/debian/control b/debian/control index 853d2867..685f22a9 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,8 @@ 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 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. @@ -28,6 +30,8 @@ Description: a set of useful profiles and a profile-switcher for GNU screen Package: byobu-extras Architecture: all Depends: ${misc:Depends}, byobu +Replaces: screen-profiles-extras +Conflicts: screen-profiles-extras 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 @@ -35,12 +39,12 @@ Description: additional colored profiles for the byobu package Package: screen-profiles Architecture: all -Depends: ${misc:Depends}, byobu +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 -Depends: ${misc:Depends}, byobu-extras +Recommends: ${misc:Depends}, byobu-extras Description: this package has been renamed 'byobu-extras' The screen-profiles-extras package has been renamed 'byobu-extras'.