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, 5 insertions, 12 deletions

diff --git a/altoslib/AltosIgnite.java b/altoslib/AltosIgnite.java
index 85905900..fc9599b6 100644
--- a/altoslib/AltosIgnite.java
+++ b/altoslib/AltosIgnite.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_2;
 
 import java.io.*;
 import java.util.concurrent.*;
@@ -141,7 +141,7 @@ public class AltosIgnite {
 		}
 	}
 
-	public void fire(int igniter) {
+	public void fire(int igniter) throws InterruptedException {
 		if (link == null)
 			return;
 		try {
@@ -154,21 +154,14 @@ public class AltosIgnite {
 				link.printf("i DoIt drogue\n");
 				break;
 			}
-		} catch (InterruptedException ie) {
 		} catch (TimeoutException te) {
 		} finally {
-			try {
-				stop_link();
-			} catch (InterruptedException ie) {
-			}
+			stop_link();
 		}
 	}
 
-	public void close() {
-		try {
-			stop_link();
-		} catch (InterruptedException ie) {
-		}
+	public void close() throws InterruptedException {
+		stop_link();
 		link.close();
 		link = null;
 	}