diff -Nru altos-1.9.7/debian/changelog altos-1.9.7/debian/changelog --- altos-1.9.7/debian/changelog 2021-06-09 05:10:20.000000000 +0000 +++ altos-1.9.7/debian/changelog 2021-08-03 15:44:09.000000000 +0000 @@ -1,3 +1,9 @@ +altos (1.9.7-2) unstable; urgency=medium + + * pull in fix from master branch for gcc-10 compilation, closes: #991800 + + -- Bdale Garbee Tue, 03 Aug 2021 09:44:09 -0600 + altos (1.9.7-1) unstable; urgency=medium [ Keith Packard ] diff -Nru altos-1.9.7/debian/patches/fixes-for-gcc-10.diff altos-1.9.7/debian/patches/fixes-for-gcc-10.diff --- altos-1.9.7/debian/patches/fixes-for-gcc-10.diff 1970-01-01 00:00:00.000000000 +0000 +++ altos-1.9.7/debian/patches/fixes-for-gcc-10.diff 2021-08-03 15:44:09.000000000 +0000 @@ -0,0 +1,21 @@ +--- altos-1.9.7.orig/src/lpc/lpc.h ++++ altos-1.9.7/src/lpc/lpc.h +@@ -868,7 +868,7 @@ struct lpc_usb { + vuint32_t introuting; + uint32_t r30; + vuint32_t eptoggle; +-} lpc_usb; ++}; + + extern struct lpc_usb lpc_usb; + #define lpc_usb (*(struct lpc_usb *) 0x40080000) +--- altos-1.9.7.orig/src/micropeak-v2.0/ao_micro.c ++++ altos-1.9.7/src/micropeak-v2.0/ao_micro.c +@@ -23,7 +23,6 @@ + #include + #include + +-uint32_t pa; + alt_t ground_alt, max_alt; + alt_t ao_max_height; + diff -Nru altos-1.9.7/debian/patches/series altos-1.9.7/debian/patches/series --- altos-1.9.7/debian/patches/series 2021-06-09 05:10:20.000000000 +0000 +++ altos-1.9.7/debian/patches/series 2021-08-03 15:44:09.000000000 +0000 @@ -0,0 +1 @@ +fixes-for-gcc-10.diff