Added files: Change license header

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

diff --git a/lib/Automake/CondStack.pm b/lib/Automake/CondStack.pm
index 45cec9b9e118c6a54135468dc10a89239ad73016..286ecfd4979fcf2cc1d2ccd0e3551d917d273844 100644 (file)
--- 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 a962d848a70693557d696dc4e237f78c629520e5..5acf017e7e041de97573e9ab2a3b1284142be0a4 100644 (file)
--- 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 77cc062e0f35a8d8b9c43a229cbee54a06d9cb49..9a34543fa88bbff8a053d9839375e363d1ac2cc1 100644 (file)
--- 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 6ca9b864dde3db60154a40132f1e718224cf6a03..13e1d1a7699e8a189ce2c11d7da920b1ab8a6adb 100644 (file)
--- 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 aafb911cd6afc3fd2b748dba4a532568e20beb4c..6b58b8c25ef2ddc00bb22bff162c506a5e90c259 100644 (file)
--- 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 2ccb3635f65779d2bed457799e710e75b25106ed..39fc05c613acc329aa3cec0b3bdd956a6ffd64be 100644 (file)
--- 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;