Thread: [Gaim-commits] SF.net SVN: gaim: [16029] web/htdocs

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 16029
Author:   thekingant
Date:     2006-04-11 20:40:16 -0700 (Tue, 11 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16029&view=rev

Log Message:
-----------
Update some files to talk about Subversion instead of CVS

Modified Paths:
--------------
    web/htdocs/downloads.php
    web/htdocs/faq.txt
    web/htdocs/faq2.txt
    web/htdocs/version.php
Modified: web/htdocs/downloads.php
===================================================================

--- web/htdocs/downloads.php	2006-04-12 03:11:21 UTC (rev 16028)
+++ web/htdocs/downloads.php	2006-04-12 03:40:16 UTC (rev 16029)
@@ -144,43 +144,50 @@
  To verify the signature of a <code>.tar.gz</code> or <code>.tar.bz2</code> file:</p>
  <pre><code>$ gpg --verify gaim-0.80.tar.bz2.asc gaim-0.80.tar.bz2</code></pre>
 
-<h2>CVS</h2>
+<h2>Subversion (aka SVN)</h2>
 
 <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, 
+ Subversion is a way of storing and tracking changes in the
+ code between releases.
+ The Gaim source is kept in a Subversion repository.  Because
+ this is the central location for
+ all Gaim development, it always has the latest code and bug fixes.  However,
  this means it also 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 
+ We encourage you to use the releases as much as possible.  You <i>can</i>
+ obtain the Gaim source from the Subversion repository,
+ but doing so puts unnecessary
+ load on the Subversion servers.  The code in Subversion
+ 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 desire
- to hack on the Gaim source, you should use CVS. Please be sure to read
- <a href="/faq.php#cvs">this</a> before using CVS.
+ to hack on the Gaim source, you should use Subversion. Please be sure to read
+ <a href="/faq.php#svn">this</a> before using Subversion.
 </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).
+ Subversion. 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 at least
+ glib and gtk 2.4 are
+ recommended) installed, as well as gcc and gmake. You also need a Subversion
+ client installed.  If you're using a Unixy operating system you can
+ usually install a Subversion client using your operating system's
+ package management tools.  Or you can download a client from
+ <a href="http://subversion.tigris.org/">the Subversion website</a>.
 </p>
 
 <h4>Step 1. Check out the source</h4>
 <p>
-  Run the following commands in a directory that you have write access to (such
+  Run the following command in a directory that you have write access to (such
   as your home directory):
 </p>
 <pre>
-<code>cvs -d ':pserver:ano...@cv...:/cvsroot/gaim' login</code>
-(Just hit enter for the password)
-<code>cvs -z3 -d ':pserver:ano...@cv...:/cvsroot/gaim' checkout gaim</code>
+<code>svn co https://svn.sourceforge.net/svnroot/gaim/trunk gaim</code>
 </pre>
 <p>
  You should see it listing all the source files.
@@ -188,7 +195,7 @@
 
 <h4>Step 2. Build again</h4>
 <p>
- Once you've checked gaim out of CVS, run the follwing commands:
+ Once you've checked Gaim out of Subversion, run the follwing commands:
 </p>
 <pre>
 <code>cd gaim
@@ -212,7 +219,7 @@
  the whole thing; instead, from inside the directory, run:
 </p>
 <pre>
-<code>cvs update -d
+<code>svn update
 gmake
 gmake install</code>
 </pre>
@@ -230,7 +237,7 @@
  is the case.
 </p>
 
-<h3>CVS Commits Mailing List</h3>
+<h3>Subversion Commits Mailing List</h3>
 
 <p>
  We also have a mailing list set up that will notify you when new

Modified: web/htdocs/faq.txt
===================================================================
--- web/htdocs/faq.txt	2006-04-12 03:11:21 UTC (rev 16028)
+++ web/htdocs/faq.txt	2006-04-12 03:40:16 UTC (rev 16029)
@@ -173,37 +173,37 @@
    preference from -1 to 0.</li>
 </ul>
 
-!ANCHOR	cvs
-Q:	Gaim &lt;non-current version&gt; is buggy.  Gaim CVS is buggy.  Why?
+!ANCHOR	svn
+Q:	Gaim &lt;non-current version&gt; is buggy.  Gaim SVN is buggy.  Why?
 
 A:	Non-current versions have old bugs which may be fixed in the
-current version--that's why we make new releases.  CVS is
+current version--that's why we make new releases.  SVN is
 frequently unusable because of changes in the code.  Bugs are
 introduced during the development process and are hopefully fixed
 before a release is made.
 
-Q:	Why do you always say not to use CVS?
+Q:	Why do you always say not to use SVN?
 
 A:	That's a long story.  For starters, see the previous question.
-It is often the case that Gaim CVS exhibits bad behavior due to
+It is often the case that Gaim SVN exhibits bad behavior due to
 features and bugfixes which are in a transitory state or which are not
 yet well understood.  These bad behaviors range from the harmless
 (maybe a graphical glitch in a dialog box) to the irritating (a
 particular protocol may not work), to the downright damaging (recently
-a bug in CVS destroyed the user's buddy lists).  While behaviors like
+a bug in SVN destroyed the user's buddy lists).  While behaviors like
 this are acceptable to some users (particularly developers, who are
-used to such things), they tend to cause many Gaim CVS users to
+used to such things), they tend to cause many Gaim SVN users to
 contact Gaim developers and report the same (usually egregious) bug
 over and over - using time which could be better spent fixing the
 bugs.
 <p>
-A second major point involves public resources - a CVS checkout is not
+A second major point involves public resources - an SVN checkout is not
 a cheap operation.  As many Sourceforge users are aware, at various
-points in the recent past Sourceforge CVS has been less than pleasant
+points in the recent past Sourceforge SVN has been less than pleasant
 to work with.  This is, of course, because Sourceforge hosts dozens
-and dozens of useful and active projects which use CVS as a primary
+and dozens of useful and active projects which use SVN as a primary
 method of source code collaboration.  Unfortunately, when too many
-users are poking around in that CVS just for the sake of poking
+users are poking around in that SVN just for the sake of poking
 around, it prevents other users who are trying to do work to improve
 those very same projects from accomplishing their tasks.  It is better
 for the community if an enterprising individual wishing to fix a
@@ -225,16 +225,16 @@
 likely if the buggy behavior is damaging in some way.)  Gaim releases
 represent code which the Gaim developers feel is relatively
 well-behaved and stable.  This includes not only the interface seen by
-Gaim users, but the traffic seen by IM service providers.  Gaim CVS
+Gaim users, but the traffic seen by IM service providers.  Gaim SVN
 bears no such guarantees.
 </p>
 <p>
 In short, there are a lot of good reasons to <i>not</i> use
-Gaim CVS if one does not wish to develop Gaim, Gaim plugins, or a
+Gaim SVN if one does not wish to develop Gaim, Gaim plugins, or a
 codebase which interacts with Gaim in some intimate way.  There are,
-however, only a few reasons <i>to</i> use Gaim CVS outside of the
+however, only a few reasons <i>to</i> use Gaim SVN outside of the
 above.  Please weigh these things carefully and decide whether you
-wish to use Gaim CVS for a good reason which furthers the community, or
+wish to use Gaim SVN for a good reason which furthers the community, or
 for selfish reasons which are not entirely important.
 </p>
 
@@ -461,7 +461,7 @@
 <p>
  Most of the protocols themselves support file transfer, but Gaim
  has not been written to support it yet.  If you would like file transfer
- to work better or be more complete, get CVS and submit a patch using the
+ to work better or be more complete, get SVN and submit a patch using the
  generic file transfer API.
 </p>
 

Modified: web/htdocs/faq2.txt
===================================================================
--- web/htdocs/faq2.txt	2006-04-12 03:11:21 UTC (rev 16028)
+++ web/htdocs/faq2.txt	2006-04-12 03:40:16 UTC (rev 16029)
@@ -171,37 +171,37 @@
  <li>If you use 0.75 or higher on win32, try deleting <code>tcl.dll</code>.</li>
 </ul>
 
-!ANCHOR	cvs
-Q:	Gaim &lt;non-current version&gt; is buggy.  Gaim CVS is buggy.  Why?
+!ANCHOR	svn
+Q:	Gaim &lt;non-current version&gt; is buggy.  Gaim SVN is buggy.  Why?
 
 A:	Non-current versions have old bugs which may be fixed in the
-current version--that's why we make new releases.  CVS is
+current version--that's why we make new releases.  SVN is
 frequently unusable because of changes in the code.  Bugs are
 introduced during the development process and are hopefully fixed
 before a release is made.
 
-Q:	Why do you always say not to use CVS?
+Q:	Why do you always say not to use SVN?
 
 A:	That's a long story.  For starters, see the previous question.
-It is often the case that Gaim CVS exhibits bad behavior due to
+It is often the case that Gaim SVN exhibits bad behavior due to
 features and bugfixes which are in a transitory state or which are not
 yet well understood.  These bad behaviors range from the harmless
 (maybe a graphical glitch in a dialog box) to the irritating (a
 particular protocol may not work), to the downright damaging (recently
-a bug in CVS destroyed the user's buddy lists).  While behaviors like
+a bug in SVN destroyed the user's buddy lists).  While behaviors like
 this are acceptable to some users (particularly developers, who are
-used to such things), they tend to cause many Gaim CVS users to
+used to such things), they tend to cause many Gaim SVN users to
 contact Gaim developers and report the same (usually egregious) bug
 over and over - using time which could be better spent fixing the
 bugs.
 <p>
-A second major point involves public resources - a CVS checkout is not
+A second major point involves public resources - an SVN checkout is not
 a cheap operation.  As many Sourceforge users are aware, at various
-points in the recent past Sourceforge CVS has been less than pleasant
+points in the recent past Sourceforge SVN has been less than pleasant
 to work with.  This is, of course, because Sourceforge hosts dozens
-and dozens of useful and active projects which use CVS as a primary
+and dozens of useful and active projects which use SVN as a primary
 method of source code collaboration.  Unfortunately, when too many
-users are poking around in that CVS just for the sake of poking
+users are poking around in that SVN just for the sake of poking
 around, it prevents other users who are trying to do work to improve
 those very same projects from accomplishing their tasks.  It is better
 for the community if an enterprising individual wishing to fix a
@@ -223,16 +223,16 @@
 likely if the buggy behavior is damaging in some way.)  Gaim releases
 represent code which the Gaim developers feel is relatively
 well-behaved and stable.  This includes not only the interface seen by
-Gaim users, but the traffic seen by IM service providers.  Gaim CVS
+Gaim users, but the traffic seen by IM service providers.  Gaim SVN
 bears no such guarantees.
 </p>
 <p>
 In short, there are a lot of good reasons to <i>not</i> use
-Gaim CVS if one does not wish to develop Gaim, Gaim plugins, or a
+Gaim SVN if one does not wish to develop Gaim, Gaim plugins, or a
 codebase which interacts with Gaim in some intimate way.  There are,
-however, only a few reasons <i>to</i> use Gaim CVS outside of the
+however, only a few reasons <i>to</i> use Gaim SVN outside of the
 above.  Please weigh these things carefully and decide whether you
-wish to use Gaim CVS for a good reason which furthers the community, or
+wish to use Gaim SVN for a good reason which furthers the community, or
 for selfish reasons which are not entirely important.
 </p>
 
@@ -481,7 +481,7 @@
 <p>
  Most of the protocols themselves support file transfer, but Gaim
  has not been written to support it yet.  If you would like file transfer
- to work better or be more complete, get CVS and submit a patch using the
+ to work better or be more complete, get SVN and submit a patch using the
  generic file transfer API.
 </p>
 

Modified: web/htdocs/version.php
===================================================================
--- web/htdocs/version.php	2006-04-12 03:11:21 UTC (rev 16028)
+++ web/htdocs/version.php	2006-04-12 03:40:16 UTC (rev 16029)
@@ -18,14 +18,15 @@
 	exit();
 }
 
-$cvs = ((strpos($version, 'cvs') !== false) || (strpos($version, 'beta') !== false));
+$dev = ((strpos($version, 'cvs') !== false) || (strpos($version, 'beta') !== false) || (strpos($version, 'dev') != false));
 $win32 = ($build == 'gaim-win32');
 $my_ver = str_replace('cvs', '', $version);
+$my_ver = str_replace('dev', '', $version);
 $my_ver = preg_replace('/beta(\d+)$/', '', $my_ver);
 $my_ver = preg_replace('/-(\d+)$/', '', $my_ver);
 $cur_ver = ($win32 ? $current_win32_version : $current_version);
 
-if ($cur_ver != $my_ver || $cvs == false) {
+if ($cur_ver != $my_ver || $dev == false) {
 	$cur_ver_parts = explode('.', $cur_ver);
 	$my_ver_parts = explode('.', $my_ver);
 
@@ -38,7 +39,7 @@
 			break;
 		}
 	}
-	
+
 	if($upgrade == false) {
 		exit();
 	}
@@ -50,7 +51,7 @@
 /*
 Is anyone still using the data anymore?
 
-if(!$cvs) {
+if(!$dev) {
 	$db = new Database($sql_type, $sql_server, $sql_username, $sql_password, $sql_database);
 	$db->connect();
 	$db->query("UPDATE version_track SET count=count+1 WHERE day=NOW() AND version = '$my_ver' AND build='$build' AND cur_version = '$cur_ver'");
@@ -65,7 +66,7 @@
     $f = fopen($filename, "r");
 	$changelog_text = fread($f, filesize($filename));
 	fclose($f);
-	
+
 	/* skip the Pimpin' Penguin line */
 	$startpos = strpos($changelog_text, "version $cur_ver");
 	$oldpos = strpos($changelog_text, "version $firstversion ", $startpos);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Gaim-commits] SF.net SVN: gaim: [16029] web/htdocs

A universal instant messaging (IM) program

pidgin-commits