tools: Fix podwrapper errors in tools directory.

This also makes the test for license "code" less strict, so it should
only match POD, not Perl comments.

This fixes commit 2f97bf873b64384835f257f8916bf1ebb2af62b4.

6 files changed, 2 insertions, 94 deletions

diff --git a/podwrapper.pl.in b/podwrapper.pl.in
index f9b61f0e..15e2eadb 100755
--- a/podwrapper.pl.in
+++ b/podwrapper.pl.in
@@ -261,8 +261,8 @@ die "$progname: $input: BUGS is now added automatically, do not add it to the PO
 die "$progname: $input: LICENSE is now added automatically, do not add it to the POD file\n"
     if $content =~ /^=head1 LICENSE/m;
 die "$progname: $input: GPL/LGPL should be specified using the --license parameter, not included in the POD file\n"
-    if $content =~ /This program is free software/ ||
-       $content =~ /This library is free software/;
+    if $content =~ /^This program is free software/ ||
+       $content =~ /^This library is free software/;
 
 # Add standard LICENSE and BUGS sections.
 my $LGPLv2plus =
diff --git a/tools/virt-list-filesystems b/tools/virt-list-filesystems
index cb83a70e..f0d39aba 100755
--- a/tools/virt-list-filesystems
+++ b/tools/virt-list-filesystems
@@ -214,17 +214,3 @@ Richard W.M. Jones L<http://people.redhat.com/~rjones/>
 =head1 COPYRIGHT
 
 Copyright (C) 2009 Red Hat 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 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
-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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/tools/virt-list-partitions b/tools/virt-list-partitions
index 693dac56..79f3b341 100755
--- a/tools/virt-list-partitions
+++ b/tools/virt-list-partitions
@@ -283,17 +283,3 @@ Richard W.M. Jones L<http://people.redhat.com/~rjones/>
 =head1 COPYRIGHT
 
 Copyright (C) 2009-2012 Red Hat 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 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
-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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/tools/virt-make-fs b/tools/virt-make-fs
index 281c92c1..a8cf56bc 100755
--- a/tools/virt-make-fs
+++ b/tools/virt-make-fs
@@ -639,17 +639,6 @@ L<guestfs(3)>,
 L<Sys::Guestfs(3)>,
 L<http://libguestfs.org/>.
 
-=head1 BUGS
-
-When reporting bugs, please enable debugging and capture the
-I<complete> output:
-
- export LIBGUESTFS_DEBUG=1
- virt-make-fs --debug [...] > /tmp/virt-make-fs.log 2>&1
-
-Attach /tmp/virt-make-fs.log to a new bug report at
-L<https://bugzilla.redhat.com/>
-
 =head1 AUTHOR
 
 Richard W.M. Jones L<http://people.redhat.com/~rjones/>
@@ -657,17 +646,3 @@ Richard W.M. Jones L<http://people.redhat.com/~rjones/>
 =head1 COPYRIGHT
 
 Copyright (C) 2010-2012 Red Hat 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 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
-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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/tools/virt-tar b/tools/virt-tar
index 053231c1..26e07f3e 100755
--- a/tools/virt-tar
+++ b/tools/virt-tar
@@ -313,17 +313,3 @@ Richard W.M. Jones L<http://people.redhat.com/~rjones/>
 =head1 COPYRIGHT
 
 Copyright (C) 2009 Red Hat 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 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
-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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/tools/virt-win-reg b/tools/virt-win-reg
index 2caa954c..9e053dda 100755
--- a/tools/virt-win-reg
+++ b/tools/virt-win-reg
@@ -769,17 +769,6 @@ L<Win::Hivex::Regedit(3)>,
 L<Sys::Virt(3)>,
 L<http://libguestfs.org/>.
 
-=head1 BUGS
-
-When reporting bugs, please enable debugging and capture the
-I<complete> output:
-
- export LIBGUESTFS_DEBUG=1
- virt-win-reg --debug [... rest ...] > /tmp/virt-win-reg.log 2>&1
-
-Attach /tmp/virt-win-reg.log to a new bug report at
-L<https://bugzilla.redhat.com/>
-
 =head1 AUTHOR
 
 Richard W.M. Jones L<http://people.redhat.com/~rjones/>
@@ -787,17 +776,3 @@ Richard W.M. Jones L<http://people.redhat.com/~rjones/>
 =head1 COPYRIGHT
 
 Copyright (C) 2010 Red Hat 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 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
-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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.