update changelogs for Debian build

diff --git a/ChangeLog b/ChangeLog
index 70d0c357d1763d4f07321f895f7dc14d360ce397..bcb4d6ebf973de5ba4227d288fd1dbd95c020b85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+commit bc399d97a8424a5262f66a03e3bc403f793bb337
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 10:38:44 2011 -0600
+
+    roll back packaging changelog for rebuild
+
+commit 13e6e799070a1469cbc2ff990379ee520b8f0e6a
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 10:29:58 2011 -0600
+
+    roll release notes version from 1.0 to 1.0.1
+
+commit 1d15c841ad276127edae0345bd316c30731fffbf
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 10:24:35 2011 -0600
+
+    ignore generated log file
+
+commit 58a74c3c3dcd01509224326cffeb67a3e809e4e6
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 10:07:15 2011 -0600
+
+    fix telemini firmware path name
+
+commit 0a92eb2fa6b213533691288d8f99d72b80312983
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 09:43:06 2011 -0600
+
+    update changelogs for Debian build
+
 commit 3cea033ec928c21b9f7b810898ed3c3cc536d2ce
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Fri Aug 26 09:41:46 2011 -0600

diff --git a/debian/changelog b/debian/changelog
index 906c0dedfef18c0507804e9a47a7805b09ec3750..a662e1c3701836d8b190e1122b9382aa06452648 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+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 ]