[Merge] ~azzar1/ubuntu/+source/gnome-shell:fix-warning-in-volume-patch into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-shell:fix-warning-in-volume-patch into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master has been updated. Commit message changed to: d/p/volume-Add-back-sound-feedback-on-scroll.patch: Add missing import For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/366211 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-shell:fix-warning-in-volume-patch into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-shell:fix-warning-in-volume-patch into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Andrea Azzarone has proposed merging
~azzar1/ubuntu/+source/gnome-shell:fix-warning-in-volume-patch into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
Commit message:
d/p/volume-Add-back-sound-feedback-on-scroll.patch: Add missing import
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/366211
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~azzar1/ubuntu/+source/gnome-shell:fix-warning-in-volume-patch into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
diff --git a/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch b/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
index 930a67f..38ebdf1 100644
--- a/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
+++ b/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
@@ -34,8 +34,8 @@ Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/53
Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/51
---
js/ui/slider.js| 2 --
- js/ui/status/volume.js | 19 ++-
- 2 files changed, 18 insertions(+), 3 deletions(-)
+ js/ui/status/volume.js | 21 +++--
+ 2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/js/ui/slider.js b/js/ui/slider.js
index f9fa732..69f72ce 100644
@@ -52,13 +52,14 @@ index f9fa732..69f72ce 100644
}
return Clutter.EVENT_PROPAGATE;
diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
-index d555b42..f8e4140 100644
+index d555b42..88344e7 100644
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -1,6 +1,7 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- const { Clutter, Gio, Gvc, St } = imports.gi;
+-const { Clutter, Gio, Gvc, St } = imports.gi;
++const { Clutter, Gio, GLib, Gvc, St } = imports.gi;
+const Mainloop = imports.mainloop;
const Signals = imports.signals;
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-fix-1824996 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-fix-1824996 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master has been updated. Commit message changed to: d/p/0001-Add-Ubuntu-mode-with-special-pages.patch: Don't set vexpand for the GtkSpinner in the apps page. (LP: #1824996) For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/366123 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-fix-1824996 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-fix-1824996 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Andrea Azzarone has proposed merging ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-fix-1824996 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master. Commit message: d/p/0001-Add-Ubuntu-mode-with-special-pages.patch: Don't set vexpand for the GtkSpinner in the apps page. (LP: #1824996) Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1824996 in gnome-initial-setup (Ubuntu): "Spinner in "apps" page is huge" https://bugs.launchpad.net/ubuntu/+source/gnome-initial-setup/+bug/1824996 For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/366123 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-fix-1824996 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index ee0d86b..44093bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gnome-initial-setup (3.32.1-1ubuntu3) UNRELEASED; urgency=medium + + * d/p/0001-Add-Ubuntu-mode-with-special-pages.patch: +- Don't set vexpand for the GtkSpinner in the apps page. (LP: #1824996) + + -- Andrea Azzarone Tue, 16 Apr 2019 14:29:35 + + gnome-initial-setup (3.32.1-1ubuntu2) disco; urgency=medium * d/p/0001-Add-Ubuntu-mode-with-special-pages.patch: diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch index 4b2eb38..f36844f 100644 --- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch +++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch @@ -15,7 +15,7 @@ Subject: Add Ubuntu mode with special pages .../pages/apps/default-snap-icon.svg | 1 + gnome-initial-setup/pages/apps/gis-apps-page.c | 651 + gnome-initial-setup/pages/apps/gis-apps-page.h | 52 ++ - gnome-initial-setup/pages/apps/gis-apps-page.ui| 112 + gnome-initial-setup/pages/apps/gis-apps-page.ui| 111 gnome-initial-setup/pages/apps/meson.build | 10 + .../pages/livepatch/gis-auth-dialog.c | 528 + .../pages/livepatch/gis-auth-dialog.h | 40 ++ @@ -37,7 +37,7 @@ Subject: Add Ubuntu mode with special pages .../pages/ubuntu-report/ubuntu-report.svg | 1 + meson.build| 3 + po/POTFILES.in | 12 + - 34 files changed, 3022 insertions(+), 5 deletions(-) + 34 files changed, 3021 insertions(+), 5 deletions(-) create mode 100644 data/com.ubuntu.welcome.policy.in create mode 100644 data/its/polkit.its create mode 100644 data/its/polkit.loc @@ -1056,10 +1056,10 @@ index 000..9494b9e +#endif /* __GIS_APPS_PAGE_H__ */ diff --git a/gnome-initial-setup/pages/apps/gis-apps-page.ui b/gnome-initial-setup/pages/apps/gis-apps-page.ui new file mode 100644 -index 000..6c99d8f +index 000..5944539 --- /dev/null +++ b/gnome-initial-setup/pages/apps/gis-apps-page.ui -@@ -0,0 +1,112 @@ +@@ -0,0 +1,111 @@ + + + @@ -1104,7 +1104,6 @@ index 000..6c99d8f + + +True -+True + + +page_spinner -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-lp-1824188 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-lp-1824188 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master has been updated. Commit message changed to: * d/p/0001-Add-Ubuntu-mode-with-special-pages.patch: - Retry getting the list of featured snaps in case of failure. (LP: #1824188) * d/p/0001-Ensure-stamp-file-if-the-user-quit-the-wizard.patch: * d/p/0001-Make-summary-page-explicitly-request-navigation-butt.patch: * d/p/0008-Ubuntu-location-default.patch: - Patches refreshed automatically by gbp. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/365966 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-lp-1824188 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-lp-1824188 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Andrea Azzarone has proposed merging
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-lp-1824188 into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
Commit message:
* d/p/0001-Add-Ubuntu-mode-with-special-pages.patch:
- Retry getting the list of featured snaps in case of failure. (LP: #1824188)
* d/p/0001-Ensure-stamp-file-if-the-user-quit-the-wizard.patch:
* d/p/0001-Make-summary-page-explicitly-request-navigation-butt.patch:
* d/p/0008-Ubuntu-location-default.patch:
- Patches refreshed automatically by gbp.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1824188 in gnome-initial-setup (Ubuntu): "Software tab is empty on clean
19.04 install"
https://bugs.launchpad.net/ubuntu/+source/gnome-initial-setup/+bug/1824188
For more details, see:
https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/365966
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-lp-1824188 into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index c934f8e..00df9a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gnome-initial-setup (3.32.1-1ubuntu2) UNRELEASED; urgency=medium
+
+ * d/p/0001-Add-Ubuntu-mode-with-special-pages.patch:
+- Retry getting the list of featured snaps in case of failure. (LP: #1824188)
+ * d/p/0001-Ensure-stamp-file-if-the-user-quit-the-wizard.patch:
+ * d/p/0001-Make-summary-page-explicitly-request-navigation-butt.patch:
+ * d/p/0008-Ubuntu-location-default.patch:
+- Patches refreshed automatically by gbp.
+
+ -- Andrea Azzarone Fri, 12 Apr 2019 17:17:35 +
+
gnome-initial-setup (3.32.1-1ubuntu1) disco; urgency=medium
* Sync with Debian. Remaining changes:
diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
index fbb4d35..4b2eb38 100644
--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
@@ -13,31 +13,31 @@ Subject: Add Ubuntu mode with special pages
gnome-initial-setup/meson.build| 3 +
gnome-initial-setup/pages/apps/apps.gresource.xml | 8 +
.../pages/apps/default-snap-icon.svg | 1 +
- gnome-initial-setup/pages/apps/gis-apps-page.c | 528
+ gnome-initial-setup/pages/apps/gis-apps-page.c | 651 +
gnome-initial-setup/pages/apps/gis-apps-page.h | 52 ++
- gnome-initial-setup/pages/apps/gis-apps-page.ui| 96
+ gnome-initial-setup/pages/apps/gis-apps-page.ui| 112
gnome-initial-setup/pages/apps/meson.build | 10 +
- .../pages/livepatch/gis-auth-dialog.c | 528
+ .../pages/livepatch/gis-auth-dialog.c | 528 +
.../pages/livepatch/gis-auth-dialog.h | 40 ++
- .../pages/livepatch/gis-auth-dialog.ui | 231 +
- .../pages/livepatch/gis-livepatch-page.c | 538 +
+ .../pages/livepatch/gis-auth-dialog.ui | 231
+ .../pages/livepatch/gis-livepatch-page.c | 538 +
.../pages/livepatch/gis-livepatch-page.h | 52 ++
- .../pages/livepatch/gis-livepatch-page.ui | 156 ++
+ .../pages/livepatch/gis-livepatch-page.ui | 156 +
.../pages/livepatch/livepatch.gresource.xml| 9 +
gnome-initial-setup/pages/livepatch/livepatch.svg | 1 +
gnome-initial-setup/pages/livepatch/meson.build| 12 +
gnome-initial-setup/pages/meson.build | 5 +-
.../pages/privacy/gis-privacy-page.c | 2 +-
.../pages/summary/gis-summary-page.c | 2 +-
- .../pages/ubuntu-report/gis-ubuntu-report-page.c | 207
+ .../pages/ubuntu-report/gis-ubuntu-report-page.c | 207 +++
.../pages/ubuntu-report/gis-ubuntu-report-page.h | 52 ++
- .../pages/ubuntu-report/gis-ubuntu-report-page.ui | 181 +++
+ .../pages/ubuntu-report/gis-ubuntu-report-page.ui | 181 ++
.../pages/ubuntu-report/meson.build| 10 +
.../ubuntu-report/ubuntu-report.gresource.xml | 8 +
.../pages/ubuntu-report/ubuntu-report.svg | 1 +
meson.build| 3 +
po/POTFILES.in | 12 +
- 34 files changed, 2883 insertions(+), 5 deletions(-)
+ 34 files changed, 3022 insertions(+), 5 deletions(-)
create mode 100644 data/com.ubuntu.welcome.policy.in
create mode 100644 data/its/polkit.its
create mode 100644 data/its/polkit.loc
@@ -154,10 +154,10 @@ index 8fa6f29..27a19d5 100644
install_data('20-gnome-initial-setup.rules', install_dir: rules_dir)
diff --git a/gnome-initial-setup/gis-driver.c b
[Merge] ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/bionic-fix-lp-1592177 into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic
Andrea Azzarone has proposed merging ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/bionic-fix-lp-1592177 into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic. Commit message: d/p/restore_filechooser_typeaheadfind.patch: Disable typeahead if in search mode In search mode we need to disable typeahead to avoid that the tree view steals the focus away from the search text entry. Closes: https://bugs.launchpad.net/bugs/1592177 Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gtk+3.0/+git/gtk+3.0/+merge/364501 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/bionic-fix-lp-1592177 into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic. diff --git a/debian/changelog b/debian/changelog index db95e02..9539d1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ gtk+3.0 (3.22.30-1ubuntu3) UNRELEASED; urgency=medium + [ Sebastien Bacher ] * d/p/Check-for-NULL-priv-popup_window-in-gtk_combo_box_popdown.patch: - Check for NULL priv->popup_window in gtk_combo_box_popdown() (lp: #1816032) - -- Sebastien Bacher Fri, 15 Mar 2019 13:13:02 +0100 + [ Andrea Azzarone ] + * d/p/restore_filechooser_typeaheadfind.patch: +- Disable typeahead if in search mode (LP: #1592177) + + -- Andrea Azzarone Fri, 15 Mar 2019 14:50:04 + gtk+3.0 (3.22.30-1ubuntu2) bionic; urgency=medium diff --git a/debian/patches/restore_filechooser_typeaheadfind.patch b/debian/patches/restore_filechooser_typeaheadfind.patch index a943a2a..11cbcfc 100644 --- a/debian/patches/restore_filechooser_typeaheadfind.patch +++ b/debian/patches/restore_filechooser_typeaheadfind.patch @@ -35,3 +35,19 @@ Index: gtk+3.0-3.22.29-2ubuntu1/gtk/gtkfilechooserwidget.c } static gboolean +@@ -3082,6 +3082,7 @@ + search_stop_searching (impl, TRUE); + search_clear_model (impl, TRUE); + gtk_widget_hide (impl->priv->remote_warning_bar); ++ gtk_tree_view_set_enable_search (GTK_TREE_VIEW (impl->priv->browse_files_tree_view), TRUE); + } + } + +@@ -3134,6 +3135,7 @@ + location_bar_update (impl); + search_setup_widgets (impl); + gtk_widget_set_sensitive (priv->filter_combo, FALSE); ++ gtk_tree_view_set_enable_search (GTK_TREE_VIEW (priv->browse_files_tree_view), FALSE); + } + + static void -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: Assigned rls bugs which are not fixed
Il mar 5 mar 2019, 13:59 Will Cooke ha scritto: > Hi all, > > Slightly later than I had planned, here's the current rls bugs which are > assigned to people but not fixed yet: > > BIONIC > > = Marco = > https://bugs.launchpad.net/oem-priority/+bug/1809788 > bionic - TBT authentication message will be cut from the dialog box > > https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1756826 > hangs when remote search provider performs expensive operation > > https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1772811 > different behaviors for switch display mode between xenial and bionic > > > = Ken = > https://bugs.launchpad.net/ubuntu/+source/xdg-desktop-portal/+bug/1749672 > (et al) > General Portals MIR > > > = Seb = > https://bugs.launchpad.net/ubuntu/+source/gvfs/+bug/1778322 > gvfs-smb-browse can't browse samba/smb tree > > > https://bugs.launchpad.net/ubuntu/+source/rhythmbox-plugin-alternative-toolbar/+bug/1812683 > rhythmbox crashes when trying to play music > > https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1781597 > [SRU] WoWLAN settings are not supported > > > = Andrea = > > https://bugs.launchpad.net/ubuntu/+source/gnome-shell-extension-ubuntu-dock/+bug/1817020 > Touching and dragging an icon on the dock blocks input to other apps > I've already fixed this upstream. We'll get it once we release the new gnome shell. > > = Till = > https://bugs.launchpad.net/ubuntu/+source/gtk+3.0/+bug/1763520 > after upgrade to bionic, printing fails without explanation / logs / > debuggability > > > = Robert = > https://bugs.launchpad.net/ubuntu/+source/gnome-software/+bug/1799614 > Use new media API > > https://bugs.launchpad.net/ubuntu/+source/gnome-software/+bug/1816396 > Starting snap from the after-install notification fails > > https://bugs.launchpad.net/ubuntu/+source/chromium-browser/+bug/1738164 > [snap] U2F doesn't work with yubikey > > https://bugs.launchpad.net/ubuntu/+source/snapd-glib/+bug/1818595 > Update to 1.46 Edit > > > = Daniel = > https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1750197 > App grid animation causes heavy CPU spikes and dropped frames in Wayland & > Xorg > > https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1763892 > 144Hz/120Hz monitor but mutter seems to cap rendering at 60FPS > > > = Iain = > https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1760569 > https://bugs.launchpad.net/ubuntu/+source/glib2.0/+bug/1816547 > Nautilus crashes in g_free -> g_bookmark_file_move_item -> > gtk_recent_manager_move_item -> nautilus_recent_update_file_moved > > DISCO (not including the ones above) > > = Andrea = > http://launchpad.net/bugs/1817546 > Changing the volume (with the mouse wheel over icon) locks up gnome-shell > > > > -- > ubuntu-desktop mailing list > ubuntu-desktop@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop > -- 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-3.31.90-1 into ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master-3.31.90-1 into ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-online-accounts/+git/gnome-online-accounts/+merge/363144 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master-3.31.90-1 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
Re: [Merge] ~azzar1/ubuntu/+source/gnome-control-center:ubuntu/cosmic-sru into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/cosmic
I dropped Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch from debian/master because we already got a diffrent patch in cosmic. We also need an SRU bug for d/p/region-Autodisconnect-IBusBus-connected-handler.patch (https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1804424) -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/359115 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-control-center:ubuntu/cosmic-sru into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/cosmic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-livepatch-privacy-url-from-etc-os-release into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Andrea Azzarone has proposed merging
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-livepatch-privacy-url-from-etc-os-release
into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/359004
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-livepatch-privacy-url-from-etc-os-release
into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 64201c2..3a5dc35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-initial-setup (3.30.0-1ubuntu5) UNRELEASED; urgency=medium
+
+ * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
+- Use privacy URL from /etc/os-release in Livepatch page.
+
+ -- Andrea Azzarone Mon, 19 Nov 2018 18:08:23 +
+
gnome-initial-setup (3.30.0-1ubuntu4) disco; urgency=medium
* debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
index ee1033e..3271d3a 100644
--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
@@ -26,7 +26,7 @@ Subject: Add Ubuntu mode with special pages
.../pages/livepatch/gis-auth-dialog.c | 528
.../pages/livepatch/gis-auth-dialog.h | 40 ++
.../pages/livepatch/gis-auth-dialog.ui | 231 +
- .../pages/livepatch/gis-livepatch-page.c | 533 +
+ .../pages/livepatch/gis-livepatch-page.c | 538 +
.../pages/livepatch/gis-livepatch-page.h | 52 ++
.../pages/livepatch/gis-livepatch-page.ui | 156 ++
.../pages/livepatch/livepatch.gresource.xml| 9 +
@@ -44,7 +44,7 @@ Subject: Add Ubuntu mode with special pages
.../pages/ubuntu-report/ubuntu-report.svg | 1 +
meson.build| 3 +
po/POTFILES.in | 12 +
- 41 files changed, 2969 insertions(+), 7 deletions(-)
+ 41 files changed, 2974 insertions(+), 7 deletions(-)
create mode 100644 data/com.ubuntu.welcome.policy.in
create mode 100644 data/its/polkit.its
create mode 100644 data/its/polkit.loc
@@ -2025,10 +2025,10 @@ index 000..2f3c742
+
diff --git a/gnome-initial-setup/pages/livepatch/gis-livepatch-page.c b/gnome-initial-setup/pages/livepatch/gis-livepatch-page.c
new file mode 100644
-index 000..e604819
+index 000..eab2fb6
--- /dev/null
+++ b/gnome-initial-setup/pages/livepatch/gis-livepatch-page.c
-@@ -0,0 +1,533 @@
+@@ -0,0 +1,538 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2018 Canonical Ltd.
@@ -2452,10 +2452,15 @@ index 000..e604819
+static void
+show_legal (GtkButton *button, GisLivepatchPage *page)
+{
++ g_autofree gchar *buffer = NULL;
++ g_autofree gchar *privacy_policy = NULL;
+ g_autoptr(GError) error = NULL;
+
++ if (g_file_get_contents ("/etc/os-release", &buffer, NULL, NULL))
++privacy_policy = get_item (buffer, "PRIVACY_POLICY_URL");
++
+ if (!gtk_show_uri_on_window (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (page))),
-+ "https://www.ubuntu.com/legal/terms-and-policies/systems-information-notice";,
++ privacy_policy,
+ GDK_CURRENT_TIME, &error)) {
+GtkWidget *dialog;
+dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (page))),
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:new-legal-url into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Review: Approve LGTM. -- https://code.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/358092 Your team Ubuntu Desktop is requested to review the proposed merge of ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:new-legal-url into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup: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-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
@seb128 This will make sure that the window will be closed but the process will keep running until livepatch is installed (or failed to install). The user will notice nothing different. -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Andrea Azzarone has proposed merging
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/356910
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index c1bea68..9394f07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnome-initial-setup (3.30.0-1ubuntu3) UNRELEASED; urgency=medium
+
+ * Populate featured snaps from ubuntu-firstrun category
+
+ -- Andrea Azzarone Wed, 17 Oct 2018 10:25:35 +0100
+
gnome-initial-setup (3.30.0-1ubuntu2) cosmic; urgency=medium
* Add Don-t-show-Facebook-in-Ubuntu.patch:
diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
index df7bbdb..3de104b 100644
--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
@@ -468,7 +468,7 @@ index 000..0d8dd94
\ No newline at end of file
diff --git a/gnome-initial-setup/pages/apps/gis-apps-page.c b/gnome-initial-setup/pages/apps/gis-apps-page.c
new file mode 100644
-index 000..bcd9462
+index 000..1230c61
--- /dev/null
+++ b/gnome-initial-setup/pages/apps/gis-apps-page.c
@@ -0,0 +1,528 @@
@@ -953,7 +953,7 @@ index 000..bcd9462
+ installed_snaps = snapd_client_list_sync (client, NULL, &error);
+ if (installed_snaps == NULL)
+g_warning ("Failed to get installed snaps: %s", error->message);
-+ featured_snaps = snapd_client_find_section_sync (client, SNAPD_FIND_FLAGS_NONE, "featured", NULL, NULL, NULL, &error);
++ featured_snaps = snapd_client_find_section_sync (client, SNAPD_FIND_FLAGS_NONE, "ubuntu-firstrun", NULL, NULL, NULL, &error);
+ if (featured_snaps != NULL) {
+guint i, n_tiles = 0, n_extra = 0;
+
diff --git a/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch b/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
index 8bad3a5..623f566 100644
--- a/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
+++ b/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
@@ -166,11 +166,10 @@ index 8564935..64272ba 100644
obj_props[PROP_NEEDS_ACCEPT] =
g_param_spec_boolean ("needs-accept", "", "", FALSE,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
-@@ -282,6 +293,21 @@ gis_page_set_skippable (GisPage *page, gboolean skippable)
- g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_SKIPPABLE]);
+@@ -283,6 +294,21 @@ gis_page_set_skippable (GisPage *page, gboolean skippable)
}
-+gboolean
+ gboolean
+gis_page_get_hide_navigation (GisPage *page)
+{
+ GisPagePrivate *priv = gis_page_get_instance_private (page);
@@ -185,9 +184,10 @@ index 8564935..64272ba 100644
+ g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_HIDE_NAVIGATION]);
+}
+
- gboolean
++gboolean
gis_page_get_needs_accept (GisPage *page)
{
+ GisPagePrivate *priv = gis_page_get_instance_private (page);
diff --git a/gnome-initial-setup/gis-page.h b/gnome-initial-setup/gis-page.h
index b9a3e9a..3862caf 100644
--- a/gnome-initial-setup/gis-page.h
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/356910 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Andrea Azzarone has proposed merging
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/356910
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index c1bea68..9394f07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnome-initial-setup (3.30.0-1ubuntu3) UNRELEASED; urgency=medium
+
+ * Populate featured snaps from ubuntu-firstrun category
+
+ -- Andrea Azzarone Wed, 17 Oct 2018 10:25:35 +0100
+
gnome-initial-setup (3.30.0-1ubuntu2) cosmic; urgency=medium
* Add Don-t-show-Facebook-in-Ubuntu.patch:
diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
index df7bbdb..3de104b 100644
--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
@@ -468,7 +468,7 @@ index 000..0d8dd94
\ No newline at end of file
diff --git a/gnome-initial-setup/pages/apps/gis-apps-page.c b/gnome-initial-setup/pages/apps/gis-apps-page.c
new file mode 100644
-index 000..bcd9462
+index 000..1230c61
--- /dev/null
+++ b/gnome-initial-setup/pages/apps/gis-apps-page.c
@@ -0,0 +1,528 @@
@@ -953,7 +953,7 @@ index 000..bcd9462
+ installed_snaps = snapd_client_list_sync (client, NULL, &error);
+ if (installed_snaps == NULL)
+g_warning ("Failed to get installed snaps: %s", error->message);
-+ featured_snaps = snapd_client_find_section_sync (client, SNAPD_FIND_FLAGS_NONE, "featured", NULL, NULL, NULL, &error);
++ featured_snaps = snapd_client_find_section_sync (client, SNAPD_FIND_FLAGS_NONE, "ubuntu-firstrun", NULL, NULL, NULL, &error);
+ if (featured_snaps != NULL) {
+guint i, n_tiles = 0, n_extra = 0;
+
diff --git a/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch b/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
index 8bad3a5..623f566 100644
--- a/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
+++ b/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
@@ -166,11 +166,10 @@ index 8564935..64272ba 100644
obj_props[PROP_NEEDS_ACCEPT] =
g_param_spec_boolean ("needs-accept", "", "", FALSE,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
-@@ -282,6 +293,21 @@ gis_page_set_skippable (GisPage *page, gboolean skippable)
- g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_SKIPPABLE]);
+@@ -283,6 +294,21 @@ gis_page_set_skippable (GisPage *page, gboolean skippable)
}
-+gboolean
+ gboolean
+gis_page_get_hide_navigation (GisPage *page)
+{
+ GisPagePrivate *priv = gis_page_get_instance_private (page);
@@ -185,9 +184,10 @@ index 8564935..64272ba 100644
+ g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_HIDE_NAVIGATION]);
+}
+
- gboolean
++gboolean
gis_page_get_needs_accept (GisPage *page)
{
+ GisPagePrivate *priv = gis_page_get_instance_private (page);
diff --git a/gnome-initial-setup/gis-page.h b/gnome-initial-setup/gis-page.h
index b9a3e9a..3862caf 100644
--- a/gnome-initial-setup/gis-page.h
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-control-center:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Andrea Azzarone has proposed merging ~azzar1/ubuntu/+source/gnome-control-center:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/356324 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-control-center:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/master has been updated. Commit message changed to: Merge from debian For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gtk+3.0/+git/gtk+3.0/+merge/355486 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Andrea Azzarone has proposed merging ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/355424 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index 14b234b..5faa898 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gnome-initial-setup (3.29.92-1ubuntu3) UNRELEASED; urgency=medium + + * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch: +Drop ubuntu-changes page (LP: #1790146). + + -- Andrea Azzarone Thu, 20 Sep 2018 13:38:11 + + gnome-initial-setup (3.29.92-1ubuntu2) cosmic; urgency=medium * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch: diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch index 01953c3..f39b104 100644 --- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch +++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch @@ -3,18 +3,18 @@ Date: Tue, 20 Mar 2018 11:51:30 +1300 Subject: Add Ubuntu mode with special pages --- - configure.ac | 9 +- + configure.ac | 8 +- data/Makefile.am | 8 + data/com.ubuntu.welcome.policy.in | 21 + data/its/polkit.its| 8 + data/its/polkit.loc| 6 + data/meson.build | 23 + - gnome-initial-setup/Makefile.am| 4 + + gnome-initial-setup/Makefile.am| 3 + gnome-initial-setup/gis-driver.c | 35 ++ gnome-initial-setup/gis-driver.h | 6 + - gnome-initial-setup/gnome-initial-setup.c | 42 +- + gnome-initial-setup/gnome-initial-setup.c | 40 +- gnome-initial-setup/meson.build| 3 + - gnome-initial-setup/pages/Makefile.am | 8 +- + gnome-initial-setup/pages/Makefile.am | 5 +- gnome-initial-setup/pages/apps/Makefile.am | 23 + gnome-initial-setup/pages/apps/apps.gresource.xml | 8 + .../pages/apps/default-snap-icon.svg | 1 + @@ -32,16 +32,9 @@ Subject: Add Ubuntu mode with special pages .../pages/livepatch/livepatch.gresource.xml| 9 + gnome-initial-setup/pages/livepatch/livepatch.svg | 1 + gnome-initial-setup/pages/livepatch/meson.build| 12 + - gnome-initial-setup/pages/meson.build | 6 +- + gnome-initial-setup/pages/meson.build | 5 +- .../pages/privacy/gis-privacy-page.c | 2 +- .../pages/summary/gis-summary-page.c | 2 +- - .../pages/ubuntu-changes/Makefile.am | 23 + - .../pages/ubuntu-changes/gis-ubuntu-changes-page.c | 175 +++ - .../pages/ubuntu-changes/gis-ubuntu-changes-page.h | 52 ++ - .../ubuntu-changes/gis-ubuntu-changes-page.ui | 118 + - .../pages/ubuntu-changes/meson.build | 10 + - .../ubuntu-changes/ubuntu-changes.gresource.xml| 8 + - .../pages/ubuntu-changes/ubuntu-changes.png| Bin 0 -> 183653 bytes .../pages/ubuntu-report/Makefile.am| 23 + .../pages/ubuntu-report/gis-ubuntu-report-page.c | 241 ++ .../pages/ubuntu-report/gis-ubuntu-report-page.h | 52 ++ @@ -50,8 +43,8 @@ Subject: Add Ubuntu mode with special pages .../ubuntu-report/ubuntu-report.gresource.xml | 8 + .../pages/ubuntu-report/ubuntu-report.svg | 1 + meson.build| 3 + - po/POTFILES.in | 14 + - 48 files changed, 3398 insertions(+), 8 deletions(-) + po/POTFILES.in | 12 + + 41 files changed, 3003 insertions(+), 7 deletions(-) create mode 100644 data/com.ubuntu.welcome.policy.in create mode 100644 data/its/polkit.its create mode 100644 data/its/polkit.loc @@ -72,13 +65,6 @@ Subject: Add Ubuntu mode with special pages create mode 100644 gnome-initial-setup/pages/livepatch/livepatch.gresource.xml create mode 100644 gnome-initial-setup/pages/livepatch/livepatch.svg create mode 100644 gnome-initial-setup/pages/livepatch/meson.build - create mode 100644 gnome-initial-setup/pages/ubuntu-changes/Makefile.am - create mode 100644 gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.c - create mode 100644 gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.h - create mode 100644 gnome-initial-setup/pages/ubuntu-chan
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master has been updated. Commit message changed to: Drop ubuntu-changes page. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/355424 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup: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-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master
> Why the save dialog was dropped? For a control center message ? Please see the > discussion in the bug: https://bugs.launchpad.net/ubuntu/+source/gnome- > screenshot/+bug/927952 The save dialog was not dropped in unity. I tried to re-introduce it in gnome-shell but there are several issues: - the strings in gnome-control-center - in a gnome-shell session, when pressing "Print" the one taking the screenshot is gnome-settings-daemon using DIRECTLY the gnome-shell API. gnome-screenshot is not used anymore. This is has to be fixed in gnome-shell and/or in gnome-settings-daemon. I'm afraid it's too late for this cycle. > > We need headerbar patch in Unity. Without it the save window simply loses > focus (another bug). We no loger support Unity. Feel free to propose it and I'll be happy to review it. -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-screenshot/+git/gnome-screenshot/+merge/354557 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master has been updated. Description changed to: I had to revert changes to always show the save dialog in Ubuntu because that behaviour would conflict with the one specified in the "shortcuts" page in Gnome Control Center where it is explicitly mentioned that the shorcuts saves the screenshot in Pictures directly. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-screenshot/+git/gnome-screenshot/+merge/354557 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master has been updated. Commit message changed to: Merge with debian. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-screenshot/+git/gnome-screenshot/+merge/354557 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-screenshot/+git/gnome-screenshot/+merge/354557 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
Andrea Azzarone has proposed merging
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic.
Commit message:
livepatch: show an error in case of failure
Show an error message in case livepatch setup fails. This also will make sure
that gnome-intial-setup does not quit before livepatch responds back.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 4ce35cf..035bb0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnome-initial-setup (3.28.0-2ubuntu7) UNRELEASED; urgency=medium
+
+ * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
+- Show an error message in case livepatch setup fails. This also will
+ make sure that gnome-intial-setup does not quit before livepatch
+ responds back (LP: #1764723).
+
+ -- Andrea Azzarone Mon, 03 Sep 2018 15:28:27 +
+
gnome-initial-setup (3.28.0-2ubuntu6.16.04.1) bionic; urgency=medium
* debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
index 1ba127d..229e026 100644
--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
@@ -8,21 +8,24 @@ This commit is a combined work of a number of authors.
data/Makefile.am | 6 +
data/com.ubuntu.welcome.policy.in | 21 +
gnome-initial-setup/Makefile.am| 4 +
+ gnome-initial-setup/gis-driver.c | 35 ++
+ gnome-initial-setup/gis-driver.h | 6 +
gnome-initial-setup/gnome-initial-setup.c | 40 +-
gnome-initial-setup/pages/Makefile.am | 6 +-
gnome-initial-setup/pages/apps/Makefile.am | 21 +
gnome-initial-setup/pages/apps/apps.gresource.xml | 8 +
.../pages/apps/default-snap-icon.svg | 1 +
- gnome-initial-setup/pages/apps/gis-apps-page.c | 531 +
+ gnome-initial-setup/pages/apps/gis-apps-page.c | 531
gnome-initial-setup/pages/apps/gis-apps-page.h | 52 ++
gnome-initial-setup/pages/apps/gis-apps-page.ui| 96
gnome-initial-setup/pages/livepatch/Makefile.am| 21 +
- .../pages/livepatch/gis-livepatch-page.c | 483 +++
+ .../pages/livepatch/gis-livepatch-page.c | 534 +
.../pages/livepatch/gis-livepatch-page.h | 52 ++
.../pages/livepatch/gis-livepatch-page.ui | 156 ++
.../pages/livepatch/livepatch.gresource.xml| 8 +
gnome-initial-setup/pages/livepatch/livepatch.svg | 1 +
.../pages/privacy/gis-privacy-page.c | 2 +-
+ .../pages/summary/gis-summary-page.c | 2 +-
.../pages/ubuntu-changes/Makefile.am | 21 +
.../pages/ubuntu-changes/gis-ubuntu-changes-page.c | 177 +++
.../pages/ubuntu-changes/gis-ubuntu-changes-page.h | 52 ++
@@ -36,7 +39,7 @@ This commit is a combined work of a number of authors.
.../ubuntu-report/ubuntu-report.gresource.xml | 8 +
.../pages/ubuntu-report/ubuntu-report.svg | 1 +
po/POTFILES.in | 9 +
- 32 files changed, 2404 insertions(+), 5 deletions(-)
+ 35 files changed, 2497 insertions(+), 6 deletions(-)
create mode 100644 data/com.ubuntu.welcome.policy.in
create mode 100644 gnome-initial-setup/pages/apps/Makefile.am
create mode 100644 gnome-initial-setup/pages/apps/apps.gresource.xml
@@ -164,8 +167,78 @@ index c04f1e4..6c36682 100644
$(INITIAL_SETUP_LIBS) \
-lm
+diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
+index eeaf1b7..6267b32 100644
+--- a/gnome-initial-setup/gis-driver.c
b/gnome-initial-setup/gis-driver.c
+@@ -78,6 +78,9 @@ struct _GisDriverPrivate {
+ GisDriverMode mode;
+ UmAccountMode account_mode;
+ gboolean small_screen;
++
++ guint inhibit_count;
++ gboolean quit_requested;
+ };
+ typedef struct _GisDriverPrivate GisDriverPrivate;
+
+@@ -535,6 +538,38 @@ gis_driver_save_data (GisDriver *driver)
+ gis_assistant_save_data (priv->assistant);
+ }
+
++void
++gis_driver_inhibit_quit (GisDriver *driver)
++{
++ GisDriverPrivate *priv = gis_driver_get_instance_private (driver);
++ priv->inhibit_count++;
++}
++
++void
++gis_driver_uninhibit_quit (GisDriver *driver)
++{
++ GisDriverPrivate *priv = gis_driver_get_instance_private (driver);
++
++
Re: [Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
Few weeks ago I proposed a patch to fix this problem without chaning the street. There should be no problem chaning it now. -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
The proposal to merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic has been updated. Commit message changed to: livepatch: show an error in case of failure Show an error message in case livepatch setup fails. This also will make sure that gnome-intial-setup does not quit before livepatch responds back. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. -- 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/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 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
[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
[Merge] ~azzar1/ubuntu/+source/gedit:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gedit:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gedit:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gedit:ubuntu/master has been updated. Description changed to: Requires to pull 'pristine-tar' and 'upstream/latest' branches from salsa. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gedit/+git/gedit/+merge/353512 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gedit:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gedit:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/master has been updated. Description changed to: Requires to pull both 'upstream/latest' and 'pristine-tar' branches from salsa. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gtk+3.0/+git/gtk+3.0/+merge/353235 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master has been updated. Description changed to: This requires to pull 'pristine-tar' and 'upstream/latest' from Salsa. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/353022 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~azzar1/ubuntu/+source/file-roller:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/file-roller:ubuntu/master
Merged in debian. Closing. -- https://code.launchpad.net/~azzar1/ubuntu/+source/file-roller/+git/file-roller/+merge/351407 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/file-roller:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/file-roller:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/file-roller:pristine-tar into ~ubuntu-desktop/ubuntu/+source/file-roller:pristine-tar
Andrea Azzarone has proposed merging ~azzar1/ubuntu/+source/file-roller:pristine-tar into ~ubuntu-desktop/ubuntu/+source/file-roller:pristine-tar. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1783735 in file-roller (Ubuntu): "Update to 3.29.1" https://bugs.launchpad.net/ubuntu/+source/file-roller/+bug/1783735 For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/file-roller/+git/file-roller/+merge/351405 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/file-roller:pristine-tar into ~ubuntu-desktop/ubuntu/+source/file-roller:pristine-tar. diff --git a/file-roller_3.29.1.orig.tar.xz.delta b/file-roller_3.29.1.orig.tar.xz.delta new file mode 100644 index 000..4afc6e0 Binary files /dev/null and b/file-roller_3.29.1.orig.tar.xz.delta differ diff --git a/file-roller_3.29.1.orig.tar.xz.id b/file-roller_3.29.1.orig.tar.xz.id new file mode 100644 index 000..376b840 --- /dev/null +++ b/file-roller_3.29.1.orig.tar.xz.id @@ -0,0 +1 @@ +da61d961fe2a9327597981a02bb3096aaf183308 -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master-fix-recursive-engines into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Review: Approve Looks ok now thanks. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/349670 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master-fix-recursive-engines into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Also this commit looks broken: https://git.launchpad.net/~3v1n0/ubuntu/+source/nautilus/commit/?h=ubuntu/master-fix-recursive-engines&id=c7d0a0b65709f3b7765d9d46d3ac9b7dfe3c2b47 -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/349670 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master-fix-recursive-engines into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Review: Needs Fixing Commit message here looks broken: https://git.launchpad.net/~3v1n0/ubuntu/+source/nautilus/commit/?h=ubuntu/master-fix-recursive-engines&id=817d15262ba338c873f1595a042957895e926f79 -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/349670 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
