<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39632 >

 I still found some places where documentation referred Freeciv
version control as CVS. Patch contains also some other minor
corrections applicable for both S2_1 and TRUNK.


 - ML

diff -Nurd -X.diff_ignore freeciv/debian/build.debian freeciv/debian/build.debian
--- freeciv/debian/build.debian	2007-08-04 18:36:08.000000000 +0300
+++ freeciv/debian/build.debian	2007-08-30 12:55:19.000000000 +0300
@@ -43,12 +43,12 @@
 MAJOR_VERSION=`awk -F= '$1 == "MAJOR_VERSION" {print $2}' configure.in`
 MINOR_VERSION=`awk -F= '$1 == "MINOR_VERSION" {print $2}' configure.in`
 PATCH_VERSION=`awk -F= '$1 == "PATCH_VERSION" {print $2}' configure.in`
-snapversion="${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-cvs`date +%Y%m%d`"
+snapversion="${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-svn`date +%Y%m%d`"
 
 cat >debian/changelog <<EOF
 freeciv ($snapversion) experimental; urgency=low
 
-  * New upstream release (CVS snapshot)
+  * New upstream release (svn snapshot)
 
  -- $EMAIL  `822-date`
 
diff -Nurd -X.diff_ignore freeciv/debian/INSTALL.debian freeciv/debian/INSTALL.debian
--- freeciv/debian/INSTALL.debian	2007-08-04 18:36:08.000000000 +0300
+++ freeciv/debian/INSTALL.debian	2007-08-30 12:58:27.000000000 +0300
@@ -14,10 +14,10 @@
 
 Of course, maybe the source tree where you're reading this file is newer
 than any version available on your Debian CD or in the ftp mirrors -
-probably a CVS grab - or you want to build it yourself for some other
+probably a svn grab - or you want to build it yourself for some other
 reason (like applying unofficial patches). Ok, you can have your cake and
 eat it too; we made a script to easily build a .deb package directly out of
-the source tree - and get a nice version number if it's a CVS snapshot, too.
+the source tree - and get a nice version number if it's a svn snapshot, too.
 
 First you will need to check if you have the following packages installed:
 
@@ -55,7 +55,7 @@
 $ make distclean
 $ fakeroot build.debian
 $ su
-# dpkg -i ../freeciv_1.11.5+cvs20010419_i386.deb
+# dpkg -i ../freeciv_1.11.5+svn20010419_i386.deb
 # exit
 $
 
diff -Nurd -X.diff_ignore freeciv/doc/BUGS freeciv/doc/BUGS
--- freeciv/doc/BUGS	2007-08-04 18:36:17.000000000 +0300
+++ freeciv/doc/BUGS	2007-08-30 12:55:51.000000000 +0300
@@ -88,7 +88,7 @@
      assertion oject->ref_count > 0' failed.
 
    ) please restart your client and append "-- --g-fatal-warnings" to
-   the command line. Unfortunately this only works with a current CVS
+   the command line. Unfortunately this only works with a current svn
    or with version 2.0.0 or better. You will get a core dump this
    way. Please include in your bug report the "stack trace" of this
    core dump.
diff -Nurd -X.diff_ignore freeciv/doc/CodingStyle freeciv/doc/CodingStyle
--- freeciv/doc/CodingStyle	2007-08-12 23:55:10.000000000 +0300
+++ freeciv/doc/CodingStyle	2007-08-30 12:46:01.000000000 +0300
@@ -228,7 +228,7 @@
 - When doing a "diff" for a patch, be sure to exclude unnecessary files
   by using the "-X" argument to "diff".  E.g.:
 
-    % diff -ruN -Xdiff_ignore freeciv_cvs freeciv >/tmp/fix-foo-bug-0.diff
+    % diff -ruN -Xdiff_ignore freeciv_svn freeciv >/tmp/fix-foo-bug-0.diff
 
   A suggested "diff_ignore" file is included in the Freeciv distribution.
 
diff -Nurd -X.diff_ignore freeciv/doc/HACKING freeciv/doc/HACKING
--- freeciv/doc/HACKING	2007-08-04 18:36:17.000000000 +0300
+++ freeciv/doc/HACKING	2007-08-30 12:45:53.000000000 +0300
@@ -58,7 +58,7 @@
 Server Autogame Testing
 ===========================================================================
 Code changes should always be tested before submission for inclusion
-into the CVS source tree. It is useful to run the client and server as
+into the svn source tree. It is useful to run the client and server as
 autogames to verify either a particular savegame no longer shows a
 fixed bug, or as a random sequence of games in a while loop overnight.
 
@@ -1035,7 +1035,7 @@
 - When doing a "diff" for a patch, be sure to exclude unnecessary files
   by using the "-X" argument to "diff".  E.g.:
 
-    % diff -ruN -Xdiff_ignore freeciv_cvs freeciv >/tmp/fix-foo-bug-0.diff
+    % diff -ruN -Xdiff_ignore freeciv_svn freeciv >/tmp/fix-foo-bug-0.diff
 
   A suggested "diff_ignore" file is included in the Freeciv distribution.
 
diff -Nurd -X.diff_ignore freeciv/doc/README.sound freeciv/doc/README.sound
--- freeciv/doc/README.sound	2007-08-04 18:36:17.000000000 +0300
+++ freeciv/doc/README.sound	2007-08-30 12:50:13.000000000 +0300
@@ -23,9 +23,8 @@
 with eg "tar -xzvf stdsoundsX.tar.gz" or use WinZip (for Windows), and
 put the files in the data directory mentioned above.
 
-Note that the CVS version neither includes any sound files nor any
-sound spec file. You can get soundsets (sound files and a spec file)
-from <ftp://ftp.freeciv.org/freeciv/contrib/sounds/>. At this address
+You can get additional soundsets (sound files and a spec file)
+from <ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets>. At this address
 you find also extra sound files to change an existing soundset or
 create a new one.
 
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to