diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | src/monkeysphere-ssh-proxycommand | 8 | ||||
| -rw-r--r-- | website/archive-key.mdwn | 25 | ||||
| -rw-r--r-- | website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn | 4 | ||||
| -rw-r--r-- | website/news/apt-repo-moved.mdwn | 7 | ||||
| -rw-r--r-- | website/news/release-0.12-1.mdwn | 9 |
7 files changed, 46 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index efb4a9c..85cb655 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -monkeysphere (0.12-1) UNRELEASED; urgency=low +monkeysphere (0.12-1) experimental; urgency=low [ Jameson Graef Rollins ] * Improved output handling. New LOG_LEVEL variable. @@ -7,6 +7,7 @@ monkeysphere (0.12-1) UNRELEASED; urgency=low * 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. -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Tue, 02 Sep 2008 18:54:29 -0400 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/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand index c37d754..a7b87ca 100755 --- a/src/monkeysphere-ssh-proxycommand +++ b/src/monkeysphere-ssh-proxycommand @@ -52,10 +52,10 @@ fi URI="ssh://${HOSTP}" # specify keyserver checking. the behavior of this proxy command is -# intentially different than that of running monkeyesphere normally, -# and keychecking is intentially done unders certain circumstances. -# This can be overridden by setting the MONKEYSPHERE_CHECK_KEYSERVER -# variable on the command line. +# intentionally different than that of running monkeyesphere normally, +# and keyserver checking is intentionally done under certain +# circumstances. This can be overridden by setting the +# MONKEYSPHERE_CHECK_KEYSERVER environment variable. # if the host is in the gpg keyring... if gpg --list-key ="${URI}" 2>&1 >/dev/null ; then diff --git a/website/archive-key.mdwn b/website/archive-key.mdwn index 898c7e5..ea44457 100644 --- a/website/archive-key.mdwn +++ b/website/archive-key.mdwn @@ -70,8 +70,21 @@ ly087Guvw8G8TdQcubteFYQDIxIc2atZkjEn3oCjtZgk8mdDlCjLQYgHV1/o+eWd S31RCBx16I7tJya0fwJJRC7qZWf7hrPdi7eqcecqyr26X5upV+Irjv5qYu/6HAGb 59W6n+8KTfMxEMaBQI6qZXxhaBr3HzEaSrz7jtkl+xxym2TGkbarXcm7e7MP66Hu GD5UCC3svhAAxKXf4K/8v7WhwBpekF9mXtgpq72Du2JG9q+OAWhxzZXbZku+RY7T -a83wKc1TaPvzK2WZlhNGjcCYSUXcfQOSn5noVTUukW3DNEKP5BmwkvVd -=Xex0 +a83wKc1TaPvzK2WZlhNGjcCYSUXcfQOSn5noVTUukW3DNEKP5BmwkvVdiEYEEBEC +AAYFAki9wXQACgkQ9n4qXRzy1ioXYwCgmzCV+o+Ai0gNx0pt9shofcjfJoAAoInV +mhn36lBeDh/E6cigrUlkdDGWiQIcBBABAgAGBQJIvdcSAAoJEO00zqvie6q8sB4Q +AKDLTKqtiONf4FkMCZFcMxQyiALcy76zTW9L2oK90zKRhKSt5RPnVmDVyiinBcRJ +h0lEkpxoqSrs+0XvASWC3RzWLEbW6XXsuHO1RXFsC3FNbe0HkHenirenFkitPMDX +Q5gHmCJ6yiq2ssuzXAG9vZ4HjkUINBgkeMASiTRC7o0we7jFSRzOTCs4WWdsavrx +7bhCadeC35ISldTSo6nOP3laPctPcLD83cJszzQyHr/LjF6KYr6n85NAwIt/oxHh +EUxmezx+lMwWHdr9TQzXzU8cxLSBZ+c+PuZ/NuHz9fOv87eaFDNEqKli9zhzh4eA +EMeiWKQXHYlmEUUWnZoea46jdjBrvHphogqlCjzMDHtg/pWOsYrGeXjjZ352SGN4 +vyinkdxwUppGQATz55WyiWIzCY1Kt7lqaQHfAM1NgVdoCQ0stlulIO4LVepHRiAY +HO4EPeQO6pVGGHWCzJyEcMcaBsYGpr9DndSNd66O+Gyeq8QobKnvTH25kwVt/8t1 +9nS+7NLwBrqXCISeDrOQYq5XeCdvpAuJy4CEN5muQWRdUPekE2dh7qcVUdROepq0 +1wMemkmgTLlA0Md7ZdZqsllKhVQ7/HOFzshEaj/VcFrQshuIAjDZFN/OrGLX/NcL +tcaBmD9lZSQ3CyxnBUTeMdJCOLOK050jNvsEsM89FL+g +=bJWl -----END PGP PUBLIC KEY BLOCK----- </pre> @@ -94,17 +107,17 @@ tag `$TAG` on architecture `$ARCH`, do: git clone git://git.monkeysphere.info/monkeysphere cd monkeysphere - git tag -v $TAG - git checkout $TAG + git tag -v "$TAG" + git checkout "$TAG" debuild -uc -us cd repo - reprepro -C monkeysphere include experimental ../$TAG_$ARCH.changes + reprepro -C monkeysphere include experimental "../$TAG_$ARCH.changes" When you get a binary package built from a separate architecture `$NEWARCH` that you want to include with the archive, do: cd repo - reprepro -C monkeysphere includedeb experimental ../$TAG_$NEWARCH.deb + reprepro -C monkeysphere includedeb experimental "../$TAG_$NEWARCH.deb" To publish the archive, make sure you have access to `archivemaster@george.riseup.net`, and then do: diff --git a/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn b/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn index 4070d0a..b814d35 100644 --- a/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn +++ b/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn @@ -245,3 +245,7 @@ I'll leave the bug open for a bit until it get more tested and 0.12 gets pushed out. -- BJ + +--- + +I think this is [[/bugs/done]] as of version 0.12-1. diff --git a/website/news/apt-repo-moved.mdwn b/website/news/apt-repo-moved.mdwn index 8f0bf81..501cc23 100644 --- a/website/news/apt-repo-moved.mdwn +++ b/website/news/apt-repo-moved.mdwn @@ -5,4 +5,11 @@ The monkeysphere APT repository has been moved from `http://archive.monkeysphere.info/debian`. You'll probably want to update your `sources.list` to match the [official lines](/download). +The monkeysphere APT repository is also using [a new archive signing +key](/archive-key): + + pub 4096R/EB8AF314 2008-09-02 [expires: 2009-09-02] + Key fingerprint = 2E8D D26C 53F1 197D DF40 3E61 18E6 67F1 EB8A F314 + uid [ full ] Monkeysphere Archive Signing Key (http://archive.monkeysphere.info/debian) + Apologies for any confusion or hassle this causes! diff --git a/website/news/release-0.12-1.mdwn b/website/news/release-0.12-1.mdwn new file mode 100644 index 0000000..ed1ecbb --- /dev/null +++ b/website/news/release-0.12-1.mdwn @@ -0,0 +1,9 @@ +[[meta title="MonkeySphere 0.12-1 released!"]] + +# MonkeySphere 0.12-1 released! # + +MonkeySphere 0.12-1 has been released. This release includes +documentation updates, and a re-organized logging subsystem with +various levels of verbosity, modeled after LogLevel in OpenSSH. + +[[download]] it now! |