Merge ~paelzer/ubuntu/+source/seabios:sync-in-cosmic into ubuntu/+source/seabios:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

This is again an MP for a sync instead of a merge.
The changelog outlines the reasons why that is the case.

The tags will help to individually check the old delta.
 * [new tag] reconstruct/1.10.2-1ubuntu1 -> reconstruct/1.10.2-1ubuntu1
 * [new tag] deconstruct/1.10.2-1ubuntu1 -> deconstruct/1.10.2-1ubuntu1
 * [new tag] logical/1.10.2-1ubuntu1 -> logical/1.10.2-1ubuntu1
 * [new tag] new/debian -> new/debian
 * [new tag] old/debian -> old/debian
 * [new tag] old/ubuntu -> old/ubuntu

https://bugs.launchpad.net/ubuntu/+source/seabios/+bug/1404396/comments/41 is the check for the former VGA regression.

A Test build under the ubuntu1 version (but beign a no-change rebuild of Debian) is in ppa https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3258

[Andreas Hasenack (ahasenack)]

+1

review: Approve

[Christian Ehrhardt  (paelzer)]

sync started, set status to merged

diff --git a/debian/changelog b/debian/changelog
index 8982cb3..69de99e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+seabios (1.11.1-1ubuntu1) cosmic; urgency=medium
+
+  * This is NOT a merge, but a sync - we would drop all Delta for the
+    following reasons
+    - Build with -fgnu89-inline for GCC 5 (doko)
+      This was an FTBFS and is fixed a long time, we are on gcc 7 (soon 8.10)
+      in cosmic and this works fine without.
+    - Turn off VGA_ALLOCATE_EXTRA_STACK (LP #1404396)
+      This was enabled to have some very old 16bit loads working after an
+      upstream change at the price to not have some other old loads working.
+      There is much (too much actually) Detail in the bug linked above.
+      But most important the reporter is very active and verified that with a
+      recent qemu/seabios we can drop this delta and the issue is not
+      re-occuring.
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 09 May 2018 10:55:52 +0200
+
 seabios (1.11.1-1) unstable; urgency=medium
 
   * new upstream release