Merge mbiebl's packaging

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

23 files changed, 458 insertions, 487 deletions

diff --git a/debian/changelog b/debian/changelog
index 9ceb1e30..5449b7c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,27 +1,70 @@
-network-manager (0.7.0~svn3269-1) experimental; urgency=low
+network-manager (0.7.0~svn3747-1) experimental; urgency=low
 
   * SVN snapshot of the upcoming 0.7 release.
   * Drop patches which are either obsolete, merged upstream or not yet ported
     - 01-supplicant_timeout.patch
-    - 04-if_fix.patch
-    - 11-man_page_sh_name.patch
-    - 12_readme_format.patch
     - 13-validate_mac_addr.patch
-    - 20-stable_branch_updates_r2652.patch
-    - 21-endianess_fix_r2754.patch
-    - 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch
-    - 23-rfkill_return_type.patch
-    - 24-get_mode_fix_r3122.patch
-    - 25-libnl_unique_pid_r3155.patch
-    - 26-libnl_1.0-pre8_r3206.patch
-    - 27-dont_repeat_errors.patch
   * debian/patches/05-debian_backend.patch
     - Updated for 0.7.
   * debian/patches/02-dbus_access_network_manager.patch
     - Updated for 0.7.
+  * debian/patches/03-system-settings-conf.patch
+    - Added. Put system settings config file in /etc/NetworkManager
+  * debian/control: Updated dependencies and build-depends
+  * debian/rules:
+    - Switch to quilt as a patch system
+     - Update for the 0.7 build
+  * debian/copyright: Updated
+  * debian/nm-vpn-properties.sgml: Dropped, obsolete
+  * debian/watch: Updated to match both the current 0.6 and the upcoming 0.7
+    series
+  * debian/network-manager.postrm: Relevant code moved to preinst
+  * debian/network-manager.network-manager-dispatcher.init: Dropped, obsolete
+  * debian/*.install: Updated
+  * debian/*.symbols: Updated
 
  -- Michael Biebl <biebl@debian.org>  Fri, 25 Jan 2008 15:35:15 +0100
 
+network-manager (0.6.6-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #470197)
+    - Ensure dbus errors are properly initialised. (Closes: #471317)
+  * Removed patches
+    - debian/patches/04-if_fix.patch (obsolete)
+    - debian/patches/11-man_page_sh_name.patch (merged upstream)
+    - debian/patches/12_readme_format.patch (merged upstream)
+    - debian/patches/20-stable_branch_updates_r2652.patch (applied upstream)
+    - debian/patches/21-endianess_fix_r2754.patch (applied upstream)
+    - debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch
+      (merged upstream)
+    - debian/patches/23-rfkill_return_type.patch (fixed upstream)
+    - debian/patches/24-get_mode_fix_r3122.patch (applied upstream)
+    - debian/patches/25-libnl_unique_pid_r3155.patch (applied upstream)
+    - debian/patches/26-libnl_1.0-pre8_r3206.patch (applied upstream)
+    - debian/patches/27-dont_repeat_errors.patch (applied upstream)
+  * debian/patches/07-domain_search.patch
+    - Add support for DHCP domain-search option. (Closes: #465158)
+      Thanks to Bas Zoetekouw for the patch.
+  * debian/patches/08-hal_deprecated_keys.patch
+    - Add support for the "net.originating_device" key, which has replaced
+      the deprecated "net.physical_device" key in newer HAL versions.
+  * debian/patches/06-dispatch_more_events.patch
+    - NetworkManagerDispatcher.1.in has been renamed to
+      NetworkManagerDispatcher.8.in. Update the patch accordingly.
+  * debian/network-manager.manpages
+    - The NetworkManager and NetworkManagerDispatcher man pages have been
+      moved to section 8.
+  * debian/control
+    - The pkg-config files have been fixed upstream and unnecessary
+      dependencies were removed. Update Depends: for libnm-glib-dev and
+      libnm-util-dev accordingly. (Closes: #469195)
+  * debian/rules, debian/network-manager.postinst
+    - Minimize downtime during upgrades. (Closes: #432322)
+      Restart the service in postinst instead of stop in prerm and start in
+      postinst.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 03 Apr 2008 02:37:16 +0200
+
 network-manager (0.6.5-5) unstable; urgency=low
 
   * Rebuild against libnl1. (Closes: #461922)
diff --git a/debian/control b/debian/control
index d67c779c..ebc55fa6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,12 @@ 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, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libglade2-dev, libglib2.0-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 1.0~pre8), libnotify-dev (>= 0.3), docbook-to-man, iproute
+Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, pkg-config,
+ intltool, quilt, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.74-4),
+ libiw-dev(>= 27+28pre9), libgnomeui-dev, libglade2-dev, libglib2.0-dev,
+ libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 1.0~pre8),
+ libnotify-dev (>= 0.3), ppp-dev, docbook-to-man, libpolkit-dbus-dev,
+ libgnutls-dev
 Standards-Version: 3.7.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
@@ -11,8 +16,8 @@ Homepage: http://www.gnome.org/projects/NetworkManager/
 
 Package: network-manager
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 3.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>= 0.5.7.1), ifupdown, adduser
-Recommends: network-manager-gnome | network-manager-kde
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), wpasupplicant (>= 0.6.2-1), dbus (>= 1.1.2), hal (>= 0.5.7.1), ifupdown, adduser
+Recommends: network-manager-gnome | network-manager-kde, policykit
 Conflicts: network-manager-gnome (<< 0.6.5-1)
 Replaces: network-manager-gnome (<< 0.6.5-1)
 Description: network management framework daemon
@@ -28,7 +33,6 @@ Description: network management framework daemon
 Package: network-manager-dev
 Architecture: any
 Section: devel
-Depends: pkg-config
 Description: network management framework (development files)
  this package provides header files that are needed to 
  compile VPN Plugins for NetworkManager.
diff --git a/debian/copyright b/debian/copyright
index 8813c529..d940e36d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,9 +22,6 @@ License:
     License along with this package; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-libnm-util/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.
-
 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).
@@ -63,11 +60,6 @@ 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/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.
diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install
index 624f7a5a..b4bbf4bc 100644
--- a/debian/libnm-glib-dev.install
+++ b/debian/libnm-glib-dev.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/pkgconfig/libnm_glib.pc
 debian/tmp/usr/lib/libnm_glib*.a
 debian/tmp/usr/lib/libnm_glib*.so
-debian/tmp/usr/include/NetworkManager/libnm_glib.h
+debian/tmp/usr/include/libnm-glib/
diff --git a/debian/libnm-glib0.symbols b/debian/libnm-glib0.symbols
new file mode 100644
index 00000000..7e5e8b38
--- /dev/null
+++ b/debian/libnm-glib0.symbols
@@ -0,0 +1,179 @@
+libnm_glib.so.0 libnm-glib0 #MINVER#
+ dbus_glib_marshal_nm_exported_connection_BOOLEAN__POINTER_POINTER@Base 0.7.0~svn3712
+ dbus_glib_marshal_nm_exported_connection_VOID__BOXED_POINTER@Base 0.7.0~svn3712
+ dbus_glib_marshal_nm_exported_connection_VOID__STRING_BOXED_BOOLEAN_POINTER@Base 0.7.0~svn3712
+ dbus_glib_marshal_nm_settings_BOOLEAN__POINTER_POINTER@Base 0.7.0~svn3712
+ dbus_glib_nm_exported_connection_object_info@Base 0.7.0~svn3712
+ dbus_glib_nm_settings_object_info@Base 0.7.0~svn3712
+ libnm_glib_get_network_state@Base 0.6.4
+ libnm_glib_init@Base 0.6.4
+ libnm_glib_register_callback@Base 0.6.4
+ libnm_glib_shutdown@Base 0.6.4
+ libnm_glib_unregister_callback@Base 0.6.4
+ nm_access_point_get_flags@Base 0.7.0~svn3712
+ nm_access_point_get_frequency@Base 0.7.0~svn3712
+ nm_access_point_get_hw_address@Base 0.7.0~svn3712
+ nm_access_point_get_max_bitrate@Base 0.7.0~svn3712
+ nm_access_point_get_mode@Base 0.7.0~svn3712
+ nm_access_point_get_rsn_flags@Base 0.7.0~svn3712
+ nm_access_point_get_ssid@Base 0.7.0~svn3712
+ nm_access_point_get_strength@Base 0.7.0~svn3712
+ nm_access_point_get_type@Base 0.7.0~svn3712
+ nm_access_point_get_wpa_flags@Base 0.7.0~svn3712
+ nm_access_point_new@Base 0.7.0~svn3712
+ nm_active_connection_get_connection@Base 0.7.0~svn3712
+ nm_active_connection_get_default@Base 0.7.0~svn3712
+ nm_active_connection_get_devices@Base 0.7.0~svn3712
+ nm_active_connection_get_scope@Base 0.7.0~svn3712
+ nm_active_connection_get_service_name@Base 0.7.0~svn3712
+ nm_active_connection_get_shared_connection@Base 0.7.0~svn3712
+ nm_active_connection_get_shared_service_name@Base 0.7.0~svn3712
+ nm_active_connection_get_specific_object@Base 0.7.0~svn3712
+ nm_active_connection_get_state@Base 0.7.0~svn3712
+ nm_active_connection_get_type@Base 0.7.0~svn3712
+ nm_active_connection_new@Base 0.7.0~svn3712
+ nm_cdma_device_get_type@Base 0.7.0~svn3712
+ nm_cdma_device_new@Base 0.7.0~svn3712
+ nm_client_activate_connection@Base 0.7.0~svn3712
+ nm_client_deactivate_connection@Base 0.7.0~svn3712
+ nm_client_get_active_connections@Base 0.7.0~svn3712
+ nm_client_get_device_by_path@Base 0.7.0~svn3712
+ nm_client_get_devices@Base 0.7.0~svn3712
+ nm_client_get_manager_running@Base 0.7.0~svn3712
+ nm_client_get_state@Base 0.7.0~svn3712
+ nm_client_get_type@Base 0.7.0~svn3712
+ nm_client_new@Base 0.7.0~svn3712
+ nm_client_sleep@Base 0.7.0~svn3712
+ nm_client_wireless_get_enabled@Base 0.7.0~svn3712
+ nm_client_wireless_hardware_get_enabled@Base 0.7.0~svn3712
+ nm_client_wireless_set_enabled@Base 0.7.0~svn3712
+ nm_dbus_connection_get_type@Base 0.7.0~svn3712
+ nm_dbus_connection_new@Base 0.7.0~svn3712
+ nm_dbus_get_int_property@Base 0.7.0~svn3712
+ nm_dbus_get_object_path_property@Base 0.7.0~svn3712
+ nm_dbus_get_property@Base 0.7.0~svn3712
+ nm_dbus_get_string_property@Base 0.7.0~svn3712
+ nm_dbus_get_uint_property@Base 0.7.0~svn3712
+ nm_dbus_introspect@Base 0.7.0~svn3712
+ nm_dbus_set_property@Base 0.7.0~svn3712
+ nm_dbus_settings_get_connection_by_path@Base 0.7.0~svn3712
+ nm_dbus_settings_get_type@Base 0.7.0~svn3712
+ nm_dbus_settings_new@Base 0.7.0~svn3712
+ nm_dbus_settings_system_add_connection@Base 0.7.0~svn3712
+ nm_dbus_settings_system_get_type@Base 0.7.0~svn3712
+ nm_dbus_settings_system_get_unmanaged_devices@Base 0.7.0~svn3712
+ nm_dbus_settings_system_new@Base 0.7.0~svn3712
+ nm_device_ethernet_get_carrier@Base 0.7.0~svn3746
+ nm_device_ethernet_get_hw_address@Base 0.7.0~svn3746
+ nm_device_ethernet_get_speed@Base 0.7.0~svn3746
+ nm_device_ethernet_get_type@Base 0.7.0~svn3746
+ nm_device_ethernet_new@Base 0.7.0~svn3746
+ nm_device_get_capabilities@Base 0.7.0~svn3712
+ nm_device_get_driver@Base 0.7.0~svn3712
+ nm_device_get_iface@Base 0.7.0~svn3712
+ nm_device_get_ip4_config@Base 0.7.0~svn3712
+ nm_device_get_managed@Base 0.7.0~svn3712
+ nm_device_get_product@Base 0.7.0~svn3712
+ nm_device_get_state@Base 0.7.0~svn3712
+ nm_device_get_type@Base 0.7.0~svn3712
+ nm_device_get_udi@Base 0.7.0~svn3712
+ nm_device_get_vendor@Base 0.7.0~svn3712
+ nm_device_new@Base 0.7.0~svn3712
+ nm_device_wifi_get_access_point_by_path@Base 0.7.0~svn3746
+ nm_device_wifi_get_access_points@Base 0.7.0~svn3746
+ nm_device_wifi_get_active_access_point@Base 0.7.0~svn3746
+ nm_device_wifi_get_bitrate@Base 0.7.0~svn3746
+ nm_device_wifi_get_capabilities@Base 0.7.0~svn3746
+ nm_device_wifi_get_hw_address@Base 0.7.0~svn3746
+ nm_device_wifi_get_mode@Base 0.7.0~svn3746
+ nm_device_wifi_get_type@Base 0.7.0~svn3746
+ nm_device_wifi_new@Base 0.7.0~svn3746
+ nm_device_wifi_set_wireless_enabled@Base 0.7.0~svn3746
+ nm_exported_connection_delete@Base 0.7.0~svn3712
+ nm_exported_connection_get_connection@Base 0.7.0~svn3712
+ nm_exported_connection_get_id@Base 0.7.0~svn3712
+ nm_exported_connection_get_type@Base 0.7.0~svn3712
+ nm_exported_connection_new@Base 0.7.0~svn3712
+ nm_exported_connection_register_object@Base 0.7.0~svn3712
+ nm_exported_connection_signal_removed@Base 0.7.0~svn3712
+ nm_exported_connection_signal_updated@Base 0.7.0~svn3712
+ nm_exported_connection_update@Base 0.7.0~svn3712
+ nm_gsm_device_get_type@Base 0.7.0~svn3712
+ nm_gsm_device_new@Base 0.7.0~svn3712
+ nm_ip4_config_get_addresses@Base 0.7.0~svn3712
+ nm_ip4_config_get_domains@Base 0.7.0~svn3712
+ nm_ip4_config_get_hostname@Base 0.7.0~svn3712
+ nm_ip4_config_get_nameservers@Base 0.7.0~svn3712
+ nm_ip4_config_get_nis_domain@Base 0.7.0~svn3712
+ nm_ip4_config_get_nis_servers@Base 0.7.0~svn3712
+ nm_ip4_config_get_type@Base 0.7.0~svn3712
+ nm_ip4_config_new@Base 0.7.0~svn3712
+ nm_marshal_VOID__OBJECT_OBJECT_ENUM@Base 0.7.0~svn3712
+ nm_marshal_VOID__OBJECT_POINTER@Base 0.7.0~svn3712
+ nm_marshal_VOID__OBJECT_STRING@Base 0.7.0~svn3712
+ nm_marshal_VOID__OBJECT_UINT@Base 0.7.0~svn3712
+ nm_marshal_VOID__OBJECT_UINT_UINT@Base 0.7.0~svn3712
+ nm_marshal_VOID__POINTER_STRING@Base 0.7.0~svn3712
+ nm_marshal_VOID__STRING_INT@Base 0.7.0~svn3712
+ nm_marshal_VOID__STRING_OBJECT@Base 0.7.0~svn3712
+ nm_marshal_VOID__STRING_STRING@Base 0.7.0~svn3712
+ nm_marshal_VOID__STRING_STRING_POINTER@Base 0.7.0~svn3712
+ nm_marshal_VOID__STRING_STRING_STRING@Base 0.7.0~svn3712
+ nm_marshal_VOID__STRING_UCHAR@Base 0.7.0~svn3712
+ nm_marshal_VOID__STRING_UINT@Base 0.7.0~svn3712
+ nm_marshal_VOID__UINT_UINT@Base 0.7.0~svn3712
+ nm_object_array_demarshal@Base 0.7.0~svn3712
+ nm_object_array_get_type@Base 0.7.0~svn3712
+ nm_object_cache_add@Base 0.7.0~svn3712
+ nm_object_cache_get@Base 0.7.0~svn3712
+ nm_object_cache_remove_by_object@Base 0.7.0~svn3712
+ nm_object_cache_remove_by_path@Base 0.7.0~svn3712
+ nm_object_demarshal_generic@Base 0.7.0~svn3712
+ nm_object_get_boolean_property@Base 0.7.0~svn3712
+ nm_object_get_byte_array_property@Base 0.7.0~svn3712
+ nm_object_get_byte_property@Base 0.7.0~svn3712
+ nm_object_get_connection@Base 0.7.0~svn3712
+ nm_object_get_double_property@Base 0.7.0~svn3712
+ nm_object_get_int_property@Base 0.7.0~svn3712
+ nm_object_get_object_path_property@Base 0.7.0~svn3712
+ nm_object_get_path@Base 0.7.0~svn3712
+ nm_object_get_property@Base 0.7.0~svn3712
+ nm_object_get_string_property@Base 0.7.0~svn3712
+ nm_object_get_type@Base 0.7.0~svn3712
+ nm_object_get_uint_property@Base 0.7.0~svn3712
+ nm_object_handle_properties_changed@Base 0.7.0~svn3712
+ nm_object_queue_notify@Base 0.7.0~svn3712
+ nm_object_set_property@Base 0.7.0~svn3712
+ nm_serial_device_get_bytes_received@Base 0.7.0~svn3746
+ nm_serial_device_get_bytes_sent@Base 0.7.0~svn3746
+ nm_serial_device_get_type@Base 0.7.0~svn3746
+ nm_settings_error_quark@Base 0.7.0~svn3712
+ nm_settings_get_type@Base 0.7.0~svn3712
+ nm_settings_list_connections@Base 0.7.0~svn3712
+ nm_settings_signal_new_connection@Base 0.7.0~svn3712
+ nm_ssid_demarshal@Base 0.7.0~svn3712
+ nm_ssid_get_type@Base 0.7.0~svn3712
+ nm_string_array_demarshal@Base 0.7.0~svn3712
+ nm_string_array_get_type@Base 0.7.0~svn3712
+ nm_uint_array_demarshal@Base 0.7.0~svn3712
+ nm_uint_array_get_type@Base 0.7.0~svn3712
+ nm_vpn_connection_get_banner@Base 0.7.0~svn3712
+ nm_vpn_connection_get_type@Base 0.7.0~svn3712
+ nm_vpn_connection_get_vpn_state@Base 0.7.0~svn3712
+ nm_vpn_connection_new@Base 0.7.0~svn3712
+libnm_glib_vpn.so.0 libnm-glib0 #MINVER#
+ dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__BOXED_POINTER@Base 0.7.0~svn3712
+ dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__BOXED_POINTER_POINTER@Base 0.7.0~svn3712
+ dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__POINTER@Base 0.7.0~svn3712
+ dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__STRING_POINTER@Base 0.7.0~svn3712
+ dbus_glib_nm_vpn_plugin_object_info@Base 0.7.0~svn3712
+ nm_vpn_plugin_disconnect@Base 0.7.0~svn3712
+ nm_vpn_plugin_error_get_type@Base 0.7.0~svn3712
+ nm_vpn_plugin_error_quark@Base 0.7.0~svn3712
+ nm_vpn_plugin_failure@Base 0.7.0~svn3712
+ nm_vpn_plugin_get_connection@Base 0.7.0~svn3712
+ nm_vpn_plugin_get_state@Base 0.7.0~svn3712
+ nm_vpn_plugin_get_type@Base 0.7.0~svn3712
+ nm_vpn_plugin_set_ip4_config@Base 0.7.0~svn3712
+ nm_vpn_plugin_set_login_banner@Base 0.7.0~svn3712
+ nm_vpn_plugin_set_state@Base 0.7.0~svn3712
diff --git a/debian/libnm-util-dev.install b/debian/libnm-util-dev.install
index 66abe57e..8a8e5486 100644
--- a/debian/libnm-util-dev.install
+++ b/debian/libnm-util-dev.install
@@ -1,11 +1,7 @@
 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/cipher.h
-debian/tmp/usr/include/NetworkManager/cipher-wep-hex.h
-debian/tmp/usr/include/NetworkManager/cipher-wep-passphrase.h
-debian/tmp/usr/include/NetworkManager/cipher-wep-ascii.h
-debian/tmp/usr/include/NetworkManager/cipher-wpa-psk-hex.h
-debian/tmp/usr/include/NetworkManager/cipher-wpa-psk-passphrase.h
-debian/tmp/usr/include/NetworkManager/dbus-helpers.h 
-debian/tmp/usr/include/NetworkManager/dbus-method-dispatcher.h
+debian/tmp/usr/include/NetworkManager/nm-connection.h
+debian/tmp/usr/include/NetworkManager/nm-utils.h
+debian/tmp/usr/include/NetworkManager/nm-setting.h
+debian/tmp/usr/include/NetworkManager/nm-setting-*.h
diff --git a/debian/libnm-util0.symbols b/debian/libnm-util0.symbols
new file mode 100644
index 00000000..7ebf78b7
--- /dev/null
+++ b/debian/libnm-util0.symbols
@@ -0,0 +1,94 @@
+libnm-util.so.0 libnm-util0 #MINVER#
+ crypto_decrypt@Base 0.7.0~svn3712
+ crypto_deinit@Base 0.7.0~svn3712
+ crypto_get_private_key@Base 0.7.0~svn3712
+ crypto_init@Base 0.7.0~svn3712
+ crypto_load_and_verify_certificate@Base 0.7.0~svn3712
+ crypto_md5_hash@Base 0.7.0~svn3712
+ crypto_verify_cert@Base 0.7.0~svn3712
+ nm_connection_add_setting@Base 0.7.0~svn3712
+ nm_connection_clear_secrets@Base 0.7.0~svn3712
+ nm_connection_compare@Base 0.7.0~svn3712
+ nm_connection_create_setting@Base 0.7.0~svn3712
+ nm_connection_dump@Base 0.7.0~svn3712
+ nm_connection_for_each_setting_value@Base 0.7.0~svn3712
+ nm_connection_get_path@Base 0.7.0~svn3712
+ nm_connection_get_scope@Base 0.7.0~svn3712
+ nm_connection_get_setting@Base 0.7.0~svn3712
+ nm_connection_get_setting_by_name@Base 0.7.0~svn3712
+ nm_connection_get_type@Base 0.7.0~svn3712
+ nm_connection_lookup_setting_type@Base 0.7.0~svn3712
+ nm_connection_need_secrets@Base 0.7.0~svn3712
+ nm_connection_new@Base 0.7.0~svn3712
+ nm_connection_new_from_hash@Base 0.7.0~svn3712
+ nm_connection_remove_setting@Base 0.7.0~svn3712
+ nm_connection_replace_settings@Base 0.7.0~svn3712
+ nm_connection_set_path@Base 0.7.0~svn3712
+ nm_connection_set_scope@Base 0.7.0~svn3712
+ nm_connection_to_hash@Base 0.7.0~svn3712
+ nm_connection_update_secrets@Base 0.7.0~svn3712
+ nm_connection_verify@Base 0.7.0~svn3712
+ nm_crypto_error_quark@Base 0.7.0~svn3712
+ nm_param_spec_specialized@Base 0.7.0~svn3712
+ nm_param_spec_specialized_get_type@Base 0.7.0~svn3712
+ nm_setting_802_1x_get_type@Base 0.7.0~svn3712
+ nm_setting_802_1x_new@Base 0.7.0~svn3712
+ nm_setting_802_1x_set_ca_cert@Base 0.7.0~svn3712
+ nm_setting_802_1x_set_client_cert@Base 0.7.0~svn3712
+ nm_setting_802_1x_set_phase2_ca_cert@Base 0.7.0~svn3712
+ nm_setting_802_1x_set_phase2_client_cert@Base 0.7.0~svn3712
+ nm_setting_802_1x_set_phase2_private_key@Base 0.7.0~svn3712
+ nm_setting_802_1x_set_private_key@Base 0.7.0~svn3712
+ nm_setting_cdma_get_type@Base 0.7.0~svn3712
+ nm_setting_cdma_new@Base 0.7.0~svn3712
+ nm_setting_clear_secrets@Base 0.7.0~svn3712
+ nm_setting_compare@Base 0.7.0~svn3712
+ nm_setting_connection_get_type@Base 0.7.0~svn3712
+ nm_setting_connection_new@Base 0.7.0~svn3712
+ nm_setting_duplicate@Base 0.7.0~svn3712
+ nm_setting_enumerate_values@Base 0.7.0~svn3712
+ nm_setting_from_hash@Base 0.7.0~svn3712
+ nm_setting_get_name@Base 0.7.0~svn3712
+ nm_setting_get_type@Base 0.7.0~svn3712
+ nm_setting_gsm_get_type@Base 0.7.0~svn3712
+ nm_setting_gsm_new@Base 0.7.0~svn3712
+ nm_setting_ip4_config_get_type@Base 0.7.0~svn3712
+ nm_setting_ip4_config_new@Base 0.7.0~svn3712
+ nm_setting_need_secrets@Base 0.7.0~svn3712
+ nm_setting_ppp_get_type@Base 0.7.0~svn3712
+ nm_setting_ppp_new@Base 0.7.0~svn3712
+ nm_setting_pppoe_get_type@Base 0.7.0~svn3712
+ nm_setting_pppoe_new@Base 0.7.0~svn3712
+ nm_setting_register@Base 0.7.0~svn3712
+ nm_setting_serial_get_type@Base 0.7.0~svn3712
+ nm_setting_serial_new@Base 0.7.0~svn3712
+ nm_setting_to_hash@Base 0.7.0~svn3712
+ nm_setting_to_string@Base 0.7.0~svn3712
+ nm_setting_unregister@Base 0.7.0~svn3712
+ nm_setting_update_secrets@Base 0.7.0~svn3712
+ nm_setting_verify@Base 0.7.0~svn3712
+ nm_setting_vpn_get_type@Base 0.7.0~svn3712
+ nm_setting_vpn_new@Base 0.7.0~svn3712
+ nm_setting_vpn_properties_get_type@Base 0.7.0~svn3712
+ nm_setting_vpn_properties_new@Base 0.7.0~svn3712
+ nm_setting_wired_get_type@Base 0.7.0~svn3712
+ nm_setting_wired_new@Base 0.7.0~svn3712
+ nm_setting_wireless_ap_security_compatible@Base 0.7.0~svn3712
+ nm_setting_wireless_get_type@Base 0.7.0~svn3712
+ nm_setting_wireless_new@Base 0.7.0~svn3712
+ nm_setting_wireless_security_get_type@Base 0.7.0~svn3712
+ nm_setting_wireless_security_new@Base 0.7.0~svn3712
+ nm_utils_escape_ssid@Base 0.7.0~svn3712
+ nm_utils_garray_to_string@Base 0.7.0~svn3712
+ nm_utils_gvalue_hash_dup@Base 0.7.0~svn3712
+ nm_utils_ip4_addresses_from_gvalue@Base 0.7.0~svn3712
+ nm_utils_ip4_addresses_to_gvalue@Base 0.7.0~svn3712
+ nm_utils_is_empty_ssid@Base 0.7.0~svn3712
+ nm_utils_register_value_transformations@Base 0.7.0~svn3712
+ nm_utils_same_ssid@Base 0.7.0~svn3712
+ nm_utils_security_valid@Base 0.7.0~svn3712
+ nm_utils_slist_free@Base 0.7.0~svn3712
+ nm_utils_ssid_to_utf8@Base 0.7.0~svn3712
+ nm_utils_string_in_list@Base 0.7.0~svn3712
+ nm_utils_string_list_contains@Base 0.7.0~svn3712
+ nm_utils_string_slist_validate@Base 0.7.0~svn3712
diff --git a/debian/network-manager-dev.install b/debian/network-manager-dev.install
index 97a00409..21a43882 100644
--- a/debian/network-manager-dev.install
+++ b/debian/network-manager-dev.install
@@ -1,4 +1,3 @@
 debian/tmp/usr/lib/pkgconfig/NetworkManager.pc
 debian/tmp/usr/include/NetworkManager/NetworkManager.h
 debian/tmp/usr/include/NetworkManager/NetworkManagerVPN.h
-debian/tmp/usr/include/NetworkManager/nm-vpn-ui-interface.h
diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs
index 231b4756..60de4e65 100644
--- a/debian/network-manager.dirs
+++ b/debian/network-manager.dirs
@@ -1,3 +1,4 @@
 etc/NetworkManager/dispatcher.d
+etc/NetworkManager/system-connections
 var/lib/NetworkManager
 var/run/NetworkManager
diff --git a/debian/network-manager.init b/debian/network-manager.init
index 9e6fcf0b..10fca34d 100644
--- a/debian/network-manager.init
+++ b/debian/network-manager.init
@@ -1,8 +1,8 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          NetworkManager
-# Required-Start:    $remote_fs dbus dhcdbd hal
-# Required-Stop:     $remote_fs dbus dhcdbd hal
+# Required-Start:    $remote_fs dbus hal
+# Required-Stop:     $remote_fs dbus hal
 # Should-Start:	     $syslog
 # Should-Stop:       $syslog
 # Default-Start:     2 3 4 5
@@ -29,9 +29,6 @@ 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/NetworkManager && . /etc/default/NetworkManager
diff --git a/debian/network-manager.install b/debian/network-manager.install
index 90422942..c5fd4648 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -1,8 +1,16 @@
 debian/tmp/usr/sbin/NetworkManager 
-debian/tmp/usr/sbin/NetworkManagerDispatcher
-debian/tmp/usr/lib/network-manager
-debian/tmp/usr/share/locale
+debian/tmp/usr/sbin/nm-system-settings
+debian/tmp/usr/bin/nm-tool
+debian/tmp/usr/lib/NetworkManager/nm-crash-logger
+debian/tmp/usr/lib/NetworkManager/nm-dhcp-client.action
+debian/tmp/usr/lib/NetworkManager/nm-dispatcher.action
+debian/tmp/usr/lib/NetworkManager/libnm-settings-plugin-keyfile.so
+debian/tmp/usr/lib/pppd/*/*.so
+debian/tmp/usr/share/locale/
+debian/tmp/usr/share/dbus-1/system-services/
+debian/tmp//usr/share/PolicyKit/
 debian/tmp/etc/dbus-1/system.d/NetworkManager.conf
