Blame SOURCES/most-of-a500a7037729aaeaba9bfda9c007d598e8fa8adc.patch

a16723
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
a16723
index b70fbe8..0eaee82 100644
a16723
--- a/doc/en/Makefile.am
a16723
+++ b/doc/en/Makefile.am
a16723
@@ -2,9 +2,9 @@
a16723
 #
a16723
 #   Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
a16723
 #
a16723
-#   This program is free software: you can redistribute it and/or modify
a16723
+#   This program is free software; you can redistribute it and/or modify
a16723
 #   it under the terms of the GNU General Public License as published by
a16723
-#   the Free Software Foundation, either version 3 of the License, or
a16723
+#   the Free Software Foundation; either version 2 of the License, or
a16723
 #   (at your option) any later version.
a16723
 #
a16723
 #   This program is distributed in the hope that it will be useful,
a16723
@@ -12,8 +12,9 @@
a16723
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
a16723
 #   GNU General Public License for more details.
a16723
 #
a16723
-#   You should have received a copy of the GNU General Public License
a16723
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
a16723
+#   You should have received a copy of the GNU General Public License along
a16723
+#   with this program; if not, write to the Free Software Foundation, Inc.,
a16723
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
a16723
 
a16723
 manfiles = cd-paranoia.1 
a16723
 man_MANS = $(manfiles)
a16723
diff --git a/doc/ja/Makefile.am b/doc/ja/Makefile.am
a16723
index bf4f717..8652b93 100644
a16723
--- a/doc/ja/Makefile.am
a16723
+++ b/doc/ja/Makefile.am
a16723
@@ -2,9 +2,9 @@
a16723
 #
a16723
 #   Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
a16723
 #
a16723
-#   This program is free software: you can redistribute it and/or modify
a16723
+#   This program is free software; you can redistribute it and/or modify
a16723
 #   it under the terms of the GNU General Public License as published by
a16723
-#   the Free Software Foundation, either version 3 of the License, or
a16723
+#   the Free Software Foundation; either version 2 of the License, or
a16723
 #   (at your option) any later version.
a16723
 #
a16723
 #   This program is distributed in the hope that it will be useful,
a16723
@@ -12,8 +12,9 @@
a16723
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
a16723
 #   GNU General Public License for more details.
a16723
 #
a16723
-#   You should have received a copy of the GNU General Public License
a16723
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
a16723
+#   You should have received a copy of the GNU General Public License along
a16723
+#   with this program; if not, write to the Free Software Foundation, Inc.,
a16723
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
a16723
 
a16723
 mansubdir=/jp/man1
a16723
 manfiles = cd-paranoia.1
a16723
diff --git a/example/C++/Makefile.am b/example/C++/Makefile.am
a16723
index 957828f..f77fdb0 100644
a16723
--- a/example/C++/Makefile.am
a16723
+++ b/example/C++/Makefile.am
a16723
@@ -1,8 +1,8 @@
a16723
 #   Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
a16723
 #
a16723
-#   This program is free software: you can redistribute it and/or modify
a16723
+#   This program is free software; you can redistribute it and/or modify
a16723
 #   it under the terms of the GNU General Public License as published by
a16723
-#   the Free Software Foundation, either version 3 of the License, or
a16723
+#   the Free Software Foundation; either version 2 of the License, or
a16723
 #   (at your option) any later version.
a16723
 #
a16723
 #   This program is distributed in the hope that it will be useful,
a16723
@@ -10,8 +10,9 @@
a16723
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
a16723
 #   GNU General Public License for more details.
a16723
 #
a16723
-#   You should have received a copy of the GNU General Public License
a16723
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
a16723
+#   You should have received a copy of the GNU General Public License along
a16723
+#   with this program; if not, write to the Free Software Foundation, Inc.,
a16723
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
a16723
 
a16723
 ##########################################################
a16723
 # Sample C++ programs using libcdio (without OO wrapper)
a16723
diff --git a/example/C++/paranoia.cpp b/example/C++/paranoia.cpp
a16723
index 17d93d4..29102f1 100644
a16723
--- a/example/C++/paranoia.cpp
a16723
+++ b/example/C++/paranoia.cpp
a16723
@@ -1,9 +1,9 @@
a16723
 /*
a16723
   Copyright (C) 2005, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
a16723
-  
a16723
-  This program is free software: you can redistribute it and/or modify
a16723
+
a16723
+  This program is free software; you can redistribute it and/or modify
a16723
   it under the terms of the GNU General Public License as published by
a16723
-  the Free Software Foundation, either version 3 of the License, or
a16723
+  the Free Software Foundation; either version 2 of the License, or
a16723
   (at your option) any later version.
a16723
 
a16723
   This program is distributed in the hope that it will be useful,
a16723
@@ -11,8 +11,9 @@
a16723
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
a16723
   GNU General Public License for more details.
a16723
 
a16723
-  You should have received a copy of the GNU General Public License
a16723
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
a16723
+  You should have received a copy of the GNU General Public License along
a16723
+  with this program; if not, write to the Free Software Foundation, Inc.,
a16723
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
a16723
 */
a16723
 
a16723
 /* Simple program to show using libcdio's version of the CD-DA paranoia. 
a16723
diff --git a/example/paranoia.c b/example/paranoia.c
a16723
index dd17b41..7a82cfa 100644
a16723
--- a/example/paranoia.c
a16723
+++ b/example/paranoia.c
a16723
@@ -2,9 +2,9 @@
a16723
   Copyright (C) 2005, 2006, 2008, 2009, 2010, 2011, 2012
a16723
    Rocky Bernstein <rocky@gnu.org>
a16723
 
a16723
-  This program is free software: you can redistribute it and/or modify
a16723
+  This program is free software; you can redistribute it and/or modify
a16723
   it under the terms of the GNU General Public License as published by
a16723
-  the Free Software Foundation, either version 3 of the License, or
a16723
+  the Free Software Foundation; either version 2 of the License, or
a16723
   (at your option) any later version.
a16723
 
a16723
   This program is distributed in the hope that it will be useful,
a16723
@@ -12,8 +12,9 @@
a16723
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
a16723
   GNU General Public License for more details.
a16723
 
a16723
-  You should have received a copy of the GNU General Public License
a16723
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
a16723
+  You should have received a copy of the GNU General Public License along
a16723
+  with this program; if not, write to the Free Software Foundation, Inc.,
a16723
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
a16723
 */
a16723
 
a16723
 /* Simple program to show using libcdio's version of the CD-DA paranoia. 
a16723
diff --git a/example/paranoia2.c b/example/paranoia2.c
a16723
index e0a14a4..7474813 100644
a16723
--- a/example/paranoia2.c
a16723
+++ b/example/paranoia2.c
a16723
@@ -1,9 +1,9 @@
a16723
 /*
a16723
   Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
a16723
 
a16723
-  This program is free software: you can redistribute it and/or modify
a16723
+  This program is free software; you can redistribute it and/or modify
a16723
   it under the terms of the GNU General Public License as published by
a16723
-  the Free Software Foundation, either version 3 of the License, or
a16723
+  the Free Software Foundation; either version 2 of the License, or
a16723
   (at your option) any later version.
a16723
 
a16723
   This program is distributed in the hope that it will be useful,
a16723
@@ -11,8 +11,9 @@
a16723
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
a16723
   GNU General Public License for more details.
a16723
 
a16723
-  You should have received a copy of the GNU General Public License
a16723
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
a16723
+  You should have received a copy of the GNU General Public License along
a16723
+  with this program; if not, write to the Free Software Foundation, Inc.,
a16723
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
a16723
 */
a16723
 
