Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

diff --git a/ChangeLog b/ChangeLog
index 8fe3609b75756280641f276a3da7b6f86f5ef0ce..cd4b4e14913a0e6b76f43d48eaf0eac18b7f0327 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,75 @@
+commit 42ab6d52540d0326ef89e9d57954b08248558468
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 19 02:21:06 2009 -0600
+
+    fix location for delivery of sources.list fragment
+
+commit 977f5dc0bc7c666dcc1f21db77416efca0d696aa
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 19 02:11:11 2009 -0600
+
+    update changelogs for Debian build
+
+commit 8d4d6655f1b4c2fbc522fd255bfb75406e5ddaef
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 19 02:11:00 2009 -0600
+
+    oops, aoview is now ao-view!
+
+commit b9a97aea65f871fd287bc0bb566d8664766f4afd
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 19 02:07:16 2009 -0600
+
+    update changelogs for Debian build
+
+commit 21e3dd0affac89919e5d0e29c6e9eb1eacb51801
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 19 02:06:49 2009 -0600
+
+    enable support for Debian menus
+
+commit 0087c1776e0253fc2bd3b86f15bf9d1b32bdc45a
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 19 00:52:57 2009 -0600
+
+    update changelogs for Debian build
+
+commit 4486d9156e19e4280b42bcd422d81d04f2d04a92
+Merge: dd09f0b 33edd62
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 19 00:49:24 2009 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit 33edd62992a32b0ec8ca66d879fa300871db5937
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Aug 18 23:38:16 2009 -0700
+
+    Update ao-view to add GPS satellite tracking data
+    
+    This adds another column to the display to hold per-satellite GPS
+    tracking data and a count of the visible and locked sats.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 29687cbd462a332d9a36ed87500c5b737dcae3f4
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Aug 18 22:35:15 2009 -0700
+
+    Handle GPS satellite tracking data
+    
+    SiRF message #4 includes signal strength and GPS engine state for each
+    of the satellites being tracked. This data is now parsed and sent to
+    eeprom and the radio.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit dd09f0bc2b950c00f3b489878cd69ad8a003f46c
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Tue Aug 18 21:57:01 2009 -0600
+
+    update changelogs for Debian build
+
 commit cd5ce661e2a8f9694933358ccb5b916fbed089c2
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Tue Aug 18 21:49:39 2009 -0600

diff --git a/debian/altos.install b/debian/altos.install
index aac3544bbb95903b33565a51c33335b52273ae6c..57f9b02a0bd6115aec9f63bb3af68c81cff9947e 100644 (file)
--- a/debian/altos.install
+++ b/debian/altos.install
@@ -1,3 +1,3 @@
-debian/repository      etc/apt/sources.list.d/altos.list
+debian/altos.list      etc/apt/sources.list.d
 src/*.ihx              usr/share/altos
 src/*.map              usr/share/altos

diff --git a/debian/altos.list b/debian/altos.list
new file mode 100644 (file)
index 0000000..201a4a2
--- /dev/null
+++ b/debian/altos.list
@@ -0,0 +1,2 @@
+deb    http://altusmetrum.org/apt sid main
+deb-src        http://altusmetrum.org/apt sid main

diff --git a/debian/changelog b/debian/changelog
index e0ee103076ffcf915f934f1e5b8a28d652b93207..318292bf9f853975be2350a0d53f26c859d523f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+altos (0.4+98+g42ab6d5) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 19 Aug 2009 02:21:23 -0600
+
+altos (0.4+96+g8d4d665) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 19 Aug 2009 02:11:11 -0600
+
+altos (0.4+94+g21e3dd0) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 19 Aug 2009 02:07:16 -0600
+
+altos (0.4+92+g4486d91) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 19 Aug 2009 00:52:57 -0600
+
 altos (0.4+88+gcd5ce66) unstable; urgency=low
 
   * build for Debian from git

diff --git a/debian/menu b/debian/menu
index 7e15c9c8657d627be1e1e624ee5121b095167622..9bd98c5a160c85c237b290cba5ba761091a9113a 100644 (file)
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
 ?package(altos):needs="X11" section="Applications/Viewers"\
-  title="aoview" command="/usr/bin/aoview"
+  title="ao-view" command="/usr/bin/ao-view"

diff --git a/debian/repository b/debian/repository
deleted file mode 100644 (file)
index 201a4a2..0000000
--- a/debian/repository
+++ /dev/null
@@ -1,2 +0,0 @@
-deb    http://altusmetrum.org/apt sid main
-deb-src        http://altusmetrum.org/apt sid main

diff --git a/debian/rules b/debian/rules
index 078dac56cddff93a9e91161cd046e1181d255b42..a2fd3fc73e7e02323699448f052d2091c185a534 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ binary-arch: install
        dh_installdocs
        dh_installexamples
        dh_install
-#      dh_installmenu
+       dh_installmenu
 #      dh_installdebconf
 #      dh_installlogrotate
 #      dh_installemacsen