Merge branch 'branch-1.3' into debian

Conflicts:
	ChangeLog
	altoslib/AltosRecordMM.java
	altosui/Makefile.am
	altosui/altos-windows.nsi.in
	configure.ac
	debian/changelog
	debian/control
	doc/Makefile
	doc/altusmetrum.xsl
	doc/release-notes-1.2.1.xsl
	doc/release-notes-1.2.xsl

1 files changed, 53 insertions, 26 deletions

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index 18b028d6..6d396635 100644
--- a/altoslib/Makefile.am
+++ b/altoslib/Makefile.am
@@ -1,4 +1,4 @@
-AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6
 
 JAVAROOT=bin
 
@@ -9,73 +9,100 @@ CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="bin:$(FREETTS)/*:/usr/share/java/
 SRC=.
 
 altoslibdir = $(datadir)/java
+record_files = \
+	AltosEepromRecord.java \
+	AltosEepromTeleScience.java \
+	AltosRecordCompanion.java \
+	AltosRecordIterable.java \
+	AltosOrderedRecord.java \
+	AltosOrderedMegaRecord.java \
+	AltosOrderedMiniRecord.java \
+	AltosRecord.java \
+	AltosRecordNone.java \
+	AltosRecordTM.java \
+	AltosRecordMM.java \
+	AltosRecordMini.java
+
 
 altoslib_JAVA = \
 	AltosLib.java \
+	AltosCompanion.java \
 	AltosConfigData.java \
 	AltosConfigValues.java \
 	AltosConvert.java \
 	AltosCRCException.java \
 	AltosDebug.java \
+	AltosEeprom.java \
 	AltosEepromChunk.java \
+	AltosEepromDownload.java \
+	AltosEepromFile.java \
+	AltosEepromTM.java \
+	AltosEepromTm.java \
+	AltosEepromHeader.java \
 	AltosEepromIterable.java \
+	AltosEepromList.java \
 	AltosEepromLog.java \
 	AltosEepromMega.java \
-	AltosEepromMegaIterable.java \
-	AltosEepromRecord.java \
-	AltosEepromTeleScience.java \
+	AltosEepromMetrum2.java \
+	AltosEepromMini.java \
+	AltosEepromMonitor.java \
 	AltosFile.java \
 	AltosFlash.java \
 	AltosFlashListener.java \
 	AltosFlightReader.java \
 	AltosFrequency.java \
 	AltosGPS.java \
-	AltosGPSQuery.java \
 	AltosGPSSat.java \
 	AltosGreatCircle.java \
 	AltosHexfile.java \
+	AltosHexsym.java \
+	AltosIdle.java \
+	AltosIdleFetch.java \
 	AltosIdleMonitor.java \
 	AltosIdleMonitorListener.java \
 	AltosIgnite.java \
 	AltosIMU.java \
-	AltosIMUQuery.java \
 	AltosLine.java \
 	AltosLink.java \
 	AltosListenerState.java \
 	AltosLog.java \
+	AltosMag.java \
+	AltosMma655x.java \
 	AltosMs5607.java \
-	AltosMs5607Query.java \
-	AltosOrderedRecord.java \
-	AltosOrderedMegaRecord.java \
+	AltosNoSymbol.java \
 	AltosParse.java \
 	AltosPreferences.java \
 	AltosPreferencesBackend.java \
-	AltosRecordCompanion.java \
-	AltosRecordIterable.java \
-	AltosRecord.java \
-	AltosRecordNone.java \
-	AltosRecordTM.java \
-	AltosRecordMM.java \
+	AltosProgrammer.java \
 	AltosReplayReader.java \
 	AltosRomconfig.java \
+	AltosSelfFlash.java \
 	AltosSensorMM.java \
+	AltosSensorEMini.java \
 	AltosSensorTM.java \
+	AltosSensorTMini.java \
+	AltosSensorMega.java \
+	AltosSensorMetrum.java \
 	AltosState.java \
+	AltosStateIterable.java \
+	AltosStateUpdate.java \
 	AltosTelemetry.java \
+	AltosTelemetryConfiguration.java \
+	AltosTelemetryFile.java \
 	AltosTelemetryIterable.java \
+	AltosTelemetryLegacy.java \
+	AltosTelemetryLocation.java \
 	AltosTelemetryMap.java \
+	AltosTelemetryMegaSensor.java \
+	AltosTelemetryMegaData.java \
+	AltosTelemetryMini.java \
+	AltosTelemetryMetrumSensor.java \
+	AltosTelemetryMetrumData.java \
 	AltosTelemetryReader.java \
-	AltosTelemetryRecordCompanion.java \
-	AltosTelemetryRecordConfiguration.java \
-	AltosTelemetryRecordGeneral.java \
-	AltosTelemetryRecord.java \
-	AltosTelemetryRecordLegacy.java \
-	AltosTelemetryRecordLocation.java \
-	AltosTelemetryRecordRaw.java \
-	AltosTelemetryRecordSatellite.java \
-	AltosTelemetryRecordSensor.java \
-	AltosTelemetryRecordMegaSensor.java \
-	AltosTelemetryRecordMegaData.java \
+	AltosTelemetryRaw.java \
+	AltosTelemetrySensor.java \
+	AltosTelemetrySatellite.java \
+	AltosTelemetryStandard.java \
 	AltosUnitsListener.java \
 	AltosMs5607.java \
 	AltosIMU.java \