From 4f8b0399433411f030864a527bc8f0d4f4aa8291 Mon Sep 17 00:00:00 2001 From: karl Date: Mon, 14 Apr 2008 17:30:26 +0000 Subject: [PATCH] gplv3+ --- src/cd-drive.c | 15 ++++++--------- src/cd-info.c | 27 +++++++++++++-------------- src/cd-paranoia/pod2c.pl | 29 ++++++++++++++--------------- src/cd-read.c | 14 ++++++-------- src/cdda-player.c | 30 ++++++++++++++---------------- src/cddb.c | 15 +++++++-------- src/cddb.h | 15 +++++++-------- src/cdinfo-linux.c | 29 ++++++++++++++--------------- src/iso-info.c | 26 ++++++++++++-------------- src/iso-read.c | 15 +++++++-------- src/mmc-tool.c | 15 +++++++-------- src/util.c | 13 ++++++------- src/util.h | 15 +++++++-------- 13 files changed, 120 insertions(+), 138 deletions(-) diff --git a/src/cd-drive.c b/src/cd-drive.c index 37b1b832..06b758d2 100644 --- a/src/cd-drive.c +++ b/src/cd-drive.c @@ -1,21 +1,18 @@ /* - $Id: cd-drive.c,v 1.27 2007/03/09 01:33:42 rocky Exp $ + $Id: cd-drive.c,v 1.28 2008/04/14 17:30:26 karl Exp $ - Copyright (C) 2004, 2005 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 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 . */ /* Program to show drivers installed and capibilites of CD drives. */ diff --git a/src/cd-info.c b/src/cd-info.c index d1ab9146..064a768a 100644 --- a/src/cd-info.c +++ b/src/cd-info.c @@ -1,23 +1,22 @@ /* - $Id: cd-info.c,v 1.152 2008/01/09 04:26:24 rocky Exp $ + $Id: cd-info.c,v 1.153 2008/04/14 17:30:26 karl Exp $ - Copyright (C) 2003, 2004, 2005, 2007, 2008 Rocky Bernstein - Copyright (C) 1996, 1997, 1998 Gerd Knorr + Copyright (C) 2003, 2004, 2005, 2007, 2008 Rocky Bernstein + Copyright (C) 1996, 1997, 1998 Gerd Knorr and Heiko Eißfeldt - 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 . */ /* CD Info - prints various information about a CD, and detects the type of diff --git a/src/cd-paranoia/pod2c.pl b/src/cd-paranoia/pod2c.pl index e0559d07..122b488e 100755 --- a/src/cd-paranoia/pod2c.pl +++ b/src/cd-paranoia/pod2c.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: pod2c.pl,v 1.2 2007/11/09 01:25:04 rocky Exp $ +# $Id: pod2c.pl,v 1.3 2008/04/14 17:30:27 karl Exp $ # Utility to turn pieces of pod text to help text. use File::Basename; @@ -16,21 +16,20 @@ open(STDIN, "<$filename") # || die "Can't open $outfile for writing:\n$!"; print "/* - Copyright (C) 1999, 2005, 2007 Rocky Bernstein + Copyright (C) 1999, 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 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 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. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ const char ${name}_help[] =\n"; while() { diff --git a/src/cd-read.c b/src/cd-read.c index ea158fab..b9bc0d07 100644 --- a/src/cd-read.c +++ b/src/cd-read.c @@ -1,22 +1,20 @@ /* - $Id: cd-read.c,v 1.31 2008/03/06 01:16:49 rocky Exp $ + $Id: cd-read.c,v 1.32 2008/04/14 17:30:26 karl Exp $ Copyright (C) 2003, 2004, 2005, 2006, 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 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., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA. + along with this program. If not, see . */ /* Program to debug read routines audio, auto, mode1, mode2 forms 1 & 2. */ diff --git a/src/cdda-player.c b/src/cdda-player.c index 20d8932c..564c5ffd 100644 --- a/src/cdda-player.c +++ b/src/cdda-player.c @@ -1,25 +1,23 @@ /* - $Id: cdda-player.c,v 1.48 2006/04/14 22:17:08 rocky Exp $ + $Id: cdda-player.c,v 1.49 2008/04/14 17:30:26 karl Exp $ - Copyright (C) 2005, 2006 Rocky Bernstein + Copyright (C) 2005, 2006, 2008 Rocky Bernstein - Adapted from Gerd Knorr's player.c program - Copyright (C) 1997, 1998 + Adapted from Gerd Knorr's player.c program + Copyright (C) 1997, 1998 - 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., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 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/src/cddb.c b/src/cddb.c index 5ffa30b5..45d6bd59 100644 --- a/src/cddb.c +++ b/src/cddb.c @@ -1,21 +1,20 @@ /* - $Id: cddb.c,v 1.6 2007/06/16 20:12:16 rocky Exp $ + $Id: cddb.c,v 1.7 2008/04/14 17:30:27 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 + 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 . */ #ifdef HAVE_CONFIG_H diff --git a/src/cddb.h b/src/cddb.h index 80d4337a..5f03ea5a 100644 --- a/src/cddb.h +++ b/src/cddb.h @@ -1,21 +1,20 @@ /* - $Id: cddb.h,v 1.4 2007/06/16 20:12:16 rocky Exp $ + $Id: cddb.h,v 1.5 2008/04/14 17:30:27 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 + 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 . */ typedef struct cddb_opts_s diff --git a/src/cdinfo-linux.c b/src/cdinfo-linux.c index e632c1e1..9199213c 100644 --- a/src/cdinfo-linux.c +++ b/src/cdinfo-linux.c @@ -1,23 +1,22 @@ /* - $Id: cdinfo-linux.c,v 1.3 2005/03/01 10:53:15 rocky Exp $ + $Id: cdinfo-linux.c,v 1.4 2008/04/14 17:30:27 karl Exp $ - Copyright (C) 2003 Rocky Bernstein - Copyright (C) 1996,1997,1998 Gerd Knorr - and Heiko Eißfeldt + Copyright (C) 2003,2008 Rocky Bernstein + Copyright (C) 1996,1997,1998 Gerd Knorr + and Heiko Eißfeldt - 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 . */ /* CD Info - prints various information about a CD, and detects the type of diff --git a/src/iso-info.c b/src/iso-info.c index c2683940..35f6e2f9 100644 --- a/src/iso-info.c +++ b/src/iso-info.c @@ -1,22 +1,20 @@ /* - $Id: iso-info.c,v 1.38 2008/01/09 04:26:24 rocky Exp $ + $Id: iso-info.c,v 1.39 2008/04/14 17:30:27 karl Exp $ - Copyright (C) 2004, 2005, 2006, 2008 Rocky Bernstein + Copyright (C) 2004, 2005, 2006, 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., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA. + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ /* ISO Info - prints various information about a ISO 9660 image. diff --git a/src/iso-read.c b/src/iso-read.c index add9ba5c..86fba265 100644 --- a/src/iso-read.c +++ b/src/iso-read.c @@ -1,21 +1,20 @@ /* - $Id: iso-read.c,v 1.14 2006/12/04 02:53:10 rocky Exp $ + $Id: iso-read.c,v 1.15 2008/04/14 17:30:27 karl Exp $ - Copyright (C) 2004, 2005, 2006 Rocky Bernstein + Copyright (C) 2004, 2005, 2006, 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 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 . */ /* Program to read ISO-9660 images. */ diff --git a/src/mmc-tool.c b/src/mmc-tool.c index f81c1f16..db14ee78 100644 --- a/src/mmc-tool.c +++ b/src/mmc-tool.c @@ -1,21 +1,20 @@ /* - $Id: mmc-tool.c,v 1.10 2008/01/09 04:26:24 rocky Exp $ + $Id: mmc-tool.c,v 1.11 2008/04/14 17:30:27 karl Exp $ - Copyright (C) 2006 Rocky Bernstein + Copyright (C) 2006, 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 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 . */ /* A program to using the MMC interface to list CD and drive features diff --git a/src/util.c b/src/util.c index 5c391b20..4667d0b3 100644 --- a/src/util.c +++ b/src/util.c @@ -1,21 +1,20 @@ /* - $Id: util.c,v 1.53 2008/03/06 01:16:49 rocky Exp $ + $Id: util.c,v 1.54 2008/04/14 17:30:27 karl Exp $ Copyright (C) 2003, 2004, 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 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 . */ /* Miscellaneous things common to standalone programs. */ diff --git a/src/util.h b/src/util.h index 4fb3d03e..7ef6fc1e 100644 --- a/src/util.h +++ b/src/util.h @@ -1,21 +1,20 @@ /* - $Id: util.h,v 1.15 2008/03/06 01:16:49 rocky Exp $ + $Id: util.h,v 1.16 2008/04/14 17:30:27 karl Exp $ - Copyright (C) 2003, 2004, 2005 Rocky Bernstein + Copyright (C) 2003, 2004, 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 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 . */ /* Miscellaneous things common to standalone programs. */