Andrea Azzarone has proposed merging
~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-online-accounts/+git/gnome-online-accounts/+merge/353636
Good to go once snapd-glib 1.43 is in cosmic.
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 10457f0..b2fa1b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gnome-online-accounts (3.29.91-1ubuntu2) UNRELEASED; urgency=medium
+
+ * debian/control*:
+ - Bump libsnapd-glib-dev to (>= 1.43).
+ * debian/patches/0001-ubuntu-sso-provider.patch:
+ - Use SNAPD_ERROR_AUTH_CANCELLED instead of SNAPD_ERROR_PERMISSION_DENIED
+ to understand if Polkit dialog was dimissed by the user.
+
+ -- Andrea Azzarone <andrea.azzar...@canonical.com> Thu, 23 Aug 2018 14:14:36 +0300
+
gnome-online-accounts (3.29.91-1ubuntu1) cosmic; urgency=medium
* Merge from Debian experimental (LP: #1788130). Remaining changes:
diff --git a/debian/control b/debian/control
index e87492d..c919037 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 10.3),
libkrb5-dev,
librest-dev,
libsecret-1-dev,
- libsnapd-glib-dev,
+ libsnapd-glib-dev (>= 1.43),
libsoup2.4-dev (>= 2.42),
libwebkit2gtk-4.0-dev (>= 2.12.0),
valac
diff --git a/debian/control.in b/debian/control.in
index b0c213f..a55e15e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 10.3),
libkrb5-dev,
librest-dev,
libsecret-1-dev,
- libsnapd-glib-dev,
+ libsnapd-glib-dev (>= 1.43),
libsoup2.4-dev (>= 2.42),
libwebkit2gtk-4.0-dev (>= 2.12.0),
valac
diff --git a/debian/patches/0001-ubuntu-sso-provider.patch b/debian/patches/0001-ubuntu-sso-provider.patch
index 9c843d4..cf58c55 100644
Binary files a/debian/patches/0001-ubuntu-sso-provider.patch and b/debian/patches/0001-ubuntu-sso-provider.patch differ
diff --git a/debian/patches/0002-livepatch-auth.patch b/debian/patches/0002-livepatch-auth.patch
index 99cee8a..dbef190 100644
--- a/debian/patches/0002-livepatch-auth.patch
+++ b/debian/patches/0002-livepatch-auth.patch
@@ -17,7 +17,7 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/1752472
create mode 100644 data/scripts/lpa_helper.py
diff --git a/configure.ac b/configure.ac
-index 87ea868..0efbf47 100644
+index 176c5b3..de81777 100644
--- a/configure.ac
+++ b/configure.ac
@@ -545,6 +545,7 @@ data/icons/32x32/Makefile
@@ -225,7 +225,7 @@ index 133458a..40a669f 100644
-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
-DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \
diff --git a/src/goabackend/goaubuntussoprovider.c b/src/goabackend/goaubuntussoprovider.c
-index be22a1b..f942cc7 100644
+index ca44c01..0ccd7f7 100644
--- a/src/goabackend/goaubuntussoprovider.c
+++ b/src/goabackend/goaubuntussoprovider.c
@@ -20,6 +20,7 @@
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
