diff -Nru roger-router-1.8.14/debian/changelog roger-router-1.8.14/debian/changelog --- roger-router-1.8.14/debian/changelog 2019-05-13 08:12:17.000000000 +0000 +++ roger-router-1.8.14/debian/changelog 2019-08-14 10:17:20.000000000 +0000 @@ -1,3 +1,9 @@ +roger-router (1.8.14-4ubuntu2) eoan; urgency=medium + + * debian/patches/eds-3.33: Update to EDS 3.33 + + -- Iain Lane Wed, 14 Aug 2019 11:17:20 +0100 + roger-router (1.8.14-4ubuntu1) eoan; urgency=medium * debian/control: diff -Nru roger-router-1.8.14/debian/patches/eds-3.33 roger-router-1.8.14/debian/patches/eds-3.33 --- roger-router-1.8.14/debian/patches/eds-3.33 1970-01-01 00:00:00.000000000 +0000 +++ roger-router-1.8.14/debian/patches/eds-3.33 2019-08-14 10:17:20.000000000 +0000 @@ -0,0 +1,45 @@ +Description: Work with libebook 3.33.4 API changes wrt 3.32 +Author: Iain Lane +Forwarded: https://gitlab.com/tabos/rogerrouter/merge_requests/6 + +--- a/roger/plugins/evolution/evolution.c ++++ b/roger/plugins/evolution/evolution.c +@@ -475,7 +475,7 @@ + + client = E_BOOK_CLIENT(e_client); + +- ret = e_book_client_remove_contact_by_uid_sync(client, contact->priv, NULL, NULL); ++ ret = e_book_client_remove_contact_by_uid_sync(client, contact->priv, E_BOOK_OPERATION_FLAG_NONE, NULL, NULL); + if (ret) { + ebook_read_book_sync(); + } +@@ -591,9 +591,9 @@ + evolution_set_image(e_contact, contact); + + if (!contact->priv) { +- ret = e_book_client_add_contact_sync(client, e_contact, NULL, NULL, &error); ++ ret = e_book_client_add_contact_sync(client, e_contact, E_BOOK_OPERATION_FLAG_NONE, NULL, NULL, &error); + } else { +- ret = e_book_client_modify_contact_sync(client, e_contact, NULL, &error); ++ ret = e_book_client_modify_contact_sync(client, e_contact, E_BOOK_OPERATION_FLAG_NONE, NULL, &error); + } + + if (!ret && error) { +--- roger-router-1.8.14.orig/configure.ac ++++ roger-router-1.8.14/configure.ac +@@ -332,12 +332,12 @@ AC_ARG_WITH([ebook], + [], + [with_ebook=check]) + +-AC_MSG_CHECKING(for libebook-1.2 >= 3.10.0) ++AC_MSG_CHECKING(for libebook-1.2 >= 3.33.3) + AS_IF([test "x$with_ebook" != xno], + [if test "x$with_ebook" = xcheck; then +- $PKG_CONFIG --atleast-version=3.10.0 libebook-1.2 && with_ebook=yes ++ $PKG_CONFIG --atleast-version=3.33.3 libebook-1.2 && with_ebook=yes + elif test "x$with_ebook" = xyes; then +- $PKG_CONFIG --atleast-version=3.10.0 libebook-1.2 || AC_MSG_FAILURE( ++ $PKG_CONFIG --atleast-version=3.33.3 libebook-1.2 || AC_MSG_FAILURE( + [--with-ebook=yes was given, but test for ebook failed]) + fi + if test "x$with_ebook" = xyes; then diff -Nru roger-router-1.8.14/debian/patches/series roger-router-1.8.14/debian/patches/series --- roger-router-1.8.14/debian/patches/series 2019-05-13 08:12:17.000000000 +0000 +++ roger-router-1.8.14/debian/patches/series 2019-08-14 10:17:20.000000000 +0000 @@ -4,3 +4,4 @@ enable-maintainer-mode.diff libsecret_0.18.6.patch new-gupnp_build.patch +eds-3.33