[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

diff --git a/drivers/media/dvb/dvb-core/demux.h b/drivers/media/dvb/dvb-core/demux.h
index 074cd5a1e8bf913a4ab85456293b5107bce485bc..19f4fe2fe184d9451d5de5cfb8d8c9b38185614f 100644 (file)
--- 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 6af08a5e652319646d3b3a6e8a83a86f1c352d2d..47d31777c0c3687961e98aab7c390dbed887df75 100644 (file)
--- 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 <ralph@convergence.de>
- *                  & Marcus Metzler <marcus@convergence.de>
-                      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 82add6530e563c8bbbfb526211ecae6ab2ae360f..742f53e1452739ae412862e82f44ca33620bc11c 100644 (file)
--- 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 <marcus@convergence.de>
- *                       & Ralph  Metzler <ralph@convergence.de>
+ * 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 d60b097e507eefdf36194c9a3182ca2b49dd97a6..109c691f05a400ecc3060ec4a0a0a6f30d1f7cca 100644 (file)
--- 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 76fe52178974ef593e6929bb7b232981b9a36798..775afb81dfe8b6e31756dcf7784989cbce8046a3 100644 (file)
--- 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 <ralph@convergence.de>
- *                    overhauled by Holger Waechtler <holger@convergence.de>
- *                    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 67ccf09d7ee412b711c9ad89914071a978337b3c..294501e03d96db8aed8d6086baf4910a142d5cc4 100644 (file)
--- 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 867a12c85da8327f15af44cb52bb9ca795bd0fdc..4ffc10e7b004727d75da6d41d0f4c99fa72b8a18 100644 (file)
--- 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 138317934ede0ede46b40d7165fe9e652db94638..93648d4d0de67790b1d200d76a9b042a39b15a81 100644 (file)
--- 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 <ralph@convergence.de>
+ * 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 df17ffc360d1780720284e8933fc3a941cde25a7..d0f791602c17ab82c31d5354ba120ae94b797ed0 100644 (file)
--- 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 92963f90f359f8ea8c0e14d3141063a2b95299e6..175d870acaf306d5eb6f7af6bc46b0f105fa23b1 100644 (file)
--- 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 <ralph@convergence.de>
- *                  & Marcus Metzler <marcus@convergence.de>
-                      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