diff options
| author | Micah Anderson <micah@riseup.net> | 2008-09-03 15:28:30 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2008-09-03 15:28:30 -0400 |
| commit | 86f97d40d6fb60f7dde3c7e3a8aab0124f151d35 (patch) | |
| tree | 94f62ff48a5ad9e4e65deec7b2fe606f2190555b /debian | |
| parent | 1e26301ec4cd2afc45c968c3fe3d77bf296b03fb (diff) | |
| parent | 52d692d728d7d56ec0f17e0a9afbb6579a7eece9 (diff) | |
Merge commit 'dkg/master'
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/monkeysphere.docs | 4 |
3 files changed, 17 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 1cc1dd8..206ddd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,22 @@ -monkeysphere (0.12-1) UNRELEASED; urgency=low +monkeysphere (0.13~pre-1) UNRELEASED; urgency=low + [ Daniel Kahn Gillmor ] + * tweaks in /usr/bin/monkeysphere to handle odd secret keyrings. + + -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Tue, 02 Sep 2008 21:28:51 -0400 + +monkeysphere (0.12-1) experimental; urgency=low + + [ Jameson Graef Rollins ] * Improved output handling. New LOG_LEVEL variable. + + [ Daniel Kahn Gillmor ] * debian/control: switched Homepage: and Vcs-Git: to canonicalized upstream hostnames. + * updated documentation for new release. + * changed my associated e-mail address for this package. - -- Jameson Graef Rollins <jrollins@phys.columbia.edu> Mon, 01 Sep 2008 23:55:56 -0700 + -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Tue, 02 Sep 2008 18:54:29 -0400 monkeysphere (0.11-1) experimental; urgency=low diff --git a/debian/control b/debian/control index ca07a5d..50bc1f1 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: monkeysphere Section: net Priority: extra -Maintainer: Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net> +Maintainer: Daniel Kahn Gillmor <dkg@fifthhorseman.net> Uploaders: Jameson Rollins <jrollins@fifthhorseman.net> Build-Depends: debhelper (>= 7.0), libgnutls-dev (>= 2.4.0), git-core Standards-Version: 3.8.0.1 diff --git a/debian/monkeysphere.docs b/debian/monkeysphere.docs index 595e6c8..b677881 100644 --- a/debian/monkeysphere.docs +++ b/debian/monkeysphere.docs @@ -1,3 +1,3 @@ -doc/README -doc/README.admin +website/getting-started-user.mdwn +website/getting-started-admin.mdwn doc/MonkeySpec |