From: Micah Anderson Date: Sun, 22 Mar 2009 23:57:35 +0000 (-0400) Subject: Merge commit 'jrollins/master' X-Git-Tag: monkeysphere_0.25~32^2~6^2~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=abd2c7a17b57d7b802353c851c2150b07824a3a5;p=monkeysphere.git Merge commit 'jrollins/master' Conflicts: website/download.mdwn --- abd2c7a17b57d7b802353c851c2150b07824a3a5 diff --cc website/download.mdwn index 543d4e9,b0c45b8..3cf9d62 --- a/website/download.mdwn +++ b/website/download.mdwn @@@ -18,8 -18,13 +18,16 @@@ Monkeysphere relies on ## Debian ## If you are running a [Debian](http://www.debian.org/) system, the - [monkeysphere is available in the Debian archive, and as a backport](http://packages.debian.org/search?keywords=monkeysphere&searchon=names§ion=all&suite=all) -[monkeysphere is available in the Debian testing ("squeeze") -distribution](http://packages.debian.org/testing/monkeysphere). If -you are running Debian testing, install the latest monkeysphere -version: ++[monkeysphere is available in the Debian archive](http://packages.debian.org/search?keywords=monkeysphere&searchon=names§ion=all&suite=all) ++ ++If you are running Debian unstable or testing install the latest monkeysphere ++version as follows: + + aptitude install monkeysphere + ++If you are running Debian stable, you can get the monkeysphere package ++from [backports.org](http://backports.org/dokuwiki/doku.php?id=instructions) + You can also install the Monkeysphere directly from the Monkeysphere Debian archive. You can add this archive to your system by putting the following lines in `/etc/apt/sources.list.d/monkeysphere.list`: