summaryrefslogtreecommitdiff
path: root/doc/install
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-27 11:21:48 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-27 11:21:48 -0400
commitbddc9573ec30ecd138a64e025904b102e153283e (patch)
treee4f57d55ad15e766a8e743a7571ef36b92ba57e6 /doc/install
parente26702bbf274bfc503eddd996d90144d813fd653 (diff)
update, add fmarier PPA
Diffstat (limited to 'doc/install')
-rw-r--r--doc/install/Ubuntu.mdwn27
1 files changed, 21 insertions, 6 deletions
diff --git a/doc/install/Ubuntu.mdwn b/doc/install/Ubuntu.mdwn
index 25f2de994..4a2796d15 100644
--- a/doc/install/Ubuntu.mdwn
+++ b/doc/install/Ubuntu.mdwn
@@ -1,14 +1,29 @@
-If using Ubuntu Oneiric or newer:
+## Raring
sudo apt-get install git-annex
-Otherwise, see [[manual_installation_instructions|install]].
+## Precise
-There is a PPA with a newer version of git-annex in it, maintained by
-Sergio Rubio. <https://launchpad.net/~rubiojr/+archive/git-annex>
+ sudo apt-get install git-annex
+
+Note: This version is too old to include the [[assistant]], but is otherwise
+usable.
+
+## Precise PPA
+
+<https://launchpad.net/~fmarier/+archive/ppa>
+
+A newer version of git-annex, including the [[assistant]].
+(Maintained by François Marier)
----
+ sudo add-apt-repository ppa:fmarier/ppa
+ sudo apt-get update
+ sudo apt-get install git-annex
+
+## Oneiric
+
+ sudo apt-get install git-annex
Warning: The version of git-annex shipped in Ubuntu Oneiric
-has [a bug that prevents upgrades from v1 git-annex repositories](https://bugs.launchpad.net/ubuntu/+source/git-annex/+bug/875958).
+had [a bug that prevents upgrades from v1 git-annex repositories](https://bugs.launchpad.net/ubuntu/+source/git-annex/+bug/875958).
If you need to upgrade such a repository, get a newer version of git-annex.