Merge lp:~laney/friends/eds-3.8 into lp:friends

[Iain Lane]

Port to EDS 3.8 - the contacts functionality was moved into an EBookContacts library. Add Build-Deps and Deps on gir1.2-ebookcontacts-1.2 accordingly. Version the rest.

Port to EDS 3.8. This isn't in the archive yet so the auto testing will fail; we can re-run it once it is in. In the meantime, I'd appreciate it if you could grab the 3.8 packages from

  https://launchpad.net/~laney/+archive/evolution-3.8

and review this for pre-approval. I'll upload this into there too so we can see if it builds (for some reason the testsuite fails badly in sbuild here).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:204
http://jenkins.qa.ubuntu.com/job/friends-ci/44/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/friends-saucy-amd64-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-ci/44/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

This looks good, but I am not going to top approve it just yet. The build of gir1.2-dee-1.0 in the daily-build PPA appears to be broken, so the tests will fail. I have confirmed the tests all pass on saucy.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/friends-autolanding/25/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/friends-saucy-amd64-autolanding/1/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/friends-autolanding/26/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/friends-saucy-amd64-autolanding/2/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:205
http://jenkins.qa.ubuntu.com/job/friends-ci/45/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/friends-saucy-amd64-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-ci/45/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/friends-autolanding/27/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/friends-saucy-amd64-autolanding/3/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-07 17:53:19 +0000
+++ debian/changelog	2013-06-06 18:27:26 +0000
@@ -1,3 +1,17 @@
+friends (0.2.0daily13.05.07.1-0ubuntu3) UNRELEASED; urgency=low
+
+  * Updated for libaccounts-glib >= 1.10
+
+ -- Ken VanDine <[e-mail]>  Thu, 06 Jun 2013 14:02:48 -0400
+
+friends (0.2.0daily13.05.07.1-0ubuntu2) saucy; urgency=low
+
+  * Port to EDS 3.8 - the contacts functionality was moved into an
+    EBookContacts library. Add Build-Deps and Deps on gir1.2-ebookcontacts-1.2
+    accordingly. Version the rest.
+
+ -- Iain Lane <[e-mail]>  Wed, 29 May 2013 18:31:49 +0100
+
 friends (0.2.0daily13.05.07.1-0ubuntu1) saucy; urgency=low
 
   [ Robert Bruce Park ]

=== modified file 'debian/control'
--- debian/control	2013-04-16 15:40:42 +0000
+++ debian/control	2013-06-06 18:27:26 +0000
@@ -7,8 +7,9 @@
                evolution-data-server,
                gir1.2-dbusmenu-glib-0.4,
                gir1.2-dee-1.0,
-               gir1.2-ebook-1.2,
-               gir1.2-edataserver-1.2,
+               gir1.2-ebook-1.2 (>= 3.8),
+               gir1.2-ebookcontacts-1.2 (>= 3.8),
+               gir1.2-edataserver-1.2 (>= 3.8),
                gir1.2-gdkpixbuf-2.0,
                gir1.2-glib-2.0,
                gir1.2-messagingmenu-1.0,
@@ -17,7 +18,7 @@
                gir1.2-signon-1.0,
                gir1.2-soup-2.4,
                gir1.2-unity-5.0,
-               libaccounts-glib-dev,
+               libaccounts-glib-dev (>= 1.10),
                libsignon-glib1,
                python3,
                python3-dbus,
@@ -51,8 +52,9 @@
 Breaks: friends (<< 0.1.1bzr13.02.12)
 Conflicts: friends (<< 0.1.1bzr13.02.12)
 Depends: gir1.2-dee-1.0,
-         gir1.2-ebook-1.2,
-         gir1.2-edataserver-1.2,
+         gir1.2-ebook-1.2 (>= 3.8),
+         gir1.2-ebookcontacts-1.2 (>= 3.8),
+         gir1.2-edataserver-1.2 (>= 3.8),
          gir1.2-gdkpixbuf-2.0,
          gir1.2-glib-2.0,
          gir1.2-networkmanager-1.0,

=== modified file 'friends/utils/base.py'
--- friends/utils/base.py	2013-04-17 06:13:49 +0000
+++ friends/utils/base.py	2013-06-06 18:27:26 +0000
@@ -31,7 +31,7 @@
 from datetime import datetime, timedelta
 from oauthlib.oauth1 import Client
 
-from gi.repository import GLib, GObject, EDataServer, EBook
+from gi.repository import GLib, GObject, EDataServer, EBook, EBookContacts
 
 from friends.errors import FriendsError, ContactsError
 from friends.utils.authentication import Authentication
@@ -586,8 +586,8 @@
 
     def _previously_stored_contact(self, source, field, search_term):
         client = self._new_book_client(source)
-        query = EBook.book_query_vcard_field_test(
-            field, EBook.BookQueryTest(0), search_term)
+        query = EBookContacts.BookQuery.vcard_field_test(
+            field, EBookContacts.BookQueryTest.IS, search_term)
         success, result = client.get_contacts_sync(query.to_string(), None)
         if not success:
             raise ContactsError('Search failed on field {}'.format(field))
@@ -610,22 +610,22 @@
     def _create_contact(self, user_fullname, user_nickname,
                         social_network_attrs):
         """Build a VCard based on a dict representation of a contact."""
-        vcard = EBook.VCard.new()
+        vcard = EBookContacts.VCard.new()
         info = social_network_attrs
 
         for i in info:
-            attr = EBook.VCardAttribute.new('social-networking-attributes', i)
+            attr = EBookContacts.VCardAttribute.new('social-networking-attributes', i)
             if type(info[i]) == type(dict()):
                 for j in info[i]:
-                    param = EBook.VCardAttributeParam.new(j)
+                    param = EBookContacts.VCardAttributeParam.new(j)
                     param.add_value(info[i][j])
                     attr.add_param(param);
             else:
                 attr.add_value(info[i])
             vcard.add_attribute(attr)
 
-        contact = EBook.Contact.new_from_vcard(
-            vcard.to_string(EBook.VCardFormat(1)))
+        contact = EBookContacts.Contact.new_from_vcard(
+            vcard.to_string(EBookContacts.VCardFormat(1)))
         contact.set_property('full-name', user_fullname)
         if user_nickname is not None:
             contact.set_property('nickname', user_nickname)

=== modified file 'service/src/Makefile.am'
--- service/src/Makefile.am	2013-03-05 00:40:28 +0000
+++ service/src/Makefile.am	2013-06-06 18:27:26 +0000
@@ -5,7 +5,7 @@
 	$(BASE_CFLAGS)
 
 VALAFLAGS = \
-	--pkg accounts \
+	--pkg libaccounts-glib \
 	--pkg dee-1.0 \
 	--pkg gio-2.0