Remove obsolete automake 1.5 check and fix branding

(cherry picked from commit ac762db5a0)

cvs.sh

@@ -35,12 +35,12 @@ case $AUTOCONF_VERSION in
   Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
   "" )
     echo "*** AUTOCONF NOT FOUND!."
-    echo "*** KDE requires autoconf $required_autoconf_version"
+    echo "*** TDE requires autoconf $required_autoconf_version"
     exit 1
     ;;
   * )
     echo "*** YOU'RE USING $AUTOCONF_VERSION."
-    echo "*** KDE requires autoconf $required_autoconf_version"
+    echo "*** TDE requires autoconf $required_autoconf_version"
     exit 1
     ;;
 esac
@@ -50,12 +50,12 @@ case $AUTOHEADER_VERSION in
   Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
   "" )
     echo "*** AUTOHEADER NOT FOUND!."
-    echo "*** KDE requires autoheader $required_autoconf_version"
+    echo "*** TDE requires autoheader $required_autoconf_version"
     exit 1
     ;;
   * )
     echo "*** YOU'RE USING $AUTOHEADER_VERSION."
-    echo "*** KDE requires autoheader $required_autoconf_version"
+    echo "*** TDE requires autoheader $required_autoconf_version"
     exit 1
     ;;
 esac
@@ -63,18 +63,13 @@ esac
 AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
 required_automake_version="1.6.1 or newer"
 case $AUTOMAKE_STRING in
-  automake*1.5d* | automake*1.5* | automake*1.5-* )
-    echo "*** YOU'RE USING $AUTOMAKE_STRING."
-    echo "*** KDE requires automake $required_automake_version"
-    exit 1
-    ;;
   automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12*)
     echo "*** $AUTOMAKE_STRING found."
     UNSERMAKE=no
     ;;
   "" )
     echo "*** AUTOMAKE NOT FOUND!."
-    echo "*** KDE requires automake $required_automake_version"
+    echo "*** TDE requires automake $required_automake_version"
     exit 1
     ;;
   *unsermake* ) :
@@ -84,7 +79,7 @@ case $AUTOMAKE_STRING in
     ;;
   * )
     echo "*** YOU'RE USING $AUTOMAKE_STRING."
-    echo "*** KDE requires automake $required_automake_version"
+    echo "*** TDE requires automake $required_automake_version"
     exit 1
     ;;
 esac