-test/nm-tool /usr/bin/
-debian/tmp/usr/bin/nm-vpn-properties
-debian/tmp/usr/share/gnome-vpn-properties/nm-vpn-properties.glade
+debian/tmp/etc/dbus-1/system.d/nm-dhcp-client.conf
+debian/tmp/etc/dbus-1/system.d/nm-system-settings.conf
+debian/tmp/etc/dbus-1/system.d/nm-dispatcher.conf
+debian/nm-system-settings.conf etc/NetworkManager/
diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages
index 50ee9f13..7f4f19b0 100644
--- a/debian/network-manager.manpages
+++ b/debian/network-manager.manpages
@@ -1,4 +1,2 @@
-man/NetworkManagerDispatcher.1
+man/NetworkManager.8
 man/nm-tool.1
-man/NetworkManager.1
-debian/nm-vpn-properties.1
diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst
index c2a445c7..c7694427 100644
--- a/debian/network-manager.postinst
+++ b/debian/network-manager.postinst
@@ -16,25 +16,8 @@
 #	<postinst> abort-remove in-favour <new-package> <version>
 
 
-# Remove a no-longer used conffile
-rm_conffile()
-{
-    CONFFILE="$1"
-    
-    if [ -e "$CONFFILE".dpkg-remove ]; then
-	echo "Removing obsolete conffile $CONFFILE"
-	rm -f "$CONFFILE".dpkg-remove
-    fi
-}
-
-
 case "$1" in
     configure)
