patches merged upstream in 1.8.7 release

diff --git a/debian/patches/0001-altos-Remove-spurious-const-from-ao_state_names.patch b/debian/patches/0001-altos-Remove-spurious-const-from-ao_state_names.patch
deleted file mode 100644 (file)
index 84f09e0..0000000
--- a/debian/patches/0001-altos-Remove-spurious-const-from-ao_state_names.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bb9d071d328969fc3c544897f1fc96e55a842198 Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Mon, 13 Aug 2018 17:43:57 -0700
-Subject: [PATCH 01/13] altos: Remove spurious 'const' from ao_state_names
-
-Current gcc complains about this.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
----
- src/kernel/ao.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kernel/ao.h b/src/kernel/ao.h
-index 2bd0e367..0a3981d7 100644
---- a/src/kernel/ao.h
-+++ b/src/kernel/ao.h
-@@ -662,7 +662,7 @@ ao_radio_init(void);
- 
- #if HAS_MONITOR
- 
--extern const char const * const ao_state_names[];
-+extern const char * const ao_state_names[];
- 
- #define AO_MONITOR_RING       8
- 
--- 
-2.19.0.rc1
-

diff --git a/debian/patches/0001-altos-don-t-build-fox1ihu-by-default.patch b/debian/patches/0001-altos-don-t-build-fox1ihu-by-default.patch
deleted file mode 100644 (file)
index f9889d4..0000000
--- a/debian/patches/0001-altos-don-t-build-fox1ihu-by-default.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ac8a9bc2ef301f1f18772af7d871c257a56ae70c Mon Sep 17 00:00:00 2001
-From: Bdale Garbee <bdale@gag.com>
-Date: Thu, 30 Aug 2018 21:36:18 -0600
-Subject: [PATCH] altos: don't build fox1ihu by default
-
----
- src/Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 0dafb5ec..a1ff84c2 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -25,7 +25,6 @@ SDCCDIRS=\
-       telerepeat-v1.0
- 
- ARMM3DIRS=\
--      fox1ihu fox1ihu/flash-loader \
-       easymega-v1.0 easymega-v1.0/flash-loader \
-       telemega-v0.1 telemega-v0.1/flash-loader \
-       telemega-v1.0 telemega-v1.0/flash-loader \
--- 
-2.19.0.rc1
-

diff --git a/debian/patches/series b/debian/patches/series
index 1867abac57f2c1828acd92816bad5bba151677b8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-0001-altos-don-t-build-fox1ihu-by-default.patch
-0001-altos-Remove-spurious-const-from-ao_state_names.patch