Ubuntu
gnome-initial-setup package

Merge ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:new-legal-url into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master

  1. Git
  2. lp:~ubuntu-desktop/ubuntu/+source/gnome-initial-setup
  3. new-legal-url
  4. Merge into ubuntu/master
Proposed by Sebastien Bacher
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: 6a1026f8e54ac29269d07f1d17c1160701e9e7a8
Proposed branch: ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:new-legal-url
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Diff against target: 97 lines (+13/-39)
2 files modified
debian/changelog (+8/-0)
debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch (+5/-39)
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Andrea Azzarone (community) Approve
Didier Roche-Tolomelli Pending
Review via email: mp+358092@code.launchpad.net

Commit message

  * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
    - update the "legal notice" URL to use the one which is specific about
      ubuntu report (lp: #1789925)

Description of the change

  * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
    - update the "legal notice" URL to use the one which is specific about
      ubuntu report (lp: #1789925)

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thx, I've merged it (edited to change cosmic->disco though)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 9b0da12..7feca0f 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+gnome-initial-setup (3.30.0-1ubuntu4) cosmic; urgency=medium
7+
8+ * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
9+ - update the "legal notice" URL to use the one which is specific about
10+ ubuntu report (lp: #1789925)
11+
12+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 31 Oct 2018 15:41:49 +0100
13+
14 gnome-initial-setup (3.30.0-1ubuntu3) cosmic; urgency=medium
15
16 * Populate featured snaps from ubuntu-firstrun category
17diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
18index 3de104b..ee1033e 100644
19--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
20+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
21@@ -36,7 +36,7 @@ Subject: Add Ubuntu mode with special pages
22 .../pages/privacy/gis-privacy-page.c | 2 +-
23 .../pages/summary/gis-summary-page.c | 2 +-
24 .../pages/ubuntu-report/Makefile.am | 23 +
25- .../pages/ubuntu-report/gis-ubuntu-report-page.c | 241 ++++++++++
26+ .../pages/ubuntu-report/gis-ubuntu-report-page.c | 207 ++++++++
27 .../pages/ubuntu-report/gis-ubuntu-report-page.h | 52 ++
28 .../pages/ubuntu-report/gis-ubuntu-report-page.ui | 181 +++++++
29 .../pages/ubuntu-report/meson.build | 10 +
30@@ -44,7 +44,7 @@ Subject: Add Ubuntu mode with special pages
31 .../pages/ubuntu-report/ubuntu-report.svg | 1 +
32 meson.build | 3 +
33 po/POTFILES.in | 12 +
34- 41 files changed, 3003 insertions(+), 7 deletions(-)
35+ 41 files changed, 2969 insertions(+), 7 deletions(-)
36 create mode 100644 data/com.ubuntu.welcome.policy.in
37 create mode 100644 data/its/polkit.its
38 create mode 100644 data/its/polkit.loc
39@@ -2895,10 +2895,10 @@ index 0000000..a19dedf
40 +CLEANFILES = $(BUILT_SOURCES)
41 diff --git a/gnome-initial-setup/pages/ubuntu-report/gis-ubuntu-report-page.c b/gnome-initial-setup/pages/ubuntu-report/gis-ubuntu-report-page.c
42 new file mode 100644
43-index 0000000..8e2c858
44+index 0000000..2518e0e
45 --- /dev/null
46 +++ b/gnome-initial-setup/pages/ubuntu-report/gis-ubuntu-report-page.c
47-@@ -0,0 +1,241 @@
48+@@ -0,0 +1,207 @@
49 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
50 +/*
51 + * Copyright (C) 2018 Canonical Ltd.
52@@ -3006,44 +3006,10 @@ index 0000000..8e2c858
53 +static void
54 +show_legal (GtkButton *button, GisUbuntuReportPage *page)
55 +{
56-+ g_autofree gchar *data = NULL;
57-+ g_auto(GStrv) lines = NULL;
58-+ int i;
59-+ g_autofree gchar *privacy_policy_url = NULL;
60 + g_autoptr(GError) error = NULL;
61 +
62-+ if (!g_file_get_contents ("/etc/os-release", &data, NULL, &error)) {
63-+ g_warning ("Failed to get privacy policy URL from /etc/os-release: %s", error->message);
64-+ return;
65-+ }
66-+ lines = g_strsplit (data, "\n", -1);
67-+ for (i = 0; lines[i] != NULL; i++) {
68-+ g_auto(GStrv) tokens = NULL;
69-+ gchar *name, *value;
70-+
71-+ tokens = g_strsplit (lines[i], "=", 2);
72-+ if (g_strv_length (tokens) != 2)
73-+ continue;
74-+
75-+ name = g_strstrip (tokens[0]);
76-+ value = g_strstrip (tokens[1]);
77-+ if (value[0] == '"' && value[strlen (value) - 1] == '"') {
78-+ value[strlen (value) - 1] = '\0';
79-+ value = value + 1;
80-+ }
81-+
82-+ if (strcmp (name, "PRIVACY_POLICY_URL") == 0) {
83-+ privacy_policy_url = g_strdup (value);
84-+ break;
85-+ }
86-+ }
87-+ if (privacy_policy_url == NULL) {
88-+ g_warning ("PRIVACY_POLICY_URL not defined in /etc/os-release");
89-+ return;
90-+ }
91-+
92 + if (!gtk_show_uri_on_window (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (page))),
93-+ privacy_policy_url,
94++ "https://www.ubuntu.com/legal/terms-and-policies/systems-information-notice",
95 + GDK_CURRENT_TIME, &error)) {
96 + GtkWidget *dialog;
97 + dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (page))),

Subscribers

People subscribed via source and target branches

to all changes: