Fix copyleft notices to follow the GNU standards.

5 files changed, 22 insertions, 30 deletions

diff --git a/mu-aux/Makefile.am b/mu-aux/Makefile.am
index 28a299b6f..7273a9fbf 100644
--- a/mu-aux/Makefile.am
+++ b/mu-aux/Makefile.am
@@ -1,22 +1,19 @@
-## Process this file with GNU Automake to create Makefile.in
-
-##   Copyright (C) 2002, 2003, 2005, 2007, 2010 Free Software
-##   Foundation, Inc.
+## This file is part of GNU Mailutils.
+## Copyright (C) 2002, 2003, 2005, 2007, 2010 Free Software
+## Foundation, Inc.
 ##
-##   GNU Mailutils 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, or (at
-##   your option) any later version.
+## GNU Mailutils 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, 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.
+## GNU Mailutils 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
+## You should have received a copy of the GNU General Public License
+## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
 EXTRA_DIST = \
  debugdef.m4\
diff --git a/mu-aux/debugdef.m4 b/mu-aux/debugdef.m4
index 34be1cdcd..ab9ee7014 100644
--- a/mu-aux/debugdef.m4
+++ b/mu-aux/debugdef.m4
@@ -4,18 +4,18 @@ divert(-1)
 #
 # Initially written by Sergey Poznyakoff for Mailfromd project.
 #
-# This program is free software; you can redistribute it and/or modify
+# GNU Mailutils 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, or (at your option)
 # any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# GNU Mailutils 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, see <http://www.gnu.org/licenses/>.
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
 changecom(/*,*/)
 
diff --git a/mu-aux/generr.awk b/mu-aux/generr.awk
index a40690c02..e0efc71aa 100644
--- a/mu-aux/generr.awk
+++ b/mu-aux/generr.awk
@@ -6,17 +6,15 @@
 # published by the Free Software Foundation; either version 3, or (at
 # your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
+# GNU Mailutils 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
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
-# This program creates error reporting source files (muerrno.c and errno.h)
+# GNU Mailutils creates error reporting source files (muerrno.c and errno.h)
 # for GNU Mailutils.
 #
 # Usage:
diff --git a/mu-aux/gylwrap b/mu-aux/gylwrap
index 66dbdd03e..20d9b4011 100755
--- a/mu-aux/gylwrap
+++ b/mu-aux/gylwrap
@@ -15,8 +15,7 @@
 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>. 
 
 # Usage:
 #     ylwrap PROGRAM [ARGS] INPUT [OUTPUT DESIRED]... -- [-yy repl] [ARGS]...
diff --git a/mu-aux/texify.sed b/mu-aux/texify.sed
index 468001ae6..e344122a0 100644
--- a/mu-aux/texify.sed
+++ b/mu-aux/texify.sed
@@ -5,15 +5,13 @@
 # published by the Free Software Foundation; either version 3, or (at
 # your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
+# GNU Mailutils 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
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
 1{s/\/\*/@comment  /
 b