Merge commit 'origin/master'

diff --git a/ChangeLog b/ChangeLog
index 8fe3609b75756280641f276a3da7b6f86f5ef0ce..a5c9604a92342be0ebd74a58f845b72a07a0bc98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,120 @@
+commit 6926c4ab5d87a8f2eb4fcde2c673fb3a4639e115
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Aug 31 16:47:44 2009 -0600
+
+    pixmap file should not be executable
+
+commit 1495e2f27acde3743c3764a0c31ee082224d6c64
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Aug 31 16:42:55 2009 -0600
+
+    update changelogs for Debian build
+
+commit c8c5b7963babe8eb16e2651fba9cd2c8d1cba74e
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Aug 31 16:42:37 2009 -0600
+
+    deliver an icon for the Debian menu system
+
+commit 591b99c232e780246fc07841c09c8c4e7835facb
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Aug 31 16:26:00 2009 -0600
+
+    update changelogs for Debian build
+
+commit b34474c1f3083e73b7184d519f54d4c8031836fd
+Merge: 8df1697 0d65bff
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Aug 31 16:25:32 2009 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit 0d65bff443c17d4d98c18b620ec075ab66b30efd
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Aug 21 10:47:46 2009 -0700
+
+    Turn off GPS tracking data when not present in data stream
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 8df169791835510d96c11a3b0aa3cc5b79fa7fde
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 19 02:21:23 2009 -0600
+
+    update changelogs for Debian build
+
+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/altusmetrum.xpm b/debian/altusmetrum.xpm
new file mode 100644 (file)
index 0000000..037b42d
--- /dev/null
+++ b/debian/altusmetrum.xpm
@@ -0,0 +1,175 @@
+/* XPM */
+static char *icon[] = {
+/* columns rows colors chars-per-pixel */
+"26 32 137 2",
+"   c #BB3D7F",
+".  c #BC3F7C",
+"X  c #BC3E7E",
+"o  c #BF4178",
+"O  c #BE4179",
+"+  c #BD407A",
+"@  c #BE407A",
+"#  c #D95F46",
+"$  c #D95F47",
+"%  c #D55B4B",
+"&  c #D75D49",
+"*  c #D65C4B",
+"=  c #D75C4B",
+"-  c #D55A4E",
+";  c #D85D49",
+":  c #D85E48",
+">  c #D85E49",
+",  c #CD525B",
+"<  c #CE525B",
+"1  c #CE535B",
+"2  c #CF5459",
+"3  c #CB505D",
+"4  c #CD515D",
+"5  c #CC515E",
+"6  c #CC505F",
+"7  c #D05654",
+"8  c #D15655",
+"9  c #D05556",
+"0  c #D05557",
+"q  c #D35851",
+"w  c #D35951",
+"e  c #D25852",
+"r  c #D25853",
+"t  c #D45950",
+"y  c #D05558",
+"u  c #DB6241",
+"i  c #DB6142",
+"p  c #DC6340",
+"a  c #D96044",
+"s  c #DA6044",
+"d  c #C64B66",
+"f  c #CB4F60",
+"g  c #CB4F61",
+"h  c #C94E63",
+"j  c #CA4E62",
+"k  c #C84C65",
+"l  c #C94D65",
+"z  c #C84C66",
+"x  c #C84C67",
+"c  c #C2466E",
+"v  c #C3476F",
+"b  c #C4476E",
+"n  c #C74B68",
+"m  c #C74A69",
+"M  c #C5496B",
+"N  c #C6496A",
+"B  c #C6496B",
+"V  c #C4486D",
+"C  c #CB5060",
+"Z  c #C04471",
+"A  c #C24571",
+"S  c #C34670",
+"D  c #C24671",
+"F  c #C14473",
+"G  c #C24572",
+"H  c #C04375",
+"J  c #C14474",
+"K  c #B53885",
+"L  c #B83B81",
+"P  c #BA3C80",
+"I  c #BA3C81",
+"U  c #B83985",
+"Y  c #B83A85",
+"T  c #B63789",
+"R  c #B4358B",
+"E  c #B5378A",
+"W  c #B3348E",
+"Q  c #B3348F",
+"!  c #B4358D",
+"~  c #B63888",
+"^  c #AF2F96",
+"/  c #AE2F97",
+"(  c #AB2C99",
+")  c #A82A9D",
+"_  c #AB2B9E",
+"`  c #AC2C9C",
+"'  c #AF3095",
+"]  c #B23390",
+"[  c #B03095",
+"{  c #9E1DB2",
+"}  c #9F1EB2",
+"|  c #9B1BB5",
+" . c #9D1CB5",
+".. c #9A17BF",
+"X. c #9B19BB",
+"o. c #9C1ABA",
+"O. c #9A19BC",
+"+. c #9B19BC",
+"@. c #A01EB3",
+"#. c #A726A5",
+"$. c #A625A6",
+"%. c #A626A6",
+"&. c #A929A0",
+"*. c #A828A2",
+"=. c #A423AB",
+"-. c #A524A8",
+";. c #A524AA",
+":. c #A221AE",
+">. c #8E0CCD",
+",. c #910FCB",
+"<. c #900DCE",
+"1. c #9413C4",
+"2. c #9613C6",
+"3. c #9815C2",
+"4. c #9310CA",
+"5. c #9512C8",
+"6. c #8F0CD2",
+"7. c #8E0BD4",
+"8. c #8D09D7",
+"9. c #8603DE",
+"0. c #8A05DD",
+"q. c #8C08D8",
+"w. c #8200E1",
+"e. c #8200E2",
+"r. c #8300E2",
+"t. c #8300E3",
+"y. c #8401E0",
+"u. c #8602E0",
+"i. c #8602E2",
+"p. c #8400E4",
+"a. c #8400E5",
+"s. c #8500E5",
+"d. c #8501E5",
+"f. c #8601E5",
+"g. c #8500E6",
+"h. c #8804E0",
+"j. c None",
+/* pixels */
+"j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.j.j.j.j.a.j.j.j.j.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.j.j.j.j.a.g.j.j.j.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.j.j.j.j.g.a.j.j.j.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.j.j.j.a.a.a.j.j.j.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.j.j.j.a.a.a.a.j.j.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.j.j.j.g.a.a.a.j.j.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.j.j.a.a.j.j.a.j.j.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.j.j.a.a.j.j.a.a.j.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.j.j.p.j.j.j.w.w.j.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.j.w.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.j.a.a.j.j.j.j.a.a.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.j.a.a.w.j.j.a.a.a.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.p.a.a.a.j.a.a.a.a.j.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.a.a.w.j.w.w.j.a.a.a.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.j.a.a.p.j.j.j.j.p.g.a.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.p.a.a.w.j.j.j.j.p.g.a.j.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.a.g.a.p.j.j.j.j.p.f.a.a.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.j.a.h.q.>.j.j.j.j.,.7.0.p.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.9.q.4.3. .j.j.j.j.{ X.2.6.j.j.j.j.j.j.j.",
+"j.j.j.j.j.j.<.3.@.#._ j.j.j.j.( *.:.X.2.j.j.j.j.j.j.",
+"j.j.j.j.j.j.O.;.` ! K j.j.j.j.I E [ #.@.j.j.j.j.j.j.",
+"j.j.j.j.j. .;.' Y o F j.j.j.j.v J P ] &.j.j.j.j.j.j.",
+"j.j.j.j.j.$.' P F M k j.j.j.j.k M v O ! ( j.j.j.j.j.",
+"j.j.j.j.j.' P F M j 3 j.j.j.j.1 6 z b O E j.j.j.j.j.",
+"j.j.j.j.j.~ F n C 2 9 j.j.j.j.w 9 6 z V X j.j.j.j.j.",
+"j.j.j.j.! O V C 2 w % j.j.j.j.% * 9 6 z F P j.j.j.j.",
+"j.j.j.j.K S z y t : $ j.j.j.j.p s - 9 j M O j.j.j.j.",
+"j.j.j./ + V C 9 * s j.j.j.j.j.j.p : t 1 z J E j.j.j.",
+"j.j.:.] J z 2 t : j.j.j.j.j.j.j.j.s * 9 j b I *.j.j.",
+"j.5.;.~ S z y t j.j.j.j.j.j.j.j.j.j.: r 6 M X _ X.j."
+};