a16723
 /* Simple program to show using libcdio's version of the CD-DA
a16723
diff --git a/lib/paranoia/Makefile.am b/lib/paranoia/Makefile.am
a16723
index 4007b52..c538bf4 100644
a16723
--- a/lib/paranoia/Makefile.am
a16723
+++ b/lib/paranoia/Makefile.am
a16723
@@ -1,8 +1,8 @@
a16723
 #   Copyright (C) 2004, 2006, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
a16723
 #
a16723
-#   This program is free software: you can redistribute it and/or modify
a16723
+#   This program is free software; you can redistribute it and/or modify
a16723
 #   it under the terms of the GNU General Public License as published by
a16723
-#   the Free Software Foundation, either version 3 of the License, or
a16723
+#   the Free Software Foundation; either version 2 of the License, or
a16723
 #   (at your option) any later version.
a16723
 #
a16723
 #   This program is distributed in the hope that it will be useful,
a16723
@@ -10,8 +10,9 @@
a16723
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
a16723
 #   GNU General Public License for more details.
a16723
 #
a16723
-#   You should have received a copy of the GNU General Public License
a16723
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
a16723
+#   You should have received a copy of the GNU General Public License along
a16723
+#   with this program; if not, write to the Free Software Foundation, Inc.,
a16723
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
a16723
 
a16723
 ########################################################
a16723
 # Things to make the libcdio_paranoia library
a16723
diff --git a/lib/paranoia/isort.h b/lib/paranoia/isort.h
a16723
index 8479f84..a1eace5 100644
a16723
--- a/lib/paranoia/isort.h
a16723
+++ b/lib/paranoia/isort.h
a16723
@@ -3,10 +3,10 @@
a16723
 
a16723
   Copyright (C) 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
a16723
   Copyright (C) 1998 Monty xiphmont@mit.edu
a16723
-  
a16723
-  This program is free software: you can redistribute it and/or modify
a16723
+
a16723
+  This program is free software; you can redistribute it and/or modify
a16723
   it under the terms of the GNU General Public License as published by
a16723
-  the Free Software Foundation, either version 3 of the License, or
a16723
+  the Free Software Foundation; either version 2 of the License, or
a16723
   (at your option) any later version.
a16723
 
a16723
   This program is distributed in the hope that it will be useful,
a16723
@@ -14,8 +14,9 @@
a16723
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
a16723
   GNU General Public License for more details.
a16723
 
a16723
-  You should have received a copy of the GNU General Public License
a16723
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
a16723
+  You should have received a copy of the GNU General Public License along
a16723
+  with this program; if not, write to the Free Software Foundation, Inc.,
a16723
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
a16723
 */
a16723
 
a16723
 #ifndef _ISORT_H_
a16723
diff --git a/src/pod2c.pl b/src/pod2c.pl
a16723
index a37d2a2..f1dc254 100755
a16723
--- a/src/pod2c.pl
a16723
+++ b/src/pod2c.pl
a16723
@@ -18,9 +18,9 @@
a16723
 print "/*
a16723
   Copyright (C) 1999, 2005, 2007, 2008 Rocky Bernstein
a16723
    
a16723
-  This program is free software: you can redistribute it and/or modify
a16723
+  This program is free software; you can redistribute it and/or modify
a16723
   it under the terms of the GNU General Public License as published by
a16723
-  the Free Software Foundation, either version 3 of the License, or
a16723
+  the Free Software Foundation; either version 2 of the License, or
a16723
   (at your option) any later version.
a16723
 
a16723
   This program is distributed in the hope that it will be useful,
a16723
@@ -28,8 +28,9 @@
a16723
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
a16723
   GNU General Public License for more details.
a16723
 
a16723
-  You should have received a copy of the GNU General Public License
a16723
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
a16723
+  You should have received a copy of the GNU General Public License along
a16723
+  with this program; if not, write to the Free Software Foundation, Inc.,
a16723
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
a16723
 */
a16723
 static const char ${name}_help[] =\n";
a16723
 while(<STDIN>) {
a16723
diff --git a/test/testparanoia.c b/test/testparanoia.c
a16723
index 54e1980..9b1545f 100644
a16723
--- a/test/testparanoia.c
a16723
+++ b/test/testparanoia.c
a16723
@@ -1,9 +1,9 @@
a16723
 /*
a16723
   Copyright (C) 2005, 2006, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
a16723
 
a16723
-  This program is free software: you can redistribute it and/or modify
a16723
+  This program is free software; you can redistribute it and/or modify
a16723
   it under the terms of the GNU General Public License as published by
a16723
-  the Free Software Foundation, either version 3 of the License, or
a16723
+  the Free Software Foundation; either version 2 of the License, or
a16723
   (at your option) any later version.
a16723
 
a16723
   This program is distributed in the hope that it will be useful,
a16723
@@ -11,8 +11,9 @@
a16723
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
a16723
   GNU General Public License for more details.
a16723
 
a16723
-  You should have received a copy of the GNU General Public License
a16723
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
a16723
+  You should have received a copy of the GNU General Public License along
a16723
+  with this program; if not, write to the Free Software Foundation, Inc.,
a16723
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
a16723
 */
a16723
 
a16723
 /* Simple program to show using libcdio's version of cdparanoia. */
a16723
-- 
a16723
1.7.10
a16723