Merge branch 'branch-1.6' into debian

[fw/altos] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 8a341f445c396c5ac25dd8dcbac95e082a562117..99b0d8a6a6e5766e6ad605d373bfdad6bffa19b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,18 @@ altos (1.5-1) unstable; urgency=medium
   * update changelog for Debian build
   * capture deleted file
   * more build dependencies for processing icons
+  * more build dependencies for processing icons
   * update ChangeLog
+  * update changelog for Debian build
+  * another build dep
+  * use dh_installmime, which requires telling configure to stay out of the way
+  * another build dep
+  * use dh_installmime, which requires telling configure to stay out of the way
+  * update changelog for release
+  * update changelog for Debian build
+  * need multi-arch in fat build
+  * ignore cal_values file in bringup directory
+  * updated ChangeLog for release
 
   [ Keith Packard ]
   * doc: Add instructions for flash recovery technique
@@ -164,8 +175,14 @@ altos (1.5-1) unstable; urgency=medium
   * altoslib/altosuilib: Add EasyMega support
   * altoslib/altosuilib: clean all versions of the .jar file
   * icons: Use DESTDIR when updating mime/icon caches
-
- -- Bdale Garbee <bdale@gag.com>  Wed, 10 Sep 2014 00:06:56 -0600
+  * .desktop: Use %F instead of %f in .desktop files
+  * configure: Add --disable-install-shared-mime-info option
+  * altoslib: Stop re-loading previous flight when starting telemetry monitoring
+  * telegps: Was mis-configuring the 'Configure Device' dialog
+  * altos: Fix ability to disable telemetry by setting interval to 0
+  * altos: Make sure we don't beep out continuity twice in idle mode
+
+ -- Bdale Garbee <bdale@gag.com>  Sat, 13 Sep 2014 11:33:05 -0600
 
 altos (1.4.1-1) unstable; urgency=medium