>From b848e92b5d2fdfbc8b042d757a2ba449b29b0fcb Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sat, 3 Nov 2012 11:37:56 +0100 Subject: [PATCH] Fixup license headers After the libcdio - libcdio-paranoia split many license headers were wrong. The original cdparanoia library is LGPLv2+ and the binaries are GPLv2+. This changes all GPLv3 headers from the libcdio split back to GPLv2+ and the files in lib/paranoia to LGPLv2+. --- doc/en/Makefile.am | 9 +++++---- doc/ja/Makefile.am | 9 +++++---- example/C++/Makefile.am | 9 +++++---- example/C++/paranoia.cpp | 11 ++++++----- example/C++/paranoia2.cpp | 9 +++++---- example/paranoia.c | 9 +++++---- example/paranoia2.c | 9 +++++---- lib/paranoia/Makefile.am | 9 +++++---- lib/paranoia/gap.c | 22 +++++++++++----------- lib/paranoia/gap.h | 22 +++++++++++----------- lib/paranoia/isort.c | 22 +++++++++++----------- lib/paranoia/isort.h | 21 +++++++++++---------- lib/paranoia/overlap.c | 22 +++++++++++----------- lib/paranoia/overlap.h | 22 +++++++++++----------- lib/paranoia/p_block.h | 20 ++++++++++---------- lib/paranoia/paranoia.c | 22 +++++++++++----------- src/pod2c.pl | 9 +++++---- test/testparanoia.c | 9 +++++---- 18 files changed, 138 insertions(+), 127 deletions(-) diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index b70fbe8..0eaee82 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -2,9 +2,9 @@ # # Copyright (C) 2005, 2008 Rocky Bernstein # -# This program is free software: you can redistribute it and/or modify +# 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 +# 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, @@ -12,8 +12,9 @@ # 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 . +# 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. manfiles = cd-paranoia.1 man_MANS = $(manfiles) diff --git a/doc/ja/Makefile.am b/doc/ja/Makefile.am index bf4f717..8652b93 100644 --- a/doc/ja/Makefile.am +++ b/doc/ja/Makefile.am @@ -2,9 +2,9 @@ # # Copyright (C) 2005, 2008 Rocky Bernstein # -# This program is free software: you can redistribute it and/or modify +# 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 +# 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, @@ -12,8 +12,9 @@ # 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 . +# 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. mansubdir=/jp/man1 manfiles = cd-paranoia.1 diff --git a/example/C++/Makefile.am b/example/C++/Makefile.am index 957828f..f77fdb0 100644 --- a/example/C++/Makefile.am +++ b/example/C++/Makefile.am @@ -1,8 +1,8 @@ # Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein # -# This program is free software: you can redistribute it and/or modify +# 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 +# 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, @@ -10,8 +10,9 @@ # 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 . +# 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. ########################################################## # Sample C++ programs using libcdio (without OO wrapper) diff --git a/example/C++/paranoia.cpp b/example/C++/paranoia.cpp index 17d93d4..29102f1 100644 --- a/example/C++/paranoia.cpp +++ b/example/C++/paranoia.cpp @@ -1,9 +1,9 @@ /* Copyright (C) 2005, 2008, 2009 Rocky Bernstein - - This program is free software: you can redistribute it and/or modify + + 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 + 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, @@ -11,8 +11,9 @@ 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 . + 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. */ /* Simple program to show using libcdio's version of the CD-DA paranoia. diff --git a/example/C++/paranoia2.cpp b/example/C++/paranoia2.cpp index b2cbbd7..b0a5c0a 100644 --- a/example/C++/paranoia2.cpp +++ b/example/C++/paranoia2.cpp @@ -1,9 +1,9 @@ /* Copyright (C) 2005, 2008, 2009 Rocky Bernstein - This program is free software: you can redistribute it and/or modify + 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 + 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, @@ -11,8 +11,9 @@ 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 . + 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. */ /* Simple program to show using libcdio's version of the CD-DA diff --git a/example/paranoia.c b/example/paranoia.c index dd17b41..7a82cfa 100644 --- a/example/paranoia.c +++ b/example/paranoia.c @@ -2,9 +2,9 @@ Copyright (C) 2005, 2006, 2008, 2009, 2010, 2011, 2012 Rocky Bernstein - This program is free software: you can redistribute it and/or modify + 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 + 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, @@ -12,8 +12,9 @@ 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 . + 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. */ /* Simple program to show using libcdio's version of the CD-DA paranoia. diff --git a/example/paranoia2.c b/example/paranoia2.c index e0a14a4..7474813 100644 --- a/example/paranoia2.c +++ b/example/paranoia2.c @@ -1,9 +1,9 @@ /* Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein - This program is free software: you can redistribute it and/or modify + 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 + 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, @@ -11,8 +11,9 @@ 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 . + 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. */ /* Simple program to show using libcdio's version of the CD-DA diff --git a/lib/paranoia/Makefile.am b/lib/paranoia/Makefile.am index 4007b52..c538bf4 100644 --- a/lib/paranoia/Makefile.am +++ b/lib/paranoia/Makefile.am @@ -1,8 +1,8 @@ # Copyright (C) 2004, 2006, 2008, 2011 Rocky Bernstein # -# This program is free software: you can redistribute it and/or modify +# 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 +# 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, @@ -10,8 +10,9 @@ # 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 . +# 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. ######################################################## # Things to make the libcdio_paranoia library diff --git a/lib/paranoia/gap.c b/lib/paranoia/gap.c index 1f5f95b..5e83856 100644 --- a/lib/paranoia/gap.c +++ b/lib/paranoia/gap.c @@ -1,20 +1,20 @@ /* Copyright (C) 2004, 2008, 2011 Rocky Bernstein Copyright (C) 1998 Monty address@hidden - - 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, + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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 Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /*** * Gap analysis support code for paranoia diff --git a/lib/paranoia/gap.h b/lib/paranoia/gap.h index 3185695..1d15f84 100644 --- a/lib/paranoia/gap.h +++ b/lib/paranoia/gap.h @@ -1,20 +1,20 @@ /* Copyright (C) 2004, 2008 Rocky Bernstein Copyright (C) 1998 Monty address@hidden - - 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, + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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 Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef _GAP_H_ diff --git a/lib/paranoia/isort.c b/lib/paranoia/isort.c index b80005b..0825f50 100644 --- a/lib/paranoia/isort.c +++ b/lib/paranoia/isort.c @@ -1,20 +1,20 @@ /* Copyright (C) 2004, 2005, 2008, 2011 Rocky Bernstein Copyright (C) 1998 Monty address@hidden - - 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, + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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 Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /* sorted vector abstraction for paranoia */ diff --git a/lib/paranoia/isort.h b/lib/paranoia/isort.h index 8479f84..842260e 100644 --- a/lib/paranoia/isort.h +++ b/lib/paranoia/isort.h @@ -3,19 +3,20 @@ Copyright (C) 2004, 2005, 2008 Rocky Bernstein Copyright (C) 1998 Monty address@hidden - - 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 distributed in the hope that it will be useful, + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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 . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef _ISORT_H_ diff --git a/lib/paranoia/overlap.c b/lib/paranoia/overlap.c index 7301e7f..d4e7473 100644 --- a/lib/paranoia/overlap.c +++ b/lib/paranoia/overlap.c @@ -1,20 +1,20 @@ /* Copyright (C) 2004, 2005, 2008, 2011 Rocky Bernstein Copyright (C) 1998 Monty address@hidden - - 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, + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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 Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /*** diff --git a/lib/paranoia/overlap.h b/lib/paranoia/overlap.h index e2a3fa8..2760692 100644 --- a/lib/paranoia/overlap.h +++ b/lib/paranoia/overlap.h @@ -1,20 +1,20 @@ /* Copyright (C) 2004, 2008 Rocky Bernstein Copyright (C) 1998 Monty address@hidden - - 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, + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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 Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef _OVERLAP_H_ diff --git a/lib/paranoia/p_block.h b/lib/paranoia/p_block.h index f1e325f..165dae5 100644 --- a/lib/paranoia/p_block.h +++ b/lib/paranoia/p_block.h @@ -2,19 +2,19 @@ Copyright (C) 2004, 2005, 2008 Rocky Bernstein Copyright (C) by Monty (address@hidden) - 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 library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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 Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef _P_BLOCK_H_ diff --git a/lib/paranoia/paranoia.c b/lib/paranoia/paranoia.c index 3af7f16..4ecfcdf 100644 --- a/lib/paranoia/paranoia.c +++ b/lib/paranoia/paranoia.c @@ -1,20 +1,20 @@ /* Copyright (C) 2004, 2005, 2006, 2008, 2011 Rocky Bernstein Copyright (C) 1998 Monty address@hidden - - 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, + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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 Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /*** * Toplevel file for the paranoia abstraction over the cdda lib diff --git a/src/pod2c.pl b/src/pod2c.pl index a37d2a2..f1dc254 100755 --- a/src/pod2c.pl +++ b/src/pod2c.pl @@ -18,9 +18,9 @@ open(STDIN, "<$filename") print "/* Copyright (C) 1999, 2005, 2007, 2008 Rocky Bernstein - This program is free software: you can redistribute it and/or modify + 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 + 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, @@ -28,8 +28,9 @@ print "/* 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 . + 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. */ static const char ${name}_help[] =\n"; while() { diff --git a/test/testparanoia.c b/test/testparanoia.c index 54e1980..9b1545f 100644 --- a/test/testparanoia.c +++ b/test/testparanoia.c @@ -1,9 +1,9 @@ /* Copyright (C) 2005, 2006, 2008, 2011 Rocky Bernstein - This program is free software: you can redistribute it and/or modify + 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 + 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, @@ -11,8 +11,9 @@ 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 . + 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. */ /* Simple program to show using libcdio's version of cdparanoia. */ -- 1.7.11.7