Merge ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:enable-location-page into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master

[Sebastien Bacher]

* debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
  - enable the 'privacy' step in the Ubuntu first login wizard,
    that way users can easily opt in for the location service
    which also enable some of the desktop features to work without
    having to go tweak the settings (like timezone changes)
    (lp: #1809002)

* debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
  - enable the 'privacy' step in the Ubuntu first login wizard,
    that way users can easily opt in for the location service
    which also enable some of the desktop features to work without
    having to go tweak the settings (like timezone changes)
    (lp: #1809002)

[Jeremy Bícha (jbicha)]

Your commit doesn't apply cleanly since ubuntu/master has a debian/changelog entry that I guess isn't in your fork.

It doesn't build because you added a line to the patch so you'll need to bump the -82,6 +85,16 line to "85,17" or just use the gbp pq workflow to edit patches.

Your commit message doesn't really follow usual git practice. I guess you used debcommit? I consider this a nitpick (so not essential to fix) since it's in the Ubuntu-specific part of the package, but I think you'd want to use more conforming commit messages when pushing commits to Debian.

review: Needs Fixing

[Sebastien Bacher (seb128)]

> Your commit doesn't apply cleanly since ubuntu/master has a debian/changelog entry that I guess isn't
> in your fork.

Sure, there were other pending branches and I merged one. Resolving changelog conflicts is common for merges and not really something that needs to be picked about in reviews imho

> It doesn't build because you added a line to the patch so you'll need to bump the -82,6 +85,16 line to
> "85,17" or just use the gbp pq workflow to edit patches.

Thanks for catching that up. I used quilt to refresh the patch but that added formatting changes so I reverted those and reverted too much. The gbp pq workflow is too much hassle, I just went for changing the 16 to 17

> Your commit message doesn't really follow usual git practice. I guess you used debcommit? I consider
> this a nitpick (so not essential to fix) since it's in the Ubuntu-specific part of the package, but I
> think you'd want to use more conforming commit messages when pushing commits to Debian.

Yes, I used "debcommit -e" which use the changelog entry. I don't know what the "usual git practice" is so I'm letting like that, we have standard tools (debcommit) so we should get those to be fixed/working in an acceptable way.

[Jeremy Bícha (jbicha)]

It depends on which standard you are talking about.

In Debian GNOME, we are using "gbp dch" to prepare debian/changelog entries from commit messages so that cherry-picking and reverting are easier. Usually, we don't update debian/changelog until we are uploading, but it's possible to update the changelog before then.

Here's an example commit:
https://salsa.debian.org/gnome-team/gtk3/commit/6e65c061

The commit message may be more clearly seen if you click Options> Email Patches.

The "Gbp-Dch: Full" line is to ensure that additional lines get added to the debian/changelog. The LP and Debian Closes bug numbers will get added automatically without having to use "Gbp-Dch: Full".

The "short" commit message ("Cherry-pick Tooltip-Fix-the-used-cursor-size-if-0-in-Settings.patch:") is just one line although it was longer than git is used to.

[Sebastien Bacher (seb128)]

Thanks, that workflow doesn't seem much different, maybe debcommit should call gbp dch when in a gbp checkout. Anyway, not a discuss for that merge request. Are you happy with the changes now? (the changelog needs to be merged but I can resolve that when commiting)

[Jeremy Bícha (jbicha)]

Yes, it's fine when you clean up the debian/changelog. Thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 3a5dc35..44abc93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,19 @@
 gnome-initial-setup (3.30.0-1ubuntu5) UNRELEASED; urgency=medium
 
   * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
+<<<<<<< debian/changelog
     - Use privacy URL from /etc/os-release in Livepatch page.
 
  -- Andrea Azzarone <[e-mail]>  Mon, 19 Nov 2018 18:08:23 +0000
+=======
+    - enable the 'privacy' step in the Ubuntu first login wizard,
+      that way users can easily opt in for the location service
+      which also enable some of the desktop features to work without
+      having to go tweak the settings (like timezone changes)
+      (lp: #1809002)
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 18 Dec 2018 17:07:17 +0100
+>>>>>>> debian/changelog
 
 gnome-initial-setup (3.30.0-1ubuntu4) disco; urgency=medium
 
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 3271d3a..ddef978 100644
--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
@@ -320,7 +320,7 @@ index bfcc03c..2676e1d 100644
  
  #define VENDOR_PAGES_GROUP "pages"
  #define VENDOR_SKIP_KEY "skip"
-@@ -82,6 +85,16 @@ static PageData page_table[] = {
+@@ -82,6 +85,17 @@ static PageData page_table[] = {
    { NULL },
  };
  
@@ -328,6 +328,7 @@ index bfcc03c..2676e1d 100644
 +  PAGE (goa,            FALSE),
 +  PAGE (livepatch,      FALSE),
 +  PAGE (ubuntu_report,  FALSE),
++  PAGE (privacy,        FALSE),
 +  PAGE (account,        TRUE),
 +  PAGE (password,       TRUE),
 +  PAGE (apps,           FALSE),