Merge remote branch 'origin/master'

diff --git a/ChangeLog b/ChangeLog
index 37c80609088b5fd34e2146f50c2e6fa91867f937..8eb36eac04d3ae0819789dd784e0f705276461ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+commit 127c3125e5a4b86b8f304bc2889e313688c3d83e
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Nov 2 15:59:12 2009 -0700
+
+    update changelogs for Debian build
+
+commit 6b1e77569e2fed3c44606ed268421df5d3ed4020
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Nov 2 15:57:41 2009 -0700
+
+    update changelogs for Debian build
+
+commit 8203bfa58af32a1d07a44c1c151b200df0b65f15
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Nov 2 15:56:42 2009 -0700
+
+    de-version the libreadline-dev build dependency
+
+commit 550482d953c491a5ede9f2d243493afb13289898
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Oct 12 16:58:46 2009 -0600
+
+    update changelogs for Debian build
+
 commit 2de548f45d0f50b558acc83f57e1e2fc1223ab92
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Mon Oct 12 16:58:19 2009 -0600

diff --git a/debian/changelog b/debian/changelog
index 44204885861ef29b2f07cd77c17e6c3f105ab40e..1040de3660cc4a1987f69b08f27f5ae628c983b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+altos (0.5+90+g127c312) unstable; urgency=low
+
+  * de-version the libreadline-dev build dependency
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 02 Nov 2009 15:57:29 -0700
+
 altos (0.5+86+g2de548f) unstable; urgency=low
 
   * automate push of updated and tagged master branch during

diff --git a/debian/control b/debian/control
index d28be629d5f16bdd9b700f17b1e3cf0b91778899..3029e7d4f05d8fa66d13014d44182ac313f9bc0b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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, libplplot-dev
+Build-Depends: debhelper (>= 7), autoconf, automake, flite1-dev, 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
 Homepage: http://altusmetrum.org/