Merge branch 'branch-1.9' into debian

3 files changed, 8 insertions, 19 deletions

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 144d21d7..7cc1f4ea 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -118,26 +118,18 @@ LINUX_MIMETYPE	=\
 	$(ICONDIR)/org-altusmetrum-mimetypes.xml
 
 # Firmware
-FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
 FIRMWARE_TD_3_0=$(top_srcdir)/src/teledongle-v3.0/teledongle-v3.0-$(VERSION).ihx
-FIRMWARE_TD=$(FIRMWARE_TD_0_2) $(FIRMWARE_TD_3_0)
+FIRMWARE_TD=$(FIRMWARE_TD_3_0)
 
-FIRMWARE_TM_1_0=$(top_srcdir)/src/telemetrum-v1.0/telemetrum-v1.0-$(VERSION).ihx
-FIRMWARE_TM_1_1=$(top_srcdir)/src/telemetrum-v1.1/telemetrum-v1.1-$(VERSION).ihx
-FIRMWARE_TM_1_2=$(top_srcdir)/src/telemetrum-v1.2/telemetrum-v1.2-$(VERSION).ihx
 FIRMWARE_TM_2_0=$(top_srcdir)/src/telemetrum-v2.0/telemetrum-v2.0-$(VERSION).ihx
-#FIRMWARE_TM_3_0=$(top_srcdir)/src/telemetrum-v3.0/telemetrum-v3.0-$(VERSION).ihx
-#FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2) $(FIRMWARE_TM_2_0) $(FIRMWARE_TM_3_0)
-FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2) $(FIRMWARE_TM_2_0)
+FIRMWARE_TM=$(FIRMWARE_TM_2_0)
 
-FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0/telemini-v1.0-$(VERSION).ihx
 FIRMWARE_TELEMINI_3_0=$(top_srcdir)/src/telemini-v3.0/telemini-v3.0-$(VERSION).ihx
-FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0) $(FIRMWARE_TELEMINI_3_0)
+FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_3_0)
 
-FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
 FIRMWARE_TBT_3_0=$(top_srcdir)/src/telebt-v3.0/telebt-v3.0-$(VERSION).ihx
 FIRMWARE_TBT_4_0=$(top_srcdir)/src/telebt-v4.0/telebt-v4.0-$(VERSION).ihx
-FIRMWARE_TBT=$(FIRMWARE_TBT_1_0) $(FIRMWARE_TBT_3_0) $(FIRMWARE_TBT_4_0)
+FIRMWARE_TBT=$(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
@@ -148,7 +140,8 @@ FIRMWARE_EMINI_1_0=$(top_srcdir)/src/easymini-v1.0/easymini-v1.0-$(VERSION).ihx
 FIRMWARE_EMINI=$(FIRMWARE_EMINI_1_0)
 
 FIRMWARE_EMEGA_1_0=$(top_srcdir)/src/easymega-v1.0/easymega-v1.0-$(VERSION).ihx
-FIRMWARE_EMEGA=$(FIRMWARE_EMEGA_1_0)
+FIRMWARE_EMEGA_2_0=$(top_srcdir)/src/easymega-v2.0/easymega-v2.0-$(VERSION).ihx
+FIRMWARE_EMEGA=$(FIRMWARE_EMEGA_1_0) $(FIRMWARE_EMEGA_2_0)
 
 FIRMWARE_TGPS_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
 FIRMWARE_TGPS_2_0=$(top_srcdir)/src/telegps-v2.0/telegps-v2.0-$(VERSION).ihx
diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in
index be9fb433..2666fc33 100644
--- a/altosui/altos-windows.nsi.in
+++ b/altosui/altos-windows.nsi.in
@@ -120,18 +120,12 @@ Section "Firmware"
 
 	SetOutPath $INSTDIR
 
-	File "../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx"
-	File "../src/telemetrum-v1.1/telemetrum-v1.1-${VERSION}.ihx"
-	File "../src/telemetrum-v1.2/telemetrum-v1.2-${VERSION}.ihx"
 	File "../src/telemetrum-v2.0/telemetrum-v2.0-${VERSION}.ihx"
 ;	File "../src/telemetrum-v3.0/telemetrum-v3.0-${VERSION}.ihx"
-	File "../src/telemini-v1.0/telemini-v1.0-${VERSION}.ihx"
 	File "../src/telemini-v3.0/telemini-v3.0-${VERSION}.ihx"
 	File "../src/telegps-v1.0/telegps-v1.0-${VERSION}.ihx"
 	File "../src/telegps-v2.0/telegps-v2.0-${VERSION}.ihx"
-	File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
 	File "../src/teledongle-v3.0/teledongle-v3.0-${VERSION}.ihx"
-	File "../src/telebt-v1.0/telebt-v1.0-${VERSION}.ihx"
 	File "../src/telebt-v3.0/telebt-v3.0-${VERSION}.ihx"
 	File "../src/telebt-v4.0/telebt-v4.0-${VERSION}.ihx"
 	File "../src/telemega-v1.0/telemega-v1.0-${VERSION}.ihx"
@@ -140,6 +134,7 @@ Section "Firmware"
 	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"
+	File "../src/easymega-v2.0/easymega-v2.0-${VERSION}.ihx"
 
 SectionEnd
 
diff --git a/altosui/altusmetrum-altosui.desktop.in b/altosui/altusmetrum-altosui.desktop.in
index 00f58ec6..0c2213a2 100644
--- a/altosui/altusmetrum-altosui.desktop.in
+++ b/altosui/altusmetrum-altosui.desktop.in
@@ -9,3 +9,4 @@ Exec=%bindir%/altosui %F
 Terminal=false
 MimeType=application/vnd.altusmetrum.telemetry;application/vnd.altusmetrum.eeprom
 Categories=Education;Electronics;Science;
+Keywords=Rocket;Telemetry;GPS