-	# Upgrade from previous versions
-        if dpkg --compare-versions "$2" lt "0.6.4-8"; then
-	    rm_conffile /etc/dbus-1/event.d/25NetworkManager
-	    rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher
-	fi
 	
 	if ! getent group netdev > /dev/null; then
 	    addgroup --quiet --system netdev
@@ -43,6 +26,15 @@ case "$1" in
 	if [ -x "/etc/init.d/dbus" ]; then
 	    invoke-rc.d dbus force-reload || true
 	fi
+
+	# Stop the service on upgrades before it is started again.
+	# dh_installinit -r will create the start code.
+	if [ -n "$2" ]; then
+		if [ -x "/etc/init.d/network-manager" ]; then
+			invoke-rc.d network-manager stop || true
+		fi
+	fi
+
 	;;
     
     abort-upgrade|abort-deconfigure|abort-remove)
diff --git a/debian/network-manager.postrm b/debian/network-manager.postrm
deleted file mode 100644
index 812369bd..00000000
--- a/debian/network-manager.postrm
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh -e
-# This script can be called in the following ways:
-#
-# After the package was removed:
-#	<postrm> remove
-#
-# After the package was purged:
-#	<postrm> purge
-#
-# After the package was upgraded:
-#	<old-postrm> upgrade <new-version>
-# if that fails:
-#	<new-postrm> failed-upgrade <old-version>
-#
-#
-# After all of the packages files have been replaced:
-#	<postrm> disappear <overwriting-package> <version>
-#
-#
-# If preinst fails during install:
-#	<new-postrm> abort-install
-#
-# If preinst fails during upgrade of removed package:
-#	<new-postrm> abort-install <old-version>
-#
-# If preinst fails during upgrade:
-#	<new-postrm> abort-upgrade <old-version>
-
-
-# Undo removal of a no-longer used conffile
-undo_rm_conffile()
-{
-    CONFFILE="$1"
-    
-    if [ ! -e "$CONFFILE" ]; then
-	if [ -e "$CONFFILE".dpkg-bak ]; then
-	    echo "Restoring modified conffile $CONFFILE"
-	    mv -f "$CONFFILE".dpkg-bak "$CONFFILE"
-	elif [ -e "$CONFFILE".dpkg-remove ]; then
-	    echo "Restoring conffile $CONFFILE"
-	    mv -f "$CONFFILE".dpkg-remove "$CONFFILE"
-	fi
-    fi
-}
-
-
-# Purge backup conffile
-rm_backup_conffile()
-{
-    CONFFILE="$1"
-    if [ -e "$CONFFILE".dpkg-bak ]; then
-	echo "Purging backup of conffile $CONFFILE"
-	rm -f "$CONFFILE".dpkg-bak
-    fi
-}
-
-
-case "$1" in
-    remove)
-        ;;
-
-    purge)
-        rm_backup_conffile /etc/dbus-1/event.d/25NetworkManager
-	rm_backup_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher
-	;;
-
-    upgrade|failed-upgrade|disappear)
-        ;;
-
-    abort-install|abort-upgrade)
-	# Abort upgrade from previous versions
-        if dpkg --compare-versions "$2" lt "0.6.4-8"; then
-	    undo_rm_conffile /etc/dbus-1/event.d/25NetworkManager
-	    undo_rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher
-	fi
-	;;
-
-    *)
-        echo "$0 called with unknown argument \`$1'" 1>&2
-	exit 1
-	;;
-esac
-
-#DEBHELPER#
-exit 0
diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst
index 3f737448..8b64b293 100644
--- a/debian/network-manager.preinst
+++ b/debian/network-manager.preinst
@@ -15,8 +15,8 @@
 #	<old-preinst> abort-upgrade <new-version>
 
 
