Index: pkg/frankie/main/network-manager/trunk/debian/control
===================================================================
--- pkg/frankie/main/network-manager/trunk/debian/control	(revision 6135)
+++ pkg/frankie/main/network-manager/trunk/debian/control	(revision 6322)
@@ -3,6 +3,7 @@
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
-Uploaders: Riccardo Setti <giskard@debian.org>, Michael Biebl <biebl@debian.org>
-Build-Depends: debhelper (>= 7),
+Uploaders: Michael Biebl <biebl@debian.org>
+Build-Depends:
+ debhelper (>= 7),
  cdbs,
  autotools-dev,
@@ -11,26 +12,51 @@
  quilt,
  libdbus-glib-1-dev (>= 0.75),
+ libdbus-1-dev (>= 1.1),
  libiw-dev(>= 27+28pre9),
- libglib2.0-dev,
- libhal-dev (>= 0.5.0),
+ libglib2.0-dev (>= 2.18),
  libnl-dev (>= 1.0~pre8),
  ppp-dev,
- libpolkit-dbus-dev,
+ libpolkit-gobject-1-dev,
  libgnutls-dev,
  uuid-dev,
- libudev-dev
-Standards-Version: 3.8.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager
+ libudev-dev,
+ libgudev-1.0-dev
+Standards-Version: 3.8.4
+Vcs-Svn: svn://svn.debian.org/pkg-utopia/packages/unstable/networkmanager/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/
 Homepage: http://www.gnome.org/projects/NetworkManager/
 
 Package: network-manager
 Architecture: any
-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, dhcp3-client
-Recommends: network-manager-gnome | network-manager-kde, policykit, ppp, dnsmasq-base, iptables
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ lsb-base (>= 3.2-14),
+ wpasupplicant (>= 0.6.2-1),
+ dbus (>= 1.1.2),
+ udev,
+ ifupdown,
+ adduser,
+ dhcp3-client
+Recommends:
+ network-manager-gnome | network-manager-kde,
+ policykit-1,
+ ppp,
+ dnsmasq-base,
+ iptables,
+ modemmanager
 Suggests: avahi-autoipd
-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~~), network-manager-openvpn (<< 0.7~~), network-manager-vpnc (<< 0.7~~), network-manager-pptp (<< 0.7~~)
+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.9~~),
+ network-manager-openvpn (<< 0.7~~),
+ network-manager-vpnc (<< 0.7~~),
+ network-manager-pptp (<< 0.7~~)
 Description: network management framework daemon
  NetworkManager attempts to keep an active network connection available at all
@@ -44,5 +70,5 @@
  .
  Optional dependencies:
-  * policykit: Required for reading and writing system connections.
+  * policykit-1: Required for reading and writing system connections.
   * ppp: Required for establishing dial-up connections (e.g. via GSM).
   * dnsmasq-base/iptables: Required for creating Ad-hoc connections and
@@ -59,8 +85,10 @@
  compile VPN Plugins for NetworkManager.
 
-Package: libnm-glib0
+Package: libnm-glib2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
 Description: network management framework (GLib shared library)
  NetworkManager attempts to keep an active network connection available at all
@@ -77,5 +105,11 @@
 Section: libdevel
 Architecture: any
-Depends: libnm-glib0 (= ${binary:Version}), ${misc:Depends}, libnm-util-dev, network-manager-dev, libglib2.0-dev, libdbus-glib-1-dev (>= 0.60)
+Depends:
+ libnm-glib2 (= ${binary:Version}),
+ ${misc:Depends},
+ libnm-util-dev,
+ network-manager-dev,
+ libglib2.0-dev,
+ libdbus-glib-1-dev (>= 0.60)
 Description: network management framework (GLib interface)
  NetworkManager attempts to keep an active network connection available at all
@@ -89,8 +123,10 @@
  connection status via NetworkManager.
 
-Package: libnm-glib-vpn0
+Package: libnm-glib-vpn1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
 Description: network management framework (GLib VPN shared library)
  NetworkManager attempts to keep an active network connection available at all
@@ -107,5 +143,8 @@
 Section: libdevel
 Architecture: any
-Depends: libnm-glib-vpn0 (= ${binary:Version}), ${misc:Depends}, libnm-glib-dev
+Depends:
+ libnm-glib-vpn1 (= ${binary:Version}),
+ ${misc:Depends},
+ libnm-glib-dev
 Description: network management framework (GLib interface)
  NetworkManager attempts to keep an active network connection available at all
@@ -122,5 +161,7 @@
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
 Description: network management framework (shared library)
  NetworkManager attempts to keep an active network connection available at all
@@ -137,5 +178,8 @@
 Section: libdevel
 Architecture: any
-Depends: libnm-util1 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev
+Depends:
+ libnm-util1 (= ${binary:Version}),
+ ${misc:Depends},
+ libglib2.0-dev
 Description: network management framework (development files)
  NetworkManager attempts to keep an active network connection available at all
@@ -148,2 +192,18 @@
  This package contains header and development files.
 
+Package: network-manager-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends:
+ network-manager (= ${binary:Version}) | libnm-util1 (= ${binary:Version}) | libnm-glib2 (= ${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.
+ .
+ This package contains detached debugging symbols.
