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

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Jun  9 14:27:25 2009
New Revision: 20287

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20287
Log:
Make gnome-network-admin only a dependency of gnome, as an 
alternative to network-manager-gnome.

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=20287&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/changelog (original)
+++ desktop/unstable/meta-gnome2/debian/changelog Tue Jun  9 14:27:25 2009
@@ -6,6 +6,8 @@
     build some gnome packages.
   * g-d-e conflicts against gstreamer0.10-gnomevfs since gstreamer will 
     prefer it over gio, which is, well, stupid.
+  * Make gnome-network-admin only a dependency of gnome, as an 
+    alternative to network-manager-gnome.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 28 Apr 2009 13:27:59 +0200
 

Modified: desktop/unstable/meta-gnome2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control?rev=20287&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control (original)
+++ desktop/unstable/meta-gnome2/debian/control Tue Jun  9 14:27:25 2009
@@ -35,7 +35,8 @@
          transmission-gtk,
          bluez-gnome,
          arj,
-         avahi-daemon
+         avahi-daemon,
+         network-manager-gnome | gnome-network-admin (>= 2.22.1)
 Conflicts: gnome-cups-manager
 Recommends: gnome-games-extra-data (>= 2.24.0),
             epiphany-extensions-more,
@@ -44,7 +45,6 @@
             update-notifier,
             gparted,
             tsclient,
-            network-manager-gnome,
             hal-cups-utils,
             gthumb,
             liferea | evolution-rss | blam,
@@ -119,7 +119,6 @@
          gnome-screensaver (>= 2.24.1),
          gnome-system-monitor (>= 2.24.3),
          gnome-system-tools (>= 2.22.1),
-         gnome-network-admin (>= 2.22.1),
          gnome-themes (>= 2.24.3),
          gnome-user-guide (>= 2.24.2),
          gnome-utils (>= 2.24.1),

Modified: desktop/unstable/meta-gnome2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control.in?rev=20287&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control.in (original)
+++ desktop/unstable/meta-gnome2/debian/control.in Tue Jun  9 14:27:25 2009
@@ -35,7 +35,8 @@
          transmission-gtk,
          bluez-gnome,
          arj,
-         avahi-daemon
+         avahi-daemon,
+         network-manager-gnome | gnome-network-admin (>= 2.22.1)
 Conflicts: gnome-cups-manager
 Recommends: gnome-games-extra-data (>= 2.24.0),
             epiphany-extensions-more,
@@ -44,7 +45,6 @@
             update-notifier,
             gparted,
             tsclient,
-            network-manager-gnome,
             hal-cups-utils,
             gthumb,
             liferea | evolution-rss | blam,
@@ -119,7 +119,6 @@
          gnome-screensaver (>= 2.24.1),
          gnome-system-monitor (>= 2.24.3),
          gnome-system-tools (>= 2.22.1),
-         gnome-network-admin (>= 2.22.1),
          gnome-themes (>= 2.24.3),
          gnome-user-guide (>= 2.24.2),
          gnome-utils (>= 2.24.1),