Include TeleMega v3.0 firmware with releases

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/Releasing b/Releasing
index bd5f7647762161dcd6cb7254a8b4ee7957d4a1aa..a20b6dc084e0d461eafb68422e0917ca6bdc48ac 100644 (file)
--- a/Releasing
+++ b/Releasing
@@ -17,6 +17,8 @@ These are Keith's notes on how to do a release
 
        - update the version and date in configure.ac if Bdale hasn't already
 
+       - follow instructions in doc/RELNOTES
+
        - make sure there is a doc/release-notes-<version>.inc
 
        - make sure doc/release-notes.inc points at that

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 805c55505ed76d6115c4ee00678bc7f7c3136f93..53bb2b0053ce27b3be7ddc6db0687caa00fdfd0f 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -141,7 +141,8 @@ FIRMWARE_TBT=$(FIRMWARE_TBT_1_0) $(FIRMWARE_TBT_3_0) $(FIRMWARE_TBT_4_0)
 
 FIRMWARE_TMEGA_1_0=$(top_srcdir)/src/telemega-v1.0/telemega-v1.0-$(VERSION).ihx
 FIRMWARE_TMEGA_2_0=$(top_srcdir)/src/telemega-v2.0/telemega-v2.0-$(VERSION).ihx
-FIRMWARE_TMEGA=$(FIRMWARE_TMEGA_1_0) $(FIRMWARE_TMEGA_2_0)
+FIRMWARE_TMEGA_3_0=$(top_srcdir)/src/telemega-v3.0/telemega-v3.0-$(VERSION).ihx
+FIRMWARE_TMEGA=$(FIRMWARE_TMEGA_1_0) $(FIRMWARE_TMEGA_2_0) $(FIRMWARE_TMEGA_3_0)
 
 FIRMWARE_EMINI_1_0=$(top_srcdir)/src/easymini-v1.0/easymini-v1.0-$(VERSION).ihx
 FIRMWARE_EMINI=$(FIRMWARE_EMINI_1_0)

diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in
index 23d6f6bd25f0c807d8f4601da76170c0ff7a11dc..be9fb4338437378903cc31cada689e20a0e69253 100644 (file)
--- a/altosui/altos-windows.nsi.in
+++ b/altosui/altos-windows.nsi.in
@@ -136,6 +136,7 @@ Section "Firmware"
        File "../src/telebt-v4.0/telebt-v4.0-${VERSION}.ihx"
        File "../src/telemega-v1.0/telemega-v1.0-${VERSION}.ihx"
        File "../src/telemega-v2.0/telemega-v2.0-${VERSION}.ihx"
+       File "../src/telemega-v3.0/telemega-v3.0-${VERSION}.ihx"
        File "../src/easymini-v1.0/easymini-v1.0-${VERSION}.ihx"
        File "../src/easymini-v2.0/easymini-v2.0-${VERSION}.ihx"
        File "../src/easymega-v1.0/easymega-v1.0-${VERSION}.ihx"

diff --git a/doc/RELNOTES b/doc/RELNOTES
index 748d2b5b428539355fa329a244b3eab6c2d85c68..e21f6f27b3bbeae30e46d3b60e70f28bb6276dd6 100644 (file)
--- a/doc/RELNOTES
+++ b/doc/RELNOTES
@@ -1,12 +1,12 @@
 Creating documentation for a new release of AltOS
 
+* Write release notes in release-notes-${version}.inc. Add to
+  Makefile
+
 * Make sure that doc/altusmetrum-docinfo.xml has the right copyright 
   year, and add release to the revision history at the front (release 
   notes will be pulled in by release-notes.inc)
 
-* Write release notes in release-notes-${version}.inc. Add to
-  Makefile
-
 * Add references to that as appropriate from each of the
   documents: