CVS:openoffice.debian.net build.wml,1.11,1.12 index.wml,1.31,1.32

["Rene Engelhard,,,," <rene@gluck.debian.org>]

Update of /cvs/debian-openoffice/openoffice.debian.net
In directory gluck:/tmp/cvs-serv15461

Modified Files:
	build.wml index.wml 
Log Message:
update

Index: build.wml
===================================================================
RCS file: /cvs/debian-openoffice/openoffice.debian.net/build.wml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- build.wml	17 May 2007 11:15:51 -0000	1.11
+++ build.wml	25 Jun 2007 10:38:53 -0000	1.12
@@ -7,7 +7,7 @@
 <h2>Building OpenOffice.org 2.2.1 from the latest apt-gettable Debian sources.</h2>
 <br>
 You will need about 6 GB free space to build the OpenOffice.org Debian packgage
-yourself.  You will also need space in /tmp, so please be sure, that your /
+yourself (assuming you only build english using DEB_BUILD_OPTIONS="lang=en-US").  You will also need space in /tmp, so please be sure, that your /
 partition is big enough or link /tmp to a partition will plenty of space.<p>
 Then put in the debian-sources source list entry for debian-unstable (aka sid)
 in to <code>/etc/apt/sources.list</code> and run
@@ -22,31 +22,25 @@
 <pre>
   dpkg-buildpackage -uc -us -rfakeroot
 </pre>
-and wait. :) Building will take between 8h (fast Pentium) and a day (my
-IBook2).<p>
+and wait. :)<p>
 The build will package openoffice.org packages for all supported $ARCHES,
 and many langpackages (-l10n-??) and helppackages (-help-??).<p>
 
-<h2>Building using the latest packaging scripts/patches from Debian arch/GNOME SVN</h2>
+<h2>Building using the latest packaging scripts/patches from Debian bzr/GNOME SVN</h2>
 
 Here is how to get the sources for OpenOffice.org for Debian:</p>
-Get the following file from here: <a href="http://ftp.debian.org/debian/pool/main/o/openoffice.org/openoffice.org_2.2.0.orig.tar.gz"; >http://ftp.debian.org/debian/pool/main/o/openoffice.org/openoffice.org_2.2.1~rc1.orig.tar.gz</a><br>
+Get the following file from here: <a href="http://ftp.debian.org/debian/pool/main/o/openoffice.org/openoffice.org_2.2.1.orig.tar.gz"; >http://ftp.debian.org/debian/pool/main/o/openoffice.org/openoffice.org_2.2.1.orig.tar.gz</a><br>
 Untar it and go in the freshly-created directory:
 <pre>
-$ tar xfvz openoffice.org_2.2.1~rc1.orig.tar.gz
-$ cd openoffice.org-2.2.1~rc1/
+$ tar xfvz openoffice.org_2.2.1.orig.tar.gz
+$ cd openoffice.org-2.2.1/
 </pre>
 Then get the up to date baz archive contents and create the <code>debian/</code> directory:<br>
 
 <pre>
-baz my-id NAME &lt;EMAIL&gt; if you don't have a baz id yet.
-</pre>
-Since the OOo repository needs signed commits, it might be wise
-to use a id with a matching uid on your gpg key.
-<pre>
-baz register-archive http://arch.debian.org/arch/debian-openoffice@lists.debian.org--packages
-baz get debian-openoffice@lists.debian.org--packages/openofficeorg--unstable--2.2.1
-mv openofficeorg--unstable--2.2.1* debian 
+bzr whoami NAME &lt;EMAIL&gt; if you don't have a bzr id yet.
+bzr co http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.2.1/unstable
+mv unstable debian
 </pre>
 Then, you need the ooo-build tree. There's a rule in debian/rules to make it
 easier:

Index: index.wml
===================================================================
RCS file: /cvs/debian-openoffice/openoffice.debian.net/index.wml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- index.wml	5 Jun 2007 09:02:18 -0000	1.31
+++ index.wml	25 Jun 2007 10:38:53 -0000	1.32
@@ -10,16 +10,16 @@
 <li>Old Stable (Sarge): <a href="http://packages.debian.org/oldstable/editors/openoffice.org";>1.1.3</a></li>
 <li>Stable (Etch): <a href="http://packages.debian.org/stable/editors/openoffice.org";>2.0.4</a></li>
 <li>Testing (Lenny): <a href="http://packages.debian.org/testing/editors/openoffice.org";>2.0.4</a></li>
-<li>Unstable (Sid): <a href="http://packages.debian.org/unstable/editors/openoffice.org";>2.2.1 rc3</a></li>
+<li>Unstable (Sid): <a href="http://packages.debian.org/unstable/editors/openoffice.org";>2.2.1</a></li>
 </ul>
 <p>Just 'apt-get install openoffice.org'.</p>
 
 <p>OpenOffice.org 1.1.x supports the i386, PowerPC, SPARC and S390 archectures
 as linux versions. There was an ARM port founded and completed so ARM is now
-supported too (upstream in 1.1.5, and not yet enabled in Debian).</p>
+supported too (upstream in 1.1.5, and not (yet) enabled in Debian).</p>
 
 <p>OpenOffice.org 2.x does support the i386, PowerPC and SPARC architectures as linux versions.</br>
-<p>Newer versions also do support the AMD64/EM64T/Intel64 architecture</p>
+<p>Newer versions also do support the x86_64/AMD64/EM64T/Intel64 architecture</p>
 
 <p> Some people are working to get OpenOffice.org
 running on Linux-ALPHA, -IA64 (Itanium) -MIPS and -HPPA.