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

5 files changed, 6 insertions, 11 deletions

diff --git a/libaltos/.gitignore b/libaltos/.gitignore
index c490e6f8..6d043d60 100644
--- a/libaltos/.gitignore
+++ b/libaltos/.gitignore
@@ -3,6 +3,7 @@
 *.la
 *.java
 *.class
+*.dll
 .libs/
 classlibaltos.stamp
 libaltos_wrap.c
diff --git a/libaltos/Makefile.am b/libaltos/Makefile.am
index 41549558..831432fc 100644
--- a/libaltos/Makefile.am
+++ b/libaltos/Makefile.am
@@ -1,6 +1,6 @@
 JAVAC=javac
 AM_CFLAGS=-DLINUX -DPOSIX_TTY -I$(JVM_INCLUDE)
-AM_JAVACFLAGS=-encoding UTF-8
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6
 
 altoslibdir=$(libdir)/altos
 
diff --git a/libaltos/cjnitest.c b/libaltos/cjnitest.c
index f0fe78f7..3a65c3d6 100644
--- a/libaltos/cjnitest.c
+++ b/libaltos/cjnitest.c
@@ -10,7 +10,8 @@ altos_puts(struct altos_file *file, char *string)
 		altos_putchar(file, c);
 }
 
-main ()
+int
+main (int argc, char **argv)
 {
 	struct altos_device	device;
 	struct altos_list	*list;
diff --git a/libaltos/libaltos.c b/libaltos/libaltos.c
index 4a6363ed..a623d5ae 100644
--- a/libaltos/libaltos.c
+++ b/libaltos/libaltos.c
@@ -53,6 +53,8 @@ altos_get_last_error(struct altos_error *error)
 
 #ifdef DARWIN
 
+#include <unistd.h>
+
 #undef USE_POLL
 
 /* Mac OS X don't have strndup even if _GNU_SOURCE is defined */
@@ -887,15 +889,6 @@ altos_list_next(struct altos_list *list, struct altos_device *device)
 		if (!get_number (object, CFSTR(kUSBVendorID), &device->vendor) ||
 		    !get_number (object, CFSTR(kUSBProductID), &device->product))
 			continue;
-		if (list->ftdi) {
-			if (device->vendor != 0x0403)
-				continue;
-		} else {
-			if (device->vendor != 0xfffe)
-				continue;
-			if (device->product < 0x000a || 0x0013 < device->product)
-				continue;
-		}
 		if (get_string (object, CFSTR("IOCalloutDevice"), device->path, sizeof (device->path)) &&
 		    get_string (object, CFSTR("USB Product Name"), device->name, sizeof (device->name)) &&
 		    get_string (object, CFSTR("USB Serial Number"), serial_string, sizeof (serial_string))) {
diff --git a/libaltos/libaltos.dylib b/libaltos/libaltos.dylib
index cfbd3f54..8b491c58 100755
--- a/libaltos/libaltos.dylib
+++ b/libaltos/libaltos.dylib