diff options
| author | Michael Biebl <biebl@debian.org> | 2008-12-16 08:03:46 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2008-12-16 08:03:46 +0000 |
| commit | dc6e834b453aa443d672daf8066a782353f6fb83 (patch) | |
| tree | c97bfe1f3a91190374599abfe81a94660f18021d | |
| parent | a9bbe0d868fa4a7ab4047f24f8bf8424c7122cb0 (diff) | |
* 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
versions of those packages do not work with network-manager 0.7.
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2661 ceb527fc-18e6-0310-9fe2-813c157c29e7
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 3db5207d..95b7cb27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,11 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low (Closes: #503682) * Update control, install and symbols file for the new libnm-util library name. + * 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 + 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 3184838f..3de07185 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,9 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14), wpasupplicant (>= 0.6.2-1), dbus (>= 1.1.2), hal (>= 0.5.7.1), ifupdown, adduser Recommends: network-manager-gnome | network-manager-kde, policykit, ppp Suggests: avahi-autoipd -Conflicts: network-manager-gnome (<< 0.6.5-1) -Replaces: network-manager-gnome (<< 0.6.5-1) +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~~) 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 |