Merge branch 'master' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 18 Aug 2009 20:03:16 +0000 (14:03 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 18 Aug 2009 20:03:16 +0000 (14:03 -0600)
13 files changed:
.gbp.conf [new file with mode: 0644]
debian/README.Debian [new file with mode: 0644]
debian/altos.doc-base.EX [new file with mode: 0644]
debian/altos.install [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/dirs [new file with mode: 0644]
debian/docs [new file with mode: 0644]
debian/menu [new file with mode: 0644]
debian/rules [new file with mode: 0755]
src/Makefile

diff --git a/.gbp.conf b/.gbp.conf
new file mode 100644 (file)
index 0000000..9561fdf
--- /dev/null
+++ b/.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/README.Debian b/debian/README.Debian
new file mode 100644 (file)
index 0000000..308febd
--- /dev/null
@@ -0,0 +1,6 @@
+altos for Debian
+----------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 17 Aug 2009 23:01:22 -0600
diff --git a/debian/altos.doc-base.EX b/debian/altos.doc-base.EX
new file mode 100644 (file)
index 0000000..803c08e
--- /dev/null
@@ -0,0 +1,20 @@
+Document: altos
+Title: Debian altos Manual
+Author: <insert document author here>
+Abstract: This manual describes what altos is
+ and how it can be used to
+ manage online manuals on Debian systems.
+Section: unknown
+
+Format: debiandoc-sgml
+Files: /usr/share/doc/altos/altos.sgml.gz
+
+Format: postscript
+Files: /usr/share/doc/altos/altos.ps.gz
+
+Format: text
+Files: /usr/share/doc/altos/altos.text.gz
+
+Format: HTML
+Index: /usr/share/doc/altos/html/index.html
+Files: /usr/share/doc/altos/html/*.html
diff --git a/debian/altos.install b/debian/altos.install
new file mode 100644 (file)
index 0000000..59d2743
--- /dev/null
@@ -0,0 +1,2 @@
+src/*.ihx      usr/share/altos
+src/*.map      usr/share/altos
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..ffdec81
--- /dev/null
@@ -0,0 +1,65 @@
+altos (0.4+102+g645cc90) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 18 Aug 2009 12:59:36 -0600
+
+altos (0.4+101+gf54e075) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 18 Aug 2009 12:59:28 -0600
+
+altos (0.4+99+g022e77d) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 18 Aug 2009 12:52:39 -0600
+
+altos (0.4+97+g90347b1) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 18 Aug 2009 12:39:41 -0600
+
+altos (0.4+94+gf9126a2) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 18 Aug 2009 12:16:23 -0600
+
+altos (0.4+93+g4d7c4c6) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 18 Aug 2009 12:06:03 -0600
+
+altos (0.4+91+g9a97abb) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 18 Aug 2009 11:58:29 -0600
+
+altos (0.4+90+g24c337d) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 18 Aug 2009 11:58:18 -0600
+
+altos (0.4+88+gf65fa2b) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 18 Aug 2009 11:57:52 -0600
+
+altos (0.4+86+gcf1fa8b) unstable; urgency=low
+
+  * build for Debian from git
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 18 Aug 2009 11:54:11 -0600
+
+altos (0) unstable; urgency=low
+
+  * Initial packaging
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 18 Aug 2009 11:43:43 -0600
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..3c94d0c
--- /dev/null
@@ -0,0 +1,17 @@
+Source: altos
+Section: otherosfs
+Priority: extra
+Maintainer: Bdale Garbee <bdale@gag.com>
+Uploaders: Keith Packard <keithp@keithp.com>
+Build-Depends: debhelper (>= 7), autoconf, automake, flite1-dev, libasound2-dev, libgconf2-dev, libglade2-dev, libgtk2.0-dev, libreadline5-dev, libusb-1.0-0-dev, nickle, sdcc
+Standards-Version: 3.8.1
+Homepage: http://altusmetrum.org/
+
+Package: altos
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Altus Metrum firmware and utilities
+ Firmware and utilities needed to support the TeleMetrum dual-deploy
+ recording altimeter for high power model rocketry.  
+ .
+ See http://altusmetrum.org/ for more information.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..62ff91c
--- /dev/null
@@ -0,0 +1,36 @@
+This package was debianized by Bdale Garbee <bdale@gag.com> on
+Mon, 17 Aug 2009 23:01:22 -0600.
+
+It was downloaded from git.gag.com.
+
+Upstream Author(s):
+
+    Keith Packard <keithp@keithp.com>
+    Bdale Garbee <bdale@gag.com>
+
+Copyright:
+
+    Copyright © 2009 Keith Packard <keithp@keithp.com>
+
+License:
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 of the License.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+The Debian packaging is:
+
+    Copyright (C) 2009 Bdale Garbee <bdale@gag.com>
+
+and is also licensed under the GPL version 2.
+
+For a complete copy of the license, see `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644 (file)
index 0000000..59c9e8a
--- /dev/null
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/altos
diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..50bd824
--- /dev/null
@@ -0,0 +1,2 @@
+NEWS
+README
diff --git a/debian/menu b/debian/menu
new file mode 100644 (file)
index 0000000..7e15c9c
--- /dev/null
@@ -0,0 +1,2 @@
+?package(altos):needs="X11" section="Applications/Viewers"\
+  title="aoview" command="/usr/bin/aoview"
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..54a6d24
--- /dev/null
@@ -0,0 +1,76 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+export DH_VERBOSE=1
+PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
+
+# this target invoked by git-buildpackage using a clean hook, see .gbp.conf
+prebuild:
+       dch -v `git describe | tr - +` "build for Debian from git"
+       git commit debian/changelog -m "update Debian changelog for build"
+
+configure: configure-stamp
+configure-stamp:
+       dh_testdir
+       ./autogen.sh --prefix=/usr
+       touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp  
+       dh_testdir
+       $(MAKE) VERSION=$(PKG_VERSION)
+       touch $@
+
+clean: 
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp configure-stamp
+       [ ! -f Makefile ] || $(MAKE) distclean
+       dh_clean 
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_prep  
+       dh_installdirs
+
+       $(MAKE) DESTDIR=$(CURDIR)/debian/altos install
+
+# Build architecture-independent files here.
+binary-indep: install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs ChangeLog
+       dh_installdocs
+       dh_installexamples
+       dh_install
+#      dh_installmenu
+#      dh_installdebconf
+#      dh_installlogrotate
+#      dh_installemacsen
+#      dh_installpam
+#      dh_installmime
+#      dh_python
+#      dh_installinit
+#      dh_installcron
+#      dh_installinfo
+       dh_installman
+       dh_link
+       dh_strip
+       dh_compress
+       dh_fixperms
+#      dh_perl
+#      dh_makeshlibs
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
index 297f676b6b27e740edb4e561a476d55a5b8cbf0d..5a8afe0b9a5859a55abd80e313973d307d06eefd 100644 (file)
@@ -4,7 +4,9 @@
 #
 CC=sdcc
 
+ifndef VERSION
 VERSION=$(shell git describe)
+endif
 
 CFLAGS=--model-small --debug --opt-code-speed