Control: tags 934745 + pending
I've prepared an NMU for folks (versioned as 0.11.4-1.1) and uploaded it
to experimental via DELAYED/2. Please feel free to tell me if I should
delay it longer, or supersede it with your own upload.
There are many other updates to this package that would be beneficial,
but as a NMU for the GNOME 3.34 transition I'm keeping this minimal.
smcv
diffstat for folks-0.11.4 folks-0.11.4
changelog | 13 ++
control | 10 +-
patches/eds-Adapt-to-libebook-API-changes.patch | 116
patches/series |1
4 files changed, 135 insertions(+), 5 deletions(-)
diff -Nru folks-0.11.4/debian/changelog folks-0.11.4/debian/changelog
--- folks-0.11.4/debian/changelog 2017-07-03 17:59:12.0 +0100
+++ folks-0.11.4/debian/changelog 2019-09-11 11:57:44.0 +0100
@@ -1,3 +1,16 @@
+folks (0.11.4-1.1) experimental; urgency=medium
+
+ * Non-maintainer upload
+
+ [ Iain Lane ]
+ * debian/patches/eds-Adapt-to-libebook-API-changes.patch: Cherry-pick. Build
+with EDS 3.33.2 (Closes: #934745)
+
+ [ Simon McVittie ]
+ * Update Vcs-*
+
+ -- Simon McVittie Wed, 11 Sep 2019 11:57:44 +0100
+
folks (0.11.4-1) unstable; urgency=medium
[ Emilio Pozuelo Monfort ]
diff -Nru folks-0.11.4/debian/control folks-0.11.4/debian/control
--- folks-0.11.4/debian/control 2017-07-03 17:59:12.0 +0100
+++ folks-0.11.4/debian/control 2019-09-11 11:57:44.0 +0100
@@ -19,15 +19,15 @@
libxml2-dev,
libncurses5-dev,
libreadline-dev,
- libebook1.2-dev (>= 3.13.90),
- libedataserver1.2-dev (>= 3.13.90),
- libebook-contacts1.2-dev (>= 3.13.90),
+ libebook1.2-dev (>= 3.33.2),
+ libedataserver1.2-dev (>= 3.33.2),
+ libebook-contacts1.2-dev (>= 3.33.2),
libzeitgeist-2.0-dev (>= 0.9.14)
Standards-Version: 4.0.0
Section: libs
Homepage: https://wiki.gnome.org/Projects/Folks
-Vcs-Git: https://anonscm.debian.org/git/pkg-telepathy/folks.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-telepathy/folks.git
+Vcs-Git: https://salsa.debian.org/telepathy-team/folks.git
+Vcs-Browser: https://salsa.debian.org/telepathy-team/folks
Package: libfolks25
Architecture: any
diff -Nru folks-0.11.4/debian/patches/eds-Adapt-to-libebook-API-changes.patch folks-0.11.4/debian/patches/eds-Adapt-to-libebook-API-changes.patch
--- folks-0.11.4/debian/patches/eds-Adapt-to-libebook-API-changes.patch 1970-01-01 01:00:00.0 +0100
+++ folks-0.11.4/debian/patches/eds-Adapt-to-libebook-API-changes.patch 2019-09-11 11:57:44.0 +0100
@@ -0,0 +1,116 @@
+From: Milan Crha
+Date: Fri, 17 May 2019 09:43:01 +0200
+Subject: eds: Adapt to libebook API changes
+
+Closes https://gitlab.gnome.org/GNOME/folks/merge_requests/10
+Origin: https://gitlab.gnome.org/GNOME/folks/commit/69baa2e62665f4163ff7367f2a8b12655350abdf
+Applied-Upstream: 0.13.1
+---
+ backends/eds/lib/edsf-persona-store.vala | 6 +++---
+ configure.ac | 2 +-
+ tests/eds/helper-create-many-contacts.vala | 2 +-
+ tests/eds/helper-delete-contacts.vala | 2 +-
+ tests/lib/eds/backend.vala | 6 +++---
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
+index 320a05d..4be0a70 100644
+--- a/backends/eds/lib/edsf-persona-store.vala
b/backends/eds/lib/edsf-persona-store.vala
+@@ -610,7 +610,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
+ /* _addressbook is guaranteed to be non-null before we ensure that
+* prepare() has already been called. */
+ yield ((!) this._addressbook).remove_contact (
+- ((Edsf.Persona) persona).contact, null);
++ ((Edsf.Persona) persona).contact, E.BookOperationFlags.NONE, null);
+ }
+ catch (GLib.Error e)
+ {
+@@ -1258,7 +1258,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
+
+ /* Commit the new contact. _addressbook is asserted as being non-null
+* above. */
+- yield ((!) this._addressbook).add_contact (contact, null,
++ yield ((!) this._addressbook).add_contact (contact, E.BookOperationFlags.NONE, null,
+ out added_uid);
+
+ debug ("Finished sending new contact to EDS; received UID %s.",
+@@ -1377,7 +1377,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
+
+ /* Commit the modification. _addressbook is asserted as being non-null
+* above. */
+- yield ((!) this._addressbook).modify_contact (contact, null);
++ yield ((!) this._addressbook).modify_contact (contact, E.BookOperationFlags.NONE, null);
+
+ timeout_id = Timeout.add_seconds (PersonaStore._property_change_timeout, () =>
