From 8ed369cbcba399d7d7400aba69e3b0c4f2ce963c Mon Sep 17 00:00:00 2001 From: Steven Luo Date: Mon, 14 Dec 2009 04:20:00 -0800 Subject: [PATCH] Don't try to support installing over browser-proxy The diversions seem to make it impossible to support directly installing over browser-proxy without a dummy package, and that's not worth it given that we're not in any repositories yet. So just conflict with browser-proxy to make sure no one tries to install directly over, and tell users to remove browser-proxy instead. --- debian/changelog | 6 +++--- debian/control | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index fb292ae..f36316a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,9 +10,9 @@ browser-switchboard (2.2-1) extras-devel; urgency=low browser-switchboard package and Tear not installed - substantial documentation update * Packaging changes: - - Rename the package to browser-switchboard; try to accommodate - updates from browser-proxy by Provides/Conflicts/Replaces - browser-proxy. + - Rename the package to browser-switchboard; Conflict with browser-proxy + to make sure that users don't try to install over it. browser-proxy + needs to be uninstalled before installing browser-switchboard. - Drop the Depends on tear, now that installing browser-switchboard doesn't break link opening when Tear isn't installed. Recommend tear | fennec | midori instead. diff --git a/debian/control b/debian/control index 3f242b9..794a168 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ Architecture: all Depends: dbus, python2.5, python2.5-dbus, python2.5-gobject, tablet-browser-ui, ${misc:Depends} Recommends: tear | fennec | midori Provides: browser-proxy -Replaces: browser-proxy Conflicts: browser-proxy, fennec-dbus-client Description: allows any web browser to be used as the default Browser Switchboard is a program which allows you to choose -- 1.7.9.5