-# Prepare to remove a no-longer used conffile
-prep_rm_conffile()
+# remove a no-longer used conffile
+rm_conffile()
 {
     PKGNAME="$1"
     CONFFILE="$2"
@@ -25,20 +25,19 @@ prep_rm_conffile()
 	md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
 	old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
 	if [ "$md5sum" != "$old_md5sum" ]; then
-	    echo "Obsolete conffile $CONFFILE has been modified by you, renaming to .dpkg-bak"
+	    echo "Obsolete conffile $CONFFILE has been modified by you."
+	    echo "Saving as $CONFFILE.dpkg-bak ..."
 	    mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
 	else
-	    mv -f "$CONFFILE" "$CONFFILE".dpkg-remove
+	    echo "Removing obsolete conffile $CONFFILE ..."
+	    rm -f "$CONFFILE"
 	fi
     fi
 }
 
 
 case "$1" in
-    install)
-        ;;
-
-    upgrade)
+    install|upgrade)
 	# Upgrade from previous versions
         if dpkg --compare-versions "$2" lt "0.6.4-8"; then
 	    if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then
@@ -47,8 +46,15 @@ case "$1" in
 	    if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then
 		/etc/dbus-1/event.d/26NetworkManagerDispatcher stop   
 	    fi
-	    prep_rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager
-	    prep_rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher
+	    rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager
+	    rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher
+	fi
+	if dpkg --compare-versions "$2" lt "0.7.0~svn3624-1"; then
+	    if [ -x "/etc/init.d/network-manager-dispatcher" ]; then
+	        invoke-rc.d network-manager-dispatcher stop
+	    fi
+	    rm_conffile network-manager /etc/init.d/network-manager-dispatcher
+	    update-rc.d network-manager-dispatcher remove >/dev/null
 	fi
 	;;
 
