Merge lp:~ubuntu-branches/ubuntu/trusty/folks/trusty-201402211552 into lp:ubuntu/trusty/folks

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/trusty/folks reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/trusty/folks/trusty-201402211552. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

55. By Ken VanDine on 2014-02-21

releasing package folks version 0.9.5-1ubuntu3

=== added file 'debian/patches/bz724058.patch'
--- debian/patches/bz724058.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/bz724058.patch	2014-02-21 15:59:23 +0000
@@ -0,0 +1,26 @@
+From 3f3c9658dd50ec3a1e66713c0c3b9635db5bbfbd Mon Sep 17 00:00:00 2001
+From: Renato Araujo Oliveira Filho <[e-mail]>
+Date: Tue, 11 Feb 2014 20:12:17 -0300
+Subject: [PATCH] check for '*' in anti link list.
+
+If '*'  exists this mean that the persona should not be linked.
+---
+ folks/anti-linkable.vala | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/folks/anti-linkable.vala b/folks/anti-linkable.vala
+index 93a82c7..5d45e3c 100644
+--- a/folks/anti-linkable.vala
++++ b/folks/anti-linkable.vala
+@@ -93,7 +93,8 @@ public interface Folks.AntiLinkable : Folks.Persona
+    */
+   public bool has_anti_link_with_persona (Persona other_persona)
+     {
+-      return (other_persona.uid in this.anti_links);
++      return (("*" in this.anti_links) ||
++          other_persona.uid in this.anti_links);
+     }
+ 
+   /**
+-- 
+1.9.0

=== renamed file 'debian/patches/bz724058.patch' => 'debian/patches/bz724058.patch.moved'
=== added file 'debian/patches/bz724809.patch'
--- debian/patches/bz724809.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/bz724809.patch	2014-02-21 15:59:23 +0000
@@ -0,0 +1,45 @@
+From 87e037787476ba645ced4b8d6a406b32f7dbfae0 Mon Sep 17 00:00:00 2001
+From: Renato Araujo Oliveira Filho <[e-mail]>
+Date: Thu, 20 Feb 2014 21:21:27 +0000
+Subject: Replaced use of EVCard.remove_attribute to EVCard.remove_attributes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=724809
+---
+diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
+index c27565b..ce4f00d 100644
+--- a/backends/eds/lib/edsf-persona-store.vala
++++ b/backends/eds/lib/edsf-persona-store.vala
+@@ -1325,11 +1325,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
+ 
+   private void _remove_attribute (E.Contact contact, string attr_name)
+     {
+-      unowned VCardAttribute? attr = contact.get_attribute (attr_name);
+-      if (attr != null)
+-        {
+-          contact.remove_attribute ((!) attr);
+-        }
++      contact.remove_attributes (null, attr_name);
+     }
+ 
+   internal async void _set_avatar (Edsf.Persona persona, LoadableIcon? avatar)
+@@ -2064,14 +2060,14 @@ public class Edsf.PersonaStore : Folks.PersonaStore
+ 
+   private void _set_contact_system_groups (E.Contact contact, Set<string> system_groups)
+     {
++      var group_ids_str = "X-GOOGLE-SYSTEM-GROUP-IDS";
+       var vcard = (E.VCard) contact;
+-      unowned E.VCardAttribute? prev_attr =
+-          vcard.get_attribute ("X-GOOGLE-SYSTEM-GROUP-IDS");
++      unowned E.VCardAttribute? prev_attr = vcard.get_attribute (group_ids_str);
+ 
+       if (prev_attr != null)
+-        contact.remove_attribute (prev_attr);
++        contact.remove_attributes (null, group_ids_str);
+ 
+-      E.VCardAttribute new_attr = new E.VCardAttribute ("", "X-GOOGLE-SYSTEM-GROUP-IDS");
++      E.VCardAttribute new_attr = new E.VCardAttribute ("", group_ids_str);
+       foreach (var group in system_groups)
+         {
+           if (group == null || group == "")
+--
+cgit v0.9.2

=== renamed file 'debian/patches/bz724809.patch' => 'debian/patches/bz724809.patch.moved'