Ubuntu patch reverting another Ubuntu patch

[Nathan Teodosio]

Downstream Update-style-to-the-same-than-flutter-installer.patch[1] is reverting a great deal of gis-apps-page.{c,ui} that are introduced by (also downstream controlled) 0001-Add-Ubuntu-mode-with-special-pages.patch[2].

I think that makes maintaining those patches more complex than necessary and suggest to merge them together.

[1] https://git.launchpad.net/ubuntu/+source/gnome-initial-setup/tree/debian/patches/Update-style-to-the-same-than-flutter-installer.patch
[2] https://git.launchpad.net/ubuntu/+source/gnome-initial-setup/tree/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch#n399

[Sergio Costas (rastersoft-gmail)]

Ops... it looks really like an unintended error during patch creation... "Update-style..." shouldn't touch all that C code.

[Sergio Costas (rastersoft-gmail)]

Oh, wait... That is the last page, isn't it? Ok, now I see what you mean. You are right, it should be simpler to merge both patches.

[Sergio Costas (rastersoft-gmail)]

Which do you think would be the best way of managing it? I can see these possibilities:

* Merging the whole "Update-style..." patch into "0001-Add-Ubuntu..."
* Removing gis-apps-page.* files from "0001-Add-Ubuntu..." and completely creating them in "Update-style..."

[Nathan Teodosio (nteodosio)]

Yup, it's the last page.

I think the latter would be great because 0001 is already tremendous. But I tried that before (for the Ubuntu Pro) pages and gave up; Left it all in 0001.

What matters of course is that it works, so please consider this just a suggestion for easing maintenance.