From 3c0f0842b7417d8d935dac2281a8b7d978656c32 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 6 Mar 2011 17:49:31 +0100 Subject: Remove old Conflicts/Replaces which were required for upgrades to squeeze. --- debian/changelog | 3 +++ debian/control | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index d27cd916..981e96d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ network-manager (0.8.2-6) UNRELEASED; urgency=low - Newer versions of dnsmasq validate the option parameters more strictly. Instead of passing a bogus file name simply use --conf-file without additional parameters. (Closes: #615082) + * debian/control + - Remove old Conflicts/Replaces which were required for upgrades to + squeeze. -- Michael Biebl Sun, 06 Mar 2011 17:12:47 +0100 diff --git a/debian/control b/debian/control index 17c931ba..c787bd2a 100644 --- a/debian/control +++ b/debian/control @@ -43,12 +43,6 @@ Recommends: iptables, modemmanager 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.9~~), -- cgit 1.3.0-6-gf8a5