From 538d0b44c43b1dec7c4f878a673bd8dd277be048 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 16 Dec 2008 08:18:47 +0000 Subject: Add the vpn (core) plugins also to the Breaks list. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2662 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 95b7cb27..9759f5b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,7 +26,7 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low * debian/control - Add Conflicts/Replaces: network-manager-pptp (<< 0.7~~) as the pppd plugin is now shipped by this package. - - Add Breaks for network-manager-{gnome,kde} (<< 0.7~~) as the 0.6 + - Add Breaks (<< 0.7~~) for the network-manager-* packages as the 0.6 versions of those packages do not work with network-manager 0.7. * debian/patches/05-dhclient_lease_files.patch - Change the location of the dhclient lease files to /var/lib/dhcp3. diff --git a/debian/control b/debian/control index 3de07185..43056543 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Recommends: network-manager-gnome | network-manager-kde, policykit, ppp Suggests: avahi-autoipd Conflicts: network-manager-gnome (<< 0.6.5-1), network-manager-pptp (<< 0.7~~) Replaces: network-manager-gnome (<< 0.6.5-1), network-manager-pptp (<< 0.7~~) -Breaks: network-manager-gnome (<< 0.7~~), network-manager-kde (<< 1:0.7~~) +Breaks: network-manager-gnome (<< 0.7~~), network-manager-kde (<< 1:0.7~~), network-manager-openvpn (<< 0.7~~), network-manager-vpnc (<< 0.7~~), network-manager-pptp (<< 0.7~~) Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for -- cgit 1.3.0-6-gf8a5