diff --git a/debian/changelog b/debian/changelog
index e0ee103076ffcf915f934f1e5b8a28d652b93207..0f2dd70a929d00604dc1357a5e174d20a4290982 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,45 @@
+altos (0.5+13+g6926c4a) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 31 Aug 2009 16:48:03 -0600
+
+altos (0.5+11+gc8c5b79) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 31 Aug 2009 16:42:55 -0600
+
+altos (0.5+9+gb34474c) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 31 Aug 2009 16:26:00 -0600
+
+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/dirs b/debian/dirs
index 8b9a4657b321055217265496916e657bd9924562..3783a46cd7265fb4b23f374839bfbe8d6bf7a6b1 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,3 +1,4 @@
 etc/apt/sources.list.d
 usr/bin
 usr/share/altos
+/usr/share/pixmaps

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

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..74cc078d889c5d015b0c4a7c43361e07866adda8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,8 @@ install: build
        dh_installdirs
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/altos install
+       install -o root -g root -m 0644 debian/altusmetrum.xpm \
+               $(CURDIR)/debian/altos/usr/share/pixmaps/altusmetrum.xpm
 
 # Build architecture-independent files here.
 binary-indep: install
@@ -51,7 +53,7 @@ binary-arch: install
        dh_installdocs
        dh_installexamples
        dh_install
-#      dh_installmenu
+       dh_installmenu
 #      dh_installdebconf
 #      dh_installlogrotate
 #      dh_installemacsen