r20459 - in /desktop/unstable/meta-gnome2/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Jun 25 08:50:11 2009
New Revision: 20459

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20459
Log:
Disallow gnome-network-admin as an alternative to 
network-manager-gnome, since APT will prefer g-n-a on upgrades.

Modified:
    desktop/unstable/meta-gnome2/debian/changelog
    desktop/unstable/meta-gnome2/debian/control
    desktop/unstable/meta-gnome2/debian/control.in

Modified: desktop/unstable/meta-gnome2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/changelog?rev=20459&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/changelog (original)
+++ desktop/unstable/meta-gnome2/debian/changelog Thu Jun 25 08:50:11 2009
@@ -6,6 +6,8 @@
   * Remove n-c-b, require brasero 2.26 instead.
   * Allow banshee as an alternative to rhythmbox; it’s a popular 
     alternative now.
+  * Disallow gnome-network-admin as an alternative to 
+    network-manager-gnome, since APT will prefer g-n-a on upgrades.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 09 Jun 2009 19:51:39 +0200
 

Modified: desktop/unstable/meta-gnome2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control?rev=20459&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control (original)
+++ desktop/unstable/meta-gnome2/debian/control Thu Jun 25 08:50:11 2009
@@ -36,7 +36,7 @@
          arj,
          avahi-daemon,
          tomboy (>= 0.12.2) | gnote,
-         network-manager-gnome | gnome-network-admin (>= 2.22.1)
+         network-manager-gnome
 Conflicts: gnome-cups-manager
 Recommends: gnome-games-extra-data (>= 2.24.0),
             epiphany-extensions-more,

Modified: desktop/unstable/meta-gnome2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control.in?rev=20459&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control.in (original)
+++ desktop/unstable/meta-gnome2/debian/control.in Thu Jun 25 08:50:11 2009
@@ -36,7 +36,7 @@
          arj,
          avahi-daemon,
          tomboy (>= 0.12.2) | gnote,
-         network-manager-gnome | gnome-network-admin (>= 2.22.1)
+         network-manager-gnome
 Conflicts: gnome-cups-manager
 Recommends: gnome-games-extra-data (>= 2.24.0),
             epiphany-extensions-more,