Merge branch 'new-debian' into debian

Conflicts:
	ChangeLog
	debian/altos.install
	debian/changelog
	debian/control
	debian/copyright
	debian/dirs
	debian/docs
	debian/menu
	debian/rules
	src/Makefile

1 files changed, 43 insertions, 0 deletions

diff --git a/altoslib/AltosFile.java b/altoslib/AltosFile.java
new file mode 100644
index 00000000..1ab00b38
--- /dev/null
+++ b/altoslib/AltosFile.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2010 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosLib; 
+
+import java.io.File;
+import java.util.*;
+
+public class AltosFile extends File {
+
+	public AltosFile(int year, int month, int day, int serial, int flight, String extension) {
+		super (AltosPreferences.logdir(),
+		       String.format("%04d-%02d-%02d-serial-%03d-flight-%03d.%s",
+				     year, month, day, serial, flight, extension));
+	}
+
+	public AltosFile(int serial, int flight, String extension) {
+		this(Calendar.getInstance().get(Calendar.YEAR),
+		     Calendar.getInstance().get(Calendar.MONTH) + 1,
+		     Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+		     serial,
+		     flight,
+		     extension);
+	}
+
+	public AltosFile(AltosRecord telem) {
+		this(telem.serial, telem.flight, "telem");
+	}
+}