From e32640d4e1421f955e89fe0359c23c99e8bbf81a Mon Sep 17 00:00:00 2001
From: davidsarah <>
Date: Thu, 26 May 2011 22:53:00 +0000
Subject: [PATCH] improve formatting, merge some cells for Ubuntu

[Imported from Trac: page OSPackages, version 30]
---
 OSPackages.md | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/OSPackages.md b/OSPackages.md
index 02c4d99..1004b52 100644
--- a/OSPackages.md
+++ b/OSPackages.md
@@ -1,10 +1,29 @@
 Tahoe-LAFS is integrated into the packaging systems of several operating systems:
 
-|platform|platform version|tahoe-lafs version (page on platform site)|page on <http://tahoe-lafs.org> | continuous integration pages on <http://tahoe-lafs.org> | continuous integration pages on platform site | people | links to packaging work |
+|Platform|Platform version|Tahoe-LAFS version<br>(page on platform site)|Page on <http://tahoe-lafs.org> | Continuous integration<br>on <http://tahoe-lafs.org> | Continuous integration<br>on platform site | People | Links to packaging work |
 |---|---|---|---|---|---|---|---|
-|![](http://tahoe-lafs.org/~zooko/debian.png)[Debian](http://debian.org)|-|-|DownloadDebianPackages|[Eugen](http://tahoe-lafs.org/buildbot/builders/Eugen%20lenny-amd64) - [.deb](http://tahoe-lafs.org/buildbot/builders/deb-lenny-amd64-eugen), [Arthur](http://tahoe-lafs.org/buildbot/builders/Arthur%20lenny%20c7%2032bit) - [.deb](http://tahoe-lafs.org/buildbot/builders/deb-lenny-i386-arthur), [François](http://tahoe-lafs.org/buildbot/builders/FranXois%20lenny-armv5tel)|-| Micah Anderson <micah@debian.org>, Zooko Wilcox-O'Hearn <zooko@zooko.com>, Giovanni Mascellani <mascellani@poisson.phc.unipi.it>, Jacob Appelbaum <jacob@appelbaum.net>|[ITP](http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=544338)|
-|![](http://tahoe-lafs.org/~zooko/ubuntu.png)[Ubuntu](http://ubuntu.org)|10.04 Lucid|[1.6.1](http://packages.ubuntu.com/lucid/tahoe-lafs)|DownloadDebianPackages|[Zandr](http://tahoe-lafs.org/buildbot/builders/lucid-amd64), [Shawn](http://tahoe-lafs.org/buildbot/builders/Shawn%20ubuntu-amd64), [Josh](http://tahoe-lafs.org/buildbot/builders/Josh%20ubuntu-amd64%20laptop)|?| [rockstar](http://paulhummer.org) |-|
-|![](http://tahoe-lafs.org/~zooko/ubuntu.png)[Ubuntu](http://ubuntu.org)|10.10 Maverick|[1.7.1](http://packages.ubuntu.com/lucid/tahoe-lafs)|DownloadDebianPackages|-|?| [rockstar](http://paulhummer.org) |-|
+|![](http://tahoe-lafs.org/~zooko/debian.png)[Debian](http://debian.org)|-|-|DownloadDebianPackages|[Eugen](http://tahoe-lafs.org/buildbot/builders/Eugen%20lenny-amd64) - [.deb](http://tahoe-lafs.org/buildbot/builders/deb-lenny-amd64-eugen),<br>[Arthur](http://tahoe-lafs.org/buildbot/builders/Arthur%20lenny%20c7%2032bit) - [.deb](http://tahoe-lafs.org/buildbot/builders/deb-lenny-i386-arthur),<br>[François](http://tahoe-lafs.org/buildbot/builders/FranXois%20lenny-armv5tel)|-|Micah Anderson <micah@debian.org>,<br>Zooko Wilcox-O'Hearn <zooko@zooko.com>,<br>Giovanni Mascellani <mascellani@poisson.phc.unipi.it>,<br>Jacob Appelbaum <jacob@appelbaum.net> |[ITP](http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=544338)|
+|---------------
+<th rowspan=2 align=left>
+
+![](http://tahoe-lafs.org/~zooko/ubuntu.png)[Ubuntu](http://ubuntu.org)
+
+</th>
+
+| | |
+|---|---|
+|10.04 Lucid|[1.6.1](http://packages.ubuntu.com/lucid/tahoe-lafs)|
+<th rowspan=2>
+
+[DownloadDebianPackages](DownloadDebianPackages)
+
+</th>
+
+| | | | |
+|---|---|---|---|
+|[Zandr](http://tahoe-lafs.org/buildbot/builders/lucid-amd64), [Shawn](http://tahoe-lafs.org/buildbot/builders/Shawn%20ubuntu-amd64), [Josh](http://tahoe-lafs.org/buildbot/builders/Josh%20ubuntu-amd64%20laptop) |-|[rockstar](http://paulhummer.org) |-|
+|10.10 Maverick|[1.7.1](http://packages.ubuntu.com/lucid/tahoe-lafs)|?|-|[rockstar](http://paulhummer.org) |-|
+|---------------
 |![](http://tahoe-lafs.org/~zooko/nixos-notext.png)[NixOS](http://nixos.org)|nixpkgs 0.14pre22774|[1.7.1](http://hydra.nixos.org/job/nixpkgs/trunk/tahoelafs)|-|[Ludo](http://tahoe-lafs.org/buildbot/builders/Ludo%20NixOS-amd64)|[hydra](http://hydra.nixos.org/job/nixpkgs/trunk/tahoelafs)| ludo, simons |-|
 |![](http://tahoe-lafs.org/~zooko/freebsd.png)[FreeBSD](http://freebsd.org)|?|[1.7.1](http://www2.nl.freebsd.org/vol1/linux/ubuntu/pool/universe/t/tahoe-lafs/)|-|[Randy](http://tahoe-lafs.org/buildbot/builders/Randy%20FreeBSD-amd64)|-| ? |-|
 |![](http://tahoe-lafs.org/~zooko/netbsd-noword-nohandle.png)[NetBSD](http://netbsd.org/) ([pkgsrc](http://www.pkgsrc.org/))|head, 2010Q3|[1.8.0]ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/filesystems/tahoe-lafs/README.html |PkgSrc|[Marc](http://tahoe-lafs.org/buildbot/builders/MM%20netbsd5%20i386%20warp)|-|gdt|-|