r20289 - in /desktop/unstable/gnome-system-tools/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Jun  9 14:47:38 2009
New Revision: 20289

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20289
Log:
gnome-network-admin conflicts with network-manager-gnome. 
Closes: #460691.

Modified:
    desktop/unstable/gnome-system-tools/debian/changelog
    desktop/unstable/gnome-system-tools/debian/control
    desktop/unstable/gnome-system-tools/debian/control.in

Modified: desktop/unstable/gnome-system-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/changelog?rev=20289&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/changelog (original)
+++ desktop/unstable/gnome-system-tools/debian/changelog Tue Jun  9 14:47:38 2009
@@ -5,7 +5,8 @@
   * 26_users_home_dir.patch: patch from Ubuntu to allow changing root 
     propertiew without making /home/root the new home directory.
     Closes: #488252.
-  * gnome-network-admin breaks network-manager-gnome. Closes: #460691.
+  * gnome-network-admin conflicts with network-manager-gnome. 
+    Closes: #460691.
   * 85_users_fix_add_group.patch: patch from Ubuntu to always allow to 
     create groups. Closes: #488249.
 

Modified: desktop/unstable/gnome-system-tools/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/control?rev=20289&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/control (original)
+++ desktop/unstable/gnome-system-tools/debian/control Tue Jun  9 14:47:38 2009
@@ -62,7 +62,7 @@
          ${shlibs:Depends},
          gnome-system-tools (= ${binary:Version})
 Replaces: gnome-system-tools (<< 2.20.0-3)
-Breaks: network-manager-gnome
+Conflicts: network-manager-gnome
 Description: GNOME Network Administration Tool
  The GNOME System Tools are a fully integrated set of tools aimed to make easy
  the job that means the computer administration on an UNIX or Linux system.

Modified: desktop/unstable/gnome-system-tools/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/control.in?rev=20289&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/control.in (original)
+++ desktop/unstable/gnome-system-tools/debian/control.in Tue Jun  9 14:47:38 2009
@@ -62,7 +62,7 @@
          ${shlibs:Depends},
          gnome-system-tools (= ${binary:Version})
 Replaces: gnome-system-tools (<< 2.20.0-3)
-Breaks: network-manager-gnome
+Conflicts: network-manager-gnome
 Description: GNOME Network Administration Tool
  The GNOME System Tools are a fully integrated set of tools aimed to make easy
  the job that means the computer administration on an UNIX or Linux system.