Change CVS -> git in various places

but keep backwards compatibility wrt to the GST_CVS variable.

diff --git a/download-translations b/download-translations
index bb71c31..21f2ac0 100755 (executable)
--- a/download-translations
+++ b/download-translations
@@ -93,12 +93,12 @@ if [ -n "$DOMAINS_UPDATED" ]; then
   echo "===================================================================="
   echo
   echo "Language domains updated    :$DOMAINS_UPDATED"
-  echo "Language domains to cvs add :$DOMAINS_TO_ADD"
+  echo "Language domains to git add :$DOMAINS_TO_ADD"
   echo
   echo "Source: http://translationproject.org/latest/$PACKAGE/"
   echo
   if [ -n "$DOMAINS_TO_ADD" ]; then
-    CMD_STRING="cvs add"
+    CMD_STRING="git add"
     for d in $DOMAINS_TO_ADD; do
       CMD_STRING="$CMD_STRING po/$d.po"
     done

diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index 51067d6..7ea1254 100644 (file)
--- a/gtk-doc-plugins.mak
+++ b/gtk-doc-plugins.mak
@@ -4,7 +4,7 @@
 help:
        @echo
        @echo "If you are a doc maintainer, run 'make update' to update"
-       @echo "the documentation files maintained in CVS"
+       @echo "the documentation files maintained in git"
        @echo
        @echo Other useful make targets:
        @echo
@@ -46,7 +46,7 @@ MAINTAINER_DOC_STAMPS =                       \
        inspect.stamp
 
 # we don't add inspect-build.stamp and scanobj-build.stamp here since they are
-# built manually by docs maintainers and result is commited to CVS
+# built manually by docs maintainers and result is commited to git
 DOC_STAMPS =                           \
        scan-build.stamp                \
        tmpl-build.stamp                \

diff --git a/gtk-doc.mak b/gtk-doc.mak
index 95757f1..ea5f1ca 100644 (file)
--- a/gtk-doc.mak
+++ b/gtk-doc.mak
@@ -160,7 +160,7 @@ clean-local: clean-local-gtkdoc
        rm -f *~ *.bak
        rm -rf .libs
 
-# company: don't delete .sgml and -sections.txt as they're in CVS
+# company: don't delete .sgml and -sections.txt as they're in git
 # FIXME : thomas added all sgml files and some other things to make
 # make distcheck work
 distclean-local:

diff --git a/m4/gst-args.m4 b/m4/gst-args.m4
index 004363c..dcd914c 100644 (file)
--- a/m4/gst-args.m4
+++ b/m4/gst-args.m4
@@ -155,7 +155,7 @@ AC_DEFUN([AG_GST_ARG_WITH_PKG_CONFIG_PATH],
 ])
 
 
-dnl This macro requires that GST_CVS is set to yes or no (release)
+dnl This macro requires that GST_GIT or GST_CVS is set to yes or no (release)
 AC_DEFUN([AG_GST_ARG_WITH_PACKAGE_NAME],
 [
   dnl package name in plugins
@@ -177,10 +177,10 @@ AC_DEFUN([AG_GST_ARG_WITH_PACKAGE_NAME],
       fi
 
       dnl default value
-      if test "x$GST_CVS" = "xyes"
+      if test "x$GST_GIT" = "xyes" -o "x$GST_CVS" = "xyes"
       then
         dnl nano >= 1
-        GST_PACKAGE_NAME="$P CVS/prerelease"
+        GST_PACKAGE_NAME="$P git/prerelease"
       else
         GST_PACKAGE_NAME="$P source release"
       fi

diff --git a/m4/gst-error.m4 b/m4/gst-error.m4
index 8cfe3a8..d9a302c 100644 (file)
--- a/m4/gst-error.m4
+++ b/m4/gst-error.m4
@@ -7,7 +7,7 @@ dnl Last modification: 2008-02-18
 
 dnl AG_GST_SET_ERROR_CFLAGS([ADD-WERROR])
 dnl AG_GST_SET_ERROR_CXXFLAGS([ADD-WERROR])
-dnl AG_GST_SET_LEVEL_DEFAULT([IS-CVS-VERSION])
+dnl AG_GST_SET_LEVEL_DEFAULT([IS-GIT-VERSION])
 
 
 dnl Sets ERROR_CFLAGS to something the compiler will accept.