Merge branch 'master' into experimental

2 files changed, 60 insertions, 57 deletions

diff --git a/debian/changelog b/debian/changelog
index 3aad5799..f144ab77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ network-manager (0.8.999-1) UNRELEASED; urgency=low
   * New upstream release (0.9 rc2).
   * Refresh debian/patches/03-systemd.patch.
   * Update debian/libnm-glib4.symbols and debian/libnm-util2.symbols.
+  * Merge changes from unstable branch.
+  * Update package descriptions.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 21 Apr 2011 17:31:46 +0200
 
  -- Michael Biebl <biebl@debian.org>  Wed, 04 May 2011 21:36:00 +0200
 
@@ -46,6 +50,13 @@ network-manager (0.8.998-1) experimental; urgency=low
 
  -- Michael Biebl <biebl@debian.org>  Sat, 09 Apr 2011 06:49:57 +0200
 
+network-manager (0.8.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.2. No further changes.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 21 Apr 2011 11:05:42 +0200
+
 network-manager (0.8.3.999-1) unstable; urgency=low
 
   * New upstream release (0.8.4 rc2).
diff --git a/debian/control b/debian/control
index 7f1c2998..0f15ef56 100644
--- a/debian/control
+++ b/debian/control
@@ -54,15 +54,15 @@ Breaks:
  network-manager-vpnc (<< 0.8.99),
  network-manager-pptp (<< 0.8.99),
  ppp (<< 2.4.5)
-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
- usage on servers. The point of NetworkManager is to make networking
- configuration and setup as painless and automatic as possible.  If using DHCP,
- NetworkManager is _intended_ to replace default routes, obtain IP addresses
- from a DHCP server, and change nameservers whenever it sees fit.
+Description: network management framework (daemon and userspace tools)
+ NetworkManager is a system network service that manages your network devices
+ and connections, attempting to keep active network connectivity when
+ available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
+ devices, and provides VPN integration with a variety of different VPN
+ services.
  .
- This package provides the userspace daemons.
+ This package provides the userspace daemons and a command line interface to
+ interact with NetworkManager.
  .
  Optional dependencies:
   * policykit-1: Required for reading and writing system connections.
@@ -87,12 +87,11 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Description: network management framework (GLib shared library)
- 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
- usage on servers. The point of NetworkManager is to make networking
- configuration and setup as painless and automatic as possible.  If using DHCP,
- NetworkManager is _intended_ to replace default routes, obtain IP addresses
- from a DHCP server, and change nameservers whenever it sees fit.
+ NetworkManager is a system network service that manages your network devices
+ and connections, attempting to keep active network connectivity when
+ available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
+ devices, and provides VPN integration with a variety of different VPN
+ services.
  .
  This package provides the shared library that applications can use to query
  connection status via NetworkManager.
@@ -109,12 +108,11 @@ Depends:
  libglib2.0-dev,
  libdbus-glib-1-dev
 Description: network management framework (GLib interface)
- 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
- usage on servers. The point of NetworkManager is to make networking
- configuration and setup as painless and automatic as possible.  If using DHCP,
- NetworkManager is _intended_ to replace default routes, obtain IP addresses
- from a DHCP server, and change nameservers whenever it sees fit.
+ NetworkManager is a system network service that manages your network devices
+ and connections, attempting to keep active network connectivity when
+ available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
+ devices, and provides VPN integration with a variety of different VPN
+ services.
  .
  This package provides the interface that applications can use to query
  connection status via NetworkManager.
@@ -126,12 +124,11 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Description: network management framework (GLib VPN shared library)
- 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
- usage on servers. The point of NetworkManager is to make networking
- configuration and setup as painless and automatic as possible.  If using DHCP,
- NetworkManager is _intended_ to replace default routes, obtain IP addresses
- from a DHCP server, and change nameservers whenever it sees fit.
+ NetworkManager is a system network service that manages your network devices
+ and connections, attempting to keep active network connectivity when
+ available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
+ devices, and provides VPN integration with a variety of different VPN
+ services.
  .
  This package provides the shared library that applications can use for
  creating VPN connections via NetworkManager.
@@ -144,12 +141,11 @@ Depends:
  ${misc:Depends},
  libnm-glib-dev
 Description: network management framework (GLib interface)
- 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
- usage on servers. The point of NetworkManager is to make networking
- configuration and setup as painless and automatic as possible.  If using DHCP,
- NetworkManager is _intended_ to replace default routes, obtain IP addresses
- from a DHCP server, and change nameservers whenever it sees fit.
+ NetworkManager is a system network service that manages your network devices
+ and connections, attempting to keep active network connectivity when
+ available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
+ devices, and provides VPN integration with a variety of different VPN
+ services.
  .
  This package provides the shared library that applications can use for
  creating VPN connections via NetworkManager.
@@ -161,12 +157,11 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Description: network management framework (shared library)
- 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
- usage on servers. The point of NetworkManager is to make networking
- configuration and setup as painless and automatic as possible.  If using DHCP,
- NetworkManager is _intended_ to replace default routes, obtain IP addresses
- from a DHCP server, and change nameservers whenever it sees fit.
+ NetworkManager is a system network service that manages your network devices
+ and connections, attempting to keep active network connectivity when
+ available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
+ devices, and provides VPN integration with a variety of different VPN
+ services.
  .
  This package contains a convenience library to ease the access to
  NetworkManager.
@@ -181,12 +176,11 @@ Depends:
  libglib2.0-dev,
  libdbus-glib-1-dev
 Description: network management framework (development files)
- 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
- usage on servers. The point of NetworkManager is to make networking
- configuration and setup as painless and automatic as possible.  If using DHCP,
- NetworkManager is _intended_ to replace default routes, obtain IP addresses
- from a DHCP server, and change nameservers whenever it sees fit.
+ NetworkManager is a system network service that manages your network devices
+ and connections, attempting to keep active network connectivity when
+ available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
+ devices, and provides VPN integration with a variety of different VPN
+ services.
  .
  This package contains header and development files.
 
@@ -197,13 +191,12 @@ Priority: extra
 Depends:
  network-manager (= ${binary:Version}) | libnm-util2 (= ${binary:Version}) | libnm-glib4 (= ${binary:Version}) | libnm-glib-vpn1 (= ${binary:Version}),
  ${misc:Depends}
-Description: network management framework daemon - debugging symbols
- 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
- usage on servers. The point of NetworkManager is to make networking
- configuration and setup as painless and automatic as possible.  If using DHCP,
- NetworkManager is _intended_ to replace default routes, obtain IP addresses
- from a DHCP server, and change nameservers whenever it sees fit.
+Description: network management framework (debugging symbols)
+ NetworkManager is a system network service that manages your network devices
+ and connections, attempting to keep active network connectivity when
+ available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
+ devices, and provides VPN integration with a variety of different VPN
+ services.
  .
  This package contains detached debugging symbols.
 
@@ -212,12 +205,11 @@ Section: libs
 Architecture: any
 Depends: ${gir:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Description: GObject introspection data for NetworkManager
- 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
- usage on servers. The point of NetworkManager is to make networking
- configuration and setup as painless and automatic as possible.  If using DHCP,
- NetworkManager is _intended_ to replace default routes, obtain IP addresses
- from a DHCP server, and change nameservers whenever it sees fit.
+ NetworkManager is a system network service that manages your network devices
+ and connections, attempting to keep active network connectivity when
+ available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
+ devices, and provides VPN integration with a variety of different VPN
+ services.
  .
  This package contains introspection data for NetworkManager.
  .