From 8966f89399f1786f49aa30fa5e50713ee3e6d8d4 Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Tue, 7 Oct 2003 18:47:11 -0700 Subject: [PATCH] [PATCH] update copyright and licensing - fix copyright stuff in various files: - remove e-mail addresses that don't exist anymore, but of course keep the names - change license from GPL to LGPL in dvb_i2c.h (Convergence code) - change license from GPL to LGPL in dvb_ringbuffer.h (ack by original author Oliver Endriss) - add LGPL license to dvb_functions --- drivers/media/dvb/dvb-core/demux.h | 3 ++- drivers/media/dvb/dvb-core/dmxdev.h | 5 ++--- drivers/media/dvb/dvb-core/dvb_demux.h | 5 ++--- drivers/media/dvb/dvb-core/dvb_filter.h | 20 ++++++++++++++++++ drivers/media/dvb/dvb-core/dvb_frontend.h | 8 +++---- drivers/media/dvb/dvb-core/dvb_functions.h | 23 +++++++++++++++++++++ drivers/media/dvb/dvb-core/dvb_i2c.h | 7 +++---- drivers/media/dvb/dvb-core/dvb_net.h | 3 +-- drivers/media/dvb/dvb-core/dvb_ringbuffer.h | 16 +++++--------- drivers/media/dvb/dvb-core/dvbdev.h | 5 ++--- 10 files changed, 64 insertions(+), 31 deletions(-) diff --git a/drivers/media/dvb/dvb-core/demux.h b/drivers/media/dvb/dvb-core/demux.h index 074cd5a1e8bf..19f4fe2fe184 100644 --- a/drivers/media/dvb/dvb-core/demux.h +++ b/drivers/media/dvb/dvb-core/demux.h @@ -1,4 +1,5 @@ -/* demux.h +/* + * demux.h * * Copyright (c) 2002 Convergence GmbH * diff --git a/drivers/media/dvb/dvb-core/dmxdev.h b/drivers/media/dvb/dvb-core/dmxdev.h index 6af08a5e6523..47d31777c0c3 100644 --- a/drivers/media/dvb/dvb-core/dmxdev.h +++ b/drivers/media/dvb/dvb-core/dmxdev.h @@ -1,9 +1,8 @@ /* * dmxdev.h * - * Copyright (C) 2000 Ralph Metzler - * & Marcus Metzler - for convergence integrated media GmbH + * Copyright (C) 2000 Ralph Metzler & Marcus Metzler + * for convergence integrated media GmbH * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb/dvb-core/dvb_demux.h index 82add6530e56..742f53e14527 100644 --- a/drivers/media/dvb/dvb-core/dvb_demux.h +++ b/drivers/media/dvb/dvb-core/dvb_demux.h @@ -1,8 +1,7 @@ /* - * dvb_demux.h - DVB kernel demux API + * dvb_demux.h: DVB kernel demux API * - * Copyright (C) 2000-2001 Marcus Metzler - * & Ralph Metzler + * Copyright (C) 2000-2001 Marcus Metzler & Ralph Metzler * for convergence integrated media GmbH * * This program is free software; you can redistribute it and/or diff --git a/drivers/media/dvb/dvb-core/dvb_filter.h b/drivers/media/dvb/dvb-core/dvb_filter.h index d60b097e507e..109c691f05a4 100644 --- a/drivers/media/dvb/dvb-core/dvb_filter.h +++ b/drivers/media/dvb/dvb-core/dvb_filter.h @@ -1,3 +1,23 @@ +/* + * dvb_filter.h + * + * Copyright (C) 2003 Convergence GmbH + * + * This program 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, + * 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 Lesser 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. + */ + #ifndef _DVB_FILTER_H_ #define _DVB_FILTER_H_ diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h index 76fe52178974..775afb81dfe8 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h @@ -1,9 +1,9 @@ /* - * dvb-core.h + * dvb_frontend.h + * + * Copyright (C) 2001 Ralph Metzler for convergence integrated media GmbH + * overhauled by Holger Waechtler for Convergence GmbH * - * Copyright (C) 2001 Ralph Metzler - * overhauled by Holger Waechtler - * for convergence integrated media GmbH * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff --git a/drivers/media/dvb/dvb-core/dvb_functions.h b/drivers/media/dvb/dvb-core/dvb_functions.h index 67ccf09d7ee4..294501e03d96 100644 --- a/drivers/media/dvb/dvb-core/dvb_functions.h +++ b/drivers/media/dvb/dvb-core/dvb_functions.h @@ -1,3 +1,26 @@ +/* + * dvb_functions.h: isolate some Linux specific stuff from the dvb-core + * that can't be expressed as a one-liner + * in order to make porting to other environments easier + * + * Copyright (C) 2003 Convergence GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Lesser 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, + * 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 Lesser 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. + * + */ + #ifndef __DVB_FUNCTIONS_H__ #define __DVB_FUNCTIONS_H__ diff --git a/drivers/media/dvb/dvb-core/dvb_i2c.h b/drivers/media/dvb/dvb-core/dvb_i2c.h index 867a12c85da8..4ffc10e7b004 100644 --- a/drivers/media/dvb/dvb-core/dvb_i2c.h +++ b/drivers/media/dvb/dvb-core/dvb_i2c.h @@ -4,8 +4,8 @@ * Copyright (C) 2002 Holger Waechtler for convergence integrated media GmbH * * 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 + * 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, @@ -13,10 +13,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 + * You should have received a copy of the GNU Lesser 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. - * Or, point your browser to http://www.gnu.org/copyleft/gpl.html */ #ifndef _DVB_I2C_H_ diff --git a/drivers/media/dvb/dvb-core/dvb_net.h b/drivers/media/dvb/dvb-core/dvb_net.h index 138317934ede..93648d4d0de6 100644 --- a/drivers/media/dvb/dvb-core/dvb_net.h +++ b/drivers/media/dvb/dvb-core/dvb_net.h @@ -1,8 +1,7 @@ /* * dvb_net.h * - * Copyright (C) 2001 Convergence integrated media GmbH - * Ralph Metzler + * Copyright (C) 2001 Ralph Metzler for convergence integrated media GmbH * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.h b/drivers/media/dvb/dvb-core/dvb_ringbuffer.h index df17ffc360d1..d0f791602c17 100644 --- a/drivers/media/dvb/dvb-core/dvb_ringbuffer.h +++ b/drivers/media/dvb/dvb-core/dvb_ringbuffer.h @@ -5,28 +5,22 @@ * Copyright (C) 2003 Oliver Endriss * * based on code originally found in av7110.c: - * Copyright (C) 1999-2002 Ralph Metzler - * & Marcus Metzler for convergence integrated media GmbH + * Copyright (C) 1999-2002 Ralph Metzler & Marcus Metzler + * for convergence integrated media GmbH * * 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 + * 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, * 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 + * You should have received a copy of the GNU Lesser 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. - * Or, point your browser to http://www.gnu.org/copyleft/gpl.html - * - * - * the project's page is at http://www.linuxtv.org/dvb/ */ #ifndef _DVB_RINGBUFFER_H_ diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h index 92963f90f359..175d870acaf3 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.h +++ b/drivers/media/dvb/dvb-core/dvbdev.h @@ -1,9 +1,8 @@ /* * dvbdev.h * - * Copyright (C) 2000 Ralph Metzler - * & Marcus Metzler - for convergence integrated media GmbH + * Copyright (C) 2000 Ralph Metzler & Marcus Metzler + * for convergence integrated media GmbH * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Lesser Public License -- 2.39.5