diff -u sugar-presence-service-0.82.0/debian/control sugar-presence-service-0.82.0/debian/control
--- sugar-presence-service-0.82.0/debian/control
+++ sugar-presence-service-0.82.0/debian/control
@@ -1,8 +1,8 @@
 Source: sugar-presence-service
 Section: x11
 Priority: optional
-Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
-Uploaders: Jonas Smedegaard <dr@jones.dk>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
 Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), python-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5.0.44), dh-buildinfo, python-dbus, python-gobject | python-gtk2 (<< 2.9)
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-presence-service.git
diff -u sugar-presence-service-0.82.0/debian/changelog sugar-presence-service-0.82.0/debian/changelog
--- sugar-presence-service-0.82.0/debian/changelog
+++ sugar-presence-service-0.82.0/debian/changelog
@@ -1,3 +1,10 @@
+sugar-presence-service (0.82.0-1ubuntu1) intrepid; urgency=low
+
+  * NM 0.7 not supported, so don't watch it for IP address changes,
+    rather use the fallback (LP: #284557)
+
+ -- Morgan Collett <morgan@ubuntu.com>  Thu, 16 Oct 2008 20:21:53 +0200
+
 sugar-presence-service (0.82.0-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- sugar-presence-service-0.82.0.orig/debian/patches/0001_nm0.7_workaround.patch
+++ sugar-presence-service-0.82.0/debian/patches/0001_nm0.7_workaround.patch
@@ -0,0 +1,19 @@
+diff -Nur -x '*.orig' -x '*~' sugar-presence-service-0.82.0/src/psutils.py sugar-presence-service-0.82.0.new/src/psutils.py
+--- sugar-presence-service-0.82.0/src/psutils.py	2008-08-06 09:10:16.000000000 +0200
++++ sugar-presence-service-0.82.0.new/src/psutils.py	2008-10-16 20:21:18.000000000 +0200
+@@ -153,10 +153,11 @@
+         self._nm_obj = None
+ 
+         sys_bus = dbus.SystemBus()
+-        self._watch = sys_bus.watch_name_owner(NM_SERVICE, self._nm_owner_cb)
+-        if not sys_bus.name_has_owner(NM_SERVICE):
+-            addr, iface = self._get_address_fallback()
+-            self._update_address(addr, iface)
++        # Ubuntu bug 284557: don't watch NM, use fallback:
++        #self._watch = sys_bus.watch_name_owner(NM_SERVICE, self._nm_owner_cb)
++        #if not sys_bus.name_has_owner(NM_SERVICE):
++        addr, iface = self._get_address_fallback()
++        self._update_address(addr, iface)
+ 
+     def do_get_property(self, pspec):
+         if pspec.name == "address":