summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMatt Goins <mjgoins@openflows.com>2008-10-31 16:05:13 -0400
committerMatt Goins <mjgoins@openflows.com>2008-10-31 16:05:13 -0400
commit7f79f55addb03d438f1afebfc19be8086f7afc9a (patch)
tree80cc83b351ed3690f40c51d777d3ca3ec240cae5 /debian
parent680d7340d29d16325eb991feb37885d6faa955e2 (diff)
parentdbd07cf1282c4831f605924e9b13d34278db7f86 (diff)
Merge commit 'dkg/master'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
-rw-r--r--debian/control2
-rw-r--r--debian/monkeysphere.dirs2
3 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index a7514a3..300175d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+monkeysphere (0.20-1) UNRELEASED; urgency=low
+
+ [ Jameson Graef Rollins ]
+ * clean up Makefile to generate more elegant source tarballs.
+
+ [ Daniel Kahn Gillmor ]
+ * ensure that tempdirs are properly created, bail out otherwise instead
+ of stumbling ahead.
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Thu, 30 Oct 2008 15:03:23 -0400
+
monkeysphere (0.19-1) experimental; urgency=low
[ Daniel Kahn Gillmor ]
diff --git a/debian/control b/debian/control
index efd734b..ccc3ad2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: monkeysphere
Section: net
Priority: extra
Maintainer: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Uploaders: Jameson Graef Rollins <jrollins@phys.columbia.edu>
+Uploaders: Jameson Graef Rollins <jrollins@finestructure.net>
Build-Depends: debhelper (>= 7.0), libgnutls-dev (>= 2.4.0)
Standards-Version: 3.8.0.1
Homepage: http://web.monkeysphere.info/
diff --git a/debian/monkeysphere.dirs b/debian/monkeysphere.dirs
index cfafe15..1f9e66b 100644
--- a/debian/monkeysphere.dirs
+++ b/debian/monkeysphere.dirs
@@ -7,6 +7,6 @@ usr/share
usr/share/monkeysphere
usr/share/man
usr/share/man/man1
-usr/share/man/man5
+usr/share/man/man7
usr/share/man/man8
etc/monkeysphere