Merge branch 'maint-1.5.4' into maint

diff --git a/t/t6000lib.sh b/t/t6000lib.sh
index 180633e1e0e37c59eeaa571ad7f7b292f35415ec..c0baaa536079b1213d83bbf234ac688567c95237 100755 (executable)
--- a/t/t6000lib.sh
+++ b/t/t6000lib.sh
@@ -97,7 +97,13 @@ check_output()
 # from front and back.
 name_from_description()
 {
-        tr "'" '-' | tr '~`!@#$%^&*()_+={}[]|\;:"<>,/? ' '-' | tr -s '-' | tr '[A-Z]' '[a-z]' | sed "s/^-*//;s/-*\$//"
+       perl -pe '
+               s/[^A-Za-z0-9.]/-/g;
+               s/-+/-/g;
+               s/-$//;
+               s/^-//;
+               y/A-Z/a-z/;
+       '
 }