summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2009-11-02 15:47:40 -0800
committerKeith Packard <keithp@keithp.com>2009-11-02 15:47:40 -0800
commit7db9d86178ecfd58cc1c17ac9fcbdcfd2f13aaec (patch)
tree69455f2c25758c247a2455cc7ff45d5bb5fee9cd
parentb219801fb0e5eaff7778d21701da977104522da3 (diff)
parentf9de20000794c97a04d5bc2476191864bd2af371 (diff)
Merge remote branch 'origin/master'0.6
-rw-r--r--ChangeLog24
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
3 files changed, 31 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 37c80609..8eb36eac 100644
--- 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 44204885..1040de36 100644
--- 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 d28be629..3029e7d4 100644
--- 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/