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

Conflicts:
	ChangeLog

diff --git a/.gbp.conf b/.gbp.conf
deleted file mode 100644 (file)
index 9561fdf..0000000
--- a/.gbp.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# Configuration file for git-buildpackage and friends
-
-[DEFAULT]
-# the default build command:
-#builder = debuild -i\.git/ -I.git
-# the default clean command:
-cleaner = debian/rules prebuild && debuild clean
-# the default branch for upstream sources:
-upstream-branch = upstream
-# the default branch for the debian patch:
-debian-branch = master
-# the default tag formats used:
-#upstream-tag = upstream/%(version)s
-#debian-tag = debian/%(version)s
-# use pristine-tar:
-pristine-tar = True
-
-# Options only affecting git-buildpackage
-[git-buildpackage]
-#upstream-branch = dfsgclean
-# uncomment this to automatically GPG sign tags
-#sign-tags = True
-# keyid to GPG sign tags with
-#keyid = 0xdeadbeef
-# push to a remote repository after a successful tag: 
-posttag = git push --mirror
-# use this for more svn-buildpackage like behaviour:
-export-dir = ../build-area/altos/
-#tarball-dir = ../tarballs/
-
-# Options only affecting git-import-orig
-[git-import-orig]
-#upstream-branch = newupstream
-#debian-branch = dfsgclean
-#filter = .svn
-
-# Options only affecting git-import-dsc
-[git-import-dsc]
-#upstream-branch = svn-upstream
-#filter = [ 'CVS', '.cvsignore' ]
-
-# Options only affecting git-dch
-[git-dch]
-#git-log = --no-merges
-#snapshot-number = snapshot + 1
-

diff --git a/.gitignore b/.gitignore
index eafee20f0bacae08b62c1fb5b944cf8dd8deb212..16ff1f7bfee0eed0bdd43fcc570982dc21eb0b1c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,6 @@ Makefile.in
 missing
 stamp-h1
 tags
+doc/telemetrum.fo
+doc/telemetrum.html
+doc/telemetrum.pdf

diff --git a/ChangeLog b/ChangeLog
index ea64f192da4256bb4bc732687102d925af033832..1c9e127a90d1db96e0506fd7a826c7da1a22d7ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+<<<<<<< HEAD
+commit 20d4d410e0fc04fe192e309811eed6c0194fa5a8
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Tue Mar 30 23:11:40 2010 -0600
+
+    initial harness for documentation
+
+commit 9801ff7de21027935f52ccabaa3ff157e22d21ce
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Mar 15 12:04:18 2010 -0600
+
+    move gbp.conf into debian/
+
+=======
+>>>>>>> df7bda1f32b0049c3878c325ea0b55999f3980e3
 commit eda5e1166a97766aa22561beaa1086ba4e19ee16
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Thu Mar 4 17:33:39 2010 -0700

diff --git a/ao-bringup/turnon_teledongle b/ao-bringup/turnon_teledongle
index 97c1e419b981bc6086a16e5f734914321268b164..7dbb82b5bbd9335063529b3dd60e1714b57e232d 100755 (executable)
--- a/ao-bringup/turnon_teledongle
+++ b/ao-bringup/turnon_teledongle
@@ -1,5 +1,23 @@
 #!/bin/sh
 
+if [ -x ../ao-tools/ao-load/ao-load ]; then
+       AOLOAD=../ao-tools/ao-load/ao-load
+elif [ -x /usr/bin/ao-load ]; then
+       AOLOAD=/usr/bin/ao-load
+else
+       echo "Can't find ao-load!  Aborting."
+       exit 1
+fi
+
+if [ -x ../ao-tools/ao-rawload/ao-rawload ]; then
+       RAWLOAD=../ao-tools/ao-rawload/ao-rawload
+elif [ -x /usr/bin/ao-rawload ]; then
+       RAWLOAD=/usr/bin/ao-rawload
+else
+       echo "Can't find ao-rawload!  Aborting."
+       exit 1
+fi
+
 echo "TeleDongle v0.2 Turn-On and Calibration Program"
 echo "Copyright 2010 by Bdale Garbee.  Released under GPL v2"
 echo
@@ -11,18 +29,20 @@ echo
 echo -n "TeleDongle serial number: "
 read SERIAL
 
-../ao-tools/ao-rawload/ao-rawload -r ao_led_blink.ihx
+echo $RAWLOAD
+
+$RAWLOAD -r ao_led_blink.ihx
 echo "LEDs should be blinking"
 sleep 5
 
-../ao-tools/ao-rawload/ao-rawload -r ao_radio_xmit.ihx
+$RAWLOAD -r ao_radio_xmit.ihx
 echo -n "Generating RF carrier.  Please enter measured frequency: "
 read FREQ
 
 CAL_VALUE=`nickle -e "floor(434.55 / $FREQ * 1186611 + 0.5)"`
 
 echo "Programming flash with cal value " $CAL_VALUE
-ao-load --cal $CAL_VALUE /usr/share/altos/teledongle-v0.2.ihx $SERIAL
+$AOLOAD --cal $CAL_VALUE /usr/share/altos/teledongle-v0.2.ihx $SERIAL
 
 echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE
 echo "Unplug and replug USB, cu to the board, confirm freq and record power"