diff --git a/debian/nm-system-settings.conf b/debian/nm-system-settings.conf
new file mode 100644
index 00000000..c37b5968
--- /dev/null
+++ b/debian/nm-system-settings.conf
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile
diff --git a/debian/nm-vpn-properties.sgml b/debian/nm-vpn-properties.sgml
deleted file mode 100644
index 7b42239e..00000000
--- a/debian/nm-vpn-properties.sgml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!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:
--->
diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch
index 12ad59de..ad1ed08f 100644
--- a/debian/patches/02-dbus_access_network_manager.patch
+++ b/debian/patches/02-dbus_access_network_manager.patch
@@ -1,7 +1,7 @@
-Index: src/NetworkManager.conf
+Index: NetworkManager/src/NetworkManager.conf
 ===================================================================
---- src/NetworkManager.conf	(Revision 3269)
-+++ src/NetworkManager.conf	(Arbeitskopie)
+--- 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"/>
diff --git a/debian/patches/03-system-settings-conf.patch b/debian/patches/03-system-settings-conf.patch
new file mode 100644
index 00000000..9f605930
--- /dev/null
+++ b/debian/patches/03-system-settings-conf.patch
@@ -0,0 +1,11 @@
+Index: NetworkManager/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in
+===================================================================
+--- NetworkManager.orig/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in	2008-06-11 12:28:11.000000000 +0200
++++ NetworkManager/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in	2008-06-11 12:32:51.000000000 +0200
+@@ -1,5 +1,5 @@
+ [D-BUS Service]
+ Name=org.freedesktop.NetworkManagerSystemSettings
+-Exec=@sbindir@/nm-system-settings --config /etc/nm-system-settings.conf
++Exec=@sbindir@/nm-system-settings --config /etc/NetworkManager/nm-system-settings.conf
+ User=root
+ 
diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch
index cc60352f..1851e7de 100644
--- a/debian/patches/05-debian_backend.patch
+++ b/debian/patches/05-debian_backend.patch
@@ -1,7 +1,48 @@
-Index: src/backends/interface_parser.c
+Index: NetworkManager/src/backends/NetworkManagerDebian.c
 ===================================================================
