diff -u papyon-0.5.1/debian/changelog papyon-0.5.1/debian/changelog
--- papyon-0.5.1/debian/changelog
+++ papyon-0.5.1/debian/changelog
@@ -1,3 +1,11 @@
+papyon (0.5.1-0ubuntu2.1) maverick-proposed; urgency=low
+
+  * debian/patches/lp_665526.patch: properly handle having a contact on
+    both the Allow and the Block list which prevents the contact list from
+    updating. (LP: #665526)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Mon, 06 Dec 2010 10:29:11 -0500
+
 papyon (0.5.1-0ubuntu2) maverick-proposed; urgency=low
 
   * debian/patches/lp_663670.patch
diff -u papyon-0.5.1/debian/patches/series papyon-0.5.1/debian/patches/series
--- papyon-0.5.1/debian/patches/series
+++ papyon-0.5.1/debian/patches/series
@@ -1,0 +2 @@
+lp_665526.patch
only in patch2:
unchanged:
--- papyon-0.5.1.orig/debian/patches/lp_665526.patch
+++ papyon-0.5.1/debian/patches/lp_665526.patch
@@ -0,0 +1,26 @@
+Description: properly handle having a contact on both the Allow and the
+ Block list which prevents the contact list from updating
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/papyon/+bug/665526
+Origin: upstream, http://cgit.freedesktop.org/papyon/patch/?id=991500a6d4c0c86e39738cf233a136c2a60e2951
+
+diff -Nur papyon-0.5.1/papyon/msnp/notification.py papyon-0.5.1.new/papyon/msnp/notification.py
+--- papyon-0.5.1/papyon/msnp/notification.py	2010-09-10 17:08:36.000000000 -0400
++++ papyon-0.5.1.new/papyon/msnp/notification.py	2010-12-06 10:28:28.000000000 -0500
+@@ -769,9 +769,16 @@
+                 address_book.profile.display_name)
+ 
+         contacts = address_book.contacts.group_by_domain()
++        mask = ~(profile.Membership.REVERSE | profile.Membership.PENDING)
++
++        for contact in address_book.contacts:
++            if (contact.memberships & mask & ~profile.Membership.FORWARD) == \
++                    (profile.Membership.ALLOW | profile.Membership.BLOCK):
++                logger.warning("Contact is on both Allow and Block list; " \
++                               "removing from Allow list (%s)" % contact.account)
++                contact._remove_membership(profile.Membership.ALLOW)
+ 
+         payloads = ['<ml l="1">']
+-        mask = ~(profile.Membership.REVERSE | profile.Membership.PENDING)
+         for domain, contacts in contacts.iteritems():
+             payloads[-1] += '<d n="%s">' % domain
+             for contact in contacts: