Merge remote-tracking branch 'origin/master' into multiarch

Conflicts:
	configure.ac

Fix version number and location of ao.h header

3 files changed, 27 insertions, 47 deletions

diff --git a/debian/changelog b/debian/changelog
index 906c0ded..b9e78c8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+altos (1.0.1+3+g93b8f40) unstable; urgency=low
+
+  * update release process docs
+  * more release process doc updates
+
+ -- Bdale Garbee <bdale@gag.com>  Sun, 28 Aug 2011 13:39:31 -0600
+
+altos (1.0.1) unstable; urgency=low
+
+  [ Bdale Garbee ]
+  * use multimaint-merge to make Debian changelogs less ugly
+  * update TeleMini turnon script now that we've made a stable firmware release
+  * moving git-buildpackage config into .git/ since it is fairly specific to 
+    Bdale's build environment, and doesn't need to be in the source package
+  * get ready for a 1.0.1 release
+  * update changelogs for Debian build
+  * fix telemini firmware path name
+  * ignore generated log file
+  * roll release notes version from 1.0 to 1.0.1
+  * roll back packaging changelog for rebuild
+
+  [ Keith Packard ]
+  * altos: Clear callsign on initial config load
+
+ -- Bdale Garbee <bdale@gag.com>  Fri, 26 Aug 2011 10:39:29 -0600
+
 altos (1.0) unstable; urgency=low
 
   [ Keith Packard ]
diff --git a/debian/control b/debian/control
index 15176565..31daaf1b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.gag.com/?p=fw/altos
 
 Package: altos
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime, freetts, nickle
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime, freetts, nickle, libjfreechart-java
 Suggests: slim | gdm
 Replaces: altusmetrum-themes, slim-altusmetrum
 Conflicts: altusmetrum-themes, slim-altusmetrum
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 9561fdfe..00000000
--- a/debian/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
-