diff --git a/debian/changelog b/debian/changelog
index 90b79f26ad9dcc23a6a37a2ce39306c6417d7268..66e72832b418d69293c1d69071df416ca3de695e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+altos (0.6+111+g20d4d41) unstable; urgency=low
+
+  * move gbp.conf into debian/
+  * initial harness for documentation
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 30 Mar 2010 23:13:02 -0600
+
 altos (0.6+108+g6e61170) unstable; urgency=low
 
   [ Keith Packard ]

diff --git a/debian/control b/debian/control
index 7d21e602328518bc4127567c4c115b280d5055cd..2ba1722df74de4e14aef91d6ff9e4c88d98d32c1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: otherosfs
 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
-Standards-Version: 3.8.3
+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.xsl
+Standards-Version: 3.8.4
 Homepage: http://altusmetrum.org/AltOS
 
 Package: altos

diff --git a/debian/docs b/debian/docs
index 50bd824bb7bc7edba72e31d1f7a6ef7932846902..d5af59c7f431e2010746b1ac4ccbeecaaebc2a1e 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,4 @@
 NEWS
 README
+doc/telemetrum.html
+doc/telemetrum.pdf

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644 (file)
index 0000000..9561fdf
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,46 @@
+# Configuration file for git-buildpackage and friends
+
+[DEFAULT]
+# the default build command:
+#builder = debuild -i\.git/ -I.git
+# the default clean command:
+cleaner = debian/rules prebuild && debuild clean
+# the default branch for upstream sources:
+upstream-branch = upstream
+# the default branch for the debian patch:
+debian-branch = master
+# the default tag formats used:
+#upstream-tag = upstream/%(version)s
+#debian-tag = debian/%(version)s
+# use pristine-tar:
+pristine-tar = True
+
+# Options only affecting git-buildpackage
+[git-buildpackage]
+#upstream-branch = dfsgclean
+# uncomment this to automatically GPG sign tags
+#sign-tags = True
+# keyid to GPG sign tags with
+#keyid = 0xdeadbeef
+# push to a remote repository after a successful tag: 
+posttag = git push --mirror
+# use this for more svn-buildpackage like behaviour:
+export-dir = ../build-area/altos/
+#tarball-dir = ../tarballs/
+
+# Options only affecting git-import-orig
+[git-import-orig]
+#upstream-branch = newupstream
+#debian-branch = dfsgclean
+#filter = .svn
+
+# Options only affecting git-import-dsc
+[git-import-dsc]
+#upstream-branch = svn-upstream
+#filter = [ 'CVS', '.cvsignore' ]
+
+# Options only affecting git-dch
+[git-dch]
+#git-log = --no-merges
+#snapshot-number = snapshot + 1
+

diff --git a/debian/rules b/debian/rules
index 780011b7734e4e8a7ce3d4970025eb2dc03a37a2..a7468b9f5c99814da86002ffd31fd184eb7df2e6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ build: build-stamp
 build-stamp: configure-stamp  
        dh_testdir
        $(MAKE) VERSION=$(PKG_VERSION)
+       (cd doc ; $(MAKE))
        touch $@
 
 clean: 

diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644 (file)
index 0000000..d329390
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,25 @@
+#
+#      http://docbook.sourceforge.net/release/xsl/current/README
+#
+
+all:   telemetrum.html telemetrum.pdf
+
+telemetrum.html:       telemetrum.xsl
+       xsltproc -o telemetrum.html \
+               /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl \
+               telemetrum.xsl
+
+telemetrum.fo: telemetrum.xsl
+       xsltproc -o telemetrum.fo \
+               /usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl \
+               telemetrum.xsl
+
+telemetrum.pdf:        telemetrum.fo
+       fop -fo telemetrum.fo -pdf telemetrum.pdf
+
+clean:
+       rm -f telemetrum.html telemetrum.pdf telemetrum.fo
+
+indent:                telemetrum.xsl
+       xmlindent -i 2 < telemetrum.xsl > telemetrum.new
+

diff --git a/doc/telemetrum.xsl b/doc/telemetrum.xsl
new file mode 100644 (file)
index 0000000..7d85531
--- /dev/null
+++ b/doc/telemetrum.xsl
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "/usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd">
+<book>
+  <bookinfo>
+    <author>
+      <firstname>Bdale</firstname>
+      <surname>Garbee</surname>
+    </author>
+    <author>
+      <firstname>Keith</firstname>
+      <surname>Packard</surname>
+    </author>
+    <copyright>
+      <year>2010</year>
+      <holder>Bdale Garbee</holder>
+    </copyright>
+    <title>TeleMetrum</title>
+    <subtitle>Owner's Manual for the TeleMetrum System</subtitle>
+    <legalnotice>
+      <para>
+        This document is released under the terms of the 
+        <ulink url="http://creativecommons.org/licenses/by-sa/3.0/">
+          Creative Commons ShareAlike 3.0
+        </ulink>
+        license.
+      </para>
+    </legalnotice>
+    <revhistory>
+      <revision>
+        <revnumber>0.1</revnumber>
+        <date>30 March 2010</date>
+        <revremark>Initial content</revremark>
+      </revision>
+    </revhistory>
+  </bookinfo>
+  <chapter>
+    <title>Introduction</title>
+    <para>
+      Placeholder.
+    </para>
+  </chapter>
+</book>
+