Clean up some trailing whitespace

[empserver] / info / findsubj.pl

diff --git a/info/findsubj.pl b/info/findsubj.pl
index 6de71165008d350e7ab4d9aa3b8cef567c29e1fa..6627518909b6da738bfe5f47316c17b530fa73b5 100644 (file)
--- a/info/findsubj.pl
+++ b/info/findsubj.pl
@@ -1,36 +1,35 @@
 #!/usr/bin/perl
 #
-#  Empire - A multi-player, client/server Internet based war game.
-#  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
-#                           Ken Stevens, Steve McClure
+#   Empire - A multi-player, client/server Internet based war game.
+#   Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+#                 Ken Stevens, Steve McClure, Markus Armbruster
 #
-#  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.
+#   Empire 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 distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-#  ---
+#   ---
 #
-#  See files README, COPYING and CREDITS in the root of the source
-#  tree for related information and legal notices.  It is expected
-#  that future projects/authors will amend these files as needed.
+#   See files README, COPYING and CREDITS in the root of the source
+#   tree for related information and legal notices.  It is expected
+#   that future projects/authors will amend these files as needed.
 #
-#  ---
+#   ---
 #
-#  findsubj.pl: Find info subjects, update subjects.mk
-# 
-#  Known contributors to this file:
-#     Ken Stevens (when it was still info.pl)
-#     Markus Armbruster, 2006-2008
+#   findsubj.pl: Find info subjects, update subjects.mk
+#
+#   Known contributors to this file:
+#      Ken Stevens (when it was still info.pl)
+#      Markus Armbruster, 2006-2008
 #
 
 # Usage: findsubj.pl INFO-FILE...
@@ -64,11 +63,11 @@ use warnings;
 
 use Errno qw(ENOENT);
 
-our (%filename, %chapter, %see_also, %sanr);
-our ($filename, %subjfil);
+my (%filename, %chapter, %see_also, %sanr);
+my ($filename, %subjfil);
 
 # Get known subjects
-our @Subjects = split(' ', read_make_var("subjects", "subjects.mk", ""));
+my @Subjects = split(' ', read_make_var("subjects", "subjects.mk", ""));
 
 # Parse the .t files
 for my $f (@ARGV) {
@@ -141,7 +140,7 @@ sub parse_file {
 
     open(F, "<$filename")
        or die "Can't open $filename: $!";
-  
+
     $_ = <F>;
     if (/^\.TH (\S+) (\S.+\S)$/) {
        $chapter{$topic} = $1;