summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--CVS-INFO7
-rw-r--r--README.cares6
-rw-r--r--ares_build.h.dist6
-rw-r--r--ares_version.h2
-rw-r--r--buildconf.bat6
6 files changed, 13 insertions, 17 deletions
diff --git a/CHANGES b/CHANGES
index ae8a57a..102c0ca 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
Changelog for the c-ares project
+* March 23, 2010 (Daniel Stenberg)
+- We switched from CVS to git. See http://github.com/bagder/c-ares
+
* March 5, 2010 (Daniel Stenberg)
- Daniel Johnson provided fixes for building with the clang compiler.
diff --git a/CVS-INFO b/CVS-INFO
deleted file mode 100644
index 7d48d08..0000000
--- a/CVS-INFO
+++ /dev/null
@@ -1,7 +0,0 @@
-
-CVS-INFO
-
-This file is only present in the CVS - never in release archives. It is used
-as a sentinel file in buildconf.bat in order to differentiate a CVS checkout
-from release and daily snapshot archives.
-
diff --git a/README.cares b/README.cares
index fd37461..37a044d 100644
--- a/README.cares
+++ b/README.cares
@@ -10,8 +10,8 @@ within the curl project (hence the letter C) and it makes a nice pun. Also,
c-ares is not API compatible with ares: a new name makes that more obvious to
the public.
-The full source code is available in the 'c-ares' release archives, and in the
-'ares' subdir of the curl CVS source repository.
+The full source code is available in the 'c-ares' release archives, and in a
+git repository: http://github.com/bagder/c-ares
If you find bugs, correct flaws, have questions or have comments in general in
regard to c-ares (or by all means the original ares too), get in touch with us
@@ -35,7 +35,7 @@ The following notes apply to c-ares version 1.7.0 and later.
* The distributed ares_build.h file is generated as a copy of ares_build.h.dist
when the c-ares source code distribution archive file is originally created.
-* If you check out from CVS on a non-configure platform, you must run the
+* If you check out from git on a non-configure platform, you must run the
appropriate buildconf* script to set up ares_build.h and other local files
before being able of compiling the library.
diff --git a/ares_build.h.dist b/ares_build.h.dist
index a55191c..b781a0a 100644
--- a/ares_build.h.dist
+++ b/ares_build.h.dist
@@ -3,7 +3,7 @@
/* $Id$ */
-/* Copyright (C) 2009 by Daniel Stenberg et al
+/* Copyright (C) 2009 - 2010 by Daniel Stenberg et al
*
* Permission to use, copy, modify, and distribute this software and its
* documentation for any purpose and without fee is hereby granted, provided
@@ -65,7 +65,7 @@
* created.
*
* File ares_build.h.dist is not included in the distribution archive.
- * File ares_build.h is not present in the CVS tree.
+ * File ares_build.h is not present in the git tree.
*
* The distributed ares_build.h file is only intended to be used on systems
* which can not run the also distributed configure script.
@@ -75,7 +75,7 @@
* and specific to the library being configured and built, which is generated
* from the ares_build.h.in template file.
*
- * If you check out from CVS on a non-configure platform, you must run the
+ * If you check out from git on a non-configure platform, you must run the
* appropriate buildconf* script to set up ares_build.h and other local files.
*
*/
diff --git a/ares_version.h b/ares_version.h
index 07c80ba..fcdc668 100644
--- a/ares_version.h
+++ b/ares_version.h
@@ -9,7 +9,7 @@
#define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
(ARES_VERSION_MINOR<<8)|\
(ARES_VERSION_PATCH))
-#define ARES_VERSION_STR "1.7.1-CVS"
+#define ARES_VERSION_STR "1.7.1-DEV"
#if (ARES_VERSION >= 0x010700)
# define CARES_HAVE_ARES_LIBRARY_INIT 1
diff --git a/buildconf.bat b/buildconf.bat
index 4b6a6e2..36ae838 100644
--- a/buildconf.bat
+++ b/buildconf.bat
@@ -2,14 +2,14 @@
REM
REM $Id$
REM
-REM This batch file must be used to set up a CVS tree to build on
+REM This batch file must be used to set up a git tree to build on
REM systems where there is no autotools support (i.e. Microsoft).
REM
REM This file is not included nor needed for c-ares' release
REM archives, neither for c-ares' daily snapshot archives.
-if exist CVS-INFO goto start_doing
-ECHO ERROR: This file shall only be used with a c-ares CVS tree checkout.
+if exist GIT-INFO goto start_doing
+ECHO ERROR: This file shall only be used with a c-ares git checkout.
goto end_all
:start_doing