--- network-manager-0.7.1~rc4.1.cf199a964.orig/aclocal.m4
+++ network-manager-0.7.1~rc4.1.cf199a964/aclocal.m4
@@ -0,0 +1 @@
+# empty file
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/network-manager.postinst
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/network-manager.postinst
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -eu
+
+case "$1" in
+    	configure)
+                # if you come from a really old network manager we have
+                # to comment the auto dhcp lines as a best effort approach
+
+		if dpkg --compare-versions "$2" "lt-nl" "0.6.5-0ubuntu12"; then
+		    sh /usr/lib/network-manager/ifblacklist_migrate.sh
+		    sleep 2
+                fi
+
+		if dpkg --compare-versions "$2" "le-nl" "0.7.1~20090213+gitf142e15-0ubuntu1"; then
+		    update-rc.d -f NetworkManager remove
+                fi
+
+		update-rc.d NetworkManager start 50 2 3 4 5 .
+
+		# request a reboot (NM tears down interfaces on restart
+		# which is not the way we want to go)
+		/usr/share/update-notifier/notify-reboot-required
+
+		[ -x /etc/dbus-1/event.d/25NetworkManager.dpkg-moving ] && \
+			rm -f /etc/dbus-1/event.d/25NetworkManager.dpkg-moving
+		[ -x /etc/dbus-1/event.d/25NetworkManager.dpkg-removing ] && \
+			rm -f /etc/dbus-1/event.d/25NetworkManager.dpkg-removing
+
+		[ -x /etc/dbus-1/event.d/26NetworkManagerDispatcher.dpkg-moving ] && \
+			rm -f /etc/dbus-1/event.d/26NetworkManagerDispatcher.dpkg-moving
+		[ -x /etc/dbus-1/event.d/26NetworkManagerDispatcher.dpkg-removing ] && \
+			rm -f /etc/dbus-1/event.d/26NetworkManagerDispatcher.dpkg-removing
+    	;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/network-manager.dbus-event
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/network-manager.dbus-event
@@ -0,0 +1,88 @@
+#! /bin/sh
+#
+# NetworkManager	NetworkManager daemon
+#				Daemon for automatically switching network 
+#				connections to the best available connection.
+#				This file should be placed in /etc/init.d.
+#
+# Authors:	Christian Bjälevik <nafallo@magicalforest.se>
+#			Jan Gerber <j@bootlab.org>
+#			Mark Roach <mrroach@okmaybe.com>
+#			Thom May <thom@debian.org>
+#
+# Version:	@(#)skeleton  2.85-23  28-Jul-2004  miquels@cistron.nl
+#
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DESC="network connection manager"
+NAME="NetworkManager"
+
+DAEMON=/usr/sbin/$NAME
+
+PIDDIR=/var/run/NetworkManager
+PIDFILE=$PIDDIR/$NAME.pid
+
+SCRIPTNAME=/etc/dbus-1/event.d/25$NAME
+USER=root
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+# We need /sbin/ip
+[ -x /sbin/ip ] || exit 1
+
+. /lib/lsb/init-functions
+
+test -f /etc/default/rcS && . /etc/default/rcS
+test -f /etc/default/NetworkManager && . /etc/default/NetworkManager
+
+#
+#	Function that starts the daemon/service.
+#
+d_start() {
+	if [ ! -d $PIDDIR ]; then
+		mkdir -p $PIDDIR
+		chown $USER:$USER $PIDDIR
+	fi
+
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+		--user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE
+		
+}
+
+#
+#	Function that stops the daemon/service.
+#
+d_stop() {
+	start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \
+		 --oknodo --user $USER --exec $DAEMON
+		 
+}
+
+
+case "$1" in
+  start)
+	log_daemon_msg "Starting $DESC" "$NAME"
+	d_start
+	log_end_msg $?
+	;;
+  stop)
+	log_daemon_msg "Stopping $DESC" "$NAME"
+	d_stop
+	log_end_msg $?
+	;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	d_stop
+	d_start
+	log_end_msg $?
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/compat
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/compat
@@ -0,0 +1 @@
+5
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/network-manager.install
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/network-manager.install
@@ -0,0 +1,25 @@
+debian/tmp/etc/init.d/NetworkManager
+debian/tmp/usr/sbin/NetworkManager 
+debian/tmp/usr/sbin/nm-system-settings
+debian/tmp/usr/lib/NetworkManager
+
+debian/tmp/lib/udev
+
+debian/tmp/etc/dbus-1/system.d/NetworkManager.conf
+debian/tmp/etc/dbus-1/system.d/nm-dhcp-client.conf
+debian/tmp/etc/dbus-1/system.d/nm-dispatcher.conf
+debian/tmp/etc/dbus-1/system.d/nm-system-settings.conf
+debian/tmp/etc/dbus-1/system.d/nm-avahi-autoipd.conf
+
+debian/tmp/usr/share/dbus-1/
+debian/tmp/usr/share/locale/
+debian/tmp/usr/share/man/
+debian/tmp/usr/share/NetworkManager/
+debian/tmp/usr/share/PolicyKit/
+
+debian/tmp/usr/lib/pppd/2.4.4/nm-pppd-plugin.so
+debian/tmp/usr/lib/pppd/2.4.4/nm-pppd-plugin.so usr/lib/pppd/2.4.5/
+
+debian/ifblacklist_migrate.sh /usr/lib/network-manager
+debian/nm-system-settings.conf /etc/NetworkManager/
+debian/source_network-manager.py /usr/share/apport/package-hooks/
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/changelog
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/changelog
@@ -0,0 +1,1823 @@
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo15sendai2) jaunty; urgency=low
+
+  *日本の3G通信モデムD26HWが使えるようになります 
+
+ -- lian liang <lianglian@thunderst.com>  Wed, 21 Apr 2010 17:04:36 +0800
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo15sendai1) jaunty; urgency=low
+
+  * 
+  * 
+
+ -- Jason Yen <jason.yen@canonical.com>  Thu, 11 Mar 2010 14:32:15 +0800
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo15) araneo; urgency=low
+
+  * add_c02lc.patch: Add support for C02LC Softbank Mobile 3G modem
+    (LP: #496861)
+
+ -- Debbie Beliveau <debbie.beliveau@canonical.com>  Fri, 22 Jan 2010 10:12:42 -0500
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo14) araneo; urgency=low
+
+  * add_l02a_support.patch: Add support for NTT docomo L-02A 3G modem (Sharp
+    request: LP: #490801)
+
+ -- Debbie Beliveau <debbie.beliveau@canonical.com>  Wed, 02 Dec 2009 14:45:10 -0500
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo13) araneo; urgency=low
+
+  * lp463465_tries_10count.patch (Sharp request, LP: #463465).
+
+ -- Bruno Dilly <bruno.dilly@canonical.com>  Tue, 10 Nov 2009 17:55:37 -0200
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo12) araneo; urgency=low
+
+  * c01lc2.patch: check for an extra T in AT command (Sharp patch, LP: #473635).
+
+ -- Ulisses Furquim <ulisses.furquim@canonical.com>  Thu, 05 Nov 2009 19:06:53 -0200
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo11) araneo; urgency=low
+
+  * lp463465_clear_tries.patch: clear tries when network ppp manager starts
+    (Sharp patch, LP: #463465).
+
+ -- Bruno Dilly <bruno.dilly@canonical.com>  Thu, 05 Nov 2009 17:41:14 -0200
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo10) araneo; urgency=low
+
+  * c01lc.patch: add tone flag for C01LC 3G modem (Sharp patch, LP: #473635).
+
+ -- Ulisses Furquim <ulisses.furquim@canonical.com>  Wed, 04 Nov 2009 16:40:55 -0200
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo9) araneo; urgency=low
+
+  * lp460903_always_false_request.patch: temporary workaround for when password
+    dialog is displayed and connection fails
+
+ -- Debbie Beliveau <debbie.beliveau@canonical.com>  Thu, 29 Oct 2009 10:58:40 -0400
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo8) araneo; urgency=low
+
+  * ignore_usbif.patch: Add case for D21LC modem
+
+ -- Debbie Beliveau <debbie.beliveau@canonical.com>  Tue, 06 Oct 2009 11:18:22 -0400
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo7) araneo; urgency=low
+
+  * ignore_usbif.patch: Add patch from Sharp
+  * many_3g_modem.patch: Add patch from Sharp
+  * add_bmobile_3gdevice.patch: Add patch from Sharp
+  * support_l05a.patch: Add patch from Sharp
+
+ -- Debbie Beliveau <debbie.beliveau@canonical.com>  Mon, 05 Oct 2009 13:14:59 -0400
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo6) araneo; urgency=low
+
+  * ppp_connect_fix.patch: Update patch per Sharp's request
+
+ -- Debbie Beliveau <debbie.beliveau@canonical.com>  Thu, 01 Oct 2009 10:18:01 -0400
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo5) araneo; urgency=low
+
+  * ignore_usbif.patch: Remove for now per Sharp's request.  Will re-introduce
+    in a later release.
+  * many_3g_modem.patch: Remove for now per Sharp's request.  Will re-introduce
+    in a later release.
+
+ -- Debbie Beliveau <debbie.beliveau@canonical.com>  Wed, 30 Sep 2009 11:10:03 -0400
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo4) araneo; urgency=low
+
+  * ignore_usbif.patch: Add case for Longcheer D21LC model
+
+ -- Debbie Beliveau <debbie.beliveau@canonical.com>  Tue, 29 Sep 2009 10:58:16 -0400
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo3) araneo; urgency=low
+
+  * ignore_usbif.patch: Patch from Sharp to ignore usb interface for certain
+    devices. Intended to fix LP: #432345 and LP: #432339.
+  * many_3g_modem.patch: Patch from Sharp to support additional 3G modems
+  * ppp_connect_fix.patch: Patch from LP: #371291 that Sharp has requested be
+    integrated
+
+ -- Debbie Beliveau <debbie.beliveau@canonical.com>  Mon, 28 Sep 2009 13:13:12 -0400
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo2) araneo; urgency=low
+
+  * debian/patches/huawei_d02hw_support.patch:
+    + add support for Huawei D02HW D12HW D21HW D22HW D23HW D31HW device
+
+ -- Hanatani Naoto <hanatani.naoto@sharp.co.jp>  Fri, 21 Aug 2009 14:30:01 +0900
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2netbook0araneo1) araneo; urgency=low
+
+  * update patches/series
+  * debian/patches/huawei_d02hw_support.patch:
+    + add support for Huawei D02HW device
+
+ -- Ulisses Furquim <ulisses.furquim@canonical.com>  Wed, 12 Aug 2009 17:23:51 -0300
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2) jaunty; urgency=low
+
+  * fix LP: #356517 - NetworkManager does not detect eth0 on armel; on armel
+    network devices have no visible bus and hence appear similar to virtual
+    devices that got blacklisted by the fix for LP: #199140; for jaunty
+    we workaround the issue by explicitly disabling the virtual device
+    blacklisting on __ARMEL__
+    - add patches/lp356517_manage_virtual_devices_on_armel.patch
+    - update patches/series
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 14 Apr 2009 13:53:20 +0200
+
+network-manager (0.7.1~rc4.1.cf199a964-0ubuntu1) jaunty; urgency=low
+
+  * upstream release 0.7.1 final candidate 1 (Wed Apr 8 06:38:37 2009 -0400)
+    + http://git.freedesktop.org/NetworkManager/NetworkManager/
+    + NETWORKMANAGER_0_7 (branch)
+      - modem-probe: retry opening the serial port if --delay is used (LP: #351803)
+        (Up to --delay milliseconds.)
+      - core: ignore DHCP-sent MTUs less than 577 (LP: #352779)
+      - core: update FSF address (bgo #577949)
+      - modem-probe: don't restrict probing on tty device name (LP: #351803)
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 08 Apr 2009 12:53:41 +0200
+
+network-manager (0.7.1~rc4-0ubuntu1) jaunty; urgency=low
+
+  * upstream release 0.7.1 rc4
+    + http://git.freedesktop.org/NetworkManager/NetworkManager/
+    + NETWORKMANAGER_0_7 (branch)
+      - dont send AT commands to serial consoles that are not using a modem driver 
+      - nozomi probing (LP: #351803)
+      - allow users with polkit authorization to view/edit secrets for system connections
+      - fix crash that might be LP: #319918
+  * allow connection sharing out of the box; we add dnsmasq-base to Recommends:
+    - update control
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 06 Apr 2009 12:43:31 +0200
+
+network-manager (0.7.1~rc3.2.gitb8fc83a7-0ubuntu1) jaunty; urgency=low
+
+  * upstream 0.7.1 rc3 + gitb8fc83a7 (Thu Mar 26 17:05:41 2009 -0400)
+    + http://git.freedesktop.org/NetworkManager/NetworkManager/
+    + NETWORKMANAGER_0_7 (branch)
+    + fix broken udev-prober for 3G modems (LP: #346835)
+  * fix LP: #348521 - network-manager sould depend on ppp
+    - update control
+  * update diverged patches
+    - update patches/60_NULL_info_linux_driver.patch
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 27 Mar 2009 14:37:33 +0100
+
+network-manager (0.7.1~rc3.1.git4cf2da146-0ubuntu1) jaunty; urgency=low
+
+  * upstream 0.7.1 rc3 + git4cf2da146
+    + http://git.freedesktop.org/NetworkManager/NetworkManager/
+    + NETWORKMANAGER_0_7 (branch)
+  * adjust patches to changed code base
+    - update patches/60_NULL_info_linux_driver.patch
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 19 Mar 2009 15:05:35 +0100
+
+network-manager (0.7.1~rc3-0ubuntu2) jaunty; urgency=low
+
+  * Recommend plasmoid-network-manager not network-manager-kde
+   - Closes LP: #340210
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Mar 2009 14:17:50 +0000
+
+network-manager (0.7.1~rc3-0ubuntu1) jaunty; urgency=low
+
+  * upstream 0.7.1 rc3
+    + http://git.freedesktop.org/NetworkManager/NetworkManager/
+    + NETWORKMANAGER_0_7 (branch)
+  * point Vcs-Bzr: to new 0.7.1 packaging branch
+    - update control
+  * fix .symbols files for libnm-glib0 and libnm-util0 to only contain symbols
+    for the right shared libs
+    - update libnm-glib0.symbols
+    - update libnm-util1.symbols
+
+  [ Steve Langasek ]
+  * src/nm-hal-manager.c: ignore virtual 'wired' devices whose 
+    originating device is /org/freedesktop/Hal/devices/computer, since 
+    these are generally managed by some other daemon and network-manager
+    just gets in the way.  LP: #199140.
+    - add patches/lp199140_dont_manage_virtual_devices.patch
+    - update series
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 05 Mar 2009 00:54:41 +0100
+
+network-manager (0.7.1~rc1+20090220-0ubuntu2) jaunty; urgency=low
+
+  * drop suggests on udev-extras as the modem code was moved into
+    network-manager
+    - update control
+  * ship udev modem probe rules and nm-modem-probe binary in
+    network-manager package
+    - update network-manager.install
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 23 Feb 2009 15:52:55 +0100
+
+network-manager (0.7.1~rc1+20090220-0ubuntu1) jaunty; urgency=low
+
+  * upstream 0.7.1 rc1 (post) snapshot
+    + http://git.freedesktop.org/NetworkManager/NetworkManager/
+    + NETWORKMANAGER_0_7 (branch)
+    + Feb 20, 2009 (a2b55d43)
+  * Fix LP: #332064 - carrier detect broken for forcedeth and other drivers
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 20 Feb 2009 16:30:39 +0100
+
+network-manager (0.7.1~rc1-0ubuntu2) jaunty; urgency=low
+
+  * upstream 0.7.1 rc1 release taken from git
+    + http://git.freedesktop.org/NetworkManager/NetworkManager/
+    + NETWORKMANAGER_0_7 (branch)
+    + Feb 18, 2009 (6176cc68)
+  * rebase some patches on new upstream code base
+    - update patches/60_NULL_info_linux_driver.patch
+  * start NetworkManager daemon later (50) and remove old init links
+    accordingly (requested by Keybuk aka scott@ubuntu.com)
+    - update debian/network-manager.postinst
+  * build depend on libudev-dev to enable support for modem probing
+    through udev-extras; in turn add udev-extras to suggests
+    - update control
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 19 Feb 2009 23:35:23 +0100
+
+network-manager (0.7.1~20090213+gitf142e15-0ubuntu1) jaunty; urgency=low
+
+  * new upstream snapshot (0.7.1 pre)
+    + http://git.freedesktop.org/NetworkManager/NetworkManager/
+    + NETWORKMANAGER_0_7 (branch)
+    + Feb 13, 2009 (f142e15)
+  * patch housekeeping for new upstream code
+    + remove upstreamed patches
+      - delete debian/patches/04-ltversioning.patch
+      - delete debian/patches/ftbfs_nm_netlink_monitor.patch
+      - delete debian/patches/lp290468_only_consider_name_suffix_VPN_service_files.patch
+      - update debian/patches/series
+    + adjust patches to new upstream code base
+      - update debian/patches/lp292054_tune_supplicant_timeout_60s.patch
+  * add symbol files for libs: libnm-util1 and libnm-glib0
+    - add libnm-glib0.symbols
+    - add libnm-util1.symbols
+  * set default behaviour for bzr-builddeb to merge = True
+    - add .bzr-builddeb/default.conf
+  * bump shlibs version for libnm-glib0 and libnm-util1 to
+    -V "libnm-glib0 (>= 0.7.1~20090213)"
+    - update rules
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 17 Feb 2009 11:00:12 +0100
+
+network-manager (0.7-0ubuntu2) jaunty; urgency=low
+
+  * ppp 2.4.5git transition: bump ppp-dev lower version bound to 2.4.5~
+    - update debian/control
+
+  * fix LP: #120363 - NetworkManager should support smartcard based
+    certificate; we apply the backend patch contributed by David Smith
+    - add debian/patches/lp120363_smartcard_pkcs11.patch
+    - update debian/patches/series
+
+  [ Alessandro Ghersi <alessandro.ghersi@fastwebnet.it> ]
+  * fix LP: #270584 add the dependency network-manager-dev in
+    libnm-glib-dev; also fixes LP: #321473 liferea doesnt handle
+    network-manager online/offline state 
+    - update debian/control
+  * update Standards-Version to 3.8.0
+    - update debian/control
+
+  [ Steven S Danna <ssd7@pitt.edu> ]
+  * fix LP: #283416 - add /etc/init.d/NetworkManager status; init
+    script was fixed upstream; however, we take the lsb-base lower
+    version bound from the bug (>= 3.2-14)
+    - udpate debian/control
+
+ -- Alexander Sack <asac@ubuntu.com>  Sat, 14 Feb 2009 22:16:12 +0100
+
+network-manager (0.7-0ubuntu1) jaunty; urgency=low
+
+  * (merge) new upstream release NetworkManager 0.7 final
+    - rev 3802 lp:~vcs-imports/network-manager/main/
+    + fix LP: #288963 Network Manager fails to connect to a system stored
+      network with "set_network_cb(): Couldn't set network config: Did not receive
+      correct message.." in intrepid
+    + fix LP: #288703 Routes lost on DHCP lease renewal (breaks VPN)
+
+  * drop probe v250 modem patch; this should be done in udev-extras; until
+    that happens we rely on accurate hal-info
+    - delete debian/patches/add_probe_for_v250_modems.patch
+    - update debian/patches/series
+  * drop upstreamed patches
+    - delete debian/patches/50_gcc43.patch
+    - delete debian/patches/lp282207_set_apn_at_syntax.patch
+    - delete debian/patches/lp268667_more_ppp_default_options.patch
+    - delete debian/patches/lp278631-initscript-polishing.patch
+    - update debian/patches/series
+  * drop unused patch
+    - delete debian/patches/41o_completely_deactivate_stage1.patch
+  * make manual regristration timeout patch out of automatic one (which
+    was applied upstream)
+    - rename debian/patches/lp303142_more_time_for_automatic_registration.patch
+      => debian/patches/lp303142_more_time_for_manual_registration.patch
+  * add patch to fix ftbfs
+    - add debian/patches/ftbfs_nm_netlink_monitor.patch
+    - update debian/patches/series
+  * [libnm-util-dev] dont try to install nm-setting-ip6-config.h - which is
+    supposed to be hidden in 0.7 final
+    - update debian/libnm-util-dev.install
+  * prepatch upstream soname version bump for libnm-util
+    - add debian/patches/04-ltversioning.patch
+    - update debian/patches/series
+    ship the libs in libnm-util1
+    - update debian/control
+    - rename debian/libnm-util0.install => debian/libnm-util1.install
+    and bump so shlibs control file info for libnm-util1
+    - update debian/rules
+  * add easy bzr builddeb support with proper upstream-revision (--show-ids)
+    - add .bzr-builddeb/default.conf
+  * install plugin in ppp 2.4.4 and 2.4.5 directory
+    - update debian/network-manager.install
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 12 Jan 2009 13:29:24 +0100
+
+network-manager (0.7~~svn20081018t105859-0ubuntu2) jaunty; urgency=low
+
+  * fix LP: #292054 - Some drivers take too long to associate (Was:
+    network-manager 0.7 always asks for WPA passphrase); we workaround
+    this driver/wpasupplicant bug by giving association more time
+    (e.g. 60sec instead of 25sec)
+    - add debian/patches/lp292054_tune_supplicant_timeout_60s.patch
+    - update debian/patches/series
+  * fix LP: #256905 - dbus policy file (nm-avahi-autoipd.conf) not properly
+    deployed in package; install nm-avahi-autoipd.conf
+    - update debian/network-manager.install
+  * fix LP: #282207 - [Sierra] NM 0.7 does not set APN for AT&T 3G connection;
+    apply fix from Jerone Young
+    - add debian/patches/lp282207_set_apn_at_syntax.patch
+    - update debian/patches/series
+  * fix LP: #268667 - not all required ppp options get set on command line
+    which makes ppp use bad values from /etc/ppp/options; we backport upstream
+    fix
+    - add debian/patches/lp268667_more_ppp_default_options.patch
+    - update debian/patches/series
+  * fix LP: #291564 - ifupdown network manager does not blacklist/unmanage
+    mapped devices in managed=false mode; thanks to Stephan Trebels for the
+    patch
+    - add debian/patches/lp291564_ifupdown_unmanage_mapping_and_iface.patch
+    - update debian/patches/series
+  * fix LP: #291902 - ifupdown plugin should not export any parsed connection
+    configuration when running in managed=false mode; we fix this by exporting
+    empty connection list in unmanaged mode
+    - add debian/patches/lp291902_IFUPDOWN_dont_export_connection_in_unmanaged_mode.patch
+    - update debian/patches/series
+  * belt-and-braces fix LP: #290468 VPN fails, "/usr/bin/nm-ppp-starter
+    missing"; we remove obsolete conffiles in -pptp .preinst; in case user
+    modified them they will be renamed to .dpkg-bak; this patch takes care that
+    NM doesn't consider files in /etc/NetworkManager/VPN that don't have a
+    .name filename suffix.
+    - add debian/patches/lp290468_only_consider_name_suffix_VPN_service_files.patch
+    - update debian/patches/series
+  * fix LP: #303142 - 3G [Option] some modems take a while time to register on
+    network (CREG); we use g_timeout_add instead of _idle_add to give the
+    modem some rest during registration phase.
+    - add debian/patches/lp303142_more_time_for_automatic_registration.patch
+    - update debian/patches/series
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 28 Nov 2008 13:47:07 +0100
+
+network-manager (0.7~~svn20081018t105859-0ubuntu1) intrepid; urgency=low
+
+  * new upstream snapshot Sat 2008-10-18 10:58:59 +0000 (rev 3648)
+    from lp:~vcs-imports/network-manager/main. Includes:
+    + (bzr3642) proper wireless capability detection
+      - update src/nm-device-wifi.c
+    + update translations nb
+
+  * More cherry-picks:
+    + (bzr3650) Updated Belarusian Latin translation.
+      - update vpn-daemons/pptp/po/be@latin.po
+
+  * Changes in upstream snapshot that don't affect directly produced binary
+    packages:
+    + (bzr3645) NA/openvpn: support .cer and .crt certificates for openvpn (related
+      to LP: #270762)
+      - update vpn-daemons/openvpn/properties/auth-helpers.c
+    + (bzr3646) NA/openvpn: The "Certificates (TLS)" tab should also be
+      present for NM_OPENVPN_CONTYPE_PASSWORD (LP: #280429)
+      - update vpn-daemons/openvpn/properties/auth-helpers.c
+    + updated vpn translations es, sv
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 20 Oct 2008 17:35:58 +0200
+
+network-manager (0.7~~svn20081015t224738-0ubuntu1) intrepid; urgency=low
+
+  * new upstream snapshot Wed 2008-10-15 22:47:38 +0000 (bzrrev 3641)
+  - a few more follow up fixes for routing routing/subnet/vpn handling.
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 16 Oct 2008 11:08:39 +0200
+
+network-manager (0.7~~svn20081015t024626-0ubuntu1) intrepid; urgency=low
+
+  new upstream snapshot Wed 2008-10-15 02:46:26 +0000 (bzrrev 3637); topic:
+  - more vpn and routing fixes
+
+  [ Alexander Sack <asac@ubuntu.com> ]
+  * drop upstreamed IFUPDOWN patches
+    - delete debian/patches/003-IFUPDOWN-remove-unused-callbacks.loom.patch		
+    - delete debian/patches/004-IFUPDOWN-devtracking.loom.patch			
+    - delete debian/patches/005-IFUPDOWN-unmanaged-mode.loom.patch			
+    - delete debian/patches/006-IFUPDOWN-parse-system-settings.loom.patch		
+    - delete debian/patches/007-IFUPDOWN-managed-mode.loom.patch			
+  * adjust patches that didnt apply cleanly anymore
+    - update debian/patches/008-BACKEND-debian-fallback-to-generic-loopback.loom.patch
+  * fix eventual restart races by --retry'ing at least 5 seconds for NM to stop
+    in init script
+    
+  [ Mario Limonciello <superm1@ubuntu.com> ]
+  * debian/network-manager.postinst:
+    - Set startup priority to be lower than Ubiquity to allow only-ubiquity
+      installs to have network access. (LP: #277302)
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 16 Oct 2008 00:08:41 +0200
+
+network-manager (0.7~~svn20081008t224042-0ubuntu3) intrepid; urgency=low
+
+  * fix LP: #281187: NetworkManager crashed with SIGSEGV in nl_addr_get_len();
+    we dont set libhal properties anymore, but instead use the result directly
+    to categorize GSM/CDMA modems
+    - update debian/patches/add_probe_for_v250_modems.patch
+  * fix LP: #282554: NM 0.7 fails to build on all architectures, but amd64 and
+    i386; we don't use nm_error, but nm_warning when modem probe fails on IO
+    level; this works around a bug about a missing signal.h include in glib.
+    - update debian/patches/add_probe_for_v250_modems.patch
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 13 Oct 2008 18:23:41 +0200
+
+network-manager (0.7~~svn20081008t224042-0ubuntu2) intrepid; urgency=low
+
+  * more ifupdown compatibility: we maintain /var/run/network/ifstate
+    in network manager dispatcher script. This fixes a bug in the
+    nfs init script that uses /var/run/network/ifstate to determine
+    whether all required devices are properly up.
+    - update debian/network-manager-dispatcher.script
+  * fix LP: #191889: [MASTER] [WORKAROUND] "Offline Mode" feature fails to
+    detect proper online state for networks that are managed outside of
+    network manager; we fix this by using NM_STATE_CONNECTED when unmanaged
+    devices exist.
+
+ -- Alexander Sack <asac@ubuntu.com>  Sat, 11 Oct 2008 14:25:55 +0200
+
+network-manager (0.7~~svn20081008t224042-0ubuntu1) intrepid; urgency=low
+
+  new upstream snapshot: Wed 2008-10-08 22:40:42 +0000 (bzrrev 3615) from
+  lp:~vcs-imports/network-manager/main branch
+
+  * fix LP: #277063 - routing randomness
+  * fix save system settings feature for keyfile plugin
+  * Fix LP: #278631 - NM output not going cleanly on console; we use
+    /lib/lsb/init-functions to do proper logging
+    - add debian/patches/lp278631-initscript-polishing.patch
+    - update debian/patches/series
+  * drop upstreamed patches:
+    000-FIXCRASH-in-add_default_dhcp_connection.loom.patch,
+    001-IFUPDOWN-wep-tx-keyidx.loom.patch, 002-IFUPDOWN-hostname.loom.patch
+    - update debian/patches/series
+    - delete debian/patches/000-FIXCRASH-in-add_default_dhcp_connection.loom.patch
+    - delete debian/patches/001-IFUPDOWN-wep-tx-keyidx.loom.patch
+    - delete debian/patches/002-IFUPDOWN-hostname.loom.patch
+  * adjust patches to new upstream codebase
+    - update debian/patches/003-IFUPDOWN-remove-unused-callbacks.loom.patch
+    - update debian/patches/004-IFUPDOWN-devtracking.loom.patch
+    - update debian/patches/005-IFUPDOWN-unmanaged-mode.loom.patch
+    - update debian/patches/006-IFUPDOWN-parse-system-settings.loom.patch
+    - update debian/patches/007-IFUPDOWN-managed-mode.loom.patch
+    - update debian/patches/008-BACKEND-debian-fallback-to-generic-loopback.loom.patch
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 09 Oct 2008 16:13:09 +0200
+
+network-manager (0.7~~svn20081004t225044-0ubuntu1) intrepid; urgency=low
+
+  new upstream snapshot: Sat 2008-10-04 22:50:44 (bzrrev 3602) from
+  lp:~vcs-imports/network-manager/main branch
+
+  * merging final revision of main.eni branch which brings
+    us back to parity with upstream branch. features temporarily lost from
+    "upstream" code base due to this
+    + graceful defaults for ifupdown ip4settings
+    + wep-tx-keyidx support
+    + pre-run intltoolize
+  * we run intltoolize -f -c  in pre-build:: target
+    - update debian/rules
+  * drop lp276253_fix_system_hostname.patch; upstream behaviour became more
+    graceful and we will add ifupdown plugin support to read/write
+    /etc/hostname
+    - delete debian/patches/lp276253_fix_system_hostname.patch
+    - update debian/patches/series
+  * enable ifupdown system-config-interface implementation by default
+    (LP: #256054)
+    - update debian/nm-system-settings.conf
+  * rewrite README.Debian; we document "managed" vs. "unmanaged" mode as well
+    as "dial up configurations"
+    - update debian/README.Debian
+  * reflect the implicit default mode (unmanaged) in default
+    nm-system-settings.conf shipped by ubuntu package in intrepid
+    - update debian/nm-system-settings.conf
+  * (disabled) add code that enforces -Os instead of -O2
+    - update debian/rules
+
+  Cherry-Picking upstream submitted patches:
+  * debian/patches/000-FIXCRASH-in-add_default_dhcp_connection.loom.patch:
+    - fix crash of nm-system-settings when replugging devices that get a
+      default connection created (wired)
+  * debian/patches/001-IFUPDOWN-wep-tx-keyidx.loom.patch:
+    - add support for wep-tx-keyidx wpa setting to ifupdown plugin
+  * debian/patches/002-IFUPDOWN-hostname.loom.patch:
+    - implement read/write support for /etc/hostname in ifupdown system config
+  * debian/patches/003-IFUPDOWN-remove-unused-callbacks.loom.patch:
+    - remove some unused callbacks (cleanup)
+  * debian/patches/004-IFUPDOWN-devtracking.loom.patch:
+    - add device tracking infrastructure - prepare managed/unmanaged mode
+  * debian/patches/005-IFUPDOWN-unmanaged-mode.loom.patch:
+    - implement global unmanaged mode (LP: #256054)
+  * debian/patches/006-IFUPDOWN-parse-system-settings.loom.patch:
+    - implement system-settings boolean key ifupdown:managed - default: false
+      (LP: #256054)
+  * debian/patches/007-IFUPDOWN-managed-mode.loom.patch:
+    - implement managed-mode: update mac address of nm-wired/wirless-settings
+      (LP: #256054)
+  * debian/patches/008-BACKEND-debian-fallback-to-generic-loopback.loom.patch:
+    - use ifconfig (instead of ifup) to bring up loopback. If ifconfig is not
+      available we fallback to the generic (libnl based) implementation
+      shipped by NetworkManager
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 06 Oct 2008 13:40:08 +0200
+
+network-manager (0.7~~svn20080928t225540+eni0-0ubuntu2) intrepid; urgency=low
+
+  [ Alexander Sack <asac@ubuntu.com> ]
+  * remove patches forwarded/applied upstream
+    - delete debian/patches/80_lp259503_access_to_freed_device_struct.patch
+    - delete debian/patches/honour_resolvconf_exitcode.patch
+    - delete debian/patches/lp269010_keyfile_secrets_crash.patch
+    - update debian/patches/series
+  * LP: #276253 - NM 0.7 sets hostname to localhost.localdomain instead of
+    what is in /etc/hostname - we fallback to hostname configured in
+    /etc/hostname even when no distro specific system plugin is enabled; we
+    do this for all cases until a proper solution was found.
+    - add debian/patches/fix_system_hostname.patch
+    - update debian/patches/series
+
+  [ Matt Zimmerman <mdz@ubuntu.com> ]
+  * (apport hook) Use [].append rather than the += operator, to avoid things
+    like: "InterestingModules: b 4 4" (should be b44)
+    - update debian/source_network-manager.py
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 02 Oct 2008 20:37:20 +0200
+
+network-manager (0.7~~svn20080908t183521+eni0-0ubuntu4) intrepid; urgency=low
+
+  * src/probe-modem.c: type_gsm, type_cdma and type_v250 variables are not
+    properly reset when the retry: block is run twice in probe_modem. This can lead to
+    unpredicted behaviour; the fix initializes those variables at the beginning of the
+    retry: block; (LP: #271446)
+    - update debian/patches/add_probe_for_v250_modems.patch
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 25 Sep 2008 03:27:46 +0200
+
+network-manager (0.7~~svn20080908t183521+eni0-0ubuntu3) intrepid; urgency=low
+
+  [ Antti "Wellark" Kaijanmäki ]
+  * Fix LP: #268095 - MASTER Network Manager should probe for GSM and CDMA command 
+    sets; we probe all modems tagged as v.250 in hal that otherwise dont specify a
+    GSM or CDMA command set.
+    - added debian/patches/add_probe_for_v250_modems.patch
+    - modified debian/patches/series
+
+  [ Alexander Sack <asac@ubuntu.com> ]
+  * point Vcs-Bzr to right source tree
+    - update debian/control
+  * Fix LP: #269755 - "network manager always crashes on resume"; these crashes
+    are a regression introduced by fix for LP: #259503 which was first
+    released in 0.7~~svn20080908t183521+eni0-0ubuntu1. To fix we redo the patch
+    in a way that will eliminate any idle callbacks as soon as they
+    become irrelevant.
+    - update debian/patches/80_lp259503_access_to_freed_device_struct.patch
+
+  [ Steve Langasek <steve.langasek@ubuntu.com> ]
+  * system-settings/plugins/keyfile/plugin.c: it might be better if we were
+    casting the data from the hash to a gobject, instead of the key which is
+    a filename... fixes a crash whenever trying to handle system-level secrets.
+    LP: #269010.
+    - add debian/patches/lp269010_keyfile_secrets_crash.patch
+    - update debian/patches/series
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 17 Sep 2008 02:54:56 +0200
+
+network-manager (0.7~~svn20080908t183521+eni0-0ubuntu2) intrepid; urgency=low
+
+  * fix FTBFS; we add uuid-dev to Build-Depends
+    - update debian/control
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 10 Sep 2008 09:01:07 +0200
+
+network-manager (0.7~~svn20080908t183521+eni0-0ubuntu1) intrepid; urgency=low
+
+  [ Alexander Sack <asac@ubuntu.com> ]
+  * new upstream snapshot (Mon 2008-09-08 18:35:21 rev3504)
+  * merge improved ifupdown system config implementation from main.eni branch;
+    Mon 2008-09-08 20:47:20 +0200; rev 2828
+  * Fix LP: #255839 - "0.7 N-M "system setting" does not work"; we create the
+    /etc/NetworkManager/system-connections/ directory during package install now
+    - update debian/network-manager.dirs
+  * adjust patch due to changed ifupdown plugin source dir
+    - update debian/patches/50_gcc43.patch
+  * fix LP: #256480 - "network-manager 0.7 breaks resolvconf integration"; we
+    pass --with-resolvconf=/sbin/resolvconf to configure.
+    - update debian/rules
+  * (proposed) fix LP: #259503 - "crashes when unplugging device (or unloading
+    module)" - crash caused by idle handler accessing already freed device.
+    We fix that for wireless and ethernet, which both were affected by
+    properly refcounting the device gobjects.
+    - add debian/patches/80_lp259503_access_to_freed_device_struct.patch
+    - update debian/patches/series
+  * drop ifupdown from Depends: - there is no sense to depend on replacements
+    - update debian/control
+  * drop patch applied upstream
+    - delete debian/patches/05-debian_backend.patch
+    - update debian/patches/series
+  * Fix LP: #261688 - NetworkManager build dependency for "libdbus-glib-1-dev
+    (>= 0.60)" incorrect; we adjust the version to >= 0.74.
+    - update debian/control
+  * bump shlibs requirements for libnm-util0 and libnm-glib0 packages to >=
+    0.7~~svn20080908
+    - update debian/rules
+  * Fix - Networkmanager doesn't update resolv.conf when resolvconf is
+    installed, but /etc/resolv.conf isnt a link; we fix that by honouring
+    the resolvconf exit code and fall back to "normal" named behaviour in case
+    it fails. This requires a resolvconf update which currently doesnt return
+    a non-zero exit code when it fails in such a way.
+    - add debian/patches/honour_resolvconf_exitcode.patch
+    - update debian/patche/series
+
+  [ Matt Zimmerman <mdz@ubuntu.com> ]
+  * Add apport package hook (LP: #258552)
+    - add debian/network-manager.links
+    - add debian/source_network-manager.py
+    - update debian/network-manager.install
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 09 Sep 2008 16:24:08 +0200
+
+network-manager (0.7~~svn20080818t061112+eni0-0ubuntu1) intrepid; urgency=low
+
+  * fix LP: #255844 - add update-notifier-common to the Depends
+    - update debian/control
+  * fix LP: #255958 - nm-tool broken on nm 0.7; we properly run make install
+    for test/ source directory with proper DESTDIR in
+    binary-install/network-manager:: cdbs target; in turn we dont explicitly
+    install the nm-tool binary in network-manager.install
+    - update debian/rules
+    - update network-manager.install
+  * adjust patches for new upstream codebase
+    - update debian/patches/05-debian_backend.patch
+    - update debian/patches/50_gcc43.patch
+    - remove debian/patches/19_interfaces_can_have_more_than_one_instance.patch
+    - update debian/patches/series
+  * adjust files installed in libnm-util-dev package: we add
+    nm-setting-ip6-config.h and we remove nm-setting-vpn-properties.h from
+    and to the .install list
+    - update debian/libnm-util-dev.install
+  * add gtk-doc-tools to build-depends
+    - update debian/control
+  * Fix LP: #145653 - "signal handler prevents apport crash reporting"
+    - add debian/patches/70_lp145653_no_sigaction_for_crashes.patch
+    - update debian/patches/series
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 18 Aug 2008 21:27:59 +0200
+
+network-manager (0.7~~svn20080720t224551+eni1-0ubuntu1) intrepid; urgency=low
+
+  * new bzr eni/ifupdown preview based on trunk rev 3808 (Sun 2008-07-20 22:45:51
+    +0000) aka eni rev 2800
+  * adjust 05-debian_backend.patch to new upstream code base
+    - update debian/patches/05-debian_backend.patch
+  * drop patches replaced by upstream features
+    - debian/patches/20_do_not_take_over_dhcpv4iface_when_v6_is_configured.patch
+    - update debian/patches/series
+  * drop patches applied upstream
+    - debian/patches/dhclient_dbus_policy_ubuntu.patch
+    - update debian/patches/series
+  * drop 41k_20_sec_wireless_link_timeout.patch after a similar fix has
+    landed in upstream sources
+    - delete debian/patches/41k_20_sec_wireless_link_timeout.patch
+    - update debian/patches/series
+  * dont install NetworkManagerDispatcher files
+    - update debian/network-manager.install
+    - update debian/network-manager.manpages
+  * install debian/tmp/usr/include/NetworkManager/nm-setting-8021x.h and
+    debian/tmp/usr/include/NetworkManager/nm-setting-pppoe.h to libnm dev
+    package
+    - update debian/libnm-util-dev.install
+  * drop nm-param-spec-specialized.h from libnm-util-dev
+    - update debian/libnm-util-dev.install
+  * ship libnm_glib_vpn.pc in libnm-glib-dev package
+    - update debian/libnm-glib-dev.install
+  * ship org.freedesktop.network-manager-settings.system.policy in
+    network-manager package; this allows the connection editor to obtain
+    modify privileges through authentication.
+    - update debian/network-manager.install
+  * ship all usr/share/* pieces in network-manager package
+    - update debian/network-manager.install
+  * enable keyfile plugin for global system settings daemon
+    - add debian/nm-system-settings.conf
+    - update debian/network-manager.install
+  * install nm-system-settings binary and plugins
+    - update debian/network-manager.install
+  * use --libexecdir=/usr/lib/NetworkManager to prevent clutter of
+    file system hierarchy; dont install usr/lib/network-manager accordingly.
+    - update debian/rules
+    - update debian/network-manager.install
+  * ship usr/lib/pppd/2.4.4/nm-pppd-plugin.so in network-manager package
+    - update debian/network-manager.install
+  * revert previous major SO version bump for libnm-util; add explicit
+    MAKESHLIBS version for libnm-util0 (>=0.7~~)
+    - rename debian/libnm-util1.install => debian/libnm-util0.install
+    - update debian/control
+  * add libpolkit-dbus-dev to Build-Depends
+    - update debian/control
+  * add libnss3-dev to Build-Depends
+    - update debian/control
+  * add debian/patches/50_gcc43.patch to support intrepid
+    - add debian/patches/50_gcc43.patch
+    - update debian/patches/series
+  * add Conflicts/Replaces on network-manager-pptp (<< 0.7~~) to prevent
+    upgrading conflict
+    - update debian/control
+  * guard against drivers that dont have linux.info.driver hal property in
+    the originating_device (hal); we provide a default driver name to prevent
+    NULL pointer issues.
+    - add debian/patches/60_NULL_info_linux_driver.patch
+    - update debian/patches/series
+  * export DHCP_CLIENT_PATH=/sbin/dhclient in order to not add dhclient as
+    build-dependency
+    - update debian/rules
+  * install update-rc.d startup links for NetworkManager in runlevels 2 3 4 5
+    and dont stop in any runlevel
+    - update debian/network-manager.postinst
+  * remove NetworkManager update-rc.d links when upgrading from any package <<
+    this version before setting up the runlevels from above
+    - update debian/network-manager.postinst
+  * dont restart NetworkManager in postinst, but use restart-notifier to
+    ask users for reboot
+    - update debian/network-manager.postinst
+  * dont run 25NetworkManager and 26NetworkManagerDispatcher scripts in any
+    pre/post script without testing that it exists and is executable
+    - update debian/network-manager.preinst
+    - update debian/network-manager.prerm
+  * introduce rm_conffile function and abort_rm_conffile function; use it
+    to remove dbus event scripts
+    - update debian/network-manager.preinst
+    - update debian/network-manager.postrm
+  * remove backup for unmodified and successfully moved or removed conffiles
+    in postinst
+    - update debian/network-manager.postinst
+  * remove NetworkManager update-rc.d links in postrm when downgrading
+    - update debian/network-manager.postrm
+  * dont install Dispatcher
+    - update debian/rules
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 07 Aug 2008 10:20:55 +0200
+
+network-manager (0.7~~svn20080121t191418+eni1-0ubuntu0~pre7) hardy; urgency=low
+
+  * 0.7 svn preview 20080121t191418 with initial eni support
+  * fix network-manager.{postinst,postrm,preinst,prerm} scripts to
+    properly migrate the /etc/dbus-1/event.d/25NetworkManager script
+    to /etc/init.d/NetworkManager
+    - add debian/network-manager.postrm
+    - add debian/network-manager.preinst
+    - update debian/network-manager.postinst
+    - update debian/network-manager.prerm
+  * drop depends on dhcdbd
+  * bump -version-info of libnm-util and ship libnm-util1 package
+    - update debian/control
+    - rename debian/libnm-util0.install => debian/libnm-util1.install
+  * force upgrade of libnm-glib0 by adding explicit MAKESHLIBS version
+    - update debian/rules
+  * stop old network manager using /etc/dbus-1/event.d/25NetworkManager
+    script and remove it after this was done
+    - update debian/network-manager.postinst
+  * add automake1.9 to Build-Depends
+    - update debian/control
+  * add ppp-dev to Build-Depends
+    - update debian/control
+  * include empty aclocal.m4 file to make cdbs trigger aclocal auto run
+    - add aclocal.m4
+  * bump Build-Depends version of libnl-dev to (>= 1.0~pre8) and runtime
+    Depends of wpasupplicant to (>= 0.6.1~)
+  * unfold Build-Depends: and Depends: lines to improve legability of patches
+    - update debian/control
+  * ship nm-setting-cdma.h to libnm-util-dev
+    - update debian/libnm-util-dev
+  * don't pass obsolete options --with-wpa_supplicant and --with-dhcdbd to
+    configure anymore
+    - update debian/rules
+  * don't install /etc/dbus-1/event.d/25NetworkManager and don't restart/stop
+    NetworkManager from /etc/dbus-1/event.d anymore
+    - update debian/rules
+    - update debian/network-manager.postinst
+    - update debian/network-manager.prerm
+  * use invoke-rc.d to restart and stop NetworkManager script installed in
+    /etc/init.d and use update-rc.d to setup/remove NetworkManager to the
+    |defaults 30| runlevels
+    - update debian/network-manager.postinst
+    - update debian/network-manager.prerm
+  * enable all autotools updates through cdbs
+    - update debian/rules
+  * adapt patches to account for changed source base:
+    - update 41k_20_sec_wireless_link_timeout.patch
+  * allow dhcp user to use dbus service org.freedesktop.nm_dhcp_client
+    - add debian/patches/dhclient_dbus_policy_ubuntu.patch
+    - update debian/patcheds/series
+  * install /etc/dbus-1/system.d/nm-dhcp-client.conf
+    - update debian/network-manager.install
+  * update patchset to account for changed source base in debian/patches/
+    and update debian/patches/series accordingly:
+    - delete 01-supplicant_timeout.patch: not applicable
+    - delete 04-if_fix.patch: applied upstream
+    - delete 06-dispatch_more_events.patch: doesn't apply anymore (might need
+      porting)
+    - delete 11-man_page_sh_name.patch: applied upstream
+    - delete 13-rml-wpa-workarounds.patch: driver workarounds -> dropped for now (might need resurrection if drivers don't work out as good - with regards to wext - as expected)
+    - delete 14-j-hostap-supplicant-driver.patch: more driver workarounds for hostap -> might need resurrection at some point
+    - delete 16_undefined_macros.patch: not applicable anymore
+    - delete 17_avahi_autoipd.patch: disable for now (might need porting if
+      avahi doesn't work)
+    - delete 21_manual_means_always_online.diff: not applicable anymore
+    - delete 23_nm-monitor-eni.diff: doesn't really apply anymore. has to be
+      done differently now
+    - delete 24pp_svn2578-gnome354565-fix-ethernet-link-detection-races.patch:
+      applied upstream
+    - delete 41c_ubuntu-fixup--get_mode_always_fails_typo_fix.patch: applied
+      upstream.
+    - delete 41e_fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch: not
+      applicable
+    - delete 41m_unref_dbus_connection_on_shutdown.patch: not applicable and
+      appears to be properly fixed now
+    - delete 41r_wpa_control_custom_timeout.patch: not applicable (wpa
+      communication is now done through dbus)
+    - delete 41r_wpa_control_explicit_TIMEOUT_reply_fixup.patch: not applicable
+      (wpa communication is now done through dbus)
+    - delete 41s_wpa_ctrl_socket_non_block.patch: not applicable as there is not
+      wpa socket communication in nm 0.7 anymore
+    - delete 41t_nm_device_wireless_index_ctrl_sockets_by_run_count.patch: not
+      applicable (same reason as abve)
+    - delete 41u_custom_timeout_for_some_wpa_ctrl_operations.patch: all this is
+      now different in 0.7
+    - delete 41wa_lp145683_wpa_ctrl_check_select_result_for_error.patch: no
+      wpa_ctrl anymore
+    - delete 41x_lp145653_reraise_fatal_signals.patch: doesn't apply anymore
+      and never worked anyway
+    - delete 41y_queue_if_dbus_name_is_taken_on_startup.patch: no obvious port;
+      lets hope that dbus detects that name owner is down more easily
+    - delete 41z_lp138217_use_timeout_to_schedule_activation.patch: not
+      applicable anymore
+    - delete 42a_lp50214_gnome464215_fix_hidden.patch: is different (maybe
+      needs porting though)
+  * drop all 0.6.x svn cherry picks which naturally don't apply for trunk (0.7)
+    anymore:
+    - delete debian/patches/24pp_svn2754-lp101857-endianess.patch
+    - delete debian/patches/24pp_svn2618_set-hardware-RF-to-enabled-if-no-killswitches.patch
+    - delete debian/patches/24pp_svn2605-gnome354565-dont-up-notwired-interfaces.patch
+    - delete debian/patches/24pp_svn2604_Add-HAL-based-rfkill-support.patch
+    - delete debian/patches/24pp_svn2591_Ensure-the-device-is-up-stage3.patch
+    - delete debian/patches/24pp_svn2579-sleep-1-second-to-stabilize-if.patch
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 22 Jan 2008 17:26:34 +0000
+
+network-manager (0.6.5-0ubuntu17) hardy; urgency=low
+
+  * upload 0.6.5-0ubuntu17 to hardy
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 05 Nov 2007 19:14:43 +0100
+
+network-manager (0.6.5-0ubuntu16.7.10.0) gutsy-proposed; urgency=low
+
+  Release changes from test package previously known as 0.6.5-0ubuntu16~ppa3:
+  * drop gracefull supplicant shutdown feature and its followup patches,
+    because they cause crashes and a real fix would need more intrusive code
+    rewrites: (LP: #145683, LP: #83623, LP: #152098, LP: #151405)
+    - debian/patches/41n_graceful_supplicant_shutdown.patch,
+      debian/patches/41q_retry_supplicant_cleanup_startup_if_ctrl_interface_connect_failes.patch,
+      debian/patches/41v_lp141233-fix-supplicant-cleanup-crashes.patch,
+      debian/patches/41w_lp145683_cancel_scan_in_supplicant_cleanup.patch: drop
+        patches that belong to the "graveful supplicant feature".
+    - debian/patches/41u_custom_timeout_for_some_wpa_ctrl_operations.patch: update
+      interleaving patch
+    - debian/patches/series: update quilt series accordingly.
+  * debian/patches/24pp_svn2604_Add-HAL-based-rfkill-support.patch: use
+    gint32 instead of guint32 for getting the killswitch power argument
+    (LP: #138794).
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 05 Nov 2007 18:01:13 +0100
+
+network-manager (0.6.5-0ubuntu16) gutsy; urgency=low
+
+  * debian/README.Debian: adapt README to match the new behaviour of
+    network-manager, which doesn't manage _any_ device configured in
+    /etc/network/interfaces anymore.
+  * debian/patches/42a_lp50214_gnome464215_fix_hidden.patch,series: new patch
+    that fixes hidden network for most chipsets (LP: #50214).
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 15 Oct 2007 18:55:20 +0200
+
+network-manager (0.6.5-0ubuntu15) gutsy; urgency=low
+
+  * debian/patches/41z_lp138217_use_timeout_to_schedule_activation.patch,series:
+    don't use idle_source to schedule activation, but rest a bit by using a
+    timeout_source with 250ms delay (LP: #138217).
+  * debian/network-manager.postinst: sleep 2 seconds after ifblacklist_migrate.sh
+    (LP: #146757).
+  * debian/patches/41w_lp145683_cancel_scan_in_supplicant_cleanup.patch,series: first part
+    for lp145683 - cancel pending scans on terminate (LP: #145683).
+  * debian/patches/41wa_lp145683_wpa_ctrl_check_select_result_for_error.patch,series:
+    second part to fix lp145683; test select result for errors (in case of
+    TERMINATE) (LP: #145683).
+  * debian/patches/41y_queue_if_dbus_name_is_taken_on_startup.patch,series: make
+    restart of network manager more failsafe and even allow to take over name
+    ownership. When ownership is taken over (dbus signal |NameLost| received), we
+    shutdown cleanly by sending |X| through |nm_shutdown_pipe| (LP: #85113).
+  * debian/patches/41x_lp145653_reraise_fatal_signals.patch: re-raise fatal
+    signals (LP: #145653).
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 02 Oct 2007 13:32:50 +0200
+
+network-manager (0.6.5-0ubuntu14) gutsy; urgency=low
+
+  * debian/ifblacklist_migrate.sh: fix "/etc/network/interfaces migration
+    overlooks wlan0" (LP: #141580).
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 24 Sep 2007 10:21:46 +0200
+
+network-manager (0.6.5-0ubuntu13) gutsy; urgency=low
+
+  * debian/patches/20_do_not_take_over_dhcpv4iface_when_v6_is_configured.patch:
+    fix race/null-deref crash that happens if /e/n/i is not completely flushed out
+    by editor/network-admin (LP: #141106).
+  * debian/patches/41v_lp141233-fix-supplicant-cleanup-crashes.patch: Add patch
+    for LP: #141233 - fix crash by not sending ctrl commands to supplicant if no ctrl
+    socket is open.
+  * debian/patches/series: add new patch to quilt series
+  * debian/patches/41t_nm_device_wireless_index_ctrl_sockets_by_run_count.patch:
+    use two distinct variables to track and check connect attempt count to
+    supplicant and global supplicant socket. Fix bug that prevented network
+    manager from attempting to connect to supplicant ctrl for cases where
+    global control already took a long time to succeed. (LP: #141233).
+  * debian/patches/41t_nm_device_wireless_index_ctrl_sockets_by_run_count.patch:
+    close global ctrl socket connection when nm_utils_supplicant_request_with_check
+    failed.
+  * debian/patches/41u_custom_timeout_for_some_wpa_ctrl_operations.patch: update patch
+    because of overlapping change with 41t_* patch.
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 21 Sep 2007 11:26:01 +0200
+
+network-manager (0.6.5-0ubuntu12) gutsy; urgency=low
+
+  * debian/patches/05-debian_backend.patch: don't manage auto/allow-* dhcp
+    interfaces anymore (LP: #139403).
+    - debian/ifblacklist_migrate.sh: new helper script that blacklists
+      auto/allow-* dhcp interfaces without any options.
+    - debian/network-manager.install: install helper script to $pkglibdir
+    - debian/network-manager.postinst: run ifblacklist_migrate.sh during
+      configure when upgrading from versions "lt-nl" 0.6.5-0ubuntu12.
+  * debian/changelog: add merge-dropped changelog entries for 0.6.3-2ubuntuX
+    revision series (LP: #124018)
+  * debian/patches/25_lp90267-dont-tear-down-upped-interfaces.patch,series:
+    drop this patch, so nm is allowed to tear down upped interfaces during
+    startup again.
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 19 Sep 2007 18:38:17 +0200
+
+network-manager (0.6.5-0ubuntu11) gutsy; urgency=low
+
+  * debian/patches/25_lp90267-dont-tear-down-upped-interfaces.patch: remove
+        redundant nm_info output previously send to syslog/daemon.log 
+        (LP: #137744).
+  * debian/patches/41r_wpa_control_custom_timeout.patch: add a state timeout
+       to wpa control Private struct and add functions to set/unset this custom
+       timeout; in turn implement this feature and make wpa_ctrl obey this
+       custom timeout.
+  * debian/patches/41r_wpa_control_explicit_TIMEOUT_reply_fixup.patch: wpa_ctrl
+       returns bogus reply string which may lead to access of not-initialized
+       memory in case an operation times out. We fix this by explicitly setting
+       reply to TIMEOUT[CLI] on wpa_ctrl side before returning.
+  * debian/patches/41s_wpa_ctrl_socket_non_block.patch: setup wpa_ctrl_socket as
+       a real NON_BLOCK socket to prevent one potential reason for stale states
+       in network-manager (deadlocks).
+  * debian/patches/41t_nm_device_wireless_index_ctrl_sockets_by_run_count.patch:
+       to prevent new supplicant sockets to not conflict with sockets that might
+       still exist from previous run we now append a run_count index to _all_
+       socket control paths. This run_count is incremented in supplicant_cleanup
+       and is mod 10 to prevent any overflow when having more than 32-bit runs.
+  * debian/patches/41q_retry_supplicant_cleanup_startup_if_ctrl_interface_connect_failes.patch:
+       another try to terminate wpasupplicant more graceful: new shutdown
+       sequence sends disable_network, ap_scan 0, interface_remove, terminate.
+  * debian/patches/41u_custom_timeout_for_some_wpa_ctrl_operations.patch: we now
+       use a custom timeout for ctrl operations: INTERFACE_ADD, DISABLE_NETWORK,
+       TERMINATE; we take care that this timeout is unset after operations are
+       through.
+  * debian/patches/series: add all these great new patches to quilt _series_.
+  * debian/patches/41d_ipw3945_turn_off_essid_in_stage1.patch,
+      41l_enable_ipw3945_reset_essid.patch,series: drop from patchset - because
+      we have a real fix in ipw3945 driver now.
+  * debian/patches/41n_graceful_supplicant_shutdown.patch: update patch in turn of
+      dropping the patches above.
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 10 Sep 2007 13:06:24 +0200
+
+network-manager (0.6.5-0ubuntu10) gutsy; urgency=low
+
+  * debian/patches/24pp_svn2754-lp101857-endianess.patch,series: prepatch patch
+      by Wojtek Kaniewski to fix endianess issues in NetworkManager
+      (LP: #101857).
+  * debian/network-manager.postinst: apply patch contributed by Villalovos, John L
+      <john.l.villalovos@intel.com> that prevents NetworkManager restart in postinst
+      if invoke-rc.d --disclose-deny dbus force-reload fails. This is required to not
+      start any service during chroot installs of ume.
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 06 Sep 2007 15:16:46 +0200
+
+network-manager (0.6.5-0ubuntu9) gutsy; urgency=low
+
+  * debian/patches/series: disable 41o_completely_deactivate_stage1.patch
+    for tribe-4
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue,  7 Aug 2007 12:36:37 +0200
+
+network-manager (0.6.5-0ubuntu8) gutsy; urgency=low
+
+  * debian/patches/41n_graceful_supplicant_shutdown.patch: move
+    supplicant_cleanup into stage1_prepare; remove test timeouts in
+    _stage2_config and add 1 second sleep to the end of xx_stage1_prepare
+  * debian/patches/series: add new patch 41n_graceful_supplicant_shutdown.patch
+    to series
+  * debian/patches/41l_enable_ipw3945_reset_essid.patch: enable
+    ipw3945_reset_essid, by setting up function in class constructor
+  * update debian/patches/41l_enable_ipw3945_reset_essid.patch:
+    completely deactivate device in  stage1 now
+  * debian/patches/series: add new patch 41l_enable_ipw3945_reset_essid.patch
+  * debian/patches/41m_unref_dbus_connection_on_shutdown.patch,
+    unref shared dbus_connection on shutdown (LP: #85113)
+  * debian/patches/series: add new patch 41m_unref_dbus_connection_on_shutdown.patch
+  * debian/patches/41k_20_sec_wireless_link_timeout.patch: increase
+    timeout for link setup ... taken from upstream ml
+  * debian/patches/series: add new patch 41k_20_sec_wireless_link_timeout.patch
+  * debian/patches/41e_fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch: Fix
+    ftbfs because of recently deprecated gnome druid - this patch enables gnome
+    deprecated in Makefiles
+  * debian/patches/series: add new patch
+    41e_fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch
+  * debian/patches/41d_ipw3945_turn_off_essid_in_stage1.patch:
+    implement stage1_prepare implementation in nm-device-802-11-wireless.c
+  * debian/patches/series: add new patch 41d_ipw3945_turn_off_essid_in_stage1.patch
+  * debian/rules, debian/control, debian/patches/series: Switch patchsystem to quilt
+  * debian/patches/41c_ubuntu-fixup--get_mode_always_fails_typo_fix.patch: fix
+    programming bug in wireless code
+  * debian/patches/24pp_svn2591_Ensure-the-device-is-up-stage3.patch: ensure
+    device is up in stage3 - cherry-picked from svn
+  * debian/patches/24pp_svn2618_set-hardware-RF-to-enabled-if-no-killswitches.patch:
+    enable hardware rf by default -  cherry-picked from svn
+  * debian/patches/24pp_svn2604_Add-HAL-based-rfkill-support.patch: hal based rfkill
+    - cherry-picked from svn
+  * debian/patches/24pp_svn2579-sleep-1-second-to-stabilize-if.patch: sleep to
+    stabilize link status - cherry-picked from svn
+  * debian/patches/41o_completely_deactivate_stage1.patch: use nm_device_deactivate
+    instead of just real_deactivate to deactivate device more cleanly
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue,  7 Aug 2007 09:51:02 +0200
+
+network-manager (0.6.5-0ubuntu7) gutsy; urgency=low
+
+  [Alexander Sack <asac@ubuntu.com>]
+  * prefetch bugfix from svn - not-connected wired interface is if-upped:
+    1. 24a_svn2578-gnome354565-fix-ethernet-link-detection-races.patch:
+      -  prefetch patch from 0.6.0 release branch (rev 2578)
+    2. 24b_svn2605-gnome354565-dont-up-notwired-interfaces.patch:
+      -  prefetch patch from 0.6.0 release branch (rev 2605)
+  * debian/patches/25_lp90267-dont-tear-down-upped-interfaces.patch: fix master bug that
+    makes already configured interfaces (in /etc/network/interfaces) being torn down. This
+    causes issue for network cards that don't have a link beat and might caus troubles
+    for applications that have already bound to the interface and don't react on netlink
+    events (LP: #90267)
+
+  [Anthony Mercatante <tonio@ubuntu.com>]
+  * fixed network-manager.install and debian/rules:
+    - Installs nm-vpn-perperties in /usr/lib to make it a hidden binary
+    - Tell dh_shlibdeps to ignore nm-vpn-properties to avoid lots of gnome
+      dependancies, causing issues to release kubuntu Kubuntu.
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 12 Jul 2007 11:15:56 +0200
+
+network-manager (0.6.5-0ubuntu6) gutsy; urgency=low
+
+  * debian/control:
+    - add a network-manager-dev Depends on libnm-util-dev
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri, 06 Jul 2007 10:59:49 +0200
+
+network-manager (0.6.5-0ubuntu5) gutsy; urgency=low
+
+  * install nm-vpn-properties (plus manpage) to package
+    network-manager. It got moved from network-manager-gnome here.
+    (LP: #123772)
+
+ -- Reinhard Tartler <siretart@tauware.de>  Thu, 05 Jul 2007 09:56:34 +0200
+
+network-manager (0.6.5-0ubuntu4) gutsy; urgency=low
+
+  * debian/control: add iproute build-depends again to fix
+    autobuilder ftbfs. 
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 26 Jun 2007 16:39:17 +0200
+
+network-manager (0.6.5-0ubuntu3) gutsy; urgency=low
+
+  Revert all changes from 0.6.5-0ubuntu1 and 0.6.5-0ubuntu2 to
+  redo new upstream source merge ...
+
+  Drop network-manager-gnome as gnome because the gui code is
+  now shipped in separate source:
+    * debian/network-manager-gnome.install,
+      debian/network-manager-gnome.manpages,
+      debian/nm-applet.sgml: obsolete files dropped
+
+    * debian/rules: don't create/install nm-applet manpage anymore
+
+    * debian/control: drop network-manager-gnome package
+
+
+  Adapt ubuntu patchset in turn of new upstream release 0.6.5:    
+    * debian/patches/05-debian_backend.patch: our @add_data changes
+      has been applied upstream - drop first hunk of interface_parser.c
+      diff.
+
+    * debian/patches/09_fix_bigendian_words.patch: drop as 
+      AC_C_BIGENDIAN check is now applied upstream - drop patch.
+
+    * debian/patches/10-po_fr.patch: we only had modifications for
+      applet .po entries. applet moved to its own source - drop patch.
+
+    * debian/patches/11-man_page_sh_name.patch: +.SH NAME as been
+      added upstream for /man/NetworkManagerDispatcher.1.in and
+      man/NetworkManager.1.in; thus, only keep diff for man/nm-tool.1.in.
+
+    * debian/patches/12_dbus1.0.patch: dbus_connection_disconnect was
+      replaced by dbus_connection_close + dbus_connection_unref; our
+      patch previously replaced dbus_connection_disconnect with
+      dbus_connection_unref (only) - drop patch due to upstream fix.
+
+    * debian/patches/13-rml-wpa-workarounds.patch: simple reapply patch
+      manually as upstream changed some unrelated code in patch proximity.
+  
+    * debian/patches/18_static_network-admin.patch: patch for gnome
+      applet only; since source has moved it has to go - drop patch
+  
+    * debian/patches/21_manual_means_always_online.diff: drop patch
+      for gnome applet code; recalc line numbers of other patches for
+      updated underlying upstream version; apply hunk
+      src/NetworkManagerMain.h manually because upstream changed code
+      in proximity.
+  
+    * debian/patches/22_manual_config_available_when_connected.patch:
+      applet changes only - drop patch
+  
+    * debian/patches/23_nm-monitor-eni.diff: manually apply
+      src/NetworkManagerSystem.h patch whose underlying code base
+      was changed within proximity of changes; in turn recalc patch
+      line number for src/backends/NetworkManagerDebian.c as well
+      as src/NetworkManager.c
+
+
+  Change Maintainer Field for ubuntu:
+    * debian/control: change maintainer field to coredev for upload
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 25 Jun 2007 18:25:54 +0200
+
+network-manager (0.6.5-0ubuntu2) gutsy; urgency=low
+
+  * Added missing build-dep iproute.
+    Fixes FTBFS on the buildd
+  * Fixed path installation of nm-vpn-properties
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 18 Jun 2007 12:56:22 +0200
+
+network-manager (0.6.5-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release
+  * Dropped obsolete 05-debian_backend.patch
+  * Dropped 09_fix_bigendian_words.patch, merged upstream
+  * Dropped 10-po_fr.patch, translation fixed upstream
+  * Dropped 11-man_page_sh_name.patch, merged upstream
+  * Dropped 12_dbus1.0.patch, merged upstream
+  * Dropped 13-rml-wpa-workarounds.patch, merged upstream
+  * Dropped obsolete 14-j-hostap-supplicant-driver.patch
+  * Dropped obsolete 16_undefined_macros.patch
+  * Dropped 18_static_network-admin.patch,
+    21_manual_means_always_online.diff and
+    22_manual_config_available_when_connected.patch, as the applet is
+    now a separate tarball
+  * Dropped obsolete
+    19_interfaces_can_have_more_than_one_instance.patch,
+    20_do_not_take_over_dhcpv4iface_when_v6_is_configured.patch
+
+  * Moved 19_interfaces_can_have_more_than_one_instance.patch,
+    20_do_not_take_over_dhcpv4iface_when_v6_is_configured.patch and
+    21_manual_means_always_online.diff in "patches-not-applied".
+    n-m 0.6.5 has major code changes and the applet is now separate tarball,
+    those patches need rewritting.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 15 Jun 2007 11:29:53 +0200
+
+network-manager (0.6.4-6ubuntu7) feisty; urgency=low
+
+  * 21_manual_means_always_online.diff:
+    The previous version of this patch (ubuntu5) made a change to nm-applet
+    that would assume the state was disconnected if the device list was empty.
+    This didn't work since the device list is always empty on start because
+    the status is obtained first.
+
+    This was guarding against having the connected state with no devices,
+    which broke later assertions.  Change the patch to correct those
+    assertions instead; a connected state with no active device will now
+    display the wired icon with a "Manual network configuration" tooltip.
+
+    LP: #82335, #105234.
+
+  * 05-debian_backend.patch:
+    Revert change in ubuntu3 that commented out the blacklisting of
+    devices listed in /etc/network/interfaces with more exotic configuration
+    than just inet dhcp.  This was done by the above patch in ubuntu5, it
+    seems silly to do it there, better to do it in the original patch.
+
+  * 22_manual_config_available_when_connected.patch:
+    Display the "Manual configuration" menu option when we have no devices,
+    but are connected; since that means some number of blacklisted devices
+    exist.  Don't display the "No network devices" message in that case.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Thu, 12 Apr 2007 19:32:01 +0100
+
+network-manager (0.6.4-6ubuntu6) feisty; urgency=low
+
+  * debian/rules:
+    - update translations template
+
+ -- Sebastien Bacher <seb128@canonical.com>  Wed, 11 Apr 2007 22:36:27 +0200
+
+network-manager (0.6.4-6ubuntu5) feisty; urgency=low
+
+  * Partially revert 0.6.4-6ubuntu3, but if we find interfaces which are
+    disabled, we assume we are always online to avoid trouble when people
+    have advanced and semi-advanced setups.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Mon,  9 Apr 2007 21:39:20 +0200
+
+network-manager (0.6.4-6ubuntu4) feisty; urgency=low
+
+  * /etc/network/interfaces can have more than one instance of the same
+    interface. For example:
+
+    iface eth0 inet dhcp
+    and later
+    iface eth0 inet6 static
+
+    The function ifparser_getif is capable only to return the first instance
+    of eth0 that is a legal entry for NM to take over, but NM still does not
+    know how to handle what's next.
+
+    Patch 19_interfaces_can_have_more_than_one_instance.patch creates a sub
+    list of linked if_block via nextsame, binding together all if_block's
+    related to the same interface and preserving if_data for each block.
+
+    Patch 20_do_not_take_over_dhcpv4iface_when_v6_is_configured.patch
+    blacklist interfaces that have dhcp for inet configuration but have an
+    inet6 entry following later on. NM does not know yet how to
+    store/restore/configure IPv6 (blacklisted too) so for now we tell NM
+    to keep the hands off these interfaces.
+
+    (Closes LP: #93636)
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Fri, 30 Mar 2007 11:17:42 +0200
+
+network-manager (0.6.4-6ubuntu3) feisty; urgency=low
+
+  * Manage some static devices we can understand.  This should avoid the
+    problem people are having with NM marking the machine as offline when
+    it's just on static instead.  LP #82335.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Tue, 13 Mar 2007 16:18:06 +0100
+
+network-manager (0.6.4-6ubuntu2) feisty; urgency=low
+
+  * Add "static configuration" menu item for NetworkRoaming spec.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Thu, 18 Jan 2007 11:22:19 +0100
+
+network-manager (0.6.4-6ubuntu1) feisty; urgency=low
+
+  * Merged with the Debian packages.  Remaining changes:
+    - Changed 12_dbus1.0.patch to unref rather than close the connection
+    - Added 13-rml-wpa-workarounds.patch
+    - Added 14-j-hostap-supplicant-driver.patch
+    - Added 16_undefined_macros.patch
+    - Call dh_iconcache for network-manager-gnome
+    - Add recommends on network-manager-gnome | network-manager-kde
+    - Remove "security" bit in README.Debian since we're using at_console
+      instead of the netdev group
+    - Remove the addition of the netdev group as well as the dependency on
+      adduser.
+  * Thanks to Riccardo Setti for help with merging the package.  Much
+    appreciated.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Fri, 15 Dec 2006 14:41:49 +0100
+
+network-manager (0.6.4-6) unstable; urgency=medium
+
+  * debian/patches/10-po_fr.patch
+    - Added. Small fixes for the French translation. (Closes: #401060)
+      Thanks to Cyril Brulebois.
+  * debian/patches/12_dbus1.0.patch
+    - Updated 12_dbus0.9.patch for D-Bus 1.0 to pass the correct flags to
+      dbus_bus_request_name(). (Closes: #401039)
+  * debian/patches/11-man_page_sh_name.patch
+    - Add missing ".SH NAME" stanzas to man pages.
+  * debian/network-manager-gnome.install
+    - Install the nm-applet autostart file into /etc/xdg/autostart rather than
+      /usr/share/gnome/autostart to be compliant to the fd.o autostart spec.
+  * Urgency medium, as it fixes a FTBFS bug.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 30 Nov 2006 21:30:47 +0100
+
+network-manager (0.6.4-5) unstable; urgency=low
+
+  * Small fix for the NetworkManagerDispatcher init script. 
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Oct 2006 11:00:34 +0200
+
+network-manager (0.6.4-4) unstable; urgency=low
+
+  * Correct typo in package description. (Closes: #390062)
+  * debian/network-manager.postinst
+    - Create group netdev if not yet existent. Add a Depends on adduser.
+  * Add instructions to README.Debian how to restart NetworkManager after
+    modifying /etc/network/interfaces. (Closes: 384892)
+  * debian/patches/05-debian_backend.patch
+    - Fix the parser for /etc/network/interfaces. (Closes: #383765)
+    - Do not restart nscd on dns changes, only invalidate the hosts cache.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 24 Oct 2006 20:18:18 +0200
+
+network-manager (0.6.4-3) unstable; urgency=low
+
+  * Changed adeprecated dbus function. (Closes: 385380)
+    - Added 12_dbus0.9.patch.
+
+ -- Riccardo Setti <giskard@debian.org>  Tue,  5 Sep 2006 19:48:00 +0200
+
+network-manager (0.6.4-2) unstable; urgency=low
+
+  * Ship the nm-tool binary. (Closes: #384891)
+
+ -- Michael Biebl <biebl@teco.edu>  Tue, 15 Aug 2006 23:42:09 +0200
+
+network-manager (0.6.4-1) unstable; urgency=low
+
+  [ Riccardo Setti ]
+  * New upstream release. (Closes: #379163)
+    - Bumped hal deps to version 0.5.7.1. NM needs user haldaemon for dbus
+    operations.
+  * Allow interfaces marked "auto-hotplug" to be managed by NM.
+    (Closes: #381017)
+  * Added 09_fix_bigendian_words.patch which will fix the WPA+plain text pw
+    auth method on powerpc (and on other bigendian archs). (Closes: #381464)
+
+  [ Michael Biebl ]
+  * Merged the patches 05-resolvconf.patch and 08-disabled_devices.patch into
+    a single patch called 05-debian_backend.patch.
+  * Updated 05-debian_backend.patch to not control mapped interfaces.
+    (Closes: #377498)
+
+ -- Michael Biebl <biebl@teco.edu>  Tue,  8 Aug 2006 01:51:13 +0200
+
+network-manager (0.6.3-2) unstable; urgency=low
+
+  * Updated 02-dbus_access_network_manager.patch to allow the hal daemon
+    (running as user "hal") to send events about hotplugged devices to the
+    NetworkManager daemon. (Closes: 355785)
+  * Added a Recommends: notification-daemon to network-manager-gnome.
+  * Improved the package description and the manpage of network-manager-gnome.
+    (Closes: #362962)
+
+ -- Michael Biebl <biebl@teco.edu>  Tue, 20 Jun 2006 23:22:11 +0200
+
+network-manager (0.6.3-1) unstable; urgency=low
+
+  * New upstream release.
+    - Removed 07-libnm_glib_reconnect_dbus.patch, merged upstream.
+    - Removed 09-nm_bad_mutex_free.patch, fixed upstream.
+    - Removed 10-interface_parser_fixes.patch, merged upstream.
+    - Removed 11-carrier_detection.patch, merged upstream.
+  * Added a watch file.
+  * Added homepage URL to package description.
+
+ -- Michael Biebl <biebl@teco.edu>  Thu,  8 Jun 2006 16:21:43 +0200
+
+network-manager (0.6.2-3) unstable; urgency=low
+
+  * Ship the NEWS.Debian file only for the network-manager package.
+    (Closes: #367063)
+  * Added 11-carrier_detection.patch to support network cards which can't do
+    carrier detection. (Closes: #366373) 
+
+ -- Michael Biebl <biebl@teco.edu>  Tue, 16 May 2006 00:16:43 +0200
+
+network-manager (0.6.3-2ubuntu7) feisty; urgency=low
+
+  * Add debian/patches/00upstream-ftbfs.patch:
+    - Fix dbus version check in src/NetworkManagerDbus.c to work with dbus
+      1.0.
+    - src/nm-netlink-monitor.c: Standard fix for new if_addr.h world order.
+    - These issues are already fixed in the currently pending Debian merge, so
+      this patch can go away soon.
+  * Add debian/patches/13_avahi-autoipd.patch:
+    - src/nm-device.c: Do not use the internal get_autoip() function, but
+      instead check if avahi-autoipd was engaged for the interface and do not
+      meddle with the settings in that case. This is in accordance with
+      upstream who wants to completely throw away the internal IPv4LL code.
+    - src/dhcp-manager/nm-dhcp-manager.c: Raise DHCP timeout from 45 seconds
+      to 99 seconds, thus effectively disabling it. We want to use
+      dhclient.conf's timeout configuration; if that happens to be longer, we
+      interrupt dhclient while it's still working and get confused if the IP
+      suddenly changes underneath us.
+    - src/dhcp-manager/nm-dhcp-manager.c: Treat DHCDBD_FAIL like
+      DHCDBD_TIMEOUT, i. e. continue with stage 4 of device activation
+      (IPv4LL address assignment) instead of giving up and trying all over
+      again. Since dhcdbd calls dhclient in single-shot mode (-1), it will
+      never return with TIMEOUT, only with FAILURE, and we want to go into
+      zeroconf mode instead of being stuck in an endless retry loop.
+    - See https://wiki.ubuntu.com/ZeroConfNetworking for details.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 6 Dec 2006 16:42:54 +0100
+
+network-manager (0.6.3-2ubuntu6) edgy; urgency=low
+
+  * ndiswrapper uses the stock wext driver now, so remove that bit of the
+    10-rml-wpa-workarounds.patch. Adjust
+    11-j-hostap-supplicant-driver.patch appropriately. Malone: #46136
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com> Tue, 17 Oct 2006 13:17:59 +0200
+
+network-manager (0.6.3-2ubuntu5) edgy; urgency=low
+
+  * Rebuild against dbus 0.90
+  * debian/patches/12_dbus0.9.patch:
+    + s/dbus_connection_disconnect/dbus_connection_close/g
+
+ -- Sebastian Dröge <slomo@ubuntu.com> Thu, 24 Aug 2006 18:09:06 +0200
+
+network-manager (0.6.3-2ubuntu4) edgy; urgency=low
+
+  * Correct network manager to not touch resolv.conf, accidentally dropped
+    during the merge.
+
+ -- Scott James Remnant <scott@ubuntu.com> Tue, 22 Aug 2006 09:16:37 +0200
+
+network-manager (0.6.3-2ubuntu3) edgy; urgency=low
+
+  * debian/rules:
+    - Add dh_iconcache to network-manager-gnome.
+
+ -- Christian Bjälevik <nafallo@ubuntu.com> Sun, 6 Aug 2006 12:32:52 +0200
+
+network-manager (0.6.3-2ubuntu2) edgy; urgency=low
+
+  * Fix packaging so that the workaround patch isn't already applied, thus
+    breaking the builds.
+
+ -- Scott James Remnant <scott@ubuntu.com> Sun, 30 Jul 2006 23:24:43 +0100
+
+network-manager (0.6.3-2ubuntu1) edgy; urgency=low
+
+  * Merge with debian unstable, using Debian packaging as a base.
+    Remaining changes:
+    - our HAL daemon runs as the "haldaemon" user, not "hal",
+    - use at_console="true" instead of netdev,
+    - retain rml's workarounds patch,
+    - retain j's hostap patch.
+
+ -- Scott James Remnant <scott@ubuntu.com> Wed, 12 Jul 2006 22:13:20 +0100
+
+network-manager (0.6.2-2) unstable; urgency=low
+
+  * More integration work. (Closes: #355244)
+    - Added network-manager-dispatcher.script and
+      06-dispatch_more_events.patch.
+      This way the scripts in /etc/networks/if-*.d/ are called properly by
+      NetworkManagerDispatcher.
+      Thanks to the Ubuntu devs for this work!
+    - Added 08-disabled_devices.patch. Network interfaces listed in
+      /etc/network/interfaces which are not configured "auto" and "dhcp" are
+      not handled by NM. This makes it possible to configure interfaces 
+      statically and have NM not messing with them. 
+      Updated README.Debian to reflect these changes.
+    - Added 09-nm_bad_mutex_free.patch. Otherwise NM crashes if a device is
+      disabled.
+  * Added 07-libnm_glib_reconnect_dbus.patch which makes libnm_glib sleep 
+    between unsuccessful connection attempts to dbus. (Closes: #366010)
+  * Bumped Standards-Version to 3.7.2, no further changes required.
+  * Removed *.la files from the dev packages as we also ship pkg-config files
+    which are a better alternative.
+  * Added 10-interface_parser_fixes.patch which fixes several problems with
+    the /etc/network/interfaces parser. (Closes: #355564)
+
+ -- Michael Biebl <biebl@teco.edu>  Fri,  5 May 2006 18:01:47 +0200
+
+network-manager (0.6.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated if_fix.patch, parts of it have been fixed upstream.
+  * Renamed patches to use a more consistent naming scheme.
+  * Depend on dhcbd (>= 1.12-2) because NM 0.6.2 does not start dhcdbd itself
+    anymore.
+  * The wpa_supplicant binary was moved from /usr/sbin to /sbin. Updated
+    debian/rules accordingly.
+  * Added dependency on hal (Closes: #356622)
+  * Added autostart file to network-manager-gnome. This way nm-applet is
+    started automatically on login.
+
+ -- Michael Biebl <biebl@teco.edu>  Sun,  2 Apr 2006 19:48:28 +0200
+
+network-manager (0.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added myself to uploaders.
+  * Added a dependency on dbus.
+
+ -- Michael Biebl <biebl@teco.edu>  Tue, 14 Mar 2006 15:48:41 +0100
+
+network-manager (0.6.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #355246)
+    - most of the work is taken from the experimental branch of NM.
+      Thanks goes to  Michael Biebl.
+    - Added NetworkManagerDebian.patch which introduce supports for resolvconf
+  * switched to debhelper5.
+  * added libnl-util0, libnl-util-dev packages.
+    - added debian/libnl-util0.install , debian/libnl-util-dev.install
+  * removed debian/dirs as it was useless.
+  * added a dependency on wpasupplicant as it's necessary for all encrypted
+    connections.
+
+ -- Riccardo Setti <giskard@autistici.org>  Thu,  9 Mar 2006 15:38:01 +0100
+
+network-manager (0.5.1-3) unstable; urgency=low
+
+  * improved debian/copyright . I hope this time it will be 
+    good enough to pass the ftp-master check. Thanks to Joerg Jaspert who
+    has pointed me to the problem.
+
+ -- Riccardo Setti <giskard@autistici.org>  Sun, 26 Feb 2006 21:57:29 +0100
+
+network-manager (0.5.1-2) unstable; urgency=low
+
+  * improved manpages.
+    - added nm-vpn-properties, nm-applet manpages
+    - added debian/network-manager-gnome.manpages
+    - modifyed NetworManager*.sgml for reflect the correct website.
+  * added nm-vpn-properties.desktop, nm-logo.xpm
+  * added dbus_access_network_manager and dbus_access_nm_applet patches:
+    - switched to group netdev
+    - updated the dep on dhcdbd
+    - removed debian/network-manager.dbus-conf debian/nm-applet.conf
+  * removed network-manager.doc as it was empty. 
+  * uploaded to unstable.
+
+ -- Riccardo Setti <giskard@autistici.org>  Thu,  9 Feb 2006 10:18:13 +0100
+
+network-manager (0.5.1-1) experimental; urgency=low
+
+  * renamed 25NetworkManagerDispatcher in 26NetworkManagerDispatcher because
+    first we need to start NetworkManager and then NetworkManagerDispatcher 
+  * added networkmanger and networkmanaferdispatcher manpages. 
+  * Inital upload to Debian (Closes: #270538)
+  * work based on the ubuntu package
+  * Added 01.patch and 02.patch for fix the problem with recent linux 
+    kernel-headers
+ 
+ -- Riccardo Setti <giskard@autistici.org>  Mon, 5 Jan 2006 17:09:29 +0100
+
+network-manager (0.5.1-0ubuntu6) dapper; urgency=low
+
+  * Really don't depend on bind9 being installed
+
+ -- Matthew Garrett <mjg59@srcf.ucam.org>  Mon, 26 Dec 2005 00:40:29 +0000
+
+network-manager (0.5.1-0ubuntu5) dapper; urgency=low
+
+  * debian/control:
+    - Version dep on dhcdbd to (>= 1.10-0ubuntu2).
+
+ -- Christian Bjälevik <nafallo@ubuntu.com>  Wed, 21 Dec 2005 19:08:53 +0100
+
+network-manager (0.5.1-0ubuntu4) dapper; urgency=low
+
+  * debian/control:
+    - Version all accurances of libdbus-glib-1-dev to (>= 0.60).
+    - Removed not needed Build-Dep on libxdcmp-dev, this is a dep
+      of libx11-dev now.
+  * debian/patches/01-STOLEN_FROM_HEAD-dbus-60:
+    - Add a patch from CVS HEAD to fix FTBFS.
+      No patchsystem, only applied it.
+
+ -- Christian Bjälevik <nafallo@ubuntu.com>  Wed, 21 Dec 2005 14:22:34 +0100
+
+network-manager (0.5.1-0ubuntu3) dapper; urgency=low
+
+  * debian/control:
+    - Changed versioned dep on wireless-tools to >= 28pre9
+      (what upstream says in their .news).
+    - Removed commented out Conflicts-line.
+    - Do not depend on bind9 being installed.
+    - Added libxdmcp-dev as a Build-Dep.
+  * debian/*.dbus-event:
+    - Use "$NAME" instead of the incredible long "$DESC: ".
+  * debian/network-manager.postinst:
+    - Do not run gtk-update-icon-cache on configure cause
+      seb128 says it's a bad idea and explained why :-).
+  * debian/README:
+    - Fix typo (cann -> can).
+  * debian/rules:
+    - Removed named-support (we don't want bind9 for this)
+    - Added --with-distro=debian.
+
+ -- Christian Bjälevik <nafallo@ubuntu.com>  Thu, 15 Dec 2005 02:04:12 +0100
+
+network-manager (0.5.1-0ubuntu2) dapper; urgency=low
+
+  * remove .arch-ids traces
+
+ -- Jan Gerber <j@bootlab.org>  Sun, 13 Nov 2005 21:19:18 -0500
+
+network-manager (0.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream version
+
+ -- Jan Gerber <j@bootlab.org>  Fri, 21 Oct 2005 08:33:25 -0400
+
+network-manager (0.5.0-0ubuntu1) breezy; urgency=low
+
+  * New upstream version
+  * split headers into network-manager-dev
+
+ -- Jan Gerber <j@bootlab.org>  Tue, 18 Oct 2005 17:43:56 +0200
+
+network-manager (0.4.1+cvs20050817-0ubuntu5) breezy; urgency=low
+
+  * fix postinst so its possible to install network-manager 
+    in pbuilder
+
+ -- Jan Gerber <j@bootlab.org>  Tue, 11 Oct 2005 19:23:47 +0200
+
+network-manager (0.4.1+cvs20050817-0ubuntu4) breezy; urgency=low
+
+  * update postinst to restart dbus on install
+
+ -- Jan Gerber <j@bootlab.org>  Sat, 29 Aug 2005 13:40:26 +0200
+
+network-manager (0.4.1+cvs20050817-0ubuntu3) breezy; urgency=low
+
+  * this is NetworkManager CVS Tag NM_0_4_1_RELEASE + 3 patches
+    - make dhcdbd only a runtime dependency
+    - fix build due to one too many ,s
+    - fix debian backend to support static IP settings again
+      (all changes are upstream by now)
+
+ -- Jan Gerber <j@bootlab.org>  Sat, 27 Aug 2005 23:40:26 +0200
+
+network-manager (0.4.1+cvs20050817-0ubuntu2) breezy; urgency=low
+
+  * restructure build system to creat orig.tar.gz and diff.gz files
+
+ -- Jan Gerber <j@bootlab.org>  Sat, 27 Aug 2005 14:04:26 +0200
+
+network-manager (0.4.1+cvs20050817-0unbuntu1) breezy; urgency=low
+
+  * fix loading static IP settings from /etc/network/interfaces
+
+ -- Jan Gerber <j@bootlab.org>  Sun, 21 Aug 2005 19:40:26 +0200
+
+network-manager (0.4.1+cvs20050817-0) breezy; urgency=low
+
+  * update to NM_0_4_1_RELEASE
+
+ -- Jan Gerber <j@bootlab.org>  Sun, 21 Aug 2005 15:27:26 +0200
+
+network-manager (0.4.1+cvs20050813-0) breezy; urgency=low
+
+  * change back to using BIND
+  * remove dependency on resolvconf and dnsmasq
+
+ -- Jan Gerber <j@bootlab.org>  Sat, 13 Aug 2005 19:37:26 +0200
+
+network-manager (0.4.1+cvs20050618-3) breezy; urgency=low
+
+  * Run resolvconf instead of messing with BIND.  Dependencies
+    changed too.  Unfortunately these changes are not properly
+    tested :-(.
+
+ -- Ian Jackson <ian@ubuntu.com>  Sat, 18 Jun 2005 13:33:26 +0100
+
+network-manager (0.4.1+cvs20050618-2) breezy; urgency=low
+
+  * Sort out chown of /var/lib/NetworkManager
+
+ -- Thom May <thom@ubuntu.com>  Sat, 18 Jun 2005 13:33:26 +0100
+
+network-manager (0.4.1+cvs20050618-1) breezy; urgency=low
+
+  * update from CVS
+  * Add configure magic to ensure we get the correct path for dhcdbd
+    (Ubuntu: #11905)
+  * Ensure /var/lib/NetworkManager is created with the correct permisions
+    (Ubuntu: #11904)
+  * Rename dbus event script to correct name and restart dbus in postinst
+  * Depend on lsb-base and use log_*_msg in event script
+
+ -- Thom May <thom@ubuntu.com>  Sat, 18 Jun 2005 11:22:49 +0100
+
+network-manager (0.4.1+cvs20050616-1) breezy; urgency=low
+
+  * New upstream. Fix descriptions.
+
+ -- Thom May <thom@ubuntu.com>  Thu, 16 Jun 2005 14:47:30 +0100
+   
+network-manager (0.4.1+cvs20050614-1) unstable; urgency=low
+
+  * New upstream release. Move to 0.4 branch; use dhcdbd.
+  * Drop network-manager-gnome
+  * add libnm-glib-0 and libnm-glib-0-dev
+
+ -- Thom May <thom@debian.org>  Tue, 14 Jun 2005 12:41:29 +0100
+
+network-manager (0.3.1+cvs20041108-1) unstable; urgency=low
+
+  * New upstream release
+  * Add dpatch
+
+ -- Thom May <thom@debian.org>  Mon,  8 Nov 2004 13:49:15 +0000
+
+network-manager (0.3.1+cvs20041101-2) unstable; urgency=low
+
+  * Update dependencies, thanks to j@bootlab.org
+
+ -- Thom May <thom@debian.org>  Tue,  2 Nov 2004 16:32:45 +0000
+
+network-manager (0.3.1+cvs20041101-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thom May <thom@debian.org>  Mon,  1 Nov 2004 13:08:32 +0000
+
+network-manager (0.3.1+cvs20041028-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thom May <thom@debian.org>  Thu, 28 Oct 2004 13:12:42 +0100
+
+network-manager (0.3+cvs20041016-2) unstable; urgency=low
+
+  * fix some minor problems in packaging; clean up for pkg-utopia entry
+
+ -- Thom May <thom@canonical.com>  Mon, 25 Oct 2004 13:43:07 +0100
+
+network-manager (0.3+cvs20041016-1) unstable; urgency=low
+
+  * New upstream release
+  * Clean up backend for debian
+
+ -- Thom May <thom@debian.org>  Sat, 16 Oct 2004 21:32:43 +0100
+
+network-manager (0.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thom May <thom@debian.org>  Fri, 15 Oct 2004 13:55:46 +0100
+
+network-manager (0.2+cvs20040928-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Thom May <thom@debian.org>  Sun,  3 Oct 2004 11:54:56 +0100
+
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/copyright
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/copyright
@@ -0,0 +1,101 @@
+This package was debianized by Thom May <thom@debian.org> on
+Sun,  3 Oct 2004 11:54:56 +0100.
+
+It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/NetworkManager 
+
+src/autoip.c, src/autoip.h are copyright of Arthur van Hoff (avh@strangeberry.com)
+and are released under the terms of the GNU Lesser General Public
+
+License:
+
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+src/gnome-keyring-md5.c, gnome-keyring-md5.h is written by Colin Plumb.
+This code is in the public domain; do with it what you wish.
+
+gnome/nm-applet/eggtrayicon.c, eggtrayicon.h are copyright of 
+Anders Carlsson <andersca@gnu.org> and are released under the terms of 
+the GNU Lesser General Public. (see above).
+
+src/nm-netlink-monitor.c is copyright of Ray Strode, David Zeuthen, <david@fubar.dk> and
+Novell, Inc. and it's released under the terms of the  GNU General Public License.
+(see below).
+
+src/nm-netlink-monitor.h is copyright of Ray Strode and it's released under the terms of the
+GNU General Public License. (see below)
+
+src/backends/interface_parser.c, is copyright of Tom Parker <palfrey@tevp.net>
+and it's released under the terms of the GNU General Public License. (see below).
+
+src/backends/NetworkManagerDebian.c is copyright of Matthew Garrett <mjg59@srcf.ucam.org>
+and it's released under the terms of the GNU General Public License. (see below)
+
+src/backends/NetworkManagerGentoo.c is copyright of Dan Williams <dcbw@redhat.com>,
+Dan Willemsen <dan@willemsen.us>, Robert Paskowitz and it's released under the terms
+of the GNU General Public License. (see below).
+
+src/backends/NetworkManagerSlackware.c, is copyright of
+Narayan Newton <narayan_newton@yahoo.com> and it's released under the terms of
+the GNU General Public License. (see below).
+
+src/backends/NetworkManagerSuSE.c, is copyright of Dan Williams <dcbw@redhat.com>,
+Kay Sievers <kay.sievers@suse.de>, Robert Love <rml@novell.com> and it's released
+under the terms of the GNU General Public License. (see below).
+
+src/backends/shvar.c, shvar.h, are copyright of Red Hat Inc and are released under the terms
+of the GNU General Public License. (see below).
+ 				
+src/named-manager/nm-named-manager.c, nm-named-manager.h, are copyright of
+Colin Walters <walters@redhat.com> and are released under the terms 
+of the GNU General Public License. (see below).
+
+utils/nm-utils.c, nm-utils.h are copyright of Ray Strode <rstrode@redhat.com> and 
+are released under the terms of the GNU General Public License. (see below).
+
+initscript/Debian/NetworkManager is copyright of <j@bootlab.org>, 
+Mark Roach <mrroach@okmaybe.com>, Thom May <thom@debian.org>
+
+gnome/applet/menu-info.c, menu-info.h are copyright of 
+Jonathan Blandford <jrb@redhat.com> and are released under the term of
+the GNU General Public License. (see below).
+
+gnome//nm-vpn-properties.c, nm-vpn-properties.h are copyright of 
+David Zeuthen, <davidz@redhat.com> and are licensed to you
+under your choice of the Academic Free License version 2.0, or the
+GNU General Public License version 2. (see below)
+			 
+The rest of the source (what it's not mentioned here)
+is copyright of Dan Williams <dcbw@redhat.com> and it's released under 
+the terms of the GNU General Public License.
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/libnm-glib0.install
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/libnm-glib0.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libnm_glib*.so.*
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/README.Debian
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/README.Debian
@@ -0,0 +1,48 @@
+NetworkManager consists of two parts: one is on the system level daemon that
+manages the connections and gathers information about new networks. The other 
+is a systray applet that users can use to interact with the NetworkManager 
+daemon. 
+
+Managed vs. Unmanaged mode and /etc/network/interfaces
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Devices listed in /etc/network/interfaces _will_ be managed by NetworkManager
+unless the ifupdown system-config-setting is enabled and is setup to run
+in "Unmanaged mode".
+
+Note: in ubuntu/intrepid "Unmanaged mode" will be the default, but that is likely
+to change in one of the following releases.
+
+The config to select unmanaged/managed mode is in /etc/NetworkManager/nm-system-settings.conf:
+
+  [ifupdown]
+  managed=true/false
+
+Unmanaged mode will make NetworkManager not touch any wired/wireless device matching
+an interface name configured in /etc/network/interfaces.
+
+Managed mode will make NetworkManager manage all devices and will make NetworkManager
+honour all dhcp and static configurations for wired and wireless devices.
+
+The default mode shipped in Ubuntu/intrepid is "unmanaged".
+
+After modifying /etc/NetworkManager/nm-systems-settings.conf _or_ /etc/network/interfaces
+you may want to restart the system-settings daemon using the command:
+"sudo killall nm-system-settings" to apply those changes.
+
+
+Dial-up configuration
+~~~~~~~~~~~~~~~~~~~~~
+
+Your dialup configurations can now be one in network-manager connection editor.
+Because of that /etc/network/interfaces configurations are considered "legacy" from
+a network manager point of view.
+
+However, if you want to use your /etc/network/interfaces configuration make sure that
+you have the ifupdown plugin in "Unmanaged mode" and take care that the used
+wired/wireless device is also configured in /etc/network/interfaces.
+
+Not that NetworkManager 0.7 will not provive UI hooks to up and down ppp connections
+managed outside of NetworkManager itself (not that it ever worked nicely before).
+
+ -- Alexander Sack <asac@ubuntu.com>, Mon, 6 Oct 2008 13:05:00 +0200
+
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/network-manager-dispatcher.script
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/network-manager-dispatcher.script
@@ -0,0 +1,61 @@
+#!/bin/sh -e
+# Script to dispatch NetworkManager events
+#
+# Runs ifupdown scripts when NetworkManager fiddles with interfaces.
+
+if [ -z "$1" ]; then
+    echo "$0: called with no interface" 1>&2
+    exit 1;
+fi
+
+# Fake ifupdown environment
+export IFACE="$1"
+export LOGICAL="$1"
+export ADDRFAM="NetworkManager"
+export METHOD="NetworkManager"
+export VERBOSITY="0"
+
+# Run the right scripts
+case "$2" in
+    up)
+	export MODE="start"
+	export PHASE="up"
+
+	if [ -d /var/run/network/ ] ; then
+		tmpfile=`mktemp -t`
+		if [ -e /var/run/network/ifstate ] ; then
+			cat /var/run/network/ifstate | grep -v ^$IFACE= > $tmpfile || true
+		fi
+		echo $IFACE=$IFACE >> $tmpfile
+		mv $tmpfile /var/run/network/ifstate
+	fi
+
+	exec run-parts /etc/network/if-up.d
+	;;
+    down)
+	export MODE="stop"
+	export PHASE="down"
+
+	if [ -e /var/run/network/ifstate ] ; then
+		tmpfile=`mktemp -t`
+		cat /var/run/network/ifstate | grep -v ^$IFACE= > $tmpfile || true
+		mv $tmpfile /var/run/network/ifstate
+	fi
+
+	exec run-parts /etc/network/if-down.d
+	;;
+    pre-up)
+	export MODE="start"
+	export PHASE="pre-up"
+	exec run-parts /etc/network/if-pre-up.d
+	;;
+    post-down)
+	export MODE="stop"
+	export PHASE="post-down"
+	exec run-parts /etc/network/if-post-down.d
+	;;
+    *)
+	echo "$0: called with unknown action \`$2'" 1>&2
+	exit 1
+	;;
+esac
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/nm-vpn-properties.sgml
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/nm-vpn-properties.sgml
@@ -0,0 +1,95 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY date        "<date>8 February, 2006</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY package     "nm-vpn-properties">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      <email>giskard@autistici.org</email>;
+    </address>
+    <author>
+      <firstname>Riccardo</firstname>
+      <surname>Setti</surname>
+    </author>
+    <copyright>
+      <year>2006</year>
+      <holder>Riccardo Setti</holder>
+    </copyright>
+    &date;
+  </refentryinfo>
+  <refmeta>
+    <refentrytitle>nm-vpn-properties</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+  <refnamediv>
+    <refname>&package;</refname>
+
+    <refpurpose>Network management framework</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&package;</command>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para><command>&package;</command> is the gnome front-end for the NetworkManager VPN handler</para>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>NetworkManager (1), nm-applet (1)</para>
+
+    <para>More Information about NetworkManager can be found at
+      http://www.gnome.org/projects/NetworkManager/ .</para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by Riccardo Setti <email>giskard@autistici.org</email> for
+      the <productname>Debian</productname> system.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/network-manager.manpages
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/network-manager.manpages
@@ -0,0 +1,3 @@
+man/nm-tool.1
+debian/nm-vpn-properties.1
+man/NetworkManager.8
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/network-manager.links
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/network-manager.links
@@ -0,0 +1 @@
+/usr/share/apport/package-hooks/source_network-manager.py /usr/share/apport/package-hooks/source_network-manager-applet.py
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/libnm-util-dev.install
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/libnm-util-dev.install
@@ -0,0 +1,19 @@
+debian/tmp/usr/lib/pkgconfig/libnm-util.pc
+debian/tmp/usr/lib/libnm-util.a
+debian/tmp/usr/lib/libnm-util.so
+debian/tmp/usr/include/NetworkManager/nm-connection.h
+debian/tmp/usr/include/NetworkManager/nm-setting.h
+debian/tmp/usr/include/NetworkManager/nm-setting-8021x.h
+debian/tmp/usr/include/NetworkManager/nm-setting-cdma.h
+debian/tmp/usr/include/NetworkManager/nm-setting-connection.h
+debian/tmp/usr/include/NetworkManager/nm-setting-ip4-config.h
+debian/tmp/usr/include/NetworkManager/nm-setting-ppp.h
+debian/tmp/usr/include/NetworkManager/nm-setting-pppoe.h
+debian/tmp/usr/include/NetworkManager/nm-setting-serial.h
+debian/tmp/usr/include/NetworkManager/nm-setting-gsm.h
+debian/tmp/usr/include/NetworkManager/nm-setting-wired.h
+debian/tmp/usr/include/NetworkManager/nm-setting-wireless.h
+debian/tmp/usr/include/NetworkManager/nm-setting-wireless-security.h
+debian/tmp/usr/include/NetworkManager/nm-setting-vpn.h
+debian/tmp/usr/include/NetworkManager/nm-utils.h
+
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/libnm-glib-dev.install
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/libnm-glib-dev.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/pkgconfig/libnm_glib.pc
+debian/tmp/usr/lib/pkgconfig/libnm_glib_vpn.pc
+debian/tmp/usr/lib/libnm_glib*.a
+debian/tmp/usr/lib/libnm_glib*.so
+debian/tmp/usr/include/libnm-glib/*.h
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/source_network-manager.py
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/source_network-manager.py
@@ -0,0 +1,96 @@
+'''Apport package hook for Network Manager
+
+(c) 2008 Canonical Ltd.
+Contributors:
+Matt Zimmerman <mdz@canonical.com>
+Martin Pitt <martin.pitt@canonical.com>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+import os
+import subprocess
+
+# TODO:
+# - HAL info for modem devices
+# - Trim down HAL dumps to only the relevant info
+
+attach_files = { 'IfupdownConfig' : '/etc/network/interfaces',
+                 'WpaSupplicantLog' : '/var/log/wpa_supplicant.log' }
+                 
+attach_commands = { 'Syslog' : ['egrep',' (NetworkManager|dhclient|kernel):','/var/log/syslog'],
+                    'Gconf' : ['gconftool-2','-R','/system/networking']
+                    }
+
+def _command_output(command, input = None, stderr = subprocess.STDOUT):
+    '''Try to execute given command (array) and return its stdout, or return
+    a textual error if it failed.'''
+
+    try:
+       sp = subprocess.Popen(command,
+                             stdout=subprocess.PIPE, stderr=stderr, close_fds=True)
+    except OSError, e:
+       return 'Error: ' + str(e)
+
+    out = sp.communicate(input)[0]
+    if sp.returncode == 0:
+       return out.strip()
+    else:
+       return 'Error: command %s failed with exit code %i: %s' % (
+           str(command), sp.returncode, out)
+
+def _read_file(file):
+    try:
+        return open(file).read().strip()
+    except Exception, e:
+        return 'Error: ' + str(e)
+
+def _network_interfaces():
+    output = _command_output(['hal-find-by-capability','--capability','net'])
+    udis = output.split('\n')
+    interfaces = {}
+    for udi in udis:
+        interface = _command_output(['hal-get-property','--udi',udi,'--key','net.interface'])
+        device = _command_output(['hal-get-property','--udi',udi,'--key','net.originating_device'])
+
+        interfaces[interface] = device
+
+    return interfaces
+                
+def _device_details(device):
+    return _command_output(['lshal','-u',device])
+
+def add_info(report):
+    for name, path in attach_files.items():
+        if os.path.exists(path):
+            report[name] = _read_file(path)
+
+    for name, command in attach_commands.items():
+        output = _command_output(command)
+        report[name] = output
+
+    for interface, device in _network_interfaces().items():
+        key = 'NetDevice.%s' % interface
+        report[key] = _device_details(device)
+
+    # It would be neat if we could just set the driver-* tags in LP
+    # per https://wiki.ubuntu.com/DebuggingNetworkManager
+    interesting_modules = ['ndiswrapper','ath_hal','b44']
+    interesting_modules_loaded = []
+    for line in open('/proc/modules'):
+        module = line.split()[0]
+        if module in interesting_modules:
+            interesting_modules_loaded.append(module)
+
+    if interesting_modules_loaded:
+        report['InterestingModules'] = ' '.join(interesting_modules_loaded)
+
+if __name__ == '__main__':
+    report = {}
+    add_info(report)
+    for key in report:
+        print '%s: %s' % (key, report[key].split('\n', 1)[0])
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/nm-system-settings.conf
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/nm-system-settings.conf
@@ -0,0 +1,6 @@
+[main]
+plugins=ifupdown,keyfile
+
+[ifupdown]
+managed=false
+
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/network-manager.dirs
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/network-manager.dirs
@@ -0,0 +1,5 @@
+etc/dbus-1/event.d
+etc/NetworkManager/dispatcher.d
+etc/NetworkManager/system-connections
+var/lib/NetworkManager
+usr/share/gnome-vpn-properties
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/network-manager.NEWS
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/network-manager.NEWS
@@ -0,0 +1,17 @@
+network-manager (0.6.2-2) unstable; urgency=low
+
+  * NetworkManager now reads the network interface configuration specified in
+    /etc/network/interfaces. Devices that are listed there and match certain
+    criteria are *not* managed by NetworkManager anymore.
+    For more on information on what these criteria are please read
+    /usr/share/doc/network-manager/README.Debian, section "Configuration".
+    This means that if NetworkManager stops to manage one of your network
+    devices with this release but you want NetworkManager to take care of this
+    device, simply remove the device configuration from
+    /etc/network/interfaces.
+    This also means that you can now setup a custom configuration without
+    NetworkManager overriding this setting. E.g. you might setup your wired
+    network interface eth0 statically in /etc/network/interfaces and for your
+    wireless network device wlan0 you can let NetworkManager handle it.
+
+ -- Michael Biebl <biebl@teco.edu>  Wed, 10 May 2006 22:51:18 +0200
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/rules
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/rules
@@ -0,0 +1,56 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+#ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+#        CFLAGS := $(CFLAGS:-O2=-Os)
+#        CXXFLAGS := $(CXXFLAGS:-O2=-Os)
+#endif
+
+DEB_AUTO_UPDATE_LIBTOOL = pre
+DEB_AUTO_UPDATE_AUTOHEADER = 2.50
+DEB_AUTO_UPDATE_ACLOCAL = 1.9
+DEB_AUTO_UPDATE_AUTOMAKE = 1.9 -a -c -f
+DEB_AUTO_UPDATE_AUTOCONF = 2.50
+
+DEB_INSTALL_DOCS_ALL := README AUTHORS TODO
+
+DEB_CONFIGURE_EXTRA_FLAGS += \
+		--with-dbus-sys=/etc/dbus-1/system.d \
+		--with-distro=debian \
+		--with-resolvconf=/sbin/resolvconf \
+		--libexecdir=/usr/lib/NetworkManager \
+		--with-pppd-plugindir=/usr/local/lib/pppd/2.4.4/ \
+		--with-crypto=nss \
+		$(NULL)
+
+DEB_DH_SHLIBDEPS_ARGS := -Xnm-vpn-properties
+
+DEB_DH_MAKESHLIBS_ARGS_libnm-glib0 := -V "libnm-glib0 (>= 0.7.1~20090213)"
+DEB_DH_MAKESHLIBS_ARGS_libnm-util1 := -V "libnm-util1 (>= 0.7.1~20090213)"
+
+clean::
+	rm -f po/*.gmo
+	rm -f debian/*.1
+	rm -f gtk-doc.make
+	echo "# empty file" > aclocal.m4
+
+pre-build::
+	intltoolize -f -c
+	gtkdocize --copy
+
+DHCP_CLIENT_PATH=/sbin/dhclient
+export DHCP_CLIENT_PATH
+
+build/network-manager::
+	/usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1
+
+binary-install/network-manager::
+	install -m 755 debian/network-manager-dispatcher.script \
+		debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown
+	cd po; intltool-update -p
+	cd test; $(MAKE) install DESTDIR=$(CURDIR)/debian/network-manager
+
+binary-install/network-manager::
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/network-manager-dev.install
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/network-manager-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/pkgconfig/NetworkManager.pc
+debian/tmp/usr/include/NetworkManager/NetworkManager.h
+debian/tmp/usr/include/NetworkManager/NetworkManagerVPN.h
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/ifblacklist_migrate.sh
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/ifblacklist_migrate.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# (C) 2007 Canonical Ltd.
+# Author: Alexander Sack <asac@jwsdot.com>
+# License: GNU General Public License, version 2 or any later version
+
+if test x$NIF_FILE = x; then
+   NIF_FILE=/etc/network/interfaces
+fi
+
+auto_ifs=$(cat $NIF_FILE | \
+    egrep "^auto|^allow-" | \
+    sed -e 's/auto//' | \
+    sed -e 's/allow-[^ ].* //')
+
+ifaces_to_disable=""
+
+echo Auto interfaces found: $auto_ifs
+
+# iterate over all auto interfaces
+for i in $auto_ifs; do
+  IFS_old=$IFS; IFS=""
+
+  NIF_FILE_content=$(cat $NIF_FILE | \
+      sed -e 's/^[ \t]*auto.*$//' | \
+      sed -e 's/^[ \t]*allow-.*$//' | \
+      sed -e 's/^[ \t]*#.*$//' | grep -v ^$)
+
+  # '--' is inserted by grep -A1 if there are multiple iface blocks
+  lines=$(echo $NIF_FILE_content | grep -A1 "^iface.*$i.*dhcp" | grep -v '\--')
+  IFS="
+"
+
+  # if there is no iface line for that interface, we would still get a line
+  # count of 1 ... so use word_count 0 below to exclude ifaces that have no
+  # configuration at all.
+  word_count=$(echo $lines | wc -w)
+  line_count=0
+  for line in $lines; do
+      nulled_line=$(echo $line | sed -e 's/[# ]//' | grep -v ^iface)
+      if test x$nulled_line != x; then
+	  line_count=$(expr $line_count + 1)
+      fi
+  done  
+
+  if test $line_count -eq 0 -a $word_count -gt 0; then
+     ifaces_to_disable="$ifaces_to_disable $i"
+     echo iface to disable = $i
+  fi
+  IFS=$IFS_old
+done
+
+backup_suffix=0
+while test -e ${NIF_FILE}.bak-${backup_suffix}; do
+   backup_suffix=$(expr $backup_suffix + 1)
+done
+
+for i in $ifaces_to_disable; do
+  echo -n "Disabling interface: $i ... "
+  sed -i.bak-${backup_suffix} -e "
+s/^\([ \t]*iface.*$i.*\)$/#\1/" $NIF_FILE
+  # for now don't kill any auto lines
+  # s/^\([ \t]*auto.*$i.*\)$/#\1/ 
+  # s/^\([ \t]*allow-.*$i.*\)$/#\1/
+
+  echo done.
+done
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/network-manager-dispatcher.dbus-event
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/network-manager-dispatcher.dbus-event
@@ -0,0 +1,80 @@
+#! /bin/sh
+#
+# NetworkManager NetworkManagerDispatcher daemon
+#				Daemon for automatically switching network 
+#				connections to the best available connection.
+#				This file should be placed in /etc/init.d.
+#
+# Authors:	Christian Bjälevik <nafallo@magicalforest.se>
+#			Jan Gerber <j@bootlab.org>
+#			Mark Roach <mrroach@okmaybe.com>
+#			Thom May <thom@debian.org>
+#
+#
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DESC="network events dispatcher"
+NAME="NetworkManagerDispatcher"
+DAEMON=/usr/sbin/$NAME
+PIDDIR=/var/run/NetworkManager
+PIDFILE=$PIDDIR/$NAME.pid
+SCRIPTNAME=/etc/dbus-1/event.d/26$NAME
+USER=root
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+test -f /etc/default/rcS && . /etc/default/rcS
+test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDispatcher
+
+#
+#	Function that starts the daemon/service.
+#
+d_start() {
+	if [ ! -d $PIDDIR ]; then
+		mkdir -p $PIDDIR
+		chown $USER:$USER $PIDDIR
+	fi
+
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+		--user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE
+
+}
+
+#
+#	Function that stops the daemon/service.
+#
+d_stop() {
+	start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \
+		 --oknodo --user $USER --exec $DAEMON
+}
+
+
+case "$1" in
+  start)
+	log_daemon_msg "Starting $DESC" "$NAME"
+	d_start
+	log_end_msg $?
+	;;
+  stop)
+	log_daemon_msg "Stopping $DESC" "$NAME"
+	d_stop
+	log_end_msg $?
+	;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	d_stop
+	d_start
+	log_end_msg $?
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/libnm-util1.install
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/libnm-util1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libnm-util.so.*
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/libnm-util1.symbols
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/libnm-util1.symbols
@@ -0,0 +1,297 @@
+libnm-util.so.1 libnm-util1 #MINVER#
+ nm_connection_add_setting@Base 0.7.1~20090213+gitf142e15
+ nm_connection_clear_secrets@Base 0.7.1~20090213+gitf142e15
+ nm_connection_compare@Base 0.7.1~20090213+gitf142e15
+ nm_connection_create_setting@Base 0.7.1~20090213+gitf142e15
+ nm_connection_dump@Base 0.7.1~20090213+gitf142e15
+ nm_connection_duplicate@Base 0.7.1~20090213+gitf142e15
+ nm_connection_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_connection_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_connection_for_each_setting_value@Base 0.7.1~20090213+gitf142e15
+ nm_connection_get_path@Base 0.7.1~20090213+gitf142e15
+ nm_connection_get_scope@Base 0.7.1~20090213+gitf142e15
+ nm_connection_get_setting@Base 0.7.1~20090213+gitf142e15
+ nm_connection_get_setting_by_name@Base 0.7.1~20090213+gitf142e15
+ nm_connection_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_connection_lookup_setting_type@Base 0.7.1~20090213+gitf142e15
+ nm_connection_lookup_setting_type_by_quark@Base 0.7.1~20090213+gitf142e15
+ nm_connection_need_secrets@Base 0.7.1~20090213+gitf142e15
+ nm_connection_new@Base 0.7.1~20090213+gitf142e15
+ nm_connection_new_from_hash@Base 0.7.1~20090213+gitf142e15
+ nm_connection_remove_setting@Base 0.7.1~20090213+gitf142e15
+ nm_connection_replace_settings@Base 0.7.1~20090213+gitf142e15
+ nm_connection_set_path@Base 0.7.1~20090213+gitf142e15
+ nm_connection_set_scope@Base 0.7.1~20090213+gitf142e15
+ nm_connection_to_hash@Base 0.7.1~20090213+gitf142e15
+ nm_connection_update_secrets@Base 0.7.1~20090213+gitf142e15
+ nm_connection_verify@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_address_compare@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_address_dup@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_address_get_address@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_address_get_gateway@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_address_get_prefix@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_address_new@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_address_ref@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_address_set_address@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_address_set_gateway@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_address_set_prefix@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_address_unref@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_route_compare@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_route_dup@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_route_get_dest@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_route_get_metric@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_route_get_next_hop@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_route_get_prefix@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_route_new@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_route_ref@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_route_set_dest@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_route_set_metric@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_route_set_next_hop@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_route_set_prefix@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_route_unref@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_add_eap_method@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_clear_eap_methods@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_anonymous_identity@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_ca_cert@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_ca_path@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_client_cert@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_eap_method@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_identity@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_num_eap_methods@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_password@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_phase1_fast_provisioning@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_phase1_peaplabel@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_phase1_peapver@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_phase2_auth@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_phase2_autheap@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_phase2_ca_cert@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_phase2_ca_path@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_phase2_client_cert@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_phase2_private_key@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_phase2_private_key_password@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_phase2_private_key_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_pin@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_pkcs11_ca_cert@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_pkcs11_client_cert@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_pkcs11_engine_path@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_pkcs11_module_init_args@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_pkcs11_module_path@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_pkcs11_phase2_ca_cert@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_pkcs11_phase2_client_cert@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_pkcs11_phase2_private_key@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_pkcs11_private_key@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_pkcs11_slot@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_private_key@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_private_key_password@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_private_key_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_psk@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_system_ca_certs@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_new@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_remove_eap_method@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_set_ca_cert_from_file@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_set_client_cert_from_file@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_set_phase2_ca_cert_from_file@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_set_phase2_client_cert_from_file@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_set_phase2_private_key_from_file@Base 0.7.1~20090213+gitf142e15
+ nm_setting_802_1x_set_private_key_from_file@Base 0.7.1~20090213+gitf142e15
+ nm_setting_cdma_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_cdma_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_setting_cdma_get_number@Base 0.7.1~20090213+gitf142e15
+ nm_setting_cdma_get_password@Base 0.7.1~20090213+gitf142e15
+ nm_setting_cdma_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_cdma_get_username@Base 0.7.1~20090213+gitf142e15
+ nm_setting_cdma_new@Base 0.7.1~20090213+gitf142e15
+ nm_setting_clear_secrets@Base 0.7.1~20090213+gitf142e15
+ nm_setting_compare@Base 0.7.1~20090213+gitf142e15
+ nm_setting_connection_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_connection_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_setting_connection_get_autoconnect@Base 0.7.1~20090213+gitf142e15
+ nm_setting_connection_get_connection_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_connection_get_id@Base 0.7.1~20090213+gitf142e15
+ nm_setting_connection_get_read_only@Base 0.7.1~20090213+gitf142e15
+ nm_setting_connection_get_timestamp@Base 0.7.1~20090213+gitf142e15
+ nm_setting_connection_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_connection_get_uuid@Base 0.7.1~20090213+gitf142e15
+ nm_setting_connection_new@Base 0.7.1~20090213+gitf142e15
+ nm_setting_duplicate@Base 0.7.1~20090213+gitf142e15
+ nm_setting_enumerate_values@Base 0.7.1~20090213+gitf142e15
+ nm_setting_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_setting_get_name@Base 0.7.1~20090213+gitf142e15
+ nm_setting_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_gsm_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_gsm_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_setting_gsm_get_apn@Base 0.7.1~20090213+gitf142e15
+ nm_setting_gsm_get_band@Base 0.7.1~20090213+gitf142e15
+ nm_setting_gsm_get_network_id@Base 0.7.1~20090213+gitf142e15
+ nm_setting_gsm_get_network_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_gsm_get_number@Base 0.7.1~20090213+gitf142e15
+ nm_setting_gsm_get_password@Base 0.7.1~20090213+gitf142e15
+ nm_setting_gsm_get_pin@Base 0.7.1~20090213+gitf142e15
+ nm_setting_gsm_get_puk@Base 0.7.1~20090213+gitf142e15
+ nm_setting_gsm_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_gsm_get_username@Base 0.7.1~20090213+gitf142e15
+ nm_setting_gsm_new@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_add_address@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_add_dns@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_add_dns_search@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_add_route@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_clear_addresses@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_clear_dns@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_clear_dns_searches@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_clear_routes@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_address@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_dhcp_client_id@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_dhcp_hostname@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_dns@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_dns_search@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_ignore_auto_dns@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_ignore_auto_routes@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_method@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_never_default@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_num_addresses@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_num_dns@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_num_dns_searches@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_num_routes@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_route@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_new@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_remove_address@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_remove_dns@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_remove_dns_search@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ip4_config_remove_route@Base 0.7.1~20090213+gitf142e15
+ nm_setting_need_secrets@Base 0.7.1~20090213+gitf142e15
+ nm_setting_new_from_hash@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_baud@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_crtscts@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_lcp_echo_failure@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_lcp_echo_interval@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_mppe_stateful@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_mru@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_mtu@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_no_vj_comp@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_noauth@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_nobsdcomp@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_nodeflate@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_refuse_chap@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_refuse_eap@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_refuse_mschap@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_refuse_mschapv2@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_refuse_pap@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_require_mppe@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_require_mppe_128@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_ppp_new@Base 0.7.1~20090213+gitf142e15
+ nm_setting_pppoe_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_pppoe_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_setting_pppoe_get_password@Base 0.7.1~20090213+gitf142e15
+ nm_setting_pppoe_get_service@Base 0.7.1~20090213+gitf142e15
+ nm_setting_pppoe_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_pppoe_get_username@Base 0.7.1~20090213+gitf142e15
+ nm_setting_pppoe_new@Base 0.7.1~20090213+gitf142e15
+ nm_setting_serial_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_serial_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_setting_serial_get_baud@Base 0.7.1~20090213+gitf142e15
+ nm_setting_serial_get_bits@Base 0.7.1~20090213+gitf142e15
+ nm_setting_serial_get_parity@Base 0.7.1~20090213+gitf142e15
+ nm_setting_serial_get_send_delay@Base 0.7.1~20090213+gitf142e15
+ nm_setting_serial_get_stopbits@Base 0.7.1~20090213+gitf142e15
+ nm_setting_serial_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_serial_new@Base 0.7.1~20090213+gitf142e15
+ nm_setting_to_hash@Base 0.7.1~20090213+gitf142e15
+ nm_setting_to_string@Base 0.7.1~20090213+gitf142e15
+ nm_setting_update_secrets@Base 0.7.1~20090213+gitf142e15
+ nm_setting_verify@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_add_data_item@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_add_secret@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_foreach_data_item@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_foreach_secret@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_get_data_item@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_get_secret@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_get_service_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_get_user_name@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_new@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_remove_data_item@Base 0.7.1~20090213+gitf142e15
+ nm_setting_vpn_remove_secret@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wired_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wired_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wired_get_auto_negotiate@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wired_get_duplex@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wired_get_mac_address@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wired_get_mtu@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wired_get_port@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wired_get_speed@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wired_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wired_new@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_add_seen_bssid@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_ap_security_compatible@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_get_band@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_get_bssid@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_get_channel@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_get_mac_address@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_get_mode@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_get_mtu@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_get_num_seen_bssids@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_get_rate@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_get_security@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_get_seen_bssid@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_get_ssid@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_get_tx_power@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_new@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_add_group@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_add_pairwise@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_add_proto@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_clear_groups@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_clear_pairwise@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_clear_protos@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_auth_alg@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_group@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_key_mgmt@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_leap_password@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_leap_username@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_num_groups@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_num_pairwise@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_num_protos@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_pairwise@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_proto@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_psk@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_wep_key@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_get_wep_tx_keyidx@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_new@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_remove_group@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_remove_pairwise@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_remove_proto@Base 0.7.1~20090213+gitf142e15
+ nm_setting_wireless_security_set_wep_key@Base 0.7.1~20090213+gitf142e15
+ nm_utils_deinit@Base 0.7.1~20090213+gitf142e15
+ nm_utils_escape_ssid@Base 0.7.1~20090213+gitf142e15
+ nm_utils_gvalue_hash_dup@Base 0.7.1~20090213+gitf142e15
+ nm_utils_init@Base 0.7.1~20090213+gitf142e15
+ nm_utils_ip4_addresses_from_gvalue@Base 0.7.1~20090213+gitf142e15
+ nm_utils_ip4_addresses_to_gvalue@Base 0.7.1~20090213+gitf142e15
+ nm_utils_ip4_netmask_to_prefix@Base 0.7.1~20090213+gitf142e15
+ nm_utils_ip4_prefix_to_netmask@Base 0.7.1~20090213+gitf142e15
+ nm_utils_ip4_routes_from_gvalue@Base 0.7.1~20090213+gitf142e15
+ nm_utils_ip4_routes_to_gvalue@Base 0.7.1~20090213+gitf142e15
+ nm_utils_is_empty_ssid@Base 0.7.1~20090213+gitf142e15
+ nm_utils_same_ssid@Base 0.7.1~20090213+gitf142e15
+ nm_utils_security_valid@Base 0.7.1~20090213+gitf142e15
+ nm_utils_slist_free@Base 0.7.1~20090213+gitf142e15
+ nm_utils_ssid_to_utf8@Base 0.7.1~20090213+gitf142e15
+ nm_utils_uuid_generate@Base 0.7.1~20090213+gitf142e15
+ nm_utils_uuid_generate_from_string@Base 0.7.1~20090213+gitf142e15
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/libnm-glib0.symbols
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/libnm-glib0.symbols
@@ -0,0 +1,139 @@
+libnm_glib.so.0 libnm-glib0 #MINVER#
+ libnm_glib_get_network_state@Base 0.7.1~20090213+gitf142e15
+ libnm_glib_init@Base 0.7.1~20090213+gitf142e15
+ libnm_glib_register_callback@Base 0.7.1~20090213+gitf142e15
+ libnm_glib_shutdown@Base 0.7.1~20090213+gitf142e15
+ libnm_glib_unregister_callback@Base 0.7.1~20090213+gitf142e15
+ nm_access_point_get_flags@Base 0.7.1~20090213+gitf142e15
+ nm_access_point_get_frequency@Base 0.7.1~20090213+gitf142e15
+ nm_access_point_get_hw_address@Base 0.7.1~20090213+gitf142e15
+ nm_access_point_get_max_bitrate@Base 0.7.1~20090213+gitf142e15
+ nm_access_point_get_mode@Base 0.7.1~20090213+gitf142e15
+ nm_access_point_get_rsn_flags@Base 0.7.1~20090213+gitf142e15
+ nm_access_point_get_ssid@Base 0.7.1~20090213+gitf142e15
+ nm_access_point_get_strength@Base 0.7.1~20090213+gitf142e15
+ nm_access_point_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_access_point_get_wpa_flags@Base 0.7.1~20090213+gitf142e15
+ nm_access_point_new@Base 0.7.1~20090213+gitf142e15
+ nm_active_connection_get_connection@Base 0.7.1~20090213+gitf142e15
+ nm_active_connection_get_default@Base 0.7.1~20090213+gitf142e15
+ nm_active_connection_get_devices@Base 0.7.1~20090213+gitf142e15
+ nm_active_connection_get_scope@Base 0.7.1~20090213+gitf142e15
+ nm_active_connection_get_service_name@Base 0.7.1~20090213+gitf142e15
+ nm_active_connection_get_specific_object@Base 0.7.1~20090213+gitf142e15
+ nm_active_connection_get_state@Base 0.7.1~20090213+gitf142e15
+ nm_active_connection_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_active_connection_new@Base 0.7.1~20090213+gitf142e15
+ nm_cdma_device_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_cdma_device_new@Base 0.7.1~20090213+gitf142e15
+ nm_client_activate_connection@Base 0.7.1~20090213+gitf142e15
+ nm_client_deactivate_connection@Base 0.7.1~20090213+gitf142e15
+ nm_client_get_active_connections@Base 0.7.1~20090213+gitf142e15
+ nm_client_get_device_by_path@Base 0.7.1~20090213+gitf142e15
+ nm_client_get_devices@Base 0.7.1~20090213+gitf142e15
+ nm_client_get_manager_running@Base 0.7.1~20090213+gitf142e15
+ nm_client_get_state@Base 0.7.1~20090213+gitf142e15
+ nm_client_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_client_new@Base 0.7.1~20090213+gitf142e15
+ nm_client_sleep@Base 0.7.1~20090213+gitf142e15
+ nm_client_wireless_get_enabled@Base 0.7.1~20090213+gitf142e15
+ nm_client_wireless_hardware_get_enabled@Base 0.7.1~20090213+gitf142e15
+ nm_client_wireless_set_enabled@Base 0.7.1~20090213+gitf142e15
+ nm_dbus_connection_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_dbus_connection_new@Base 0.7.1~20090213+gitf142e15
+ nm_dbus_settings_get_connection_by_path@Base 0.7.1~20090213+gitf142e15
+ nm_dbus_settings_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_dbus_settings_new@Base 0.7.1~20090213+gitf142e15
+ nm_dbus_settings_system_add_connection@Base 0.7.1~20090213+gitf142e15
+ nm_dbus_settings_system_get_can_modify@Base 0.7.1~20090213+gitf142e15
+ nm_dbus_settings_system_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_dbus_settings_system_get_unmanaged_devices@Base 0.7.1~20090213+gitf142e15
+ nm_dbus_settings_system_new@Base 0.7.1~20090213+gitf142e15
+ nm_device_ethernet_get_carrier@Base 0.7.1~20090213+gitf142e15
+ nm_device_ethernet_get_hw_address@Base 0.7.1~20090213+gitf142e15
+ nm_device_ethernet_get_speed@Base 0.7.1~20090213+gitf142e15
+ nm_device_ethernet_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_device_ethernet_new@Base 0.7.1~20090213+gitf142e15
+ nm_device_get_capabilities@Base 0.7.1~20090213+gitf142e15
+ nm_device_get_dhcp4_config@Base 0.7.1~20090213+gitf142e15
+ nm_device_get_driver@Base 0.7.1~20090213+gitf142e15
+ nm_device_get_iface@Base 0.7.1~20090213+gitf142e15
+ nm_device_get_ip4_config@Base 0.7.1~20090213+gitf142e15
+ nm_device_get_managed@Base 0.7.1~20090213+gitf142e15
+ nm_device_get_product@Base 0.7.1~20090213+gitf142e15
+ nm_device_get_state@Base 0.7.1~20090213+gitf142e15
+ nm_device_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_device_get_udi@Base 0.7.1~20090213+gitf142e15
+ nm_device_get_vendor@Base 0.7.1~20090213+gitf142e15
+ nm_device_new@Base 0.7.1~20090213+gitf142e15
+ nm_device_wifi_get_access_point_by_path@Base 0.7.1~20090213+gitf142e15
+ nm_device_wifi_get_access_points@Base 0.7.1~20090213+gitf142e15
+ nm_device_wifi_get_active_access_point@Base 0.7.1~20090213+gitf142e15
+ nm_device_wifi_get_bitrate@Base 0.7.1~20090213+gitf142e15
+ nm_device_wifi_get_capabilities@Base 0.7.1~20090213+gitf142e15
+ nm_device_wifi_get_hw_address@Base 0.7.1~20090213+gitf142e15
+ nm_device_wifi_get_mode@Base 0.7.1~20090213+gitf142e15
+ nm_device_wifi_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_device_wifi_new@Base 0.7.1~20090213+gitf142e15
+ nm_dhcp4_config_get_one_option@Base 0.7.1~20090213+gitf142e15
+ nm_dhcp4_config_get_options@Base 0.7.1~20090213+gitf142e15
+ nm_dhcp4_config_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_dhcp4_config_new@Base 0.7.1~20090213+gitf142e15
+ nm_exported_connection_delete@Base 0.7.1~20090213+gitf142e15
+ nm_exported_connection_get_connection@Base 0.7.1~20090213+gitf142e15
+ nm_exported_connection_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_exported_connection_new@Base 0.7.1~20090213+gitf142e15
+ nm_exported_connection_register_object@Base 0.7.1~20090213+gitf142e15
+ nm_exported_connection_signal_removed@Base 0.7.1~20090213+gitf142e15
+ nm_exported_connection_signal_updated@Base 0.7.1~20090213+gitf142e15
+ nm_exported_connection_update@Base 0.7.1~20090213+gitf142e15
+ nm_gsm_device_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_gsm_device_new@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_config_get_addresses@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_config_get_domains@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_config_get_hostname@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_config_get_nameservers@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_config_get_routes@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_config_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_config_get_wins_servers@Base 0.7.1~20090213+gitf142e15
+ nm_ip4_config_new@Base 0.7.1~20090213+gitf142e15
+ nm_object_array_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_object_get_connection@Base 0.7.1~20090213+gitf142e15
+ nm_object_get_path@Base 0.7.1~20090213+gitf142e15
+ nm_object_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_serial_device_get_bytes_received@Base 0.7.1~20090213+gitf142e15
+ nm_serial_device_get_bytes_sent@Base 0.7.1~20090213+gitf142e15
+ nm_serial_device_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_settings_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_settings_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_settings_list_connections@Base 0.7.1~20090213+gitf142e15
+ nm_settings_signal_new_connection@Base 0.7.1~20090213+gitf142e15
+ nm_ssid_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_string_array_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_uint_array_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_connection_get_banner@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_connection_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_connection_get_vpn_state@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_connection_new@Base 0.7.1~20090213+gitf142e15
+libnm_glib_vpn.so.0 libnm-glib0 #MINVER#
+ nm_vpn_plugin_disconnect@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_error_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_error_quark@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_failure@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_get_connection@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_get_state@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_set_ip4_config@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_set_login_banner@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_set_state@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_ui_interface_delete_connection@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_ui_interface_export@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_ui_interface_get_capabilities@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_ui_interface_get_suggested_name@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_ui_interface_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_ui_interface_import@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_ui_interface_ui_factory@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_ui_widget_interface_get_type@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_ui_widget_interface_get_widget@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_ui_widget_interface_save_secrets@Base 0.7.1~20090213+gitf142e15
+ nm_vpn_plugin_ui_widget_interface_update_connection@Base 0.7.1~20090213+gitf142e15
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/control
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/control
@@ -0,0 +1,138 @@
+Source: network-manager
+Section: net
+Priority: optional
+Maintainer: Ubuntu Core Dev Team <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Riccardo Setti <giskard@debian.org>
+Uploaders: Michael Biebl <biebl@debian.org>
+Build-Depends: debhelper (>= 5.0.0),
+        automake1.9,
+        cdbs,
+        quilt,
+        gnome-common,
+        intltool,
+        libgnome-keyring-dev,
+        libdbus-glib-1-dev (>= 0.74),
+        libiw-dev(>= 27+28pre9),
+        libgnomeui-dev,
+        libpanel-applet2-dev,
+        libglade2-dev,
+        libgconf2-dev,
+        libhal-dev (>= 0.5.0),
+        libnl-dev (>= 1.0~pre8),
+        libnotify-dev (>= 0.3),
+	libpolkit-dbus-dev,
+	libnss3-dev,
+        docbook-to-man,
+        ppp-dev (>= 2.4.5~),
+        iproute,
+	gtk-doc-tools,
+	uuid-dev,
+	libudev-dev
+Standards-Version: 3.8.0
+Vcs-Bzr: https://code.launchpad.net/~network-manager/network-manager/ubuntu.0.7.1
+
+Package: network-manager
+Architecture: armel
+Depends: ${shlibs:Depends},
+	${misc:Depends},
+	iproute,
+	iputils-arping,
+	lsb-base (>= 3.2-14),
+	wpasupplicant (>= 0.6.1~),
+	dbus (>= 0.60),
+	hal (>=0.5.7.1),
+	update-notifier-common,
+	ppp
+Replaces: network-manager-pptp (<< 0.7~~)
+Conflicts: network-manager-pptp (<< 0.7~~)
+Recommends: network-manager-gnome | plasma-widget-network-manager, dnsmasq-base
+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.
+ .
+ This package provides the userspace daemons.
+ .
+  Homepage: http://www.gnome.org/projects/NetworkManager/
+
+Package: network-manager-dev
+Architecture: armel
+Section: devel
+Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config, libnm-util-dev
+Description: network management framework (development files)
+ this package provides header files that are needed to 
+ compile VPN Plugins for NetworkManager.
+ .
+  Homepage: http://www.gnome.org/projects/NetworkManager/
+
+Package: libnm-glib0
+Section: libs
+Architecture: armel
+Depends: ${shlibs: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.
+ .
+ This package provides the shared library that applications can use to query
+ connection status via NetworkManager.
+ .
+  Homepage: http://www.gnome.org/projects/NetworkManager/
+
+Package: libnm-glib-dev
+Section: libdevel
+Architecture: armel
+Depends: libnm-glib0 (= ${Source-Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60), network-manager-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.
+ .
+ This package provides the interface that applications can use to query
+ connection status via NetworkManager.
+ .
+  Homepage: http://www.gnome.org/projects/NetworkManager/
+
+Package: libnm-util1
+Section: libs
+Architecture: armel
+Depends: ${shlibs:Depends}
+Breaks: network-manager-gnome (<< 0.7~~), network-manager-kde (<< 1:0.2.3)
+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.
+ .
+ This package contains a convenience library to ease the access to
+ NetworkManager.
+ .
+  Homepage: http://www.gnome.org/projects/NetworkManager/
+
+Package: libnm-util-dev
+Section: libdevel
+Architecture: armel
+Depends: libnm-util1 (= ${Source-Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60)
+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.
+ .
+ This package contains header and development files.
+ .
+  Homepage: http://www.gnome.org/projects/NetworkManager/
+
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/network-manager.postrm
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/network-manager.postrm
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# abort a mv_conffile (from above).
+abort_rm_conffile() {
+    CONFFILE="$1"
+
+    if [ -e "$CONFFILE".dpkg-backup ]; then
+        mv -f "$CONFFILE".dpkg-backup "$CONFFILE"
+    elif [ -e "$CONFFILE".dpkg-removing ]; then
+        mv -f "$CONFFILE".dpkg-removing "$CONFFILE"
+    fi
+}
+
+# abort a mv_conffile (from above).
+abort_mv_conffile() {
+    CONFFILE="$1"
+    NEWCONFFILE="$2"
+
+    # reinstantiate .dpkg-* files - if they exist
+    if [ -e "$NEWCONFFILE".dpkg-backup ]; then
+        mv -f "$NEWCONFFILE".dpkg-backup "$CONFFILE"
+    elif [ -e "$NEWCONFFILE".dpkg-moving ]; then
+        mv -f "$NEWCONFFILE".dpkg-moving "$CONFFILE"
+    fi
+
+    if [ -e "$NEWCONFFILE" ]; then
+        rm -f "$NEWCONFFILE"
+    fi
+}
+
+case "$1" in
+    remove|purge)
+	update-rc.d -f NetworkManager remove
+        ;;
+
+    upgrade|failed-upgrade|disappear)
+	if dpkg --compare-versions "$2" "lt-nl" "0.7~~"; then
+		update-rc.d -f NetworkManager remove
+	fi
+        ;;
+
+    abort-install|abort-upgrade)
+        if dpkg --compare-versions "$2" lt "0.7~~"; then
+             abort_mv_conffile /etc/dbus-1/event.d/25NetworkManager \
+                               /etc/init.d/NetworkManager
+
+             abort_rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher
+
+             /etc/dbus-1/event.d/25NetworkManager start
+        fi
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/network-manager.preinst
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/network-manager.preinst
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+# move a conffile if there are modifications
+mv_conffile() {
+    CONFFILE="$1"
+    NEWCONFFILE="$2"
+
+    if [ -e "$CONFFILE" ]; then
+        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+        old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;s/.* //;p}}\" /var/lib/dpkg/status`"
+        if [ "$md5sum" = "$old_md5sum" ]; then
+            mv -f "$CONFFILE" "$NEWCONFFILE".dpkg-backup
+        else
+            cp -f "$CONFFILE" "$NEWCONFFILE".dpkg-moving
+            mv -f "$CONFFILE" "$NEWCONFFILE"
+        fi
+    fi
+}
+
+# move a conffile if there are modifications
+rm_conffile() {
+    CONFFILE="$1"
+
+    if [ -e "$CONFFILE" ]; then
+        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+        old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;s/.* //;p}}\" /var/lib/dpkg/status`"
+        if [ "$md5sum" = "$old_md5sum" ]; then
+            mv -f "$CONFFILE" "$CONFFILE".dpkg-backup
+        else
+            cp -f "$CONFFILE" "$CONFFILE".dpkg-removing
+            rm -f "$CONFFILE"
+        fi
+    fi
+}
+
+
+case "$1" in
+    install|upgrade)
+        # Upgrade from nm 0.6.x
+        if dpkg --compare-versions "$2" lt "0.7~~"; then
+             # dont stop the 0.6.x instance as we will ask for reboot
+             rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher
+             mv_conffile /etc/dbus-1/event.d/25NetworkManager \
+                         /etc/init.d/NetworkManager
+
+        fi
+        ;;
+
+    abort-upgrade)
+        ;;
+
+    *)
+        echo "$0 called with unknown argument \`$1'" 1>&2
+        exit 1
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/network-manager.prerm
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/network-manager.prerm
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  	remove)
+		RESULT=0
+                invoke-rc.d NetworkManager stop
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/huawei_d02hw_support.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/huawei_d02hw_support.patch
@@ -0,0 +1,26 @@
+Index: network-manager/src/nm-gsm-device.c
+===================================================================
+--- network-manager.orig/src/nm-gsm-device.c	2009-08-21 14:09:47.000000000 +0900
++++ network-manager/src/nm-gsm-device.c	2009-08-21 14:22:56.000000000 +0900
+@@ -487,6 +487,12 @@
+ 	switch (reply_index) {
+ 	case 0: /* Huawei E160G */
+ 	case 1: /* Ericsson F3507g */
++	case 4: /* EMOBILE Huawei D02HW */
++	case 5: /* EMOBILE Huawei D12HW */
++	case 6: /* EMOBILE Huawei D21HW */
++	case 7: /* EMOBILE Huawei D22HW */
++	case 8: /* EMOBILE Huawei D23HW */
++	case 9: /* EMOBILE Huawei D31HW */
+ 		priv->needs_cgreg = TRUE;
+ 		break;
+ 	default:
+@@ -504,7 +510,7 @@
+ {
+ 	NMGsmDevice *self = NM_GSM_DEVICE (device);
+ 	NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (self);
+-	const char *responses[] = { "E160G", "F3507g", "D5530", "MD300", NULL };
++	const char *responses[] = { "E160G", "F3507g", "D5530", "MD300", "D02HW", "D12HW", "D21HW", "D21HW", "D22HW", "D23HW", "D31HW", NULL };
+ 	const char *terminators[] = { "OK", "ERROR", "ERR", NULL };
+ 
+ 	/* Get the model the first time */
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/lp291564_ifupdown_unmanage_mapping_and_iface.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/lp291564_ifupdown_unmanage_mapping_and_iface.patch
@@ -0,0 +1,103 @@
+=== modified file 'system-settings/plugins/ifupdown/plugin.c'
+--- a/system-settings/plugins/ifupdown/plugin.c	2008-10-20 14:22:58.000000000 +0000
++++ b/system-settings/plugins/ifupdown/plugin.c	2008-11-04 08:52:36.000000000 +0000
+@@ -73,6 +73,7 @@
+ 	GHashTable *iface_connections;
+ 	gchar* hostname;
+ 
++	GHashTable *well_known_interfaces;
+ 	GHashTable *well_known_udis;
+ 	gboolean unmanage_well_known;
+ 
+@@ -293,32 +294,44 @@
+ 						  udi,
+ 						  &error);
+ 
+-	PLUGIN_PRINT("SCPlugin-Ifupdown",
+-			   "devices added (udi: %s, iface: %s)", udi, iface);
+-
+-	if(!iface)
++	if(!iface) {
++		PLUGIN_PRINT("SCPlugin-Ifupdown",
++				   "device added (udi: %s, iface: %s): iface not found", udi, iface);
+ 		return;
++	}
+ 
+-	exported_iface_connection =
+-		NM_EXPORTED_CONNECTION (g_hash_table_lookup (priv->iface_connections, iface));
+-
+-	/* if we have a configured connection for this particular iface
+-	 * we want to either unmanage the device or lock it
+-	 */
+-	if(!exported_iface_connection)
+-		goto out;
+-
+-	iface_connection = nm_exported_connection_get_connection (exported_iface_connection);
+-
+-	if(!iface_connection)
++	if(!g_hash_table_lookup (priv->well_known_interfaces, iface)) {
++		PLUGIN_PRINT("SCPlugin-Ifupdown",
++				   "device added (udi: %s, iface: %s): not well known", udi, iface);
+ 		goto out;
++	}
+ 
++	PLUGIN_PRINT("SCPlugin-Ifupdown",
++			   "device added (udi: %s, iface: %s): well known", udi, iface);
+ 	g_hash_table_insert (priv->well_known_udis, (gpointer)udi, "nothing");
+ 
+ 	if (ALWAYS_UNMANAGE || priv->unmanage_well_known)
+ 		g_signal_emit_by_name (G_OBJECT(config), "unmanaged-devices-changed");
+-	else
++	else {
++		exported_iface_connection =
++			NM_EXPORTED_CONNECTION (g_hash_table_lookup (priv->iface_connections, iface));
++
++		if(!exported_iface_connection) {
++			PLUGIN_PRINT("SCPlugin-Ifupdown",
++					   "device added (udi: %s, iface: %s): no exported connection", udi, iface);
++			goto out;
++		}
++
++		iface_connection = nm_exported_connection_get_connection (exported_iface_connection);
++
++		if(!iface_connection) {
++			goto out;
++			PLUGIN_PRINT("SCPlugin-Ifupdown",
++					   "device added (udi: %s, iface: %s): no iface connection", udi, iface);
++		}
++
+ 		bind_device_to_connection (config, priv->g_connection, udi, exported_iface_connection);
++	}
+ 
+  out:
+ 	g_free (iface);
+@@ -371,6 +384,9 @@
+ 	if(!priv->iface_connections)
+ 		priv->iface_connections = g_hash_table_new (g_str_hash, g_str_equal);
+ 
++	if(!priv->well_known_interfaces)
++		priv->well_known_interfaces = g_hash_table_new (g_str_hash, g_str_equal);
++
+ 	if(!priv->well_known_udis)
+ 		priv->well_known_udis = g_hash_table_new (g_str_hash, g_str_equal);
+ 
+@@ -413,6 +429,9 @@
+ 											  block);
+ 
+ 			g_hash_table_insert (priv->iface_connections, block->name, connection);
++			g_hash_table_insert (priv->well_known_interfaces, block->name, "known");
++		} else if (!strcmp ("mapping", block->type)) {
++			g_hash_table_insert (priv->well_known_interfaces, block->name, "known");
+ 		}
+ 		block = block -> next;
+ 	}
+@@ -686,6 +705,9 @@
+ 	if (priv->inotify_system_hostname_wd >= 0)
+ 		nm_inotify_helper_remove_watch (inotify_helper, priv->inotify_system_hostname_wd);
+ 
++	if (priv->well_known_interfaces)
++		g_hash_table_destroy(priv->well_known_interfaces);
++
+ 	if (priv->well_known_udis)
+ 		g_hash_table_destroy(priv->well_known_udis);
+ 
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/ppp_connect_fix.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/ppp_connect_fix.patch
@@ -0,0 +1,13 @@
+Index: network-manager/src/NetworkManager.conf
+===================================================================
+--- network-manager.orig/src/NetworkManager.conf	2009-10-01 10:14:31.000000000 -0400
++++ network-manager/src/NetworkManager.conf	2009-10-01 10:16:57.000000000 -0400
+@@ -16,8 +16,6 @@
+         <policy at_console="true">
+                 <allow send_destination="org.freedesktop.NetworkManager"/>
+ 
+-                <deny send_destination="org.freedesktop.NetworkManager"
+-                      send_interface="org.freedesktop.NetworkManager.PPP"/>
+         </policy>
+         <policy context="default">
+                 <deny own="org.freedesktop.NetworkManager"/>
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/lp463465_clear_tries.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/lp463465_clear_tries.patch
@@ -0,0 +1,29 @@
+*** network-manager.old/src/ppp-manager/nm-ppp-manager.c	2009-11-05 12:36:36.000000000 +0900
+--- network-manager/src/ppp-manager/nm-ppp-manager.c	2009-11-05 18:20:49.000000000 +0900
+***************
+*** 410,416 ****
+  	 */
+  	nm_act_request_request_connection_secrets (priv->act_req,
+  	                                           setting_name,
+! 	                                           FALSE,
+  	                                           SECRETS_CALLER_PPP,
+  	                                           hint1,
+  	                                           hint2);
+--- 410,416 ----
+  	 */
+  	nm_act_request_request_connection_secrets (priv->act_req,
+  	                                           setting_name,
+! 	                                           tries > 1 ? TRUE : FALSE,
+  	                                           SECRETS_CALLER_PPP,
+  	                                           hint1,
+  	                                           hint2);
+***************
+*** 898,903 ****
+--- 898,904 ----
+  		ignored = system ("/sbin/modprobe ppp_generic");
+  
+  	connection = nm_act_request_get_connection (req);
++ 	g_object_set_data (G_OBJECT (connection), PPP_MANAGER_SECRET_TRIES, NULL);
+  	ppp_setting = NM_SETTING_PPP (nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP));
+  	g_return_val_if_fail (ppp_setting != NULL, FALSE);
+  	
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/02-dbus_access_network_manager.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/02-dbus_access_network_manager.patch
@@ -0,0 +1,14 @@
+diff -Nur bzr.debian.0.9.4.patchupdate/src/NetworkManager.conf bzr.debian.0.9.4.patchupdate.new/src/NetworkManager.conf
+--- bzr.debian.0.9.4.patchupdate/src/NetworkManager.conf	2007-06-25 17:14:46.000000000 +0200
++++ bzr.debian.0.9.4.patchupdate.new/src/NetworkManager.conf	2007-06-25 17:15:51.000000000 +0200
+@@ -8,6 +8,10 @@
+                 <allow send_destination="org.freedesktop.NetworkManager"/>
+                 <allow send_interface="org.freedesktop.NetworkManager"/>
+         </policy>
++        <policy user="haldaemon">
++                <allow send_destination="org.freedesktop.NetworkManager"/>
++                <allow send_interface="org.freedesktop.NetworkManager"/>
++        </policy>
+         <policy at_console="true">
+                 <allow send_destination="org.freedesktop.NetworkManager"/>
+                 <allow send_interface="org.freedesktop.NetworkManager"/>
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/add_l02a_support.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/add_l02a_support.patch
@@ -0,0 +1,17 @@
+*** network-manager.old/callouts/nm-modem-probe.c	2009-12-01 19:59:24.000000000 +0900
+--- network-manager/callouts/nm-modem-probe.c	2009-12-01 20:00:08.000000000 +0900
+***************
+*** 602,607 ****
+--- 602,613 ----
+  			printf ("ID_NM_MODEM_PROBED=1\n");
+  		goto exit;
+  	}
++ 	if (vid == 0x1004 && pid == 0x6109 && usbif != 0) {
++ 		verbose ("(%s) ignoring LGE USB interface #1 and #2", device);
++ 		if (export)
++ 			printf ("ID_NM_MODEM_PROBED=1\n");
++ 		goto exit;
++ 	}
+  
+  	verbose ("probing %s", device);
+  
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/c01lc2.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/c01lc2.patch
@@ -0,0 +1,22 @@
+*** network-manager.old/src/nm-gsm-device.c	2009-11-05 12:36:36.000000000 +0900
+--- network-manager/src/nm-gsm-device.c	2009-11-05 12:51:11.000000000 +0900
+***************
+*** 209,215 ****
+  
+  		/* for C01LC */
+  		if(priv->needs_tone_flag)
+! 			str = g_string_new ("ATDT");
+  		else
+  			str = g_string_new ("ATD");
+  
+--- 209,218 ----
+  
+  		/* for C01LC */
+  		if(priv->needs_tone_flag)
+! 			if(number[0] == 'T' || number[0] == 't')
+! 				str = g_string_new ("ATD");
+! 			else
+! 				str = g_string_new ("ATDT");
+  		else
+  			str = g_string_new ("ATD");
+  
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/support_l05a.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/support_l05a.patch
@@ -0,0 +1,49 @@
+Index: network-manager/src/nm-gsm-device.c
+===================================================================
+--- network-manager.orig/src/nm-gsm-device.c	2009-10-05 13:13:27.000000000 -0400
++++ network-manager/src/nm-gsm-device.c	2009-10-05 13:13:27.000000000 -0400
+@@ -387,6 +387,8 @@
+ 	switch (reply_index) {
+ 	case 4:
+ 	case 0:
++	case 10:
++	case 6:
+ 		/* Try autoregistration a few times here because the card is actually
+ 		 * responding to the query and thus we aren't waiting as long for
+ 		 * each CREG request.  Some cards (ex. Option iCON 225) return OK
+@@ -404,20 +406,24 @@
+ 		}
+ 		break;
+ 	case 1:
++	case 7:
+ 		nm_info ("Registered on Home network");
+ 		automatic_registration_get_network (NM_GSM_DEVICE (device));
+ 		break;
+ 	case 2:
++	case 8:
+ 		nm_info ("Searching for a network...");
+ 		schedule_automatic_registration_again (NM_GSM_DEVICE (device));
+ 		break;
+ 	case 3:
++	case 9:
+ 		nm_warning ("Automatic registration failed: registration denied.");
+ 		nm_device_state_changed (NM_DEVICE (device),
+ 		                         NM_DEVICE_STATE_FAILED,
+ 		                         NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED);
+ 		break;
+ 	case 5:
++	case 11:
+ 		nm_info ("Registered on Roaming network");
+ 		automatic_registration_get_network (NM_GSM_DEVICE (device));
+ 		break;
+@@ -449,8 +455,8 @@
+ automatic_registration (NMGsmDevice *device)
+ {
+ 	NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (device);
+-	const char *creg_responses[] = { "+CREG: 0,0", "+CREG: 0,1", "+CREG: 0,2", "+CREG: 0,3", "+CREG: 0,4", "+CREG: 0,5", NULL };
+-	const char *cgreg_responses[] = { "+CGREG: 0,0", "+CGREG: 0,1", "+CGREG: 0,2", "+CGREG: 0,3", "+CGREG: 0,4", "+CGREG: 0,5", NULL };
++	const char *creg_responses[] = { "+CREG: 0,0", "+CREG: 0,1", "+CREG: 0,2", "+CREG: 0,3", "+CREG: 0,4", "+CREG: 0,5", "+CREG:0,0", "+CREG:0,1", "+CREG:0,2", "+CREG:0,3", "+CREG:0,4", "+CREG:0,5", NULL };
++	const char *cgreg_responses[] = { "+CGREG: 0,0", "+CGREG: 0,1", "+CGREG: 0,2", "+CGREG: 0,3", "+CGREG: 0,4", "+CGREG: 0,5", "+CGREG:0,0", "+CGREG:0,1", "+CGREG:0,2", "+CGREG:0,3", "+CGREG:0,4", "+CGREG:0,5", NULL };
+ 	const char *terminators[] = { "OK", "ERROR", "ERR", NULL };
+ 
+ 	if (priv->needs_cgreg)
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/ignore_usbif.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/ignore_usbif.patch
@@ -0,0 +1,83 @@
+Index: network-manager/callouts/nm-modem-probe.c
+===================================================================
+--- network-manager.orig/callouts/nm-modem-probe.c	2009-10-05 13:13:49.000000000 -0400
++++ network-manager/callouts/nm-modem-probe.c	2009-10-06 11:17:19.000000000 -0400
+@@ -33,6 +33,24 @@
+ #define HUAWEI_VENDOR_ID   0x12D1
+ #define SIERRA_VENDOR_ID   0x1199
+ 
++#define LONGCHEER_VENDOR_ID 0x1c9e
++#define LC_PRODUCT_C01LC 0x9603
++#define LC_PRODUCT_D11LC 0x6061
++#define LC_PRODUCT_D12LC 0x9104
++#define LC_PRODUCT_D21LC 0x9404
++#define LC_C01LC_DP_IF 2
++#define LC_D11LC_DP_IF 0
++#define LC_D12LC_DP_IF 3 
++#define LC_D21LC_DP_IF 3 
++
++#define LG_ELECTRONICS_VENDOR_ID 0x1004
++#define LG_PRODUCT_L02A  0x6109
++#define LG_L02A_DP_IF  0
++
++#define ZTE_VENDOR_ID  0x19d2
++#define ZTE_PRODUCT_ID 0x0031
++#define ZTE_DP_IF 3
++
+ #define MODEM_CAP_GSM         0x0001 /* GSM */
+ #define MODEM_CAP_IS707_A     0x0002 /* CDMA Circuit Switched Data */
+ #define MODEM_CAP_IS707_P     0x0004 /* CDMA Packet Switched Data */
+@@ -429,6 +447,42 @@
+ 	    " --help\n\n");
+ }
+ 
++
++static gboolean
++check_ignoring_usb_interface(unsigned int vid, unsigned int pid, unsigned int usbif)
++{
++  switch(vid)
++    {
++    case HUAWEI_VENDOR_ID:
++      if(usbif != 0) {
++	return TRUE;
++      }
++      break;
++    case LONGCHEER_VENDOR_ID:
++      if(pid == LC_PRODUCT_C01LC && usbif != LC_C01LC_DP_IF) {
++	return TRUE;
++      } else if(pid == LC_PRODUCT_D11LC && usbif != LC_D11LC_DP_IF) {
++	return TRUE;
++      } else if(pid == LC_PRODUCT_D12LC && usbif != LC_D12LC_DP_IF) {
++	return TRUE;
++      } else if(pid == LC_PRODUCT_D21LC && usbif != LC_D21LC_DP_IF) {
++	return TRUE;
++      }
++      break;
++    case LG_ELECTRONICS_VENDOR_ID:
++      if(pid == LG_PRODUCT_L02A && usbif != LG_L02A_DP_IF) {
++	return TRUE;
++      }
++      break;
++    case ZTE_VENDOR_ID:
++      if(pid == ZTE_PRODUCT_ID && usbif != ZTE_DP_IF) {
++	return TRUE;
++      }
++      break;
++    }
++  return FALSE;
++}
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -542,8 +596,8 @@
+ 	         device, vid, pid, usbif, driver);
+ 
+ 	/* Some devices just shouldn't be touched */
+-	if (vid == HUAWEI_VENDOR_ID && usbif != 0) {
+-		verbose ("(%s) ignoring Huawei USB interface #1", device);
++	if(check_ignoring_usb_interface(vid, pid, usbif)) {
++		verbose ("(%s) ignoring USB interface", device);
+ 		if (export)
+ 			printf ("ID_NM_MODEM_PROBED=1\n");
+ 		goto exit;
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/lp291902_IFUPDOWN_dont_export_connection_in_unmanaged_mode.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/lp291902_IFUPDOWN_dont_export_connection_in_unmanaged_mode.patch
@@ -0,0 +1,29 @@
+=== modified file 'system-settings/plugins/ifupdown/plugin.c'
+--- a/system-settings/plugins/ifupdown/plugin.c	2008-10-10 11:25:53 +0000
++++ b/system-settings/plugins/ifupdown/plugin.c	2008-11-28 11:12:57 +0000
+@@ -507,18 +507,24 @@ SCPluginIfupdown_init (NMSystemConfigInt
+  */
+ static GSList*
+ SCPluginIfupdown_get_connections (NMSystemConfigInterface *config)
+ {
+ 	SCPluginIfupdownPrivate *priv = SC_PLUGIN_IFUPDOWN_GET_PRIVATE (config);
+ 	GSList *connections = NULL;
+ 	GList *priv_list = g_hash_table_get_values(priv->iface_connections);
+ 	GList *it = priv_list;
++
+ 	PLUGIN_PRINT("SCPlugin-Ifupdown", "(%d) ... get_connections.", GPOINTER_TO_UINT(config));
+ 
++	if(priv->unmanage_well_known) {
++		PLUGIN_PRINT("SCPlugin-Ifupdown", "(%d) ... get_connections (managed=false): return empty list.", GPOINTER_TO_UINT(config));
++		return NULL;
++	}
++
+ 	while(it) {
+ 		NMExportedConnection *conn = it->data;
+ 		connections = g_slist_append(connections, conn);
+ 		it = it->next;
+ 	}
+ 	PLUGIN_PRINT("SCPlugin-Ifupdown", "(%d) connections count: %d", GPOINTER_TO_UINT(config), g_slist_length(connections));
+ 	return connections;
+ }
+
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/many_3g_modem.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/many_3g_modem.patch
@@ -0,0 +1,25 @@
+Index: network-manager/src/nm-gsm-device.c
+===================================================================
+--- network-manager.orig/src/nm-gsm-device.c	2009-10-05 13:13:27.000000000 -0400
++++ network-manager/src/nm-gsm-device.c	2009-10-05 13:13:42.000000000 -0400
+@@ -493,6 +493,11 @@
+ 	case 7: /* EMOBILE Huawei D22HW */
+ 	case 8: /* EMOBILE Huawei D23HW */
+ 	case 9: /* EMOBILE Huawei D31HW */
++	case 10: /* SOFTBANK MOBILE Longcheer C01LC */
++	case 11: /* EMOBILE Longcheer D11LC D12LC */
++	case 12: /* EMOBILE Longcheer D21LC */
++	case 13: /* ZTE HX003ZT */
++	case 14: /* ZTE BM-DL3-150H BM-DC1-500M */
+ 		priv->needs_cgreg = TRUE;
+ 		break;
+ 	default:
+@@ -510,7 +515,7 @@
+ {
+ 	NMGsmDevice *self = NM_GSM_DEVICE (device);
+ 	NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (self);
+-	const char *responses[] = { "E160G", "F3507g", "D5530", "MD300", "D02HW", "D12HW", "D21HW", "D21HW", "D22HW", "D23HW", "D31HW", NULL };
++	const char *responses[] = { "E160G", "F3507g", "D5530", "MD300", "D02HW", "D12HW", "D21HW", "D22HW", "D23HW", "D31HW", "C01LC", "HSDPA USB MODE", "D21LC", "MF633", "MF636", NULL };
+ 	const char *terminators[] = { "OK", "ERROR", "ERR", NULL };
+ 
+ 	/* Get the model the first time */
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/lp120363_smartcard_pkcs11.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/lp120363_smartcard_pkcs11.patch
@@ -0,0 +1,701 @@
+diff -Naur network-manager-0.7.bak/libnm-util/libnm-util.ver network-manager-0.7.dev/libnm-util/libnm-util.ver
+--- network-manager-0.7.bak/libnm-util/libnm-util.ver	2008-11-29 02:55:17.000000000 +0900
++++ network-manager-0.7.dev/libnm-util/libnm-util.ver	2009-01-07 00:59:02.000000000 +0900
+@@ -55,6 +55,16 @@
+ 	nm_setting_802_1x_get_phase2_private_key_password;
+ 	nm_setting_802_1x_get_phase2_private_key_type;
+ 	nm_setting_802_1x_get_pin;
++	nm_setting_802_1x_get_pkcs11_engine_path;
++	nm_setting_802_1x_get_pkcs11_module_path;
++	nm_setting_802_1x_get_pkcs11_module_init_args;
++	nm_setting_802_1x_get_pkcs11_slot;
++	nm_setting_802_1x_get_pkcs11_ca_cert;
++	nm_setting_802_1x_get_pkcs11_client_cert;
++	nm_setting_802_1x_get_pkcs11_private_key;
++	nm_setting_802_1x_get_pkcs11_phase2_ca_cert;
++	nm_setting_802_1x_get_pkcs11_phase2_client_cert;
++	nm_setting_802_1x_get_pkcs11_phase2_private_key;
+ 	nm_setting_802_1x_get_private_key;
+ 	nm_setting_802_1x_set_private_key_from_file;
+ 	nm_setting_802_1x_get_private_key_password;
+diff -Naur network-manager-0.7.bak/libnm-util/nm-setting-8021x.c network-manager-0.7.dev/libnm-util/nm-setting-8021x.c
+--- network-manager-0.7.bak/libnm-util/nm-setting-8021x.c	2008-11-29 02:55:17.000000000 +0900
++++ network-manager-0.7.dev/libnm-util/nm-setting-8021x.c	2009-01-07 12:33:29.000000000 +0900
+@@ -94,6 +94,16 @@
+ 	GByteArray *phase2_private_key;
+ 	char *phase2_private_key_password;
+ 	gboolean system_ca_certs;
++	char *pkcs11_engine_path;
++	char *pkcs11_module_path;
++	char *pkcs11_module_init_args;
++	guint pkcs11_slot;
++	char *pkcs11_ca_cert;
++	char *pkcs11_client_cert;
++	char *pkcs11_private_key;
++	char *pkcs11_phase2_ca_cert;
++	char *pkcs11_phase2_client_cert;
++	char *pkcs11_phase2_private_key;
+ } NMSetting8021xPrivate;
+ 
+ enum {
+@@ -120,6 +130,16 @@
+ 	PROP_PIN,
+ 	PROP_PSK,
+ 	PROP_SYSTEM_CA_CERTS,
++	PROP_PKCS11_ENGINE_PATH,
++	PROP_PKCS11_MODULE_PATH,
++	PROP_PKCS11_MODULE_INIT_ARGS,
++	PROP_PKCS11_SLOT,
++	PROP_PKCS11_CA_CERT,
++	PROP_PKCS11_CLIENT_CERT,
++	PROP_PKCS11_PRIVATE_KEY,
++	PROP_PKCS11_PHASE2_CA_CERT,
++	PROP_PKCS11_PHASE2_CLIENT_CERT,
++	PROP_PKCS11_PHASE2_PRIVATE_KEY,
+ 
+ 	LAST_PROP
+ };
+@@ -689,6 +709,86 @@
+ 	return NM_SETTING_802_1X_CK_TYPE_X509;
+ }
+ 
++const char *
++nm_setting_802_1x_get_pkcs11_engine_path (NMSetting8021x *setting)
++{
++	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
++
++	return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_engine_path;
++}
++
++const char *
++nm_setting_802_1x_get_pkcs11_module_path (NMSetting8021x *setting)
++{
++	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
++
++	return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_module_path;
++}
++
++const char *
++nm_setting_802_1x_get_pkcs11_module_init_args (NMSetting8021x *setting)
++{
++	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
++
++	return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_module_init_args;
++}
++
++guint
++nm_setting_802_1x_get_pkcs11_slot (NMSetting8021x *setting)
++{
++	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), 0);
++
++	return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_slot;
++}
++
++const char *
++nm_setting_802_1x_get_pkcs11_ca_cert (NMSetting8021x *setting)
++{
++	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
++
++	return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_ca_cert;
++}
++
++const char *
++nm_setting_802_1x_get_pkcs11_client_cert (NMSetting8021x *setting)
++{
++	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
++
++	return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_client_cert;
++}
++
++const char *
++nm_setting_802_1x_get_pkcs11_private_key (NMSetting8021x *setting)
++{
++	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
++
++	return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_private_key;
++}
++
++const char *
++nm_setting_802_1x_get_pkcs11_phase2_ca_cert (NMSetting8021x *setting)
++{
++	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
++
++	return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_phase2_ca_cert;
++}
++
++const char *
++nm_setting_802_1x_get_pkcs11_phase2_client_cert (NMSetting8021x *setting)
++{
++	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
++
++	return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_phase2_client_cert;
++}
++
++const char *
++nm_setting_802_1x_get_pkcs11_phase2_private_key (NMSetting8021x *setting)
++{
++	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
++
++	return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_phase2_private_key;
++}
++
+ static void
+ need_secrets_password (NMSetting8021x *self,
+                        GPtrArray *secrets,
+@@ -742,15 +842,26 @@
+ {
+ 	NMSetting8021xPrivate *priv = NM_SETTING_802_1X_GET_PRIVATE (self);
+ 
++	if (priv->pkcs11_module_path &&
++		(!priv->pin || !strlen (priv->pin)) &&
++		(priv->pkcs11_private_key || priv->pkcs11_phase2_private_key))
++		g_ptr_array_add (secrets, NM_SETTING_802_1X_PIN);
++
+ 	if (phase2) {
+-		if (!priv->phase2_private_key || !priv->phase2_private_key->len)
++		if (!priv->pkcs11_phase2_private_key &&
++			(!priv->phase2_private_key || !priv->phase2_private_key->len))
+ 			g_ptr_array_add (secrets, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY);
+-		else if (need_private_key_password (priv->phase2_private_key, priv->phase2_private_key_password))
++		else if (!priv->pkcs11_phase2_private_key &&
++				 need_private_key_password (priv->phase2_private_key,
++											priv->phase2_private_key_password))
+ 			g_ptr_array_add (secrets, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD);
+ 	} else {
+-		if (!priv->private_key || !priv->private_key->len)
++		if (!priv->pkcs11_private_key &&
++			(!priv->private_key || !priv->private_key->len))
+ 			g_ptr_array_add (secrets, NM_SETTING_802_1X_PRIVATE_KEY);
+-		else if (need_private_key_password (priv->private_key, priv->private_key_password))
++		else if (!priv->pkcs11_private_key &&
++				 need_private_key_password (priv->private_key,
++											priv->private_key_password))
+ 			g_ptr_array_add (secrets, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD);
+ 	}
+ }
+@@ -761,6 +872,11 @@
+ 	NMSetting8021xPrivate *priv = NM_SETTING_802_1X_GET_PRIVATE (self);
+ 
+ 	if (phase2) {
++		/* TODO: add better checks for pkcs11 case */
++		if (priv->pkcs11_phase2_client_cert &&
++			priv->pkcs11_phase2_private_key)
++			return TRUE;
++
+ 		if (!priv->phase2_client_cert) {
+ 			g_set_error (error,
+ 			             NM_SETTING_802_1X_ERROR,
+@@ -796,6 +912,10 @@
+ 			}
+ 		}
+ 	} else {
++		/* TODO: add better checks for pkcs11 case */
++		if (priv->pkcs11_client_cert &&
++			priv->pkcs11_private_key)
++			return TRUE;
+ 		if (!priv->client_cert) {
+ 			g_set_error (error,
+ 			             NM_SETTING_802_1X_ERROR,
+@@ -1142,6 +1262,16 @@
+ 	g_free (priv->phase2_autheap);
+ 	g_free (priv->phase2_ca_path);
+ 	g_free (priv->password);
++	g_free (priv->pin);
++	g_free (priv->pkcs11_engine_path);
++	g_free (priv->pkcs11_module_path);
++	g_free (priv->pkcs11_module_init_args);
++	g_free (priv->pkcs11_ca_cert);
++	g_free (priv->pkcs11_client_cert);
++	g_free (priv->pkcs11_private_key);
++	g_free (priv->pkcs11_phase2_ca_cert);
++	g_free (priv->pkcs11_phase2_client_cert);
++	g_free (priv->pkcs11_phase2_private_key);
+ 
+ 	nm_utils_slist_free (priv->eap, g_free);
+ 
+@@ -1235,6 +1365,10 @@
+ 		g_free (priv->password);
+ 		priv->password = g_value_dup_string (value);
+ 		break;
++	case PROP_PIN:
++		g_free (priv->pin);
++		priv->pin = g_value_dup_string (value);
++		break;
+ 	case PROP_PRIVATE_KEY:
+ 		if (priv->private_key)
+ 			g_byte_array_free (priv->private_key, TRUE);
+@@ -1256,6 +1390,45 @@
+ 	case PROP_SYSTEM_CA_CERTS:
+ 		priv->system_ca_certs = g_value_get_boolean (value);
+ 		break;
++	case PROP_PKCS11_ENGINE_PATH:
++		g_free (priv->pkcs11_engine_path);
++		priv->pkcs11_engine_path = g_value_dup_string (value);
++		break;
++	case PROP_PKCS11_MODULE_PATH:
++		g_free (priv->pkcs11_module_path);
++		priv->pkcs11_module_path = g_value_dup_string (value);
++		break;
++	case PROP_PKCS11_MODULE_INIT_ARGS:
++		g_free (priv->pkcs11_module_init_args);
++		priv->pkcs11_module_init_args = g_value_dup_string (value);
++		break;
++	case PROP_PKCS11_SLOT:
++		priv->pkcs11_slot = g_value_get_uint (value);
++		break;
++	case PROP_PKCS11_CA_CERT:
++		g_free (priv->pkcs11_ca_cert);
++		priv->pkcs11_ca_cert = g_value_dup_string (value);
++		break;
++	case PROP_PKCS11_CLIENT_CERT:
++		g_free (priv->pkcs11_client_cert);
++		priv->pkcs11_client_cert = g_value_dup_string (value);
++		break;
++	case PROP_PKCS11_PRIVATE_KEY:
++		g_free (priv->pkcs11_private_key);
++		priv->pkcs11_private_key = g_value_dup_string (value);
++		break;
++	case PROP_PKCS11_PHASE2_CA_CERT:
++		g_free (priv->pkcs11_phase2_ca_cert);
++		priv->pkcs11_phase2_ca_cert = g_value_dup_string (value);
++		break;
++	case PROP_PKCS11_PHASE2_CLIENT_CERT:
++		g_free (priv->pkcs11_phase2_client_cert);
++		priv->pkcs11_phase2_client_cert = g_value_dup_string (value);
++		break;
++	case PROP_PKCS11_PHASE2_PRIVATE_KEY:
++		g_free (priv->pkcs11_phase2_private_key);
++		priv->pkcs11_phase2_private_key = g_value_dup_string (value);
++		break;
+ 	default:
+ 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ 		break;
+@@ -1315,6 +1488,9 @@
+ 	case PROP_PASSWORD:
+ 		g_value_set_string (value, priv->password);
+ 		break;
++	case PROP_PIN:
++		g_value_set_string (value, priv->pin);
++		break;
+ 	case PROP_PRIVATE_KEY:
+ 		g_value_set_boxed (value, priv->private_key);
+ 		break;
+@@ -1330,6 +1506,36 @@
+ 	case PROP_SYSTEM_CA_CERTS:
+ 		g_value_set_boolean (value, priv->system_ca_certs);
+ 		break;
++	case PROP_PKCS11_ENGINE_PATH:
++		g_value_set_string (value, priv->pkcs11_engine_path);
++		break;
++	case PROP_PKCS11_MODULE_PATH:
++		g_value_set_string (value, priv->pkcs11_module_path);
++		break;
++	case PROP_PKCS11_MODULE_INIT_ARGS:
++		g_value_set_string (value, priv->pkcs11_module_init_args);
++		break;
++	case PROP_PKCS11_SLOT:
++		g_value_set_uint (value, priv->pkcs11_slot);
++		break;
++	case PROP_PKCS11_CA_CERT:
++		g_value_set_string (value, priv->pkcs11_ca_cert);
++		break;
++	case PROP_PKCS11_CLIENT_CERT:
++		g_value_set_string (value, priv->pkcs11_client_cert);
++		break;
++	case PROP_PKCS11_PRIVATE_KEY:
++		g_value_set_string (value, priv->pkcs11_private_key);
++		break;
++	case PROP_PKCS11_PHASE2_CA_CERT:
++		g_value_set_string (value, priv->pkcs11_phase2_ca_cert);
++		break;
++	case PROP_PKCS11_PHASE2_CLIENT_CERT:
++		g_value_set_string (value, priv->pkcs11_phase2_client_cert);
++		break;
++	case PROP_PKCS11_PHASE2_PRIVATE_KEY:
++		g_value_set_string (value, priv->pkcs11_phase2_private_key);
++		break;
+ 	default:
+ 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ 		break;
+@@ -1467,6 +1673,14 @@
+ 							   G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
+ 
+ 	g_object_class_install_property
++		(object_class, PROP_PIN,
++		 g_param_spec_string (NM_SETTING_802_1X_PIN,
++							  "PIN",
++							  "PIN",
++							  NULL,
++							  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET));
++
++	g_object_class_install_property
+ 		(object_class, PROP_PASSWORD,
+ 		 g_param_spec_string (NM_SETTING_802_1X_PASSWORD,
+ 						  "Password",
+@@ -1514,6 +1728,87 @@
+ 							   FALSE,
+ 							   G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
+ 
++	g_object_class_install_property
++		(object_class, PROP_PKCS11_ENGINE_PATH,
++		 g_param_spec_string (NM_SETTING_802_1X_PKCS11_ENGINE_PATH,
++						  "OpenSSL pkcs11 engine path",
++						  "OpenSSL pkcs11 engine path",
++						  NULL,
++						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
++
++	g_object_class_install_property
++		(object_class, PROP_PKCS11_MODULE_PATH,
++		 g_param_spec_string (NM_SETTING_802_1X_PKCS11_MODULE_PATH,
++						  "PKCS11 smartcard library module path",
++						  "PKCS11 smartcard library module path",
++						  NULL,
++						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
++
++	g_object_class_install_property
++		(object_class, PROP_PKCS11_MODULE_INIT_ARGS,
++		 g_param_spec_string (NM_SETTING_802_1X_PKCS11_MODULE_INIT_ARGS,
++						  "PKCS11 smartcard library initialization arguments",
++						  "PKCS11 smartcard library initialization arguments",
++						  NULL,
++						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
++
++	g_object_class_install_property
++		(object_class, PROP_PKCS11_SLOT,
++		 g_param_spec_uint (NM_SETTING_802_1X_PKCS11_SLOT,
++						"PKCS11 slot",
++						"PKCS11 slot",
++						0, 1000, 0,
++						G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
++
++	g_object_class_install_property
++		(object_class, PROP_PKCS11_CA_CERT,
++		 g_param_spec_string (NM_SETTING_802_1X_PKCS11_CA_CERT,
++						  "PKCS11 object ID of CA certificate",
++						  "PKCS11 object ID of CA certificate",
++						  NULL,
++						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
++
++	g_object_class_install_property
++		(object_class, PROP_PKCS11_CLIENT_CERT,
++		 g_param_spec_string (NM_SETTING_802_1X_PKCS11_CLIENT_CERT,
++						  "PKCS11 object ID of client certificate",
++						  "PKCS11 object ID of client certificate",
++						  NULL,
++						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
++
++	g_object_class_install_property
++		(object_class, PROP_PKCS11_PRIVATE_KEY,
++		 g_param_spec_string (NM_SETTING_802_1X_PKCS11_PRIVATE_KEY,
++						  "PKCS11 object ID of private key",
++						  "PKCS11 object ID of private key",
++						  NULL,
++						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
++
++	g_object_class_install_property
++		(object_class, PROP_PKCS11_PHASE2_CA_CERT,
++		 g_param_spec_string (NM_SETTING_802_1X_PKCS11_PHASE2_CA_CERT,
++						  "PKCS11 object ID of phase2 CA certificate",
++						  "PKCS11 object ID of phase2 CA certificate",
++						  NULL,
++						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
++
++	g_object_class_install_property
++		(object_class, PROP_PKCS11_PHASE2_CLIENT_CERT,
++		 g_param_spec_string (NM_SETTING_802_1X_PKCS11_PHASE2_CLIENT_CERT,
++						  "PKCS11 object ID of phase2 client certificate",
++						  "PKCS11 object ID of phase2 client certificate",
++						  NULL,
++						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
++
++	g_object_class_install_property
++		(object_class, PROP_PKCS11_PHASE2_PRIVATE_KEY,
++		 g_param_spec_string (NM_SETTING_802_1X_PKCS11_PHASE2_PRIVATE_KEY,
++						  "PKCS11 object ID of phase2 private key",
++						  "PKCS11 object ID of phase2 private key",
++						  NULL,
++						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
++
++
+ 	/* Initialize crypto lbrary. */
+ 	if (!nm_utils_init (&error)) {
+ 		g_warning ("Couldn't initilize nm-utils/crypto system: %d %s",
+diff -Naur network-manager-0.7.bak/libnm-util/nm-setting-8021x.h network-manager-0.7.dev/libnm-util/nm-setting-8021x.h
+--- network-manager-0.7.bak/libnm-util/nm-setting-8021x.h	2008-11-29 02:55:17.000000000 +0900
++++ network-manager-0.7.dev/libnm-util/nm-setting-8021x.h	2009-01-07 01:39:34.000000000 +0900
+@@ -82,6 +82,16 @@
+ #define NM_SETTING_802_1X_PIN "pin"
+ #define NM_SETTING_802_1X_PSK "psk"
+ #define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
++#define NM_SETTING_802_1X_PKCS11_ENGINE_PATH "pkcs11-engine-path"
++#define NM_SETTING_802_1X_PKCS11_MODULE_PATH "pkcs11-module-path"
++#define NM_SETTING_802_1X_PKCS11_MODULE_INIT_ARGS "pkcs11-module-init-args"
++#define NM_SETTING_802_1X_PKCS11_SLOT "pkcs11-slot"
++#define NM_SETTING_802_1X_PKCS11_CA_CERT "pkcs11-ca-cert"
++#define NM_SETTING_802_1X_PKCS11_CLIENT_CERT "pkcs11-client-cert"
++#define NM_SETTING_802_1X_PKCS11_PRIVATE_KEY "pkcs11-private-key"
++#define NM_SETTING_802_1X_PKCS11_PHASE2_CA_CERT "pkcs11-phase2-ca-cert"
++#define NM_SETTING_802_1X_PKCS11_PHASE2_CLIENT_CERT "pkcs11-phase2-client-cert"
++#define NM_SETTING_802_1X_PKCS11_PHASE2_PRIVATE_KEY "pkcs11-phase2-private-key"
+ 
+ typedef struct {
+ 	NMSetting parent;
+@@ -182,6 +192,17 @@
+                                                                       GError **err);
+ NMSetting8021xCKType nm_setting_802_1x_get_phase2_private_key_type   (NMSetting8021x *setting);
+ 
++const char *      nm_setting_802_1x_get_pkcs11_engine_path           (NMSetting8021x *setting);
++const char *      nm_setting_802_1x_get_pkcs11_module_path           (NMSetting8021x *setting);
++const char *      nm_setting_802_1x_get_pkcs11_module_init_args      (NMSetting8021x *setting);
++guint             nm_setting_802_1x_get_pkcs11_slot                  (NMSetting8021x *setting);
++const char *      nm_setting_802_1x_get_pkcs11_ca_cert               (NMSetting8021x *setting);
++const char *      nm_setting_802_1x_get_pkcs11_client_cert           (NMSetting8021x *setting);
++const char *      nm_setting_802_1x_get_pkcs11_private_key           (NMSetting8021x *setting);
++const char *      nm_setting_802_1x_get_pkcs11_phase2_ca_cert        (NMSetting8021x *setting);
++const char *      nm_setting_802_1x_get_pkcs11_phase2_client_cert    (NMSetting8021x *setting);
++const char *      nm_setting_802_1x_get_pkcs11_phase2_private_key    (NMSetting8021x *setting);
++
+ G_END_DECLS
+ 
+ #endif /* NM_SETTING_8021X_H */
+diff -Naur network-manager-0.7.bak/src/supplicant-manager/nm-supplicant-config.c network-manager-0.7.dev/src/supplicant-manager/nm-supplicant-config.c
+--- network-manager-0.7.bak/src/supplicant-manager/nm-supplicant-config.c	2008-11-29 02:55:17.000000000 +0900
++++ network-manager-0.7.dev/src/supplicant-manager/nm-supplicant-config.c	2009-01-07 01:54:33.000000000 +0900
+@@ -53,6 +53,9 @@
+ 	GHashTable *blobs;
+ 	guint32    ap_scan;
+ 	gboolean   dispose_has_run;
++	char       *pkcs11_engine_path;
++	char       *pkcs11_module_path;
++	char       *pkcs11_module_init_args;
+ } NMSupplicantConfigPrivate;
+ 
+ NMSupplicantConfig *
+@@ -89,6 +92,7 @@
+ 
+ 	priv->ap_scan = 1;
+ 	priv->dispose_has_run = FALSE;
++	priv->pkcs11_engine_path = g_strdup ("/usr/lib/engines/engine_pkcs11.so");
+ }
+ 
+ gboolean
+@@ -224,9 +228,14 @@
+ static void
+ nm_supplicant_config_finalize (GObject *object)
+ {
++	NMSupplicantConfigPrivate *priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE (object);
++
+ 	/* Complete object destruction */
+-	g_hash_table_destroy (NM_SUPPLICANT_CONFIG_GET_PRIVATE (object)->config);
+-	g_hash_table_destroy (NM_SUPPLICANT_CONFIG_GET_PRIVATE (object)->blobs);
++	g_hash_table_destroy (priv->config);
++	g_hash_table_destroy (priv->blobs);
++	g_free (priv->pkcs11_engine_path);
++	g_free (priv->pkcs11_module_path);
++	g_free (priv->pkcs11_module_init_args);
+ 
+ 	/* Chain up to the parent class */
+ 	G_OBJECT_CLASS (nm_supplicant_config_parent_class)->finalize (object);
+@@ -261,6 +270,69 @@
+ 	NM_SUPPLICANT_CONFIG_GET_PRIVATE (self)->ap_scan = ap_scan;
+ }
+ 
++const char *
++nm_supplicant_config_get_pkcs11_engine_path (NMSupplicantConfig * self)
++{
++	g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), NULL);
++
++	return NM_SUPPLICANT_CONFIG_GET_PRIVATE (self)->pkcs11_engine_path;
++}
++
++void
++nm_supplicant_config_set_pkcs11_engine_path (NMSupplicantConfig * self,
++                                             const char *pkcs11_engine_path)
++{
++	NMSupplicantConfigPrivate *priv;
++
++	g_return_if_fail (NM_IS_SUPPLICANT_CONFIG (self));
++
++	priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE (self);
++	g_free (priv->pkcs11_engine_path);
++	priv->pkcs11_engine_path = g_strdup (pkcs11_engine_path);
++}
++
++const char *
++nm_supplicant_config_get_pkcs11_module_path (NMSupplicantConfig * self)
++{
++	g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), NULL);
++
++	return NM_SUPPLICANT_CONFIG_GET_PRIVATE (self)->pkcs11_module_path;
++}
++
++void
++nm_supplicant_config_set_pkcs11_module_path (NMSupplicantConfig * self,
++                                             const char *pkcs11_module_path)
++{
++	NMSupplicantConfigPrivate *priv;
++
++	g_return_if_fail (NM_IS_SUPPLICANT_CONFIG (self));
++
++	priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE (self);
++	g_free (priv->pkcs11_module_path);
++	priv->pkcs11_module_path = g_strdup (pkcs11_module_path);
++}
++
++const char *
++nm_supplicant_config_get_pkcs11_module_init_args (NMSupplicantConfig * self)
++{
++	g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), NULL);
++
++	return NM_SUPPLICANT_CONFIG_GET_PRIVATE (self)->pkcs11_module_init_args;
++}
++
++void
++nm_supplicant_config_set_pkcs11_module_init_args (NMSupplicantConfig * self,
++                                                  const char *pkcs11_module_init_args)
++{
++	NMSupplicantConfigPrivate *priv;
++
++	g_return_if_fail (NM_IS_SUPPLICANT_CONFIG (self));
++
++	priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE (self);
++	g_free (priv->pkcs11_module_init_args);
++	priv->pkcs11_module_init_args = g_strdup (pkcs11_module_init_args);
++}
++
+ static void
+ get_hash_cb (gpointer key, gpointer value, gpointer user_data)
+ {
+@@ -489,6 +561,8 @@
+ 	char *value;
+ 	gboolean success;
+ 	const char *key_mgmt, *auth_alg;
++	const char *pkcs11_engine_path;
++	const char *pkcs11_module_path;
+ 
+ 	g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), FALSE);
+ 	g_return_val_if_fail (setting != NULL, FALSE);
+@@ -555,6 +629,27 @@
+ 		}
+ 	}
+ 
++	pkcs11_engine_path = nm_setting_802_1x_get_pkcs11_engine_path (setting_8021x);
++	pkcs11_module_path = nm_setting_802_1x_get_pkcs11_module_path (setting_8021x);
++
++	if (pkcs11_engine_path && pkcs11_module_path) {
++		nm_supplicant_config_set_pkcs11_engine_path (self, pkcs11_engine_path);
++		nm_supplicant_config_set_pkcs11_module_path (self, pkcs11_module_path);
++		nm_supplicant_config_set_pkcs11_module_init_args (self,
++														  nm_setting_802_1x_get_pkcs11_module_init_args (setting_8021x));
++
++		ADD_STRING_VAL ("1", "engine", FALSE, FALSE, FALSE);
++		ADD_STRING_VAL ("pkcs11", "engine_id", FALSE, FALSE, FALSE);
++
++		/* TODO: handle more than one slot */
++		ADD_STRING_VAL (nm_setting_802_1x_get_pkcs11_ca_cert (setting_8021x), "ca_cert_id", FALSE, FALSE, FALSE);
++		ADD_STRING_VAL (nm_setting_802_1x_get_pkcs11_client_cert (setting_8021x), "cert_id", FALSE, FALSE, FALSE);
++		ADD_STRING_VAL (nm_setting_802_1x_get_pkcs11_private_key (setting_8021x), "key_id", FALSE, FALSE, FALSE);
++		ADD_STRING_VAL (nm_setting_802_1x_get_pkcs11_phase2_ca_cert (setting_8021x), "ca_cert2_id", FALSE, FALSE, FALSE);
++		ADD_STRING_VAL (nm_setting_802_1x_get_pkcs11_phase2_client_cert (setting_8021x), "cert2_id", FALSE, FALSE, FALSE);
++		ADD_STRING_VAL (nm_setting_802_1x_get_pkcs11_phase2_private_key (setting_8021x), "key2_id", FALSE, FALSE, FALSE);
++	}
++
+ 	return TRUE;
+ }
+ 
+diff -Naur network-manager-0.7.bak/src/supplicant-manager/nm-supplicant-config.h network-manager-0.7.dev/src/supplicant-manager/nm-supplicant-config.h
+--- network-manager-0.7.bak/src/supplicant-manager/nm-supplicant-config.h	2008-11-29 02:55:17.000000000 +0900
++++ network-manager-0.7.dev/src/supplicant-manager/nm-supplicant-config.h	2009-01-07 01:30:36.000000000 +0900
+@@ -57,6 +57,21 @@
+ void nm_supplicant_config_set_ap_scan (NMSupplicantConfig * self,
+                                        guint32 ap_scan);
+ 
++const char *nm_supplicant_config_get_pkcs11_engine_path (NMSupplicantConfig * self);
++
++void nm_supplicant_config_set_pkcs11_engine_path (NMSupplicantConfig * self,
++                                                  const char *pkcs11_engine_path);
++
++const char *nm_supplicant_config_get_pkcs11_module_path (NMSupplicantConfig * self);
++
++void nm_supplicant_config_set_pkcs11_module_path (NMSupplicantConfig * self,
++                                                  const char *pkcs11_module_path);
++
++const char *nm_supplicant_config_get_pkcs11_module_init_args (NMSupplicantConfig * self);
++
++void nm_supplicant_config_set_pkcs11_module_init_args (NMSupplicantConfig * self,
++													   const char *pkcs11_module_init_args);
++
+ gboolean nm_supplicant_config_add_option (NMSupplicantConfig *self,
+                                           const char * key,
+                                           const char * value,
+diff -Naur network-manager-0.7.bak/src/supplicant-manager/nm-supplicant-interface.c network-manager-0.7.dev/src/supplicant-manager/nm-supplicant-interface.c
+--- network-manager-0.7.bak/src/supplicant-manager/nm-supplicant-interface.c	2008-11-29 02:55:17.000000000 +0900
++++ network-manager-0.7.dev/src/supplicant-manager/nm-supplicant-interface.c	2009-01-07 02:00:32.000000000 +0900
+@@ -1157,6 +1157,8 @@
+ 	NMSupplicantInfo *info;
+ 	DBusGProxyCall *call;
+ 	guint32 ap_scan;
++	const char *pkcs11_engine_path;
++	const char *pkcs11_module_path;
+ 
+ 	g_return_val_if_fail (NM_IS_SUPPLICANT_INTERFACE (self), FALSE);
+ 
+@@ -1182,6 +1184,41 @@
+ 									G_TYPE_INVALID);
+ 	nm_supplicant_info_set_call (info, call);
+ 
++	if (!call)
++		return FALSE;
++
++	pkcs11_engine_path = nm_supplicant_config_get_pkcs11_engine_path (priv->cfg);
++	pkcs11_module_path = nm_supplicant_config_get_pkcs11_module_path (priv->cfg);
++
++	if (pkcs11_engine_path && pkcs11_module_path) {
++		GHashTable *pkcs11_config_hash;
++		GValue *val;
++
++		pkcs11_config_hash = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) blob_free);
++
++		val = g_slice_new0 (GValue);
++		g_value_init (val, G_TYPE_STRING);
++		g_value_set_string (val, pkcs11_engine_path);
++		g_hash_table_insert (pkcs11_config_hash, "pkcs11_engine_path", val);
++
++		val = g_slice_new0 (GValue);
++		g_value_init (val, G_TYPE_STRING);
++		g_value_set_string (val, pkcs11_module_path);
++		g_hash_table_insert (pkcs11_config_hash, "pkcs11_module_path", val);
++
++		/* TODO: waiting on pkcs11_module_init_args support in wpasupplicant
++		tmp = nm_supplicant_config_get_pkcs11_module_init_args (priv->cfg);
++		g_hash_table_insert (pkcs11_config_hash, "pkcs11_module_init_args",
++		                     str_to_gvalue(tmp));
++		*/
++
++		dbus_g_proxy_call_no_reply (priv->iface_proxy, "setSmartcardModules",
++									DBUS_TYPE_G_MAP_OF_VARIANT,
++									pkcs11_config_hash,
++									G_TYPE_INVALID);
++		g_hash_table_destroy (pkcs11_config_hash);
++	}
++
+ 	return call != NULL;
+ }
+ 
+diff -Naur network-manager-0.7.bak/src/supplicant-manager/nm-supplicant-settings-verify.c network-manager-0.7.dev/src/supplicant-manager/nm-supplicant-settings-verify.c
+--- network-manager-0.7.bak/src/supplicant-manager/nm-supplicant-settings-verify.c	2008-11-29 02:55:17.000000000 +0900
++++ network-manager-0.7.dev/src/supplicant-manager/nm-supplicant-settings-verify.c	2009-01-07 01:34:32.000000000 +0900
+@@ -120,7 +120,12 @@
+ 	{ "pac_file",           TYPE_BYTES,   0, 0, FALSE,  NULL },
+ 	{ "engine",             TYPE_INT,     0, 1, FALSE,  NULL },
+ 	{ "engine_id",          TYPE_BYTES,   0, 0, FALSE,  NULL },
+-	{ "key_id",             TYPE_BYTES,   0, 0, FALSE,  NULL },
++	{ "ca_cert_id",         TYPE_BYTES,   0, 0, FALSE,  NULL },
++	{ "cert_id",            TYPE_BYTES,   0, 0, FALSE,  NULL },
++ 	{ "key_id",             TYPE_BYTES,   0, 0, FALSE,  NULL },
++	{ "ca_cert2_id",        TYPE_BYTES,   0, 0, FALSE,  NULL },
++	{ "cert2_id",           TYPE_BYTES,   0, 0, FALSE,  NULL },
++	{ "key2_id",            TYPE_BYTES,   0, 0, FALSE,  NULL },
+ 	{ "fragment_size",      TYPE_INT,     1, 2000, FALSE,  NULL },
+ };
+ 
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/lp191889_always_offline_with_unmanaged_devices.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/lp191889_always_offline_with_unmanaged_devices.patch
@@ -0,0 +1,26 @@
+=== modified file 'src/nm-manager.c'
+--- a/src/nm-manager.c	2008-09-18 15:16:44 +0000
++++ b/src/nm-manager.c	2008-10-10 15:44:42 +0000
+@@ -354,16 +354,21 @@ nm_manager_update_state (NMManager *mana
+ 		GSList *iter;
+ 
+ 		for (iter = priv->devices; iter; iter = iter->next) {
+ 			NMDevice *dev = NM_DEVICE (iter->data);
+ 
+ 			if (nm_device_get_state (dev) == NM_DEVICE_STATE_ACTIVATED) {
+ 				new_state = NM_STATE_CONNECTED;
+ 				break;
++			} else if (nm_device_get_state (dev) == NM_DEVICE_STATE_UNMANAGED) {
++				new_state = NM_STATE_CONNECTED;
++				nm_info ("Unmanaged Device found; state CONNECTED forced. "
++						"(see http://bugs.launchpad.net/bugs/191889)");
++				break;
+ 			} else if (nm_device_is_activating (dev)) {
+ 				new_state = NM_STATE_CONNECTING;
+ 			}
+ 		}
+ 	}
+ 
+ 	if (priv->state != new_state) {
+ 		priv->state = new_state;
+
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/lp292054_tune_supplicant_timeout_60s.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/lp292054_tune_supplicant_timeout_60s.patch
@@ -0,0 +1,28 @@
+=== modified file 'src/nm-device-wifi.c'
+---
+ src/nm-device-wifi.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: network-manager-0.7.1~20090213+gitf142e15/src/nm-device-wifi.c
+===================================================================
+--- network-manager-0.7.1~20090213+gitf142e15.orig/src/nm-device-wifi.c
++++ network-manager-0.7.1~20090213+gitf142e15/src/nm-device-wifi.c
+@@ -2569,17 +2569,17 @@
+ 	NMDeviceWifiPrivate *priv;
+ 	guint id;
+ 
+ 	g_return_val_if_fail (self != NULL, FALSE);
+ 
+ 	priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
+ 
+ 	/* Set up a timeout on the connection attempt to fail it after 25 seconds */
+-	id = g_timeout_add_seconds (25, supplicant_connection_timeout_cb, self);
++	id = g_timeout_add_seconds (60, supplicant_connection_timeout_cb, self);
+ 	if (id <= 0) {
+ 		nm_warning ("Activation (%s/wireless): couldn't start supplicant "
+ 		            "timeout timer.",
+ 		            nm_device_get_iface (NM_DEVICE (self)));
+ 		return FALSE;
+ 	}
+ 	priv->supplicant.con_timeout_id = id;
+ 	return TRUE;
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/008-BACKEND-debian-fallback-to-generic-loopback.loom.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/008-BACKEND-debian-fallback-to-generic-loopback.loom.patch
@@ -0,0 +1,64 @@
+=== modified file 'ChangeLog'
+---
+ ChangeLog                           |   10 ++++++++++
+ src/backends/NetworkManagerDebian.c |    6 +++++-
+ 2 files changed, 15 insertions(+), 1 deletion(-)
+
+Index: network-manager-0.7~~svn20081015t024626/ChangeLog
+===================================================================
+--- network-manager-0.7~~svn20081015t024626.orig/ChangeLog
++++ network-manager-0.7~~svn20081015t024626/ChangeLog
+@@ -120,16 +120,26 @@
+ 
+ 2008-10-10  Tambet Ingo  <tambet@gmail.com>
+ 
+ 	* src/nm-logging.c (nm_logging_setup): Don't use LOG_CONS when running as
+ 	a daemon to prevent NM logging spew on console on startup and shutdown (due
+ 	to dependency loop between NM and syslog).
+ 
+ 2008-10-10  Alexander Sack  <asac@ubuntu.com>
++  
++	Fallback to generic enable_loopback if /sbin/ifup isnt installed or
++	fails.
++		* src/backends/NetworkManagerDebian.c
++			- (nm_system_enable_loopback): test for /sbin/ifconfig binary
++				and fallback to nm_generic_enable_loopback if it
++				doesnt exist or when /sbin/ifconfig lo up fails for
++				whatever reason.
++
++2008-10-10  Alexander Sack  <asac@ubuntu.com>
+ 
+ 	Implement managed mode. We bind devices configured in /etc/network/interfaces
+ 	to their connections by updating wired/wireless setting with the
+ 	mac address of the device.
+ 
+ 	* system-settings/plugins/ifupdown/plugin.c
+ 		- (get_net_address_for_udi): implement function to retrieve MAC
+ 			address of udi from hal in GByteArray format
+Index: network-manager-0.7~~svn20081015t024626/src/backends/NetworkManagerDebian.c
+===================================================================
+--- network-manager-0.7~~svn20081015t024626.orig/src/backends/NetworkManagerDebian.c
++++ network-manager-0.7~~svn20081015t024626/src/backends/NetworkManagerDebian.c
+@@ -39,17 +39,21 @@
+ /*
+  * nm_system_enable_loopback
+  *
+  * Bring up the loopback interface
+  *
+  */
+ void nm_system_enable_loopback (void)
+ {
+-	nm_spawn_process ("/sbin/ifup lo");
++	// if wrapper fails we gonna try our own
++	if(!g_file_test ("/sbin/ifconfig", G_FILE_TEST_IS_EXECUTABLE) ||
++		nm_spawn_process ("/sbin/ifconfig lo up") != 0) {
++		nm_generic_enable_loopback ();
++	}
+ }
+ 
+ /*
+  * nm_system_update_dns
+  *
+  * Invalidate the nscd host cache, if it exists, since
+  * we changed resolv.conf.
+  *
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/70_lp145653_no_sigaction_for_crashes.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/70_lp145653_no_sigaction_for_crashes.patch
@@ -0,0 +1,27 @@
+=== modified file 'src/NetworkManager.c'
+--- a/src/NetworkManager.c	2008-08-07 14:07:14 +0000
++++ b/src/NetworkManager.c	2008-08-18 18:11:57 +0000
+@@ -168,22 +168,18 @@ setup_signals (void)
+ 	sigset_t mask;
+ 
+ 	sigemptyset (&mask);
+ 	action.sa_handler = nm_signal_handler;
+ 	action.sa_mask = mask;
+ 	action.sa_flags = 0;
+ 	sigaction (SIGTERM,  &action, NULL);
+ 	sigaction (SIGINT,  &action, NULL);
+-	sigaction (SIGILL,  &action, NULL);
+-	sigaction (SIGBUS,  &action, NULL);
+ 	sigaction (SIGFPE,  &action, NULL);
+ 	sigaction (SIGHUP,  &action, NULL);
+-	sigaction (SIGSEGV, &action, NULL);
+-	sigaction (SIGABRT, &action, NULL);
+ 	sigaction (SIGUSR1,  &action, NULL);
+ }
+ 
+ static void
+ write_pidfile (const char *pidfile)
+ {
+  	char pid[16];
+ 	int fd;
+
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/lp463465_tries_10count.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/lp463465_tries_10count.patch
@@ -0,0 +1,19 @@
+*** network-manager.old/src/ppp-manager/nm-ppp-manager.c	2009-11-10 18:50:57.000000000 +0900
+--- network-manager.new/src/ppp-manager/nm-ppp-manager.c	2009-11-10 18:51:49.000000000 +0900
+***************
+*** 410,416 ****
+  	 */
+  	nm_act_request_request_connection_secrets (priv->act_req,
+  	                                           setting_name,
+! 	                                           tries > 1 ? TRUE : FALSE,
+  	                                           SECRETS_CALLER_PPP,
+  	                                           hint1,
+  	                                           hint2);
+--- 410,416 ----
+  	 */
+  	nm_act_request_request_connection_secrets (priv->act_req,
+  	                                           setting_name,
+! 	                                           tries > 10 ? TRUE : FALSE,
+  	                                           SECRETS_CALLER_PPP,
+  	                                           hint1,
+  	                                           hint2);
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/lp303142_more_time_for_manual_registration.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/lp303142_more_time_for_manual_registration.patch
@@ -0,0 +1,28 @@
+=== modified file 'src/nm-gsm-device.c'
+---
+ src/nm-gsm-device.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: network-manager.ubuntu.07/src/nm-gsm-device.c
+===================================================================
+--- network-manager.ubuntu.07.orig/src/nm-gsm-device.c
++++ network-manager.ubuntu.07/src/nm-gsm-device.c
+@@ -254,17 +254,17 @@
+ static void
+ schedule_manual_registration_again (NMGsmDevice *self)
+ {
+ 	NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (self);
+ 
+ 	if (priv->pending_id)
+ 		g_source_remove (priv->pending_id);
+ 
+-	priv->pending_id = g_idle_add (manual_registration_again, self);
++ 	priv->pending_id = g_timeout_add (1000, manual_registration_again, self);
+ }
+ 
+ static void
+ manual_registration_response (NMSerialDevice *device,
+                               int reply_index,
+                               const char *reply,
+                               gpointer user_data)
+ {
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/lp199140_dont_manage_virtual_devices.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/lp199140_dont_manage_virtual_devices.patch
@@ -0,0 +1,33 @@
+---
+ src/nm-hal-manager.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+Index: network-manager-0.7.1~rc2+1git7f1c86e3/src/nm-hal-manager.c
+===================================================================
+--- network-manager-0.7.1~rc2+1git7f1c86e3.orig/src/nm-hal-manager.c
++++ network-manager-0.7.1~rc2+1git7f1c86e3/src/nm-hal-manager.c
+@@ -148,16 +148,24 @@
+ 
+ 		category = libhal_device_get_property_string (priv->hal_ctx, udi, "info.category", NULL);
+ 		if (category) {
+ 			is_wired = strcmp (category, "net.80203") == 0;
+ 			libhal_free_string (category);
+ 		}
+ 	}
+ 
++	if (is_wired && libhal_device_property_exists (priv->hal_ctx, udi, "net.originating_device", NULL))
++	{
++		char *netdev_parent = libhal_device_get_property_string (priv->hal_ctx, udi, "net.originating_device", NULL);
++		if (!strcmp(netdev_parent, "/org/freedesktop/Hal/devices/computer"))
++			is_wired = FALSE;
++		libhal_free_string (netdev_parent);
++	}
++
+ 	return is_wired;
+ }
+ 
+ static GObject *
+ wired_device_creator (NMHalManager *self,
+                       const char *udi,
+                       const char *origdev_udi,
+                       gboolean managed)
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/nousepeerdns.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/nousepeerdns.patch
@@ -0,0 +1,23 @@
+diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
+index 73fd1ed..6907bbe 100644
+--- a/src/ppp-manager/nm-ppp-manager.c
++++ b/src/ppp-manager/nm-ppp-manager.c
+@@ -807,16 +807,14 @@ create_pppd_cmd_line (NMPPPManager *self,
+ 	/* Always ask for DNS, we don't have to use them if the connection
+ 	 * overrides the returned servers.
+ 	 */
+-	nm_cmd_line_add_string (cmd, "usepeerdns");
+-
+ 	if (nm_setting_ppp_get_mru (setting)) {
+ 		nm_cmd_line_add_string (cmd, "mru");
+-		nm_cmd_line_add_int (cmd, nm_setting_ppp_get_mru (setting));
++		nm_cmd_line_add_int (cmd, 1452);
+ 	}
+ 
+ 	if (nm_setting_ppp_get_mtu (setting)) {
+ 		nm_cmd_line_add_string (cmd, "mtu");
+-		nm_cmd_line_add_int (cmd, nm_setting_ppp_get_mtu (setting));
++		nm_cmd_line_add_int (cmd, 1452);
+ 	}
+ 
+ 	nm_cmd_line_add_string (cmd, "lcp-echo-failure");
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/60_NULL_info_linux_driver.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/60_NULL_info_linux_driver.patch
@@ -0,0 +1,29 @@
+=== modified file 'src/nm-hal-manager.c'
+---
+ src/nm-hal-manager.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: network-manager-0.7.1~rc3.2.gitb8fc83a7/src/nm-hal-manager.c
+===================================================================
+--- network-manager-0.7.1~rc3.2.gitb8fc83a7.orig/src/nm-hal-manager.c
++++ network-manager-0.7.1~rc3.2.gitb8fc83a7/src/nm-hal-manager.c
+@@ -132,16 +132,19 @@
+ 		char *drv;
+ 
+ 		drv = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL);
+ 		if (drv) {
+ 			driver_name = g_strdup (drv);
+ 			libhal_free_string (drv);
+ 		}
+ 	}
++	if(!driver_name)
++		driver_name = g_strdup("NULL(info.linux.driver)");
++
+ 	return driver_name;
+ }
+ 
+ /* Returns the parent if the device is a Sony Ericsson 'mbm'-style device */
+ static char *
+ is_mbm (LibHalContext *ctx, const char *udi)
+ {
+ 	guint32 vendor_id = 0, product_id = 0;
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/add_bmobile_3gdevice.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/add_bmobile_3gdevice.patch
@@ -0,0 +1,23 @@
+Index: network-manager/src/nm-gsm-device.c
+===================================================================
+--- network-manager.orig/src/nm-gsm-device.c	2009-10-05 13:13:27.000000000 -0400
++++ network-manager/src/nm-gsm-device.c	2009-10-05 13:13:39.000000000 -0400
+@@ -497,7 +497,8 @@
+ 	case 11: /* EMOBILE Longcheer D11LC D12LC */
+ 	case 12: /* EMOBILE Longcheer D21LC */
+ 	case 13: /* ZTE HX003ZT */
+-	case 14: /* ZTE BM-DL3-150H BM-DC1-500M */
++	case 14: /* ZTE BM-DC1-500M */
++	case 15: /* ZTE BM-DL3-150H */
+ 		priv->needs_cgreg = TRUE;
+ 		break;
+ 	default:
+@@ -515,7 +516,7 @@
+ {
+ 	NMGsmDevice *self = NM_GSM_DEVICE (device);
+ 	NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (self);
+-	const char *responses[] = { "E160G", "F3507g", "D5530", "MD300", "D02HW", "D12HW", "D21HW", "D22HW", "D23HW", "D31HW", "C01LC", "HSDPA USB MODE", "D21LC", "MF633", "MF636", NULL };
++	const char *responses[] = { "E160G", "F3507g", "D5530", "MD300", "D02HW", "D12HW", "D21HW", "D22HW", "D23HW", "D31HW", "C01LC", "HSDPA USB MODE", "D21LC", "MF633", "MF636", "MF626", NULL };
+ 	const char *terminators[] = { "OK", "ERROR", "ERR", NULL };
+ 
+ 	/* Get the model the first time */
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/23_nm-monitor-eni.diff
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/23_nm-monitor-eni.diff
@@ -0,0 +1,230 @@
+=== modified file 'src/NetworkManager.c'
+Binary files bzr.debian.0.9.5/.bzr/checkout/dirstate and bzr.debian.0.9.5.new/.bzr/checkout/dirstate differ
+diff -Nur bzr.debian.0.9.5/src/backends/NetworkManagerDebian.c bzr.debian.0.9.5.new/src/backends/NetworkManagerDebian.c
+--- bzr.debian.0.9.5/src/backends/NetworkManagerDebian.c	2007-06-25 17:40:34.000000000 +0200
++++ bzr.debian.0.9.5.new/src/backends/NetworkManagerDebian.c	2007-06-25 17:40:34.000000000 +0200
+@@ -31,7 +31,11 @@
+ #include <sys/types.h>
+ #include <signal.h>
+ #include <arpa/inet.h>
++#include <sys/inotify.h>
++#include <string.h>
+ #include "NetworkManagerSystem.h"
++#include "NetworkManagerDbus.h"
++#include "NetworkManagerPolicy.h"
+ #include "NetworkManagerUtils.h"
+ #include "nm-device.h"
+ #include "nm-device-802-3-ethernet.h"
+@@ -43,14 +47,178 @@
+ #define ARPING "/usr/sbin/arping"
+ #define RESOLVCONF "resolvconf"
+ 
++/* taken from NetworkManager.c */
++static char *nm_get_device_interface_from_hal (LibHalContext *ctx, const char *udi)
++{
++	char *iface = NULL;
++
++	if (libhal_device_property_exists (ctx, udi, "net.interface", NULL))
++	{
++		/* Only use Ethernet and Wireless devices at the moment */
++		if (libhal_device_property_exists (ctx, udi, "info.category", NULL))
++		{
++			char *category = libhal_device_get_property_string (ctx, udi, "info.category", NULL);
++			if (category && (!strcmp (category, "net.80203") || !strcmp (category, "net.80211")))
++			{
++				char *temp = libhal_device_get_property_string (ctx, udi, "net.interface", NULL);
++				iface = g_strdup (temp);
++				libhal_free_string (temp);
++			}
++			libhal_free_string (category);
++		}
++	}
++
++	return (iface);
++}
++
++/* callback called when /etc/network/interfaces is modified */
++static gboolean eni_changed (GIOChannel *eni_channel, GIOCondition cond, gpointer user_data)
++{
++	gboolean reparse = FALSE;
++	NMData *data = (NMData *) user_data;
++	NMDevice *active;
++	char **net_devices;
++	DBusError error;
++	int num_net_devices;
++	int i;
++	GSList *walk;
++	struct inotify_event evt;
++
++	/* read the notifications from the watch descriptor */
++	while (g_io_channel_read_chars (eni_channel, (gchar *) &evt,
++			sizeof (struct inotify_event), NULL, NULL) == G_IO_STATUS_NORMAL) {
++		if (evt.len > 0) {
++			gchar filename[evt.len];
++			g_io_channel_read_chars (eni_channel, filename, evt.len, NULL, NULL);
++
++			if (!strcmp (filename, "interfaces"))
++				reparse = TRUE;
++		}
++	}
++	
++	if (reparse == FALSE)
++		/* ignore this notification */
++		return TRUE;
++
++	nm_info ("/etc/network/interface changed: rebuilding the device list.");
++
++	/* get the existing devices from Hal */
++	dbus_error_init (&error);
++	net_devices = libhal_find_device_by_capability (data->hal_ctx, "net", &num_net_devices, &error);
++	if (dbus_error_is_set (&error)) {
++		nm_warning ("Could not get existing devices from Hal: %s", error.message);
++		dbus_error_free (&error);
++
++		return FALSE;
++	}
++
++	/* get the currently active device, we do not touch it if it has not been disabled */
++	active = nm_get_active_device (data);
++	if (active && nm_system_device_get_disabled (active) == TRUE)
++		active = NULL;
++
++	nm_lock_mutex (data->dev_list_mutex, __FUNCTION__);
++
++	/* remove the devices */
++	for (walk = data->dev_list; walk != NULL; walk = g_slist_next (walk)) {
++		NMDevice *dev = NM_DEVICE (walk->data);
++		
++		if (active && dev == active) {
++			/* do not remove the active device */
++			nm_info ("Keeping active %s device '%s'.",
++				nm_device_is_802_11_wireless (dev) ? "wireless (802.11)" :	"wired Ethernet (802.3)",
++				nm_device_get_iface (dev));
++			
++			continue;
++		}
++
++		nm_info ("Removing %s device '%s'.", 
++				nm_device_is_802_11_wireless (dev) ? "wireless (802.11)" :	"wired Ethernet (802.3)",
++				nm_device_get_iface (dev));
++		nm_device_set_removed (dev, TRUE);
++		nm_device_stop (dev);
++		
++		nm_dbus_schedule_device_status_change_signal (data, dev, NULL, DEVICE_REMOVED);
++		g_object_unref (dev);
++	}
++
++	g_slist_free (data->dev_list);
++	data->dev_list = NULL;
++	if (active)
++		data->dev_list = g_slist_append (data->dev_list, active);
++
++	nm_info ("Recreating the device list.");
++	/* repopulate the device list */
++	for (i = 0; i < num_net_devices; i++)
++	{
++		char *iface;
++
++		if ((iface = nm_get_device_interface_from_hal (data->hal_ctx, net_devices[i])))
++		{
++			NMDevice *dev;
++
++			if (active && !strcmp (iface, nm_device_get_iface (active)))
++				continue;
++
++			if ((dev = nm_device_new (iface, net_devices[i], FALSE, DEVICE_TYPE_UNKNOWN, data)))
++			{
++				nm_info ("Now managing %s device '%s'.",
++					nm_device_is_802_11_wireless (dev) ? "wireless (802.11)" : "wired Ethernet (802.3)",
++					nm_device_get_iface (dev));
++
++				data->dev_list = g_slist_append (data->dev_list, dev);
++				nm_device_deactivate (dev);
++
++				nm_dbus_schedule_device_status_change_signal (data, dev, NULL, DEVICE_ADDED);
++			}
++
++			g_free (iface);
++		}
++	}
++	nm_info ("Device list recreated successfully.");
++
++	libhal_free_string_array (net_devices);
++	nm_policy_schedule_device_change_check (data);
++	nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__);
++
++	return TRUE;
++}
++
+ /*
+  * nm_system_init
+  *
+  * Initializes the distribution-specific system backend
+  *
+  */
+-void nm_system_init (void)
++void nm_system_init (NMData *data)
+ {
++	GIOChannel *eni_channel;
++	GSource *io_source;
++
++	int ifd = inotify_init ();
++	if (ifd == -1) {
++		nm_warning ("Could not initialize inotify");
++
++		return;
++	}
++
++	int wd = inotify_add_watch (ifd, "/etc/network/", IN_CLOSE_WRITE);
++	if (wd == -1) {
++		nm_warning ("Could not monitor /etc/network/interface");
++		close (ifd);
++
++		return;
++	}
++
++	/* add an io_watch to the main_context */
++	eni_channel = g_io_channel_unix_new (ifd);
++	g_io_channel_set_flags (eni_channel, G_IO_FLAG_NONBLOCK, NULL);
++	g_io_channel_set_encoding (eni_channel, NULL, NULL); 
++	io_source = g_io_create_watch (eni_channel, G_IO_IN | G_IO_ERR);
++	g_source_set_callback (io_source, (GSourceFunc) eni_changed, data, NULL);
++	g_source_attach (io_source, data->main_context);
++	g_io_channel_unref (eni_channel);
++	g_source_unref (io_source);
+ }
+ 
+ /*
+diff -Nur bzr.debian.0.9.5/src/NetworkManager.c bzr.debian.0.9.5.new/src/NetworkManager.c
+--- bzr.debian.0.9.5/src/NetworkManager.c	2007-06-25 17:18:17.000000000 +0200
++++ bzr.debian.0.9.5.new/src/NetworkManager.c	2007-06-25 17:40:34.000000000 +0200
+@@ -757,8 +757,6 @@
+ 	nm_logging_setup (become_daemon);
+ 	nm_info ("starting...");
+ 
+-	nm_system_init();
+-
+ 	/* Initialize our instance data */
+ 	nm_data = nm_data_new (enable_test_devices);
+ 	if (!nm_data)
+@@ -800,6 +798,8 @@
+ 	/* If Hal is around, grab a device list from it */
+ 	if ((owner = get_name_owner (nm_data->dbus_connection, "org.freedesktop.Hal")))
+ 		nm_hal_init (nm_data);
++	
++	nm_system_init (nm_data);
+ 
+ 	/* We run dhclient when we need to, and we don't want any stray ones
+ 	 * lying around upon launch.
+diff -Nur bzr.debian.0.9.5/src/NetworkManagerSystem.h bzr.debian.0.9.5.new/src/NetworkManagerSystem.h
+--- bzr.debian.0.9.5/src/NetworkManagerSystem.h	2007-06-25 17:18:17.000000000 +0200
++++ bzr.debian.0.9.5.new/src/NetworkManagerSystem.h	2007-06-25 17:40:34.000000000 +0200
+@@ -33,7 +33,7 @@
+  * implemented in the backend files in backends/ directory
+  */
+ 
+-void			nm_system_init (void);
++void			nm_system_init (struct NMData *data);
+ gboolean		nm_system_device_has_active_routes			(NMDevice *dev);
+ 
+ int			nm_system_get_rtnl_index_from_iface		(const char *iface);
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/add_c02lc.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/add_c02lc.patch
@@ -0,0 +1,121 @@
+*** network-manager.old/callouts/nm-modem-probe.c	2009-12-14 13:43:30.000000000 +0900
+--- network-manager/callouts/nm-modem-probe.c	2009-12-14 14:12:04.000000000 +0900
+***************
+*** 35,44 ****
+--- 35,46 ----
+  
+  #define LONGCHEER_VENDOR_ID 0x1c9e
+  #define LC_PRODUCT_C01LC 0x9603
++ #define LC_PRODUCT_C02LC 0x9900
+  #define LC_PRODUCT_D11LC 0x6061
+  #define LC_PRODUCT_D12LC 0x9104
+  #define LC_PRODUCT_D21LC 0x9404
+  #define LC_C01LC_DP_IF 2
++ #define LC_C02LC_DP_IF 2
+  #define LC_D11LC_DP_IF 0
+  #define LC_D12LC_DP_IF 3 
+  #define LC_D21LC_DP_IF 3 
+***************
+*** 461,466 ****
+--- 463,470 ----
+      case LONGCHEER_VENDOR_ID:
+        if(pid == LC_PRODUCT_C01LC && usbif != LC_C01LC_DP_IF) {
+  	return TRUE;
++       } else if(pid == LC_PRODUCT_C02LC && usbif != LC_C02LC_DP_IF) {
++ 	return TRUE;
+        } else if(pid == LC_PRODUCT_D11LC && usbif != LC_D11LC_DP_IF) {
+  	return TRUE;
+        } else if(pid == LC_PRODUCT_D12LC && usbif != LC_D12LC_DP_IF) {
+*** network-manager.old/src/nm-gsm-device.c	2009-12-14 13:43:30.000000000 +0900
+--- network-manager/src/nm-gsm-device.c	2009-12-14 14:11:56.000000000 +0900
+***************
+*** 56,62 ****
+  	gboolean needs_cgreg;
+  	gboolean checked_cgmm;
+  
+! 	gboolean needs_tone_flag;  /* for C01LC */
+  } NMGsmDevicePrivate;
+  
+  enum {
+--- 56,62 ----
+  	gboolean needs_cgreg;
+  	gboolean checked_cgmm;
+  
+! 	gboolean needs_tone_flag;  /* for Softbank Modem */
+  } NMGsmDevicePrivate;
+  
+  enum {
+***************
+*** 207,213 ****
+  	if (cid) {
+  		GString *str;
+  
+! 		/* for C01LC */
+  		if(priv->needs_tone_flag)
+  			if(number[0] == 'T' || number[0] == 't')
+  				str = g_string_new ("ATD");
+--- 207,213 ----
+  	if (cid) {
+  		GString *str;
+  
+! 		/* for softbank Modem */
+  		if(priv->needs_tone_flag)
+  			if(number[0] == 'T' || number[0] == 't')
+  				str = g_string_new ("ATD");
+***************
+*** 519,533 ****
+  	case 13: /* ZTE HX003ZT */
+  	case 14: /* ZTE BM-DC1-500M */
+  	case 15: /* ZTE BM-DL3-150H */
+  		priv->needs_cgreg = TRUE;
+  		break;
+  	default:
+  		break;
+  	}
+  
+! 	if (reply_index == 10) /* Softbank C01LC */
+! 		priv->needs_tone_flag = TRUE;
+! 	
+  	do_register (NM_GSM_DEVICE (device));
+  }
+  
+--- 519,540 ----
+  	case 13: /* ZTE HX003ZT */
+  	case 14: /* ZTE BM-DC1-500M */
+  	case 15: /* ZTE BM-DL3-150H */
++ 	case 16: /* SOFTBANK MOBILE Longcheer C02LC */
+  		priv->needs_cgreg = TRUE;
+  		break;
+  	default:
+  		break;
+  	}
+  
+! 	switch(reply_index)
+! 		{
+! 		case 10: /* Softbank C01LC */
+! 		case 16: /* Softbank C02LC */
+! 			priv->needs_tone_flag = TRUE;
+! 			break;
+! 		default:
+! 			break;
+! 		}
+  	do_register (NM_GSM_DEVICE (device));
+  }
+  
+***************
+*** 539,545 ****
+  {
+  	NMGsmDevice *self = NM_GSM_DEVICE (device);
+  	NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (self);
+! 	const char *responses[] = { "E160G", "F3507g", "D5530", "MD300", "D02HW", "D12HW", "D21HW", "D22HW", "D23HW", "D31HW", "C01LC", "HSDPA USB MODE", "D21LC", "MF633", "MF636", "MF626", NULL };
+  	const char *terminators[] = { "OK", "ERROR", "ERR", NULL };
+  
+  	/* Get the model the first time */
+--- 546,552 ----
+  {
+  	NMGsmDevice *self = NM_GSM_DEVICE (device);
+  	NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (self);
+! 	const char *responses[] = { "E160G", "F3507g", "D5530", "MD300", "D02HW", "D12HW", "D21HW", "D22HW", "D23HW", "D31HW", "C01LC", "HSDPA USB MODE", "D21LC", "MF633", "MF636", "MF626", "C02LC", NULL };
+  	const char *terminators[] = { "OK", "ERROR", "ERR", NULL };
+  
+  	/* Get the model the first time */
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/lp460903_always_false_request.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/lp460903_always_false_request.patch
@@ -0,0 +1,19 @@
+*** network-manager.old/src/ppp-manager/nm-ppp-manager.c	2009-10-28 19:58:15.000000000 +0900
+--- network-manager/src/ppp-manager/nm-ppp-manager.c	2009-10-28 19:58:23.000000000 +0900
+***************
+*** 410,416 ****
+  	 */
+  	nm_act_request_request_connection_secrets (priv->act_req,
+  	                                           setting_name,
+! 	                                           tries > 1 ? TRUE : FALSE,
+  	                                           SECRETS_CALLER_PPP,
+  	                                           hint1,
+  	                                           hint2);
+--- 410,416 ----
+  	 */
+  	nm_act_request_request_connection_secrets (priv->act_req,
+  	                                           setting_name,
+! 	                                           FALSE,
+  	                                           SECRETS_CALLER_PPP,
+  	                                           hint1,
+  	                                           hint2);
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/lp356517_manage_virtual_devices_on_armel.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/lp356517_manage_virtual_devices_on_armel.patch
@@ -0,0 +1,34 @@
+---
+ src/nm-hal-manager.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: network-manager-0.7.1~rc4.1.cf199a964/src/nm-hal-manager.c
+===================================================================
+--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/nm-hal-manager.c
++++ network-manager-0.7.1~rc4.1.cf199a964/src/nm-hal-manager.c
+@@ -181,23 +181,25 @@
+ 
+ 		category = libhal_device_get_property_string (priv->hal_ctx, udi, "info.category", NULL);
+ 		if (category) {
+ 			is_wired = strcmp (category, "net.80203") == 0;
+ 			libhal_free_string (category);
+ 		}
+ 	}
+ 
++#ifndef __ARMEL__
+ 	if (is_wired && libhal_device_property_exists (priv->hal_ctx, udi, "net.originating_device", NULL))
+ 	{
+ 		char *netdev_parent = libhal_device_get_property_string (priv->hal_ctx, udi, "net.originating_device", NULL);
+ 		if (!strcmp(netdev_parent, "/org/freedesktop/Hal/devices/computer"))
+ 			is_wired = FALSE;
+ 		libhal_free_string (netdev_parent);
+ 	}
++#endif
+ 
+ 	return is_wired;
+ }
+ 
+ static GObject *
+ wired_device_creator (NMHalManager *self,
+                       const char *udi,
+                       const char *origdev_udi,
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/c01lc.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/c01lc.patch
@@ -0,0 +1,72 @@
+*** network-manager.old/src/nm-gsm-device.c	2009-11-03 15:14:11.000000000 +0900
+--- network-manager/src/nm-gsm-device.c	2009-11-03 15:29:02.000000000 +0900
+***************
+*** 55,60 ****
+--- 55,62 ----
+  
+  	gboolean needs_cgreg;
+  	gboolean checked_cgmm;
++ 
++ 	gboolean needs_tone_flag;  /* for C01LC */
+  } NMGsmDevicePrivate;
+  
+  enum {
+***************
+*** 197,209 ****
+  	const char *number;
+  	const char *responses[] = { "CONNECT", "BUSY", "NO DIAL TONE", "NO CARRIER", NULL };
+  
+  	setting = NM_SETTING_GSM (gsm_device_get_setting (NM_GSM_DEVICE (device), NM_TYPE_SETTING_GSM));
+  	number = nm_setting_gsm_get_number (setting);
+  
+  	if (cid) {
+  		GString *str;
+  
+! 		str = g_string_new ("ATD");
+  		if (g_str_has_suffix (number, "#"))
+  			str = g_string_append_len (str, number, strlen (number) - 1);
+  		else
+--- 199,218 ----
+  	const char *number;
+  	const char *responses[] = { "CONNECT", "BUSY", "NO DIAL TONE", "NO CARRIER", NULL };
+  
++ 	NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (device);
++ 
+  	setting = NM_SETTING_GSM (gsm_device_get_setting (NM_GSM_DEVICE (device), NM_TYPE_SETTING_GSM));
+  	number = nm_setting_gsm_get_number (setting);
+  
+  	if (cid) {
+  		GString *str;
+  
+! 		/* for C01LC */
+! 		if(priv->needs_tone_flag)
+! 			str = g_string_new ("ATDT");
+! 		else
+! 			str = g_string_new ("ATD");
+! 
+  		if (g_str_has_suffix (number, "#"))
+  			str = g_string_append_len (str, number, strlen (number) - 1);
+  		else
+***************
+*** 490,495 ****
+--- 499,506 ----
+  
+  	priv->checked_cgmm = TRUE;
+  
++ 	priv->needs_tone_flag = FALSE;
++ 
+  	switch (reply_index) {
+  	case 0: /* Huawei E160G */
+  	case 1: /* Ericsson F3507g */
+***************
+*** 511,516 ****
+--- 522,530 ----
+  		break;
+  	}
+  
++ 	if (reply_index == 10) /* Softbank C01LC */
++ 		priv->needs_tone_flag = TRUE;
++ 	
+  	do_register (NM_GSM_DEVICE (device));
+  }
+  
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/21_manual_means_always_online.diff
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/21_manual_means_always_online.diff
@@ -0,0 +1,36 @@
+diff -Nur bzr.debian.0.9.5/src/NetworkManagerDbus.c bzr.debian.0.9.5.new/src/NetworkManagerDbus.c
+--- bzr.debian.0.9.5/src/NetworkManagerDbus.c	2007-06-25 17:38:42.000000000 +0200
++++ bzr.debian.0.9.5.new/src/NetworkManagerDbus.c	2007-06-25 17:38:42.000000000 +0200
+@@ -302,6 +302,9 @@
+ 	if (data->asleep == TRUE)
+ 		return NM_STATE_ASLEEP;
+ 
++	if (data->always_online == TRUE)
++	  return NM_STATE_CONNECTED;
++
+ 	act_dev = nm_get_active_device (data);
+ 	if (!act_dev && !data->modem_active)
+ 		return NM_STATE_DISCONNECTED;
+diff -Nur bzr.debian.0.9.5/src/NetworkManagerMain.h bzr.debian.0.9.5.new/src/NetworkManagerMain.h
+--- bzr.debian.0.9.5/src/NetworkManagerMain.h	2007-06-25 17:18:17.000000000 +0200
++++ bzr.debian.0.9.5.new/src/NetworkManagerMain.h	2007-06-25 17:38:42.000000000 +0200
+@@ -86,6 +86,7 @@
+ 	gboolean				modem_active;
+ 	gboolean				asleep;
+ 	gboolean				disconnected;
++	gboolean                                always_online;
+ 
+ 	GSList *				dialup_list;
+ 	GMutex *				dialup_list_mutex;
+diff -Nur bzr.debian.0.9.5/src/nm-device.c bzr.debian.0.9.5.new/src/nm-device.c
+--- bzr.debian.0.9.5/src/nm-device.c	2007-06-25 17:38:42.000000000 +0200
++++ bzr.debian.0.9.5.new/src/nm-device.c	2007-06-25 17:38:42.000000000 +0200
+@@ -195,6 +195,8 @@
+ 	/* Allow distributions to flag devices as disabled */
+ 	if (nm_system_device_get_disabled (dev))
+ 	{
++		/* In this case, we assume we're always online */
++		app_data->always_online = TRUE;
+ 		g_object_unref (G_OBJECT (dev));
+ 		return NULL;
+ 	}
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/force_cgreg.patch
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/force_cgreg.patch
@@ -0,0 +1,12 @@
+*** network-manager.old/src/nm-gsm-device.c	2010-03-24 11:45:37.000000000 +0900
+--- network-manager/src/nm-gsm-device.c	2010-03-24 12:50:57.000000000 +0900
+***************
+*** 471,476 ****
+--- 471,477 ----
+  	const char *cgreg_responses[] = { "+CGREG: 0,0", "+CGREG: 0,1", "+CGREG: 0,2", "+CGREG: 0,3", "+CGREG: 0,4", "+CGREG: 0,5", "+CGREG:0,0", "+CGREG:0,1", "+CGREG:0,2", "+CGREG:0,3", "+CGREG:0,4", "+CGREG:0,5", NULL };
+  	const char *terminators[] = { "OK", "ERROR", "ERR", NULL };
+  
++ 	priv->needs_cgreg = TRUE;
+  	if (priv->needs_cgreg)
+  		modem_wait_for_reply (device, "AT+CGREG?", 15, cgreg_responses, terminators, automatic_registration_response, NULL);
+  	else
--- network-manager-0.7.1~rc4.1.cf199a964.orig/debian/patches/series
+++ network-manager-0.7.1~rc4.1.cf199a964/debian/patches/series
@@ -0,0 +1,29 @@
+02-dbus_access_network_manager.patch
+60_NULL_info_linux_driver.patch
+70_lp145653_no_sigaction_for_crashes.patch
+lp191889_always_offline_with_unmanaged_devices.patch
+lp292054_tune_supplicant_timeout_60s.patch
+
+008-BACKEND-debian-fallback-to-generic-loopback.loom.patch
+lp291564_ifupdown_unmanage_mapping_and_iface.patch
+lp291902_IFUPDOWN_dont_export_connection_in_unmanaged_mode.patch
+lp303142_more_time_for_manual_registration.patch
+lp120363_smartcard_pkcs11.patch
+lp199140_dont_manage_virtual_devices.patch
+lp356517_manage_virtual_devices_on_armel.patch
+
+# Sharp patches
+huawei_d02hw_support.patch
+ppp_connect_fix.patch
+ignore_usbif.patch
+many_3g_modem.patch
+add_bmobile_3gdevice.patch
+support_l05a.patch
+lp460903_always_false_request.patch
+lp463465_clear_tries.patch
+c01lc.patch
+c01lc2.patch
+lp463465_tries_10count.patch
+add_l02a_support.patch
+add_c02lc.patch
+force_cgreg.patch
