Added files: Change license header

Change the license header from GPLv3+ to GPLv2+ since Automake has not yet
transitioned.

6 files changed, 32 insertions, 28 deletions

diff --git a/lib/Automake/CondStack.pm b/lib/Automake/CondStack.pm
index 45cec9b9e..286ecfd49 100644
--- a/lib/Automake/CondStack.pm
+++ b/lib/Automake/CondStack.pm
@@ -1,9 +1,9 @@
 # Copyright (C) 2018  Free Software Foundation, Inc.
 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/Automake/ConfVars.pm b/lib/Automake/ConfVars.pm
index a962d848a..5acf017e7 100644
--- a/lib/Automake/ConfVars.pm
+++ b/lib/Automake/ConfVars.pm
@@ -1,9 +1,9 @@
 # Copyright (C) 2018  Free Software Foundation, Inc.
 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,9 +13,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Like define_variable, but define a variable to be the configure
-# substitution by the same name.
-
 package Automake::ConfVars;
 
 use 5.006;
diff --git a/lib/Automake/File.pm b/lib/Automake/File.pm
index 77cc062e0..9a34543fa 100644
--- a/lib/Automake/File.pm
+++ b/lib/Automake/File.pm
@@ -1,9 +1,9 @@
 # Copyright (C) 2018  Free Software Foundation, Inc.
 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/Automake/Global.pm b/lib/Automake/Global.pm
index 6ca9b864d..13e1d1a76 100644
--- a/lib/Automake/Global.pm
+++ b/lib/Automake/Global.pm
@@ -1,9 +1,9 @@
 # Copyright (C) 2018  Free Software Foundation, Inc.
 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/Automake/Utils.pm b/lib/Automake/Utils.pm
index aafb911cd..6b58b8c25 100644
--- a/lib/Automake/Utils.pm
+++ b/lib/Automake/Utils.pm
@@ -1,9 +1,9 @@
 # Copyright (C) 2018  Free Software Foundation, Inc.
 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/t/pm/Utils.pl b/t/pm/Utils.pl
index 2ccb3635f..39fc05c61 100644
--- a/t/pm/Utils.pl
+++ b/t/pm/Utils.pl
@@ -1,9 +1,9 @@
 # Copyright (C) 2018  Free Software Foundation, Inc.
 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,6 +12,7 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 use Automake::Utils;
 
 sub check_subst
@@ -43,7 +44,13 @@ sit amet urna.  Curabitur vulputate vestibulum lorem.  Fusce sagittis, libero
 lacinia eros.
 ";
 
-  my $expected_res = "Aliquam posuere. Nunc aliquet, augue nec adipiscing interdum, lacus tellus malesuada massa, quis varius mi purus non odio. Pellentesque condimentum, magna ut suscipit hendrerit, ipsum augue ornare nulla, non luctus diam neque sit amet urna. Curabitur vulputate vestibulum lorem. Fusce sagittis, libero non molestie mollis, magna orci ultrices dolor, at vulputate neque nulla lacinia eros.";
+  my $expected_res = "Aliquam posuere. Nunc aliquet, augue nec adipiscing " .
+      "interdum, lacus tellus malesuada massa, quis varius mi purus non " .
+      "odio. Pellentesque condimentum, magna ut suscipit hendrerit, ipsum " .
+      "augue ornare nulla, non luctus diam neque sit amet urna. Curabitur " .
+      "vulputate vestibulum lorem. Fusce sagittis, libero non molestie " .
+      "mollis, magna orci ultrices dolor, at vulputate neque nulla lacinia " .
+      "eros.";
 
   return 1 if (flatten $test_str) ne $expected_res;
   return 0;