[Merge] ~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-online-accounts/+git/gnome-online-accounts/+merge/353571 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master
Review: Approve thanks -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-online-accounts/+git/gnome-online-accounts/+merge/353571 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-online-accounts/+git/gnome-online-accounts/+merge/353571 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master
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/353571 Requires to pull upstream/latest and pristine-tar branches from salsa. -- 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 79cc6f2..ec10284 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,11 @@ gnome-online-accounts (3.29.91-1ubuntu1) UNRELEASED; urgency=medium - Add b-d on libsnapd-glib-dev - depends on python3 and python3-macaroonbakery for the ubuntu sso provider. +<<< debian/changelog +=== ++ debian/gbp.conf: + - Set the upstream branch to upstream/latest. +>>> debian/changelog + debian/gnome-online-accounts.install: install usr/share/goa-1.0/scripts/lpa_helper.py + debian/libgoa-backend-1.0-1.symbols: diff --git a/debian/gbp.conf b/debian/gbp.conf index 0a84a8c..1faabe6 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,6 +1,6 @@ [DEFAULT] debian-branch=ubuntu/master -upstream-branch=upstream/3.28.x +upstream-branch=upstream/latest debian-tag=ubuntu/%(version)s upstream-vcs-tag=%(version)s pristine-tar=True diff --git a/debian/patches/0002-livepatch-auth.patch b/debian/patches/0002-livepatch-auth.patch index 99cee8a..40fb8a7 100644 --- a/debian/patches/0002-livepatch-auth.patch +++ b/debian/patches/0002-livepatch-auth.patch @@ -313,11 +313,10 @@ index be22a1b..f942cc7 100644 static void dialog_response_cb (GtkDialog *dialog, gint response_id, -@@ -579,6 +609,120 @@ snapd_login_ready_cb (GObject *object, - g_main_loop_quit (data->loop); +@@ -580,6 +610,120 @@ snapd_login_ready_cb (GObject *object, } -+static void + static void +subprocess_wait_cb (GObject *object, +GAsyncResult *res, +gpointer user_data) @@ -431,9 +430,10 @@ index be22a1b..f942cc7 100644 + g_main_loop_quit (data->loop); +} + - static void ++static void add_account_cb (GoaManager *manager, GAsyncResult *res, + gpointer user_data) @@ -603,8 +747,8 @@ add_credentials_key_values (GVariantBuilder *builder, discharges_var = g_variant_new_strv ((const gchar * const*) data->discharges, -1); discharges_str = g_variant_print (discharges_var, FALSE); -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master has been updated. Description changed to: Requires to pull upstream/latest and pristine-tar branches from salsa. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-online-accounts/+git/gnome-online-accounts/+merge/353571 -- 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. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
