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
