[Pkg-utopia-commits] r2661 - in /packages/experimental/networkmanager/debian: changelog control

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Dec 16 08:03:46 2008
New Revision: 2661

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2661
Log:
* 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.

Modified:
    packages/experimental/networkmanager/debian/changelog
    packages/experimental/networkmanager/debian/control

Modified: packages/experimental/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/changelog?rev=2661&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/changelog (original)
+++ packages/experimental/networkmanager/debian/changelog Tue Dec 16 08:03:46 2008
@@ -23,6 +23,11 @@
       (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.
 

Modified: packages/experimental/networkmanager/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/control?rev=2661&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/control (original)
+++ packages/experimental/networkmanager/debian/control Tue Dec 16 08:03:46 2008
@@ -17,8 +17,9 @@
 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