From 0e61f3de1ab3f8c662af37eeb55edbc2eb1b8ba1 Mon Sep 17 00:00:00 2001 From: karl Date: Thu, 17 Apr 2008 17:39:47 +0000 Subject: [PATCH] gplv3+ --- doc/Makefile.am | 28 +++++++++++++--------------- lib/cdda_interface/scsi_interface.c | 17 ++++++++--------- lib/paranoia/gap.c | 15 +++++++-------- lib/paranoia/gap.h | 15 +++++++-------- lib/paranoia/isort.c | 16 ++++++++-------- lib/paranoia/isort.h | 15 +++++++-------- lib/paranoia/overlap.c | 16 ++++++++-------- lib/paranoia/overlap.h | 15 +++++++-------- lib/paranoia/p_block.c | 27 +++++++++++++-------------- lib/paranoia/p_block.h | 27 +++++++++++++-------------- lib/paranoia/paranoia.c | 15 +++++++-------- src/cd-paranoia/doc/Makefile.am | 27 ++++++++++++--------------- src/cd-paranoia/doc/en/Makefile.am | 27 ++++++++++++--------------- src/cd-paranoia/doc/ja/Makefile.am | 27 ++++++++++++--------------- 14 files changed, 134 insertions(+), 153 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 7c9078b6..f8e72e86 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,21 +1,19 @@ -# $Id: Makefile.am,v 1.8 2008/03/21 10:42:36 rocky Exp $ +# $Id: Makefile.am,v 1.9 2008/04/17 17:39:47 karl Exp $ # -# Copyright (C) 2003, 2004, 2008 Rocky Bernstein +# Copyright (C) 2003, 2004, 2008 Rocky Bernstein +# 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 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# 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, see . + EXTRA_DIST = doxygen/Doxyfile.in doxygen/run_doxygen info_TEXINFOS = libcdio.texi libcdio_TEXINFOS = fdl.texi glossary.texi diff --git a/lib/cdda_interface/scsi_interface.c b/lib/cdda_interface/scsi_interface.c index 247dee31..5bd05575 100644 --- a/lib/cdda_interface/scsi_interface.c +++ b/lib/cdda_interface/scsi_interface.c @@ -1,25 +1,24 @@ /* - $Id: scsi_interface.c,v 1.2 2004/12/19 01:43:38 rocky Exp $ + $Id: scsi_interface.c,v 1.3 2008/04/17 17:39:47 karl Exp $ - Copyright (C) 2004 Rocky Bernstein + Copyright (C) 2004, 2008 Rocky Bernstein Original interface.c Copyright (C) 1994-1997 Eissfeldt heiko@colossus.escape.de Current blenderization Copyright (C) 1998-1999 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu - - 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 2 of the License, or + 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. - + 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 + along with this program. If not, see . */ /****************************************************************** * diff --git a/lib/paranoia/gap.c b/lib/paranoia/gap.c index 8c74dcfd..c79305fa 100644 --- a/lib/paranoia/gap.c +++ b/lib/paranoia/gap.c @@ -1,22 +1,21 @@ /* - $Id: gap.c,v 1.3 2005/11/08 23:21:40 pjcreath Exp $ + $Id: gap.c,v 1.4 2008/04/17 17:39:48 karl Exp $ - Copyright (C) 2004 Rocky Bernstein + Copyright (C) 2004, 2008 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu - 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 2 of the License, or + 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. - + 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 + along with this program. If not, see . */ /*** * Gap analysis support code for paranoia diff --git a/lib/paranoia/gap.h b/lib/paranoia/gap.h index 91fc7a84..44034f3e 100644 --- a/lib/paranoia/gap.h +++ b/lib/paranoia/gap.h @@ -1,22 +1,21 @@ /* - $Id: gap.h,v 1.1 2004/12/18 17:29:32 rocky Exp $ + $Id: gap.h,v 1.2 2008/04/17 17:39:48 karl Exp $ - Copyright (C) 2004 Rocky Bernstein + Copyright (C) 2004, 2008 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu - 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 2 of the License, or + 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. - + 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 + along with this program. If not, see . */ #ifndef _GAP_H_ diff --git a/lib/paranoia/isort.c b/lib/paranoia/isort.c index f0ab73f1..49a808f4 100644 --- a/lib/paranoia/isort.c +++ b/lib/paranoia/isort.c @@ -1,23 +1,23 @@ /* - $Id: isort.c,v 1.6 2005/10/15 03:18:42 rocky Exp $ + $Id: isort.c,v 1.7 2008/04/17 17:39:48 karl Exp $ - Copyright (C) 2004, 2005 Rocky Bernstein + Copyright (C) 2004, 2005, 2008 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu - 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 2 of the License, or + 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. - + 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 + along with this program. If not, see . */ + /* sorted vector abstraction for paranoia */ /* Old isort got a bit complex. This re-constrains complexity to diff --git a/lib/paranoia/isort.h b/lib/paranoia/isort.h index 1ced2282..8479f840 100644 --- a/lib/paranoia/isort.h +++ b/lib/paranoia/isort.h @@ -1,22 +1,21 @@ /* - $Id: isort.h,v 1.5 2005/10/17 20:56:51 pjcreath Exp $ + $Id: isort.h,v 1.6 2008/04/17 17:39:48 karl Exp $ - Copyright (C) 2004, 2005 Rocky Bernstein + Copyright (C) 2004, 2005, 2008 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu - 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 2 of the License, or + 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. - + 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 + along with this program. If not, see . */ #ifndef _ISORT_H_ diff --git a/lib/paranoia/overlap.c b/lib/paranoia/overlap.c index c76ddac3..764b1154 100644 --- a/lib/paranoia/overlap.c +++ b/lib/paranoia/overlap.c @@ -1,23 +1,23 @@ /* - $Id: overlap.c,v 1.5 2005/11/07 20:06:46 pjcreath Exp $ + $Id: overlap.c,v 1.6 2008/04/17 17:39:48 karl Exp $ - Copyright (C) 2004, 2005 Rocky Bernstein + Copyright (C) 2004, 2005, 2008 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu - 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 2 of the License, or + 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. - + 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 + along with this program. If not, see . */ + /*** * * Statistic code and cache management for overlap settings diff --git a/lib/paranoia/overlap.h b/lib/paranoia/overlap.h index d772da9c..e2b72016 100644 --- a/lib/paranoia/overlap.h +++ b/lib/paranoia/overlap.h @@ -1,22 +1,21 @@ /* - $Id: overlap.h,v 1.1 2004/12/18 17:29:32 rocky Exp $ + $Id: overlap.h,v 1.2 2008/04/17 17:39:48 karl Exp $ - Copyright (C) 2004 Rocky Bernstein + Copyright (C) 2004, 2008 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu - 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 2 of the License, or + 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. - + 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 + along with this program. If not, see . */ #ifndef _OVERLAP_H_ diff --git a/lib/paranoia/p_block.c b/lib/paranoia/p_block.c index b4309cb5..a7bdb34f 100644 --- a/lib/paranoia/p_block.c +++ b/lib/paranoia/p_block.c @@ -1,22 +1,21 @@ /* - $Id: p_block.c,v 1.12 2007/09/28 12:10:55 rocky Exp $ + $Id: p_block.c,v 1.13 2008/04/17 17:39:48 karl Exp $ - Copyright (C) 2004, 2005, 2007 Rocky Bernstein - Copyright (C) 1998 Monty xiphmont@mit.edu + Copyright (C) 2004, 2005, 2007, 2008 Rocky Bernstein + Copyright (C) 1998 Monty xiphmont@mit.edu - 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 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 . */ #ifdef HAVE_CONFIG_H diff --git a/lib/paranoia/p_block.h b/lib/paranoia/p_block.h index e3285c6e..8bf17bf3 100644 --- a/lib/paranoia/p_block.h +++ b/lib/paranoia/p_block.h @@ -1,22 +1,21 @@ /* - $Id: p_block.h,v 1.5 2005/09/20 00:42:14 rocky Exp $ + $Id: p_block.h,v 1.6 2008/04/17 17:39:48 karl Exp $ - Copyright (C) 2004, 2005 Rocky Bernstein - Copyright (C) by Monty (xiphmont@mit.edu) + Copyright (C) 2004, 2005, 2008 Rocky Bernstein + Copyright (C) by Monty (xiphmont@mit.edu) - 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 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 . */ #ifndef _P_BLOCK_H_ diff --git a/lib/paranoia/paranoia.c b/lib/paranoia/paranoia.c index 2f92ab20..2d73f583 100644 --- a/lib/paranoia/paranoia.c +++ b/lib/paranoia/paranoia.c @@ -1,22 +1,21 @@ /* - $Id: paranoia.c,v 1.26 2006/03/18 18:37:56 rocky Exp $ + $Id: paranoia.c,v 1.27 2008/04/17 17:39:48 karl Exp $ - Copyright (C) 2004, 2005, 2006 Rocky Bernstein + Copyright (C) 2004, 2005, 2006, 2008 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu - 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 2 of the License, or + 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. - + 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 + along with this program. If not, see . */ /*** * Toplevel file for the paranoia abstraction over the cdda lib diff --git a/src/cd-paranoia/doc/Makefile.am b/src/cd-paranoia/doc/Makefile.am index c264fc6d..725c241a 100644 --- a/src/cd-paranoia/doc/Makefile.am +++ b/src/cd-paranoia/doc/Makefile.am @@ -1,22 +1,19 @@ -# $Id: Makefile.am,v 1.3 2007/05/16 10:00:50 rocky Exp $ +# $Id: Makefile.am,v 1.4 2008/04/17 17:39:48 karl Exp $ # -# Copyright (C) 2005, 2007 Rocky Bernstein +# Copyright (C) 2005, 2007, 2008 Rocky Bernstein # -# 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 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 . SUBDIRS = en ja EXTRA_DIST = FAQ.txt overlapdef.txt diff --git a/src/cd-paranoia/doc/en/Makefile.am b/src/cd-paranoia/doc/en/Makefile.am index c29eccd1..b70fbe8b 100644 --- a/src/cd-paranoia/doc/en/Makefile.am +++ b/src/cd-paranoia/doc/en/Makefile.am @@ -1,22 +1,19 @@ -# $Id: Makefile.am,v 1.2 2005/01/29 08:17:56 rocky Exp $ +# $Id: Makefile.am,v 1.3 2008/04/17 17:39:48 karl Exp $ # -# Copyright (C) 2005 Rocky Bernstein +# Copyright (C) 2005, 2008 Rocky Bernstein # -# 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 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 . manfiles = cd-paranoia.1 man_MANS = $(manfiles) diff --git a/src/cd-paranoia/doc/ja/Makefile.am b/src/cd-paranoia/doc/ja/Makefile.am index 38c9d8f8..bf4f7170 100644 --- a/src/cd-paranoia/doc/ja/Makefile.am +++ b/src/cd-paranoia/doc/ja/Makefile.am @@ -1,22 +1,19 @@ -# $Id: Makefile.am,v 1.1 2007/05/16 10:00:50 rocky Exp $ +# $Id: Makefile.am,v 1.2 2008/04/17 17:39:48 karl Exp $ # -# Copyright (C) 2005 Rocky Bernstein +# Copyright (C) 2005, 2008 Rocky Bernstein # -# 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 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 . mansubdir=/jp/man1 manfiles = cd-paranoia.1