---- src/backends/interface_parser.c	(Revision 2569)
-+++ src/backends/interface_parser.c	(Arbeitskopie)
+--- NetworkManager.orig/src/backends/NetworkManagerDebian.c	2008-06-11 12:28:11.000000000 +0200
++++ NetworkManager/src/backends/NetworkManagerDebian.c	2008-06-11 12:33:02.000000000 +0200
+@@ -74,18 +74,21 @@
+ 	nm_spawn_process ("/usr/bin/killall -q dhclient");
+ }
+ 
++#define RESOLVCONF "resolvconf"
+ 
+ /*
+  * nm_system_update_dns
+  *
+- * Make glibc/nscd aware of any changes to the resolv.conf file by
+- * restarting nscd.
++ * Invalidate the nscd host cache, if it exists, since
++ * we changed resolv.conf.
+  *
+  */
+ void nm_system_update_dns (void)
+ {
+-	nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart");
+-
++	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
++		nm_info ("Clearing nscd hosts cache.");
++		nm_spawn_process ("/usr/sbin/nscd -i hosts");
++	}
+ }
+ 
+ /*
+@@ -125,6 +128,9 @@
+  */
+ gboolean nm_system_should_modify_resolv_conf (void)
+ {
+-	return TRUE;
++	if (g_find_program_in_path(RESOLVCONF) != NULL)
++		return FALSE;
++	else
++		return TRUE;
+ }
+ 
+Index: NetworkManager/src/backends/interface_parser.c
+===================================================================
+--- NetworkManager.orig/src/backends/interface_parser.c	2008-06-11 12:28:11.000000000 +0200
++++ NetworkManager/src/backends/interface_parser.c	2008-06-11 12:33:02.000000000 +0200
 @@ -73,14 +73,18 @@
  	//printf("added data '%s' with key '%s'\n",data,key);
  }
