Merge branch 'bdale'

Conflicts:
	debian/control

3 files changed, 5 insertions, 3 deletions

diff --git a/debian/altos.desktop b/debian/altos.desktop
index 4281ad3a..4345cf09 100644
--- a/debian/altos.desktop
+++ b/debian/altos.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Application
-Name=AltOS View
+Name=AltOS UI
 GenericName=TeleMetrum Telemetry Viewer
 Comment=View and log downlink data from TeleMetrum
 Icon=/usr/share/pixmaps/altusmetrum.xpm
-Exec=/usr/bin/ao-view %f
+Exec=/usr/bin/altosui %f
 Terminal=false
 MimeType=text/plain;
 Categories=Education;Science;
diff --git a/debian/control b/debian/control
index cc8fda94..f2bd1914 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Bdale Garbee <bdale@gag.com>
 Uploaders: Keith Packard <keithp@keithp.com>
 Build-Depends: debhelper (>= 7), autoconf, automake, flite1-dev, gawk, libasound2-dev, libgconf2-dev, libglade2-dev, libgtk2.0-dev, libreadline-dev, libusb-1.0-0-dev, nickle, sdcc, libplplot-dev, xsltproc, fop, docbook-xml, docbook-xsl, libsndfile1-dev, swig, openjdk-6-jdk, freetts
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://altusmetrum.org/AltOS
 
 Package: altos
diff --git a/debian/dirs b/debian/dirs
index db75fea7..7b4dffb8 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,7 +1,9 @@
 etc/apt/sources.list.d
 usr/bin
+usr/lib/altos
 usr/share/altos
 usr/share/applications
 usr/share/gdm/themes/altusmetrum
+usr/share/java
 usr/share/pixmaps
 usr/share/slim/themes/altusmetrum