gaim/www

Remove the "CVS Info" link from the right side of the web page and

2004-01-15, Mark Doliner
caebc721a796
Parents 81bdfb986633
Children 80a905336a05
Remove the "CVS Info" link from the right side of the web page and
move the info from that page to the bottom of downloads.php
4 files changed, 100 insertions(+), 160 deletions(-)
  • +0 -148
    htdocs/cvs.php
  • +98 -5
    htdocs/downloads.php
  • +2 -2
    htdocs/shortcuts.php
  • +0 -5
    inc/navigation.inc.php
    • --- a/htdocs/cvs.php Thu Jan 15 00:23:30 2004 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,148 +0,0 @@
    -<?php
    - require "base.inc.php";
    -
    - start_html("CVS Information");
    -
    - start_section("CVS Information");
    -?>
    -
    -<p>
    - CVS is a way of storing and tracking changes in the code between releases. It
    - always has the latest code and bug fixes, but with releases coming every other week,
    - most people can wait for the release to get a given fix.
    - Here's step-by-step instructions for how to check out and build gaim from
    - CVS. Before you begin, make sure you have libtool, gettext, automake, and
    - autoconf installed. If you normally install gaim from RPM, make sure you also
    - have devel packages of glib 2.0 and gtk 2.0 (but glib and gtk 2.2 are recommended)
    - installed, as well as gcc and gmake. You also need, of course, cvs installed (version 1.11).
    -</p>
    -<br />
    -
    -<b>Step 1. Check out the source</b>
    -<p>
    - Run the following commands in a directory that you have write access to (such
    - as your home directory):
    -</p>
    -<p>
    - <code>
    - cvs -d ':pserver:anonymous@cvs.sourceforge.net:/cvsroot/gaim' login
    - </code>
    - <br />
    - (Just hit enter for the password)<br />
    - <code>
    - cvs -z3 -d ':pserver:anonymous@cvs.sourceforge.net:/cvsroot/gaim'
    - checkout gaim
    - </code>
    -</p>
    -<p>
    - You should see it listing all the source files.
    -</p>
    -<p>
    - If you want to use gtk1.2, use the following command instead:
    - <br />
    - <code>
    - cvs -z3 -d ':pserver:anonymous@cvs.sourceforge.net:/cvsroot/gaim' checkout -r gtk1-stable gaim
    - </code>
    - <br />
    -</p>
    -<br />
    -
    -<b>Step 2. Build again</b>
    -<p>
    - Once you've checked gaim out of CVS, run the follwing commands:
    -</p>
    -<p>
    - <code>cd gaim</code><br />
    - <code>./autogen.sh</code><br />
    -</p>
    -<p>
    - If you see any errors here, you haven't installed everything you need.
    - autogen.sh will also run ./configure for you once it's created, if it's
    - created successfully. If you see any errors related to GLib or GTK, you
    - haven't installed the devel packages.
    -</p>
    -<p>
    - <code>gmake</code><br />
    - <code>gmake install</code>
    -</p>
    -<br />
    -
    -<b>Step 3. Update gaim</b>
    -<p>
    - When there are changes to gaim's code, you'll want to update your local copy.
    - You don't have to remove the entire directory that you checked out and redo
    - the whole thing; instead, from inside the directory, run:
    -</p>
    -<p>
    - <code>cvs update -d</code><br />
    - <code>gmake</code><br />
    - <code>gmake install</code><br />
    -</p>
    -<p>
    - The update will merge all the changes into the current files, and then
    - gmake will rebuild gaim.
    -</p>
    -<p>
    - And that should be everything. Please note you need to use gmake; BSD make
    - will not work. Also, gmake is installed simply as 'make' on some systems -
    - if gmake isn't found, use make instead. Please be sure that you are using
    - the correct version before submitting bug reports - gaim is installed in
    - /usr/local/bin by default, and you may have an older copy in /usr/bin.
    - ./configure should warn you if that is the case.
    -</p>
    -<?php
    - end_section();
    -
    - start_section("CVS Mailing List");
    -?>
    -<p>
    - We've also now got a mailing list set up that will notify you when new
    - commits are made. Join gaim-commits@lists.sourceforge.net by telling us
    - your email address at
    - <a href="http://lists.sourceforge.net/lists/listinfo/gaim-commits">http://lists.sourceforge.net/lists/listinfo/gaim-commits</a>. Then you'll know
    - when to update (and if you're particularly devilish enough, you can set up
    - a filter that will update and rebuild gaim when it receives such a
    - message).
    -</p>
    -<?php
    - end_section();
    -
    -/*
    - print "<a name=\"nightly\"></a>\n";
    -
    - start_section("CVS Nightlies");
    -?>
    -<p>
    - If for some reason using CVS as described above is not an option, you may
    - opt to use the <a href="/gaim-CVS.tar.gz">CVS Nightly source tarball</a>.
    - It comes complete with a ./configure script just like a normal release, so
    - you don't need automake, autoconf, or any of the other development tools.
    -</p>
    -<p>
    - An option available for users of Red Hat, Mandrake, and other RPM-based
    - distributions is the nightly CVS <a href="/gaim-CVS.i386.rpm">gaim RPM</a>.
    -</p>
    -<ul>
    - <li>Nightly source tarball (<a href="http://us.dl.sf.net/gaim/direct_download/gaim-CVS.tar.gz">US Mirror</a>
    - , <a href="http://eu.dl.sf.net/gaim/direct_download/gaim-CVS.tar.gz">Europe Mirror</a>)</li>
    -<!-- <li><a href="/gaim-CVS.i386.rpm">Nightly RPM</a> (i386)</li> -->
    -</ul>
    -<br />
    -<a name="nightly-debs"></a>
    -<p>
    - If you use Debian, you can use Robot101's nightly Debian packages.
    - Add the following to your <code>/etc/apt/sources.list</code> and
    - type <code>apt-get update</code>, <code>apt-get upgrade</code.:
    -</p>
    -<p><b>i386:</b></p>
    -<pre>
    - deb http://people.debian.org/~robot101/gaim unstable cvs
    - deb-src http://people.debian.org/~robot101/gaim unstable cvs
    -</pre>
    -
    -<?php
    - end_section();
    -*/
    -
    - end_html();
    -?>
    --- a/htdocs/downloads.php Thu Jan 15 00:23:30 2004 -0500
    +++ b/htdocs/downloads.php Thu Jan 15 15:04:02 2004 -0500
    @@ -80,18 +80,111 @@
    <?php
    end_section();
    start_section("CVS") ?>
    +
    <p>
    -
    + CVS is a way of storing and tracking changes in the code between releases.
    + The Gaim source is kept in CVS. Because this is the central location for
    + all Gaim development, it always has the latest code and bug fixes. However,
    + this also means it has the latest bugs.
    +</p>
    +
    +<p>
    We encourage you to use the releases as much as possible. You <i>can</i>
    obtain the Gaim source from anonymous CVS, but doing so puts unnecessary
    load on the CVS servers. The code in CVS is never guaranteed to work
    correctly, and if something is obviously broken you should not complain
    about it, this only slows the development process. However, if you feel
    a need to be more cutting-edge than necessary, or if you desire to hack
    - on the Gaim source, you should use CVS. See our
    - <a href="<?php print $navigation["CVS Information"]["URL"] ?>">CVS</a>
    - page for more information.
    - </p>
    + on the Gaim source, you should use CVS.
    +</p>
    +
    +<p>
    + Here's step-by-step instructions for how to check out and build gaim from
    + CVS. Before you begin, make sure you have libtool, gettext, automake, and
    + autoconf installed. If you normally install gaim from RPM, make sure you
    + also have devel packages of glib 2.0 and gtk 2.0 (but glib and gtk 2.2 are
    + recommended) installed, as well as gcc and gmake. You also need, of course,
    + cvs installed (version 1.11).
    +</p>
    +
    +<b>Step 1. Check out the source</b>
    +<p>
    + Run the following commands in a directory that you have write access to (such
    + as your home directory):
    +</p>
    +<p>
    + <code>
    + cvs -d ':pserver:anonymous@cvs.sourceforge.net:/cvsroot/gaim' login
    + </code>
    + <br />
    + (Just hit enter for the password)<br />
    + <code>
    + cvs -z3 -d ':pserver:anonymous@cvs.sourceforge.net:/cvsroot/gaim'
    + checkout gaim
    + </code>
    +</p>
    +<p>
    + You should see it listing all the source files.
    +</p>
    +<br />
    +
    +<b>Step 2. Build again</b>
    +<p>
    + Once you've checked gaim out of CVS, run the follwing commands:
    +</p>
    +<p>
    + <code>cd gaim</code><br />
    + <code>./autogen.sh</code><br />
    +</p>
    +<p>
    + If you see any errors here, you haven't installed everything you need.
    + autogen.sh will also run ./configure for you once it's created, if it's
    + created successfully. If you see any errors related to GLib or GTK, you
    + haven't installed the devel packages.
    +</p>
    +<p>
    + <code>gmake</code><br />
    + <code>gmake install</code>
    +</p>
    +<br />
    +
    +<b>Step 3. Update gaim</b>
    +<p>
    + When there are changes to gaim's code, you'll want to update your local copy.
    + You don't have to remove the entire directory that you checked out and redo
    + the whole thing; instead, from inside the directory, run:
    +</p>
    +<p>
    + <code>cvs update -d</code><br />
    + <code>gmake</code><br />
    + <code>gmake install</code><br />
    +</p>
    +<p>
    + The update will merge all the changes into the current files, and then
    + gmake will rebuild gaim.
    +</p>
    +<p>
    + And that should be everything. Please note you need to use gmake; BSD make
    + will not work. Also, gmake is installed simply as 'make' on some systems -
    + if gmake isn't found, use make instead. Please be sure that you are using
    + the correct version before submitting bug reports - gaim is installed in
    + /usr/local/bin by default, and you may have an older copy in /usr/bin.
    + ./configure should warn you if that is the case.
    +</p>
    +
    +<?php
    + end_section();
    +
    + start_section("CVS Mailing List");
    +?>
    +<p>
    + We also now have a mailing list set up that will notify you when new
    + commits are made. Join gaim-commits@lists.sourceforge.net by telling us
    + your email address at
    + <a href="http://lists.sourceforge.net/lists/listinfo/gaim-commits">http://lists.sourceforge.net/lists/listinfo/gaim-commits</a>.
    + Then you'll know when to update.
    +</p>
    +
    <?php
    end_section();
    --- a/htdocs/shortcuts.php Thu Jan 15 00:23:30 2004 -0500
    +++ b/htdocs/shortcuts.php Thu Jan 15 15:04:02 2004 -0500
    @@ -117,11 +117,11 @@
    </tr>
    <tr>
    <td><b>Control-&lt;1-8&gt;</b></td>
    - <td>Insert Smily</td>
    + <td>Insert Smiley</td>
    </tr>
    <tr>
    <td><b>Control-Shift-&lt;1-8&gt;</b></td>
    - <td>Insert Smily</td>
    + <td>Insert Smiley</td>
    </tr>
    <tr>
    <td><b>Control--</b></td>
    --- a/inc/navigation.inc.php Thu Jan 15 00:23:30 2004 -0500
    +++ b/inc/navigation.inc.php Thu Jan 15 15:04:02 2004 -0500
    @@ -45,11 +45,6 @@
    "PREFIX" => "themes"
    ),
    - "CVS Information" => array(
    - "URL" => "/cvs.php",
    - "PREFIX" => "cvsinfo"
    - ),
    -
    "Bug Reports" => array(
    "URL" => "/bug.php",
    "PREFIX" => "bugs"