@@ -148,10 +189,10 @@ Index: src/backends/interface_parser.c
  const char *ifparser_getkey(if_block* iface, const char *key)
  {
  	if_data *curr = iface->info;
-Index: src/backends/interface_parser.h
+Index: NetworkManager/src/backends/interface_parser.h
 ===================================================================
---- src/backends/interface_parser.h	(Revision 2569)
-+++ src/backends/interface_parser.h	(Arbeitskopie)
+--- NetworkManager.orig/src/backends/interface_parser.h	2008-06-11 12:28:11.000000000 +0200
++++ NetworkManager/src/backends/interface_parser.h	2008-06-11 12:33:02.000000000 +0200
 @@ -44,6 +44,7 @@
  void ifparser_destroy(void);
  
@@ -160,212 +201,3 @@ Index: src/backends/interface_parser.h
  if_block *ifparser_getfirst(void);
  const char *ifparser_getkey(if_block* iface, const char *key);
  
-Index: src/backends/NetworkManagerDebian.c
-===================================================================
---- src/backends/NetworkManagerDebian.c	(Revision 2569)
-+++ src/backends/NetworkManagerDebian.c	(Arbeitskopie)
-@@ -42,6 +42,7 @@
- #include "nm-utils.h"
- 
- #define ARPING "/usr/sbin/arping"
-+#define RESOLVCONF "resolvconf"
- 
- /*
-  * nm_system_init
-@@ -198,14 +199,16 @@
- /*
-  * nm_system_update_dns
-  *
-- * Make glibc/nscd aware of any changes to the resolv.conf file by
-- * restarting nscd.
-+ * Invalidate the nscd host cache, if it exists, since
-+ * we changed resolv.conf.
-  *
-  */
- void nm_system_update_dns (void)
- {
--	nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart");
--
-+	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
-+		nm_info ("Clearing nscd hosts cache.");
-+		nm_spawn_process ("/usr/sbin/nscd -i hosts");
-+	}
- }
- 
- 
-@@ -217,8 +220,7 @@
-  *
-  */
- void nm_system_restart_mdns_responder (void)
--{
--	nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder");
-+{	
- }
- 
- 
-@@ -377,13 +379,60 @@
- /*
-  * nm_system_device_get_disabled
-  *
-- * Return whether the distro-specific system config tells us to use
-- * dhcp for this device.
-+ * Return whether the distro-specific system config tells us to disable 
-+ * this device.
-  *
-  */
- gboolean nm_system_device_get_disabled (NMDevice *dev)
- {
--	return FALSE;
-+	const char      *iface;
-+	if_block	*curr_device, *curr_b;
-+	if_data		*curr_d;
-+	gboolean	 blacklist = TRUE;
-+
-+	g_return_val_if_fail (dev != NULL, TRUE);
-+
-+	iface = nm_device_get_iface (dev);
-+
-+	ifparser_init ();
-+
-+	/* If the device is listed in a mapping, do not control it */
-+	if (ifparser_getmapping (iface) != NULL) {
-+		blacklist = TRUE;
-+		goto out;
-+	}
-+
-+	/* If the interface isn't listed in /etc/network/interfaces then
-+	 * it's considered okay to control it.
-+ 	 */
-+	curr_device = ifparser_getif (iface);
-+	if (curr_device == NULL) {
-+		blacklist = FALSE;
-+		goto out;
-+	}
-+
-+	/* If the interface is listed and isn't marked "auto" then it's
-+	 * definitely not okay to control it.
-+	 */
-+	for (curr_b = ifparser_getfirst (); curr_b; curr_b = curr_b->next) {
-+		if ((!strcmp (curr_b->type, "auto") || !strcmp (curr_b->type, "allow-hotplug"))
-+		    && strstr (curr_b->name, iface))
-+			blacklist = FALSE;
-+	}
-+
-+	/* If the interface has no options other than just "inet dhcp"
-+	 * it's probably ok to fiddle with it. 
-+	 */
-+	for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) {
-+		if (strcmp (curr_d->key, "inet")
-+		    || strcmp (curr_d->data, "dhcp" ))
-+			blacklist = TRUE;
-+	}
-+
-+out:
-+	ifparser_destroy ();
-+
-+	return blacklist;
- }
- 
- 
-@@ -426,12 +475,18 @@
- 		if (strcmp (dialup, config->name) == 0)
- 		{
- 			char *cmd;
-+			int status;
- 
- 			nm_info ("Deactivating dialup device %s (%s) ...", dialup, (char *) config->data);
- 			cmd = g_strdup_printf ("/sbin/ifdown %s", (char *) config->data);
--			nm_spawn_process (cmd);
-+			status = nm_spawn_process (cmd);
- 			g_free (cmd);
--			ret = TRUE;
-+			if (status == 0) {
-+				ret = TRUE;
-+			} else {
-+				nm_warning ("Couldn't deactivate dialup device %s (%s) - %d", dialup, (char *) config->data, status);
-+				ret = FALSE;
-+			}
- 			break;
- 		}
- 	}
-@@ -450,12 +505,18 @@
- 		if (strcmp (dialup, config->name) == 0)
- 		{
- 			char *cmd;
-+			int status;
- 
- 			nm_info ("Activating dialup device %s (%s) ...", dialup, (char *) config->data);
- 			cmd = g_strdup_printf ("/sbin/ifup %s", (char *) config->data);
--			nm_spawn_process (cmd);
-+			status = nm_spawn_process (cmd);
- 			g_free (cmd);
--			ret = TRUE;
-+			if (status == 0) {
-+				ret = TRUE;
-+			} else {
-+				nm_warning ("Couldn't activate dialup device %s (%s) - %d", dialup, (char *) config->data, status);
-+				ret = FALSE;
-+			}
- 			break;
- 		}
- 	}
-@@ -466,23 +527,26 @@
- GSList * nm_system_get_dialup_config (void)
- {
- 	const char *buf;
--	unsigned int i = 0;
-+	const char *provider;
- 	GSList *list = NULL;
- 	if_block *curr;
- 	ifparser_init();
- 
- 	/* FIXME: get all ppp(and others?) lines from /e/n/i here */
- 	curr = ifparser_getfirst();
--	while(curr!=NULL)
-+	while (curr != NULL)
- 	{
- 		NMDialUpConfig *config;
--		if (strcmp(curr->type,"iface")==0) 
-+		if (strcmp(curr->type, "iface") == 0) 
- 		{
--			buf = ifparser_getkey(curr,"inet");
--			if (buf && strcmp (buf, "ppp")==0)
-+			buf = ifparser_getkey(curr, "inet");
-+			if (buf && strcmp (buf, "ppp") == 0)
- 			{
-+				provider = ifparser_getkey(curr, "provider");
-+				if (!provider) 
-+					provider = "default provider";
- 				config = g_malloc (sizeof (NMDialUpConfig));
--				config->name = g_strdup_printf ("Modem (#%d)", i++);
-+				config->name = g_strdup_printf ("%s via Modem", provider);
- 				config->data = g_strdup (curr->name);	/* interface name */
- 
- 				list = g_slist_append (list, config);
-@@ -494,14 +558,6 @@
- 	}
- 	ifparser_destroy();
- 
--	/* Hack: Go back and remove the "(#0)" if there is only one device */
--	if (i == 1)
--	{
--		NMDialUpConfig *config = (NMDialUpConfig *) list->data;
--		g_free (config->name);
--		config->name = g_strdup ("Modem");
--	}
--
- 	return list;
- }
- 
-@@ -542,7 +598,10 @@
-  */
- gboolean nm_system_should_modify_resolv_conf (void)
- {
--	return TRUE;
-+	if (g_find_program_in_path(RESOLVCONF) != NULL)
-+		return FALSE;
-+	else
-+		return TRUE;
- }
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..a7c62915
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+02-dbus_access_network_manager.patch
+03-system-settings-conf.patch
+05-debian_backend.patch
diff --git a/debian/rules b/debian/rules
index a4a1c76d..fda59f0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,30 +2,24 @@
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_INSTALL_DOCS_ALL := README AUTHORS TODO
 
+DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager"
+
 DEB_CONFIGURE_EXTRA_FLAGS += \
 		--with-dbus-sys=/etc/dbus-1/system.d \
-		--with-wpa_supplicant=/sbin/wpa_supplicant \
-		--with-dhcdbd=/usr/sbin/dhcdbd \
-		--with-distro=debian
+		--with-distro=debian \
+		--with-crypto=gnutls
 	
-DEB_DH_INSTALLINIT_ARGS := -- start 26 2 3 4 5 . stop 14 0 1 6 .
-
-DEB_DH_SHLIBDEPS_ARGS := -Xnm-vpn-properties
+DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 14 0 1 6 .
 
 clean::
 	rm -f po/*.gmo
-	rm -f debian/*.1
-
-
-build/network-manager::
-	/usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1
 	
 binary-install/network-manager::
-	dh_installinit --name network-manager-dispatcher $(DEB_DH_INSTALLINIT_ARGS)
 	install -m 755 debian/network-manager-dispatcher.script \
 		debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown
 		
diff --git a/debian/watch b/debian/watch
index f2d66b4c..4b762cde 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 
-http://download.gnome.org/sources/NetworkManager/0.6/NetworkManager-(.*)\.tar\.gz
+http://download.gnome.org/sources/NetworkManager/([\d\.]+)/NetworkManager-(.*)\.tar\.gz