Branch networkmanager for experimental (work on upstream 0.8)

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3357 ceb527fc-18e6-0310-9fe2-813c157c29e7

17 files changed, 329 insertions, 147 deletions

diff --git a/debian/changelog b/debian/changelog
index 884dc8fa..d4e7075b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,149 @@
-network-manager (0.7.0-2) UNRELEASED; urgency=low
+network-manager (0.7.2-3) UNRELEASED; urgency=low
 
+  * debian/rules
+    - Don't ship empty TODO file. (Closes: #558471)
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 29 Nov 2009 10:19:59 +0100
+
+network-manager (0.7.2-2) unstable; urgency=low
+
+  * debian/rules
+    - Disable -Werror (more-warnings) for now as it causes build failures on
+      sparc.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 27 Nov 2009 07:26:23 +0100
+
+network-manager (0.7.2-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fixes segfault of nm-system-settings for empty SSIDs. (Closes: #531605)
+    - Fixes build failures with binutils-gold. (Closes: #555770)
+    - Adds support for GTC (WPA2 Enterprise/PEAP). (Closes: #543454)
+  * debian/patches/02-dbus_access_network_manager.patch
+    - Update group="netdev" policy based on the upstream changes for
+      at_console. The updated D-Bus policy also fixes communication failures
+      between pppd and NetworkManager. (Closes: #555624)
+  * Drop patches that have been merged upstream
+    - debian/patches/04-struct_termios.patch
+    - debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch
+  * debian/libnm-util1.symbols
+    - Add new symbol nm_setting_wireless_security_get_wep_key_type.
+  * debian/control
+    - Bump Standards-Version to 3.8.3. No further changes.
+  * debian/network-manager.install
+    - Make sure we install all udev rules files.
+  * debian/network-manager.init
+    - Kill the D-Bus activated nm-system-settings daemon on "stop". Update
+      README.Debian accordingly.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Nov 2009 00:12:29 +0100
+
+network-manager (0.7.1-2) unstable; urgency=low
+
+  [ Michael Biebl ]
+  * debian/control
+    - Add Build-Depends on libudev-dev. This allows to query udev for modem
+      capabilities without having to spawn udevadm.
+  * debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch
+    - HAL 0.5.13 added support for the ssb bus type which is internally used
+      on most Broadcom ethernet and wifi chipsets. Update NM to detect the
+      driver for the changed device layout. (Closes: #540613)
+      Patch backported from upstream git.
+  * debian/network-manager.init
+    - Update LSB header. Provide the "network-manager" facility instead of
+      "NetworkManager" as gdm is depending on the former and to be more in
+      line with the recommended practice to name the Provides like the init
+      script itself. (Closes: #539753)
+
+  [ Sjoerd Simons ]
+  * debian/control
+    - Add libnm-util-dev to the depends of libnm-glib-dev. (Closes: #539888)
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 17 Aug 2009 23:47:01 +0200
+
+network-manager (0.7.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Use set -e instead of #!/bin/sh -e for all maintainer scripts.
+  * debian/patches/04-struct_termios.patch
+    - Fix FTBFS on alpha by using the POSIX.1 struct termios interface instead
+      of the obsolete struct termio ioctl interface. (Closes: #524161)
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 17 Apr 2009 00:47:03 +0200
+
+network-manager (0.7.0.100-1) unstable; urgency=low
+
+  * New upstream release (0.7.1 rc4).
+  * debian/network-manager.install
+    - Install modem prober udev rules file into /lib/udev/rules.d.
+  * debian/network-manager.preinst
+    - Remove obsolete conffile
+      /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules.
+    - Move the old pid file from /var/run/NetworkManager to /var/run on
+      upgrades so the daemon can be stopped correctly in postinst and the
+      obsolete run directory is removed automatically.
+  * debian/network-manager.dirs
+    - Do no longer install the /var/run/NetworkManager directory.
+  * debian/network-manager.init
+    - Store the NetworkManager pid file directly in /var/run.
+  * debian/control
+    - Bump Standards-Version to 3.8.1. See the changes above wrt the /var/run
+      directory.
+  * debian/patches/02-dbus_access_network_manager.patch
+    - Remove haldaemon section, obsolete.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 08 Apr 2009 07:06:19 +0200
+
+network-manager (0.7.0.99-1) unstable; urgency=low
+
+  * New upstream release (0.7.1 rc3).
+    - Fix FTBFS for older GCC versions. (Closes: #517520)
+    - Fix crash for wireless-ssid setting in ifupdown plugin which also caused
+      hostname to be set incorrectly. (Closes: #513852)
+    - Handle unsupported format for wifi keys in ifupdown plugin.
+      (Closes: #513874)
+  * debian/network-manager.install
+    - Install modem prober and corresponding udev rules file.
+  * debian/control
+    - Add Recommends on dnsmasq-base and iptables which are required for
+      creating Ad-hoc connections and connection sharing. (Closes: #513151)
+    - Document optional dependencies, like avahi-autoipd or policykit, in the
+      package description. (Closes: #504455)
+  * debian/rules
+    - Update stop priorities for 0 1 6 from K14 to K88.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 05 Mar 2009 13:21:13 +0100
+
+network-manager (0.7.0.97-1) unstable; urgency=low
+
+  * New upstream release.
+    - Update 02-dbus_access_network_manager.patch for the latest upstream
+      changes which fixes non-deterministic allow/deny for D-Bus messages with
+      no interface. (Closes: #510729)
+    - Disable 03-F3507g.patch for now, patch no longer applies and should be
+      replaced by ModemManager anyway.
+    - Remove 04-ltversioning.patch, merged upstream.
+    - Remove 05-dhclient_lease_files.patch, merged upstream.
+  * Merge experimental branch into unstable. Remaining changes:
+    - Remove 07-domain_search.patch, merged upstream.
+    - Remove 08-hal_deprecated_keys.patch, fixed upstream.
+    - Remove 09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch, obsolete.
+    - Disable 20-manual_means_always_online.patch, needs to be ported to 0.7.
+    - Drop libdbus-glib-1-dev Depends from libnm-util-dev.
   * debian/control 
     - Add ${misc:Depends} to all binary packages.
     - Let network-manager depend on dhcp3-client directly, as the dependency
       on dhcdbd has been removed. (Closes: #509655)
+    - Wrap Build-Depends.
+    - Bump Build-Depends on debhelper to (>= 7).
+  * debian/compat
+    - Bump debhelper compat level to 7.
   * debian/rules
     - Include debhelper.mk before any other files as recommended by the cdbs
       documentation.
+  * Update symbols file for libnm-util and libnm-glib due to API additions.
 
- -- Michael Biebl <biebl@debian.org>  Tue, 13 Jan 2009 08:10:22 +0100
+ -- Michael Biebl <biebl@debian.org>  Tue, 24 Feb 2009 22:47:20 +0100
 
 network-manager (0.7.0-1) experimental; urgency=low
 
@@ -118,6 +253,33 @@ network-manager (0.7.0~svn4191-1) experimental; urgency=low
 
  -- Sjoerd Simons <sjoerd@debian.org>  Sat, 18 Oct 2008 21:28:05 +0100
 
+network-manager (0.6.6-3) unstable; urgency=low
+
+  * debian/network-manager.network-manager-dispatcher.init 
+    - NetworkManagerDispatcher uses the D-Bus system bus. Update the LSB
+      header accordingly to avoid breakages with insserv based systems.
+      (Closes: #500085)
+  * debian/patches/20-manual_means_always_online.patch
+    - manual-means-online: If there are interfaces that are not managed by
+      NetworkManager because they have custom configuration in
+      /etc/network/interfaces, we assume to be online. This is obviously not
+      always correct. But reporting offline state for unmanaged devices is
+      causing major hassles as more and more apps rely on NM and go into
+      offline mode otherwise, even if there is a connection (established via
+      ifupdown). (Closes: #491826, #502371, #509006, #509829, #511712)
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 14 Jan 2009 09:29:03 +0100
+
+network-manager (0.6.6-2) unstable; urgency=low
+
+  * debian/control
+    - Add Build-Depends on pkg-config.
+    - Drop obsolete Depends on iputils-arping. (Closes: #487794)
+  * debian/patches/09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch 
+    - Fix memory leak in src/nm-dbus-net.c. (Closes: #488604)
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 05 Jul 2008 15:11:33 +0200
+
 network-manager (0.6.6-1) unstable; urgency=low
 
   * New upstream release. (Closes: #470197)
diff --git a/debian/compat b/debian/compat
index 7ed6ff82..7f8f011e 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 0e443965..97b98c27 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,23 @@ Section: net
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Riccardo Setti <giskard@debian.org>, Michael Biebl <biebl@debian.org>
-Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, pkg-config,
- intltool, quilt, libdbus-glib-1-dev (>= 0.75), libiw-dev(>= 27+28pre9),
- libglib2.0-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 1.0~pre8), ppp-dev,
- libpolkit-dbus-dev, libgnutls-dev, uuid-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7),
+ cdbs,
+ autotools-dev,
+ pkg-config,
+ intltool,
+ quilt,
+ libdbus-glib-1-dev (>= 0.75),
+ libiw-dev(>= 27+28pre9),
+ libglib2.0-dev,
+ libhal-dev (>= 0.5.0),
+ libnl-dev (>= 1.0~pre8),
+ ppp-dev,
+ libpolkit-dbus-dev,
+ libgnutls-dev,
+ uuid-dev,
+ libudev-dev
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager
 Homepage: http://www.gnome.org/projects/NetworkManager/
@@ -15,7 +27,7 @@ Homepage: http://www.gnome.org/projects/NetworkManager/
 Package: network-manager
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14), wpasupplicant (>= 0.6.2-1), dbus (>= 1.1.2), hal (>= 0.5.7.1), ifupdown, adduser, dhcp3-client
-Recommends: network-manager-gnome | network-manager-kde, policykit, ppp
+Recommends: network-manager-gnome | network-manager-kde, policykit, ppp, dnsmasq-base, iptables
 Suggests: avahi-autoipd
 Conflicts: network-manager-gnome (<< 0.6.5-1), network-manager-pptp (<< 0.7~~)
 Replaces: network-manager-gnome (<< 0.6.5-1), network-manager-pptp (<< 0.7~~)
@@ -29,13 +41,21 @@ Description: network management framework daemon
  from a DHCP server, and change nameservers whenever it sees fit.
  .
  This package provides the userspace daemons.
+ .
+ Optional dependencies:
+  * policykit: Required for reading and writing system connections.
+  * ppp: Required for establishing dial-up connections (e.g. via GSM).
+  * dnsmasq-base/iptables: Required for creating Ad-hoc connections and
+    connection sharing.
+  * avahi-autoipd: Used for IPv4LL, a protocol for automatic Link-Local IP
+    address configuration.
 
 Package: network-manager-dev
 Architecture: any
 Section: devel
 Depends: ${misc:Depends}
 Description: network management framework (development files)
- this package provides header files that are needed to 
+ this package provides header files that are needed to
  compile VPN Plugins for NetworkManager.
 
 Package: libnm-glib0
@@ -56,7 +76,7 @@ Description: network management framework (GLib shared library)
 Package: libnm-glib-dev
 Section: libdevel
 Architecture: any
-Depends: libnm-glib0 (= ${binary:Version}), ${misc:Depends}, network-manager-dev, libglib2.0-dev, libdbus-glib-1-dev (>= 0.60)
+Depends: libnm-glib0 (= ${binary:Version}), ${misc:Depends}, libnm-util-dev, network-manager-dev, libglib2.0-dev, libdbus-glib-1-dev (>= 0.60)
 Description: network management framework (GLib interface)
  NetworkManager attempts to keep an active network connection available at all
  times. It is intended only for the desktop use-case, and is not intended for
@@ -116,7 +136,7 @@ Description: network management framework (shared library)
 Package: libnm-util-dev
 Section: libdevel
 Architecture: any
-Depends: libnm-util1 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev, libdbus-glib-1-dev (>= 0.60)
+Depends: libnm-util1 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev
 Description: network management framework (development files)
  NetworkManager attempts to keep an active network connection available at all
  times. It is intended only for the desktop use-case, and is not intended for
diff --git a/debian/libnm-glib0.symbols b/debian/libnm-glib0.symbols
index aed61ada..129fbab0 100644
--- a/debian/libnm-glib0.symbols
+++ b/debian/libnm-glib0.symbols
@@ -95,6 +95,7 @@ libnm_glib.so.0 libnm-glib0 #MINVER#
  nm_ip4_config_get_nameservers@Base 0.7.0
  nm_ip4_config_get_routes@Base 0.7.0
  nm_ip4_config_get_type@Base 0.7.0
+ nm_ip4_config_get_wins_servers@Base 0.7.0.97
  nm_ip4_config_new@Base 0.7.0
  nm_object_array_get_type@Base 0.7.0
  nm_object_get_connection@Base 0.7.0
diff --git a/debian/libnm-util1.symbols b/debian/libnm-util1.symbols
index 94922a5e..375db04f 100644
--- a/debian/libnm-util1.symbols
+++ b/debian/libnm-util1.symbols
@@ -143,6 +143,7 @@ libnm-util.so.1 libnm-util1 #MINVER#
  nm_setting_ip4_config_get_ignore_auto_dns@Base 0.7.0
  nm_setting_ip4_config_get_ignore_auto_routes@Base 0.7.0
  nm_setting_ip4_config_get_method@Base 0.7.0
+ nm_setting_ip4_config_get_never_default@Base 0.7.0.97
  nm_setting_ip4_config_get_num_addresses@Base 0.7.0
  nm_setting_ip4_config_get_num_dns@Base 0.7.0
  nm_setting_ip4_config_get_num_dns_searches@Base 0.7.0
@@ -261,6 +262,7 @@ libnm-util.so.1 libnm-util1 #MINVER#
  nm_setting_wireless_security_get_psk@Base 0.7.0
  nm_setting_wireless_security_get_type@Base 0.7.0
  nm_setting_wireless_security_get_wep_key@Base 0.7.0
+ nm_setting_wireless_security_get_wep_key_type@Base 0.7.2
  nm_setting_wireless_security_get_wep_tx_keyidx@Base 0.7.0
  nm_setting_wireless_security_new@Base 0.7.0
  nm_setting_wireless_security_remove_group@Base 0.7.0
diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian
index 0f52b41e..74221a38 100644
--- a/debian/network-manager.README.Debian
+++ b/debian/network-manager.README.Debian
@@ -1,14 +1,14 @@
 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. 
+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.
 
 Security
 ~~~~~~~~
 To allow users to connect to the NetworkManager daemon they have to be in the
 group "netdev". If you want to add a user to group "netdev" use the command
 "adduser username netdev" or one of the graphical user management frontends.
-After that you have to reload D-Bus with the command "/etc/init.d/dbus reload".
+After that you have to reload D-Bus with the command "service dbus reload".
 
 Alternatively you can install the "consolekit" package which will grant access
 for all locally logged in users.
@@ -35,9 +35,8 @@ wireless devices.
 
 
 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.
+/etc/network/interfaces you may want to tell NetworkManager about the changes
+by running "service network-manager restart".
 
 
 Dial-up configuration
diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs
index 35ce9986..233c3b50 100644
--- a/debian/network-manager.dirs
+++ b/debian/network-manager.dirs
@@ -1,2 +1 @@
 var/lib/NetworkManager
-var/run/NetworkManager
diff --git a/debian/network-manager.init b/debian/network-manager.init
index 18797994..250971bb 100644
--- a/debian/network-manager.init
+++ b/debian/network-manager.init
@@ -1,6 +1,6 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          NetworkManager
+# Provides:          network-manager
 # Required-Start:    $remote_fs dbus hal
 # Required-Stop:     $remote_fs dbus hal
 # Should-Start:	     $syslog
@@ -20,11 +20,9 @@ NAME="NetworkManager"
 
 DAEMON=/usr/sbin/$NAME
 
-PIDDIR=/var/run/NetworkManager
-PIDFILE=$PIDDIR/$NAME.pid
+PIDFILE=/var/run/$NAME.pid
 
 SCRIPTNAME=/etc/init.d/network-manager
-USER=root
 
 # Gracefully exit if the package has been removed.
 test -x $DAEMON || exit 0
@@ -37,14 +35,8 @@ 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 \
-		--oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE
-		
+		--oknodo --exec $DAEMON -- $DAEMON_OPTS
 }
 
 #
@@ -52,8 +44,11 @@ d_start() {
 #
 d_stop() {
 	start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \
-		 --oknodo --user $USER --exec $DAEMON
-		 
+		 --oknodo --exec $DAEMON
+
+	# kill the system settings daemon
+	start-stop-daemon --stop --retry 5 --quiet \
+		 --oknodo --exec /usr/sbin/nm-system-settings
 }
 
 
diff --git a/debian/network-manager.install b/debian/network-manager.install
index f861ce48..9daceb24 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/sbin/NetworkManager 
+debian/tmp/usr/sbin/NetworkManager
 debian/tmp/usr/sbin/nm-system-settings
 debian/tmp/usr/bin/nm-tool
 debian/tmp/usr/lib/NetworkManager/nm-crash-logger
@@ -19,3 +19,5 @@ debian/tmp/etc/dbus-1/system.d/nm-avahi-autoipd.conf
 debian/tmp/etc/NetworkManager/dispatcher.d/
 debian/tmp/etc/NetworkManager/system-connections/
 debian/nm-system-settings.conf etc/NetworkManager/
+debian/tmp/lib/udev/rules.d/*.rules
+debian/tmp/lib/udev/nm-modem-probe
diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst
index c7694427..f91886f5 100644
--- a/debian/network-manager.postinst
+++ b/debian/network-manager.postinst
@@ -1,4 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
+
 # This script can be called in the following ways:
 #
 # After the package was installed:
@@ -35,6 +38,15 @@ case "$1" in
 		fi
 	fi
 
+	# Update init script priorities
+	if dpkg --compare-versions "$2" lt "0.7.0.99-1"; then
+		for i in 0 1 6 ; do
+			if [ -e /etc/rc$i.d/K14network-manager ]; then
+				mv /etc/rc$i.d/K14network-manager /etc/rc$i.d/K88network-manager
+			fi
+		done
+	fi
+
 	;;
     
     abort-upgrade|abort-deconfigure|abort-remove)
diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst
index 8b64b293..5bfef656 100644
--- a/debian/network-manager.preinst
+++ b/debian/network-manager.preinst
@@ -1,4 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
+
 # This script can be called in the following ways:
 #
 # Before the package is installed:
@@ -56,6 +59,14 @@ case "$1" in
 	    rm_conffile network-manager /etc/init.d/network-manager-dispatcher
 	    update-rc.d network-manager-dispatcher remove >/dev/null
 	fi
+	if dpkg --compare-versions "$2" lt "0.7.0.100-1"; then
+	    rm_conffile network-manager /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules
+	    # Move old pid file to /var/run, so /var/run/NetworkManager can be removed
+	    # cleanly on upgrades and the daemon can be stopped correctly in postinst
+	    if [ -f /var/run/NetworkManager/NetworkManager.pid ]; then
+	        mv /var/run/NetworkManager/NetworkManager.pid /var/run/
+	    fi
+	fi
 	;;
 
     abort-upgrade)
diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch
index ad1ed08f..8c90bfd7 100644
--- a/debian/patches/02-dbus_access_network_manager.patch
+++ b/debian/patches/02-dbus_access_network_manager.patch
@@ -1,19 +1,56 @@
-Index: NetworkManager/src/NetworkManager.conf
+Index: NetworkManager-0.7.2/src/NetworkManager.conf
 ===================================================================
---- NetworkManager.orig/src/NetworkManager.conf	2008-06-11 12:28:11.000000000 +0200
-+++ NetworkManager/src/NetworkManager.conf	2008-06-11 12:32:33.000000000 +0200
-@@ -11,6 +11,14 @@
-                 <allow send_destination="org.freedesktop.NetworkManager.PPP"/>
-                 <allow send_interface="org.freedesktop.NetworkManager.PPP"/>
+--- NetworkManager-0.7.2.orig/src/NetworkManager.conf	2009-11-23 20:17:47.000000000 +0100
++++ NetworkManager-0.7.2/src/NetworkManager.conf	2009-11-24 00:38:15.416687481 +0100
+@@ -9,6 +9,51 @@
+                 <allow send_destination="org.freedesktop.NetworkManager"
+                        send_interface="org.freedesktop.NetworkManager.PPP"/>
          </policy>
-+        <policy user="haldaemon">
-+                <allow send_destination="org.freedesktop.NetworkManager"/>
-+                <allow send_interface="org.freedesktop.NetworkManager"/>
-+        </policy>
 +        <policy group="netdev">
 +                <allow send_destination="org.freedesktop.NetworkManager"/>
-+                <allow send_interface="org.freedesktop.NetworkManager"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.DBus.Introspectable"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.DBus.Properties"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.AccessPoint"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Connection.Active"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Cdma"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Wired"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Gsm"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Serial"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Wireless"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.DHCP4Config"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.IP4Config"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
 +        </policy>
          <policy at_console="true">
                  <allow send_destination="org.freedesktop.NetworkManager"/>
-                 <allow send_interface="org.freedesktop.NetworkManager"/>
+ 
diff --git a/debian/patches/04-ltversioning.patch b/debian/patches/04-ltversioning.patch
deleted file mode 100644
index e88f8750..00000000
--- a/debian/patches/04-ltversioning.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Index: network-manager-0.7.0/libnm-glib/Makefile.am
-===================================================================
---- network-manager-0.7.0.orig/libnm-glib/Makefile.am	2008-12-06 00:35:11.000000000 +0100
-+++ network-manager-0.7.0/libnm-glib/Makefile.am	2008-12-06 00:35:23.000000000 +0100
-@@ -91,7 +91,8 @@
- 	$(GCONF_LIBS)					\
- 	$(GNOME_KEYRING_LIBS)
- 
--libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver
-+libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver \
-+	-version-info "1:0:1"
- 
- noinst_PROGRAMS = libnm-glib-test
- 
-@@ -103,7 +104,8 @@
- libnm_glib_vpn_la_SOURCES = nm-vpn-plugin.c nm-vpn-plugin-ui-interface.c
- libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
- libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
--libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver
-+libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver \
-+	-version-info "0:0:0"
- 
- 
- nm-client-bindings.h: $(top_srcdir)/introspection/nm-manager-client.xml
-Index: network-manager-0.7.0/libnm-glib/Makefile.in
-===================================================================
---- network-manager-0.7.0.orig/libnm-glib/Makefile.in	2008-12-06 00:35:14.000000000 +0100
-+++ network-manager-0.7.0/libnm-glib/Makefile.in	2008-12-06 00:36:06.000000000 +0100
-@@ -405,14 +405,18 @@
- 	$(GCONF_LIBS)					\
- 	$(GNOME_KEYRING_LIBS)
- 
--libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver
-+libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver \
-+	-version-info "1:0:1"
-+
- libnm_glib_test_SOURCES = libnm-glib-test.c
- libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
- libnm_glib_test_LDADD = libnm_glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
- libnm_glib_vpn_la_SOURCES = nm-vpn-plugin.c nm-vpn-plugin-ui-interface.c
- libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
- libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
--libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver
-+libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver \
-+	-version-info "0:0:0"
-+
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libnm_glib.pc libnm_glib_vpn.pc
- DISTCLEANFILES = libnm_glib.pc libnm_glib.pc
-Index: network-manager-0.7.0/libnm-util/Makefile.am
-===================================================================
---- network-manager-0.7.0.orig/libnm-util/Makefile.am	2008-12-06 00:34:59.000000000 +0100
-+++ network-manager-0.7.0/libnm-util/Makefile.am	2008-12-06 00:35:23.000000000 +0100
-@@ -52,7 +52,8 @@
- 
- libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS)
- 
--libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver
-+libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver \
-+	-version-info "1:0:0"
- 
- if WITH_GNUTLS
- libnm_util_la_SOURCES += crypto_gnutls.c
-Index: network-manager-0.7.0/libnm-util/Makefile.in
-===================================================================
---- network-manager-0.7.0.orig/libnm-util/Makefile.in	2008-12-06 00:35:02.000000000 +0100
-+++ network-manager-0.7.0/libnm-util/Makefile.in	2008-12-06 00:35:39.000000000 +0100
-@@ -367,7 +367,9 @@
- 	$(libnm_util_include_HEADERS) $(am__append_1) $(am__append_4)
- libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS) \
- 	$(am__append_3) $(am__append_6)
--libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver
-+libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver \
-+	-version-info "1:0:0"
-+
- libnm_util_includedir = $(includedir)/NetworkManager
- test_crypto_SOURCES = test-crypto.c crypto.c $(am__append_7) \
- 	$(am__append_10)
diff --git a/debian/patches/05-dhclient_lease_files.patch b/debian/patches/05-dhclient_lease_files.patch
deleted file mode 100644
index 8f0597f3..00000000
--- a/debian/patches/05-dhclient_lease_files.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: network-manager-0.7.0/src/dhcp-manager/nm-dhcp-dhclient.c
-===================================================================
---- network-manager-0.7.0.orig/src/dhcp-manager/nm-dhcp-dhclient.c	2008-12-06 01:09:52.000000000 +0100
-+++ network-manager-0.7.0/src/dhcp-manager/nm-dhcp-dhclient.c	2008-12-06 01:10:29.000000000 +0100
-@@ -36,7 +36,11 @@
- #define NM_DHCP_MANAGER_PID_FILENAME	"dhclient"
- #define NM_DHCP_MANAGER_PID_FILE_EXT	"pid"
- 
-+#if defined (TARGET_DEBIAN)
-+#define NM_DHCP_MANAGER_LEASE_DIR       LOCALSTATEDIR "/lib/dhcp3"
-+#else
- #define NM_DHCP_MANAGER_LEASE_DIR       LOCALSTATEDIR "/lib/dhclient"
-+#endif
- #define NM_DHCP_MANAGER_LEASE_FILENAME	"dhclient"
- #define NM_DHCP_MANAGER_LEASE_FILE_EXT	"lease"
- 
diff --git a/debian/patches/20-manual_means_always_online.patch b/debian/patches/20-manual_means_always_online.patch
new file mode 100644
index 00000000..4da87b8e
--- /dev/null
+++ b/debian/patches/20-manual_means_always_online.patch
@@ -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;
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
index c38d933a..3ad97cdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 02-dbus_access_network_manager.patch
-03-F3507g.patch
-04-ltversioning.patch
-05-dhclient_lease_files.patch
+#03-F3507g.patch
+#20-manual_means_always_online.patch
diff --git a/debian/rules b/debian/rules
index 8e81f9b1..35f0ec9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ common-binary-post-install-arch:: list-missing
 
 DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/NetworkManager -X/usr/lib/pppd/
 
-DEB_INSTALL_DOCS_ALL := README AUTHORS TODO
+DEB_INSTALL_DOCS_ALL := README AUTHORS
 
 DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager"
 
@@ -19,7 +19,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
 		--with-distro=debian \
 		--with-resolvconf=/sbin/resolvconf \
 		--with-dhcp-client=/sbin/dhclient \
-		--with-crypto=gnutls
+		--with-crypto=gnutls \
+		--disable-more-warnings
 	
 DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 88 0 1 6 .