True, attached is a new patch on top of the previous.
On Sun, Nov 04, 2012 at 04:45:46PM -0500, Rocky Bernstein wrote: > Going back on a public repository is problematic. Could you add a new patch > that builds on what is there? > > Thanks. > > > On Sun, Nov 4, 2012 at 3:43 PM, Adrian Reber <[email protected]> wrote: > > > > > Unfortunately I sent the wrong patch. The first was an older version. > > > > This is the right one which actually changes the license headers of > > lib/paranoia to LGPv2+ instead of GPLv2+. Sorry, you need to revert my > > previous patch. > > > > Adrian > > > > On Sun, Nov 04, 2012 at 02:53:30PM -0500, Rocky Bernstein wrote: > > > Applied now. Please double check. > > > > > > On Sun, Nov 4, 2012 at 2:36 PM, Adrian Reber <[email protected]> wrote: > > > > > > > On Fri, Nov 02, 2012 at 10:21:34AM -0400, Rocky Bernstein wrote: > > > > > Should be the same as cdparanoia. Do me a favor, submit a patch to > > > > address > > > > > all of the things you find. Thanks. > > > > > > > > Attached is patch trying to fix the license headers in > > > > libcdio-paranoia. > > > > > > > > Adrian > > > >
>From ca1b4d28b0d11c316f1ef60d664c07dab933f699 Mon Sep 17 00:00:00 2001 From: Adrian Reber <[email protected]> Date: Sun, 4 Nov 2012 22:55:53 +0100 Subject: [PATCH] Fixup license headers (again) Like said in previous commit, but this time for real: 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+. --- lib/paranoia/gap.c | 22 +++++++++++----------- lib/paranoia/gap.h | 22 +++++++++++----------- lib/paranoia/isort.c | 22 +++++++++++----------- lib/paranoia/isort.h | 20 ++++++++++---------- lib/paranoia/overlap.c | 22 +++++++++++----------- lib/paranoia/overlap.h | 22 +++++++++++----------- lib/paranoia/p_block.h | 20 ++++++++++---------- lib/paranoia/paranoia.c | 22 +++++++++++----------- 8 files changed, 86 insertions(+), 86 deletions(-) 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 <[email protected]> Copyright (C) 1998 Monty [email protected] - - 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 <[email protected]> Copyright (C) 1998 Monty [email protected] - - 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 <[email protected]> Copyright (C) 1998 Monty [email protected] - - 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 a1eace5..842260e 100644 --- a/lib/paranoia/isort.h +++ b/lib/paranoia/isort.h @@ -4,19 +4,19 @@ Copyright (C) 2004, 2005, 2008 Rocky Bernstein <[email protected]> Copyright (C) 1998 Monty [email protected] - 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 _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 <[email protected]> Copyright (C) 1998 Monty [email protected] - - 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 <[email protected]> Copyright (C) 1998 Monty [email protected] - - 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 <[email protected]> Copyright (C) by Monty ([email protected]) - 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 <[email protected]> Copyright (C) 1998 Monty [email protected] - - 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 -- 1.7.11.7
