From 9801ff7de21027935f52ccabaa3ff157e22d21ce Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 15 Mar 2010 12:04:18 -0600 Subject: move gbp.conf into debian/ --- debian/gbp.conf | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 debian/gbp.conf (limited to 'debian') diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 00000000..9561fdfe --- /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 + -- cgit v1.2.3 From 20d4d410e0fc04fe192e309811eed6c0194fa5a8 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 30 Mar 2010 23:11:40 -0600 Subject: initial harness for documentation --- .gitignore | 3 +++ debian/control | 4 ++-- debian/docs | 2 ++ debian/rules | 1 + doc/Makefile | 25 +++++++++++++++++++++++++ doc/telemetrum.xsl | 44 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 doc/Makefile create mode 100644 doc/telemetrum.xsl (limited to 'debian') diff --git a/.gitignore b/.gitignore index eafee20f..16ff1f7b 100644 --- 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/debian/control b/debian/control index 7d21e602..2ba1722d 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: otherosfs Priority: extra Maintainer: Bdale Garbee Uploaders: Keith Packard -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 50bd824b..d5af59c7 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1,4 @@ NEWS README +doc/telemetrum.html +doc/telemetrum.pdf diff --git a/debian/rules b/debian/rules index 780011b7..a7468b9f 100755 --- 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 index 00000000..d3293900 --- /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 index 00000000..7d855318 --- /dev/null +++ b/doc/telemetrum.xsl @@ -0,0 +1,44 @@ + + + + + + Bdale + Garbee + + + Keith + Packard + + + 2010 + Bdale Garbee + + TeleMetrum + Owner's Manual for the TeleMetrum System + + + This document is released under the terms of the + + Creative Commons ShareAlike 3.0 + + license. + + + + + 0.1 + 30 March 2010 + Initial content + + + + + Introduction + + Placeholder. + + + + -- cgit v1.2.3 From 28e40ccfcd80ab8764d4aa235257cea4d193a0c1 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 30 Mar 2010 23:14:47 -0600 Subject: update changelogs for Debian build --- ChangeLog | 18 ++++++++++++++++++ debian/changelog | 7 +++++++ 2 files changed, 25 insertions(+) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 2a3c8fdb..1b55a7f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +commit 20d4d410e0fc04fe192e309811eed6c0194fa5a8 +Author: Bdale Garbee +Date: Tue Mar 30 23:11:40 2010 -0600 + + initial harness for documentation + +commit 9801ff7de21027935f52ccabaa3ff157e22d21ce +Author: Bdale Garbee +Date: Mon Mar 15 12:04:18 2010 -0600 + + move gbp.conf into debian/ + +commit eda5e1166a97766aa22561beaa1086ba4e19ee16 +Author: Bdale Garbee +Date: Thu Mar 4 17:33:39 2010 -0700 + + update changelogs for Debian build + commit 6e61170d42936c18cd6efba6f4c14af616a30745 Author: Keith Packard Date: Sun Feb 28 18:24:46 2010 -0800 diff --git a/debian/changelog b/debian/changelog index 90b79f26..66e72832 100644 --- 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 Tue, 30 Mar 2010 23:13:02 -0600 + altos (0.6+108+g6e61170) unstable; urgency=low [ Keith Packard ] -- cgit v1.2.3 From f03ed0876c67b58624abf0c14bf73444b0322d3c Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 30 Mar 2010 23:18:37 -0600 Subject: update changelogs for Debian build --- ChangeLog | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- debian/changelog | 11 +++++++++-- 2 files changed, 64 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 1c9e127a..c70c5929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,19 @@ -<<<<<<< HEAD +commit b41e617080fe825f7810ee5eee52ea37f7618ec6 +Merge: 28e40cc df7bda1 +Author: Bdale Garbee +Date: Tue Mar 30 23:15:32 2010 -0600 + + Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos + + Conflicts: + ChangeLog + +commit 28e40ccfcd80ab8764d4aa235257cea4d193a0c1 +Author: Bdale Garbee +Date: Tue Mar 30 23:14:47 2010 -0600 + + update changelogs for Debian build + commit 20d4d410e0fc04fe192e309811eed6c0194fa5a8 Author: Bdale Garbee Date: Tue Mar 30 23:11:40 2010 -0600 @@ -11,8 +26,45 @@ Date: Mon Mar 15 12:04:18 2010 -0600 move gbp.conf into debian/ -======= ->>>>>>> df7bda1f32b0049c3878c325ea0b55999f3980e3 +commit df7bda1f32b0049c3878c325ea0b55999f3980e3 +Merge: 23da4f3 a7042fe +Author: Keith Packard +Date: Fri Mar 12 10:38:26 2010 -0800 + + Merge remote branch 'origin/master' + +commit 23da4f3bcdd1d780c9e1f6b68ad2fb309fcae6ba +Author: Keith Packard +Date: Fri Mar 12 10:37:32 2010 -0800 + + Document the ao-dumplog '--remote' flag for radio-link downloads + + The --remote (or -R) flag uses TeleDongle to fetch data over the radio + command link from TeleMetrum. It's been there for a while, but the man + page failed to mention it. + + Signed-off-by: Keith Packard + +commit 93df98898f8cd199ae13158bc4f65e3494c954ad +Author: Keith Packard +Date: Fri Mar 12 10:35:12 2010 -0800 + + Round radio calibration value instead of truncating + + The radio calibration function in the bring-up code was truncating the + radio calibration value which caused the resulting frequency to + always measure above the target frequency, instead of trying to get as + close as possible. This change will result in a closer frequency + match, but may sometimes be below the target frequency. + + Signed-off-by: Keith Packard + +commit a7042fe7d065d1da1252be5ad43e3c9856214dc8 +Author: Bdale Garbee +Date: Fri Mar 5 19:11:11 2010 -0800 + + update changelogs for Debian build + commit eda5e1166a97766aa22561beaa1086ba4e19ee16 Author: Bdale Garbee Date: Thu Mar 4 17:33:39 2010 -0700 diff --git a/debian/changelog b/debian/changelog index 66e72832..75000f80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ -altos (0.6+111+g20d4d41) unstable; urgency=low +altos (0.6+117+gb41e617) unstable; urgency=low + [ Bdale Garbee ] + * update changelogs for Debian build * move gbp.conf into debian/ * initial harness for documentation - -- Bdale Garbee Tue, 30 Mar 2010 23:13:02 -0600 + [ Keith Packard ] + * Round radio calibration value instead of truncating + * Document the ao-dumplog '--remote' flag for radio-link downloads + + + -- Bdale Garbee Tue, 30 Mar 2010 23:18:08 -0600 altos (0.6+108+g6e61170) unstable; urgency=low -- cgit v1.2.3 From 00f49c8fb0aa38331360bdb85c32bcebe60dcdc3 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 30 Mar 2010 23:19:07 -0600 Subject: fix typo --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 2ba1722d..85074142 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: otherosfs Priority: extra Maintainer: Bdale Garbee Uploaders: Keith Packard -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 +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 -- cgit v1.2.3 From eb3cc3e9b60ec23acbb7d797affa743d671801ab Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 30 Mar 2010 23:19:48 -0600 Subject: update changelogs for Debian build --- ChangeLog | 12 ++++++++++++ debian/changelog | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index c70c5929..618c4a51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +commit 00f49c8fb0aa38331360bdb85c32bcebe60dcdc3 +Author: Bdale Garbee +Date: Tue Mar 30 23:19:07 2010 -0600 + + fix typo + +commit f03ed0876c67b58624abf0c14bf73444b0322d3c +Author: Bdale Garbee +Date: Tue Mar 30 23:18:37 2010 -0600 + + update changelogs for Debian build + commit b41e617080fe825f7810ee5eee52ea37f7618ec6 Merge: 28e40cc df7bda1 Author: Bdale Garbee diff --git a/debian/changelog b/debian/changelog index 75000f80..f0fe4564 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,16 @@ -altos (0.6+117+gb41e617) unstable; urgency=low +altos (0.6+119+g00f49c8) unstable; urgency=low [ Bdale Garbee ] * update changelogs for Debian build * move gbp.conf into debian/ * initial harness for documentation + * fix typo [ Keith Packard ] * Round radio calibration value instead of truncating * Document the ao-dumplog '--remote' flag for radio-link downloads - - -- Bdale Garbee Tue, 30 Mar 2010 23:18:08 -0600 + -- Bdale Garbee Tue, 30 Mar 2010 23:19:15 -0600 altos (0.6+108+g6e61170) unstable; urgency=low -- cgit v1.2.3 From 76768804e68ed09421d7a48cb0b390f102ce2d76 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 30 Mar 2010 23:26:35 -0600 Subject: make lintian happy --- debian/source/format | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/source/format (limited to 'debian') diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..89ae9db8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) -- cgit v1.2.3