From 8b5651bb009bf892b3a5537c5f36b8891f238aa4 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 25 Jun 2010 11:39:21 +0200 Subject: [PATCH] switch a few left-over from GPLv2 to GPLv2 or later --- extras/edd_id/edd_id.c | 15 ++++++++--- extras/floppy/create_floppy_devices.c | 20 +++++++++------ .../rule_generator/rule_generator.functions | 20 ++++++++++++--- extras/rule_generator/write_cd_rules | 17 ++++++++++--- extras/rule_generator/write_net_rules | 25 +++++++++++++------ extras/scsi_id/scsi_id.c | 16 ++++++++---- extras/scsi_id/scsi_id.h | 15 ++++++++--- extras/scsi_id/scsi_serial.c | 18 +++++++++---- extras/usb_id/usb_id.c | 18 +++++++++---- 9 files changed, 121 insertions(+), 43 deletions(-) diff --git a/extras/edd_id/edd_id.c b/extras/edd_id/edd_id.c index 15295ed31f4..ac4da07611d 100644 --- a/extras/edd_id/edd_id.c +++ b/extras/edd_id/edd_id.c @@ -4,9 +4,18 @@ * Copyright (C) 2005 John Hull * Copyright (C) 2005 Kay Sievers * - * 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 version 2 of the License. + * 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, see . */ #ifndef _GNU_SOURCE diff --git a/extras/floppy/create_floppy_devices.c b/extras/floppy/create_floppy_devices.c index 2fc05cc4943..47724f8b048 100644 --- a/extras/floppy/create_floppy_devices.c +++ b/extras/floppy/create_floppy_devices.c @@ -1,17 +1,23 @@ /* - * create_floppy_devices - * * Create all possible floppy device based on the CMOS type. * Based upon code from drivers/block/floppy.c * * Copyright(C) 2005, SUSE Linux Products GmbH * - * Author: - * Hannes Reinecke + * Author: Hannes Reinecke * - * 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 version 2 of the License. + * 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, see . */ #include diff --git a/extras/rule_generator/rule_generator.functions b/extras/rule_generator/rule_generator.functions index b972091615d..e2060a2ece0 100644 --- a/extras/rule_generator/rule_generator.functions +++ b/extras/rule_generator/rule_generator.functions @@ -1,8 +1,22 @@ # functions used by the udev rule generator + +# Copyright (C) 2006 Marco d'Itri + +# 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, see . + +PATH='/sbin:/bin' # -# 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 version 2 of the License. PATH='/sbin:/bin' diff --git a/extras/rule_generator/write_cd_rules b/extras/rule_generator/write_cd_rules index 0d16fe6effa..00382ada2fd 100644 --- a/extras/rule_generator/write_cd_rules +++ b/extras/rule_generator/write_cd_rules @@ -4,12 +4,21 @@ # # It adds symlinks for optical drives based on the device class determined # by cdrom_id and used ID_PATH to identify the device. -# + # (C) 2006 Marco d'Itri # -# 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 version 2 of the License. +# 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, see . # debug, if UDEV_LOG= if [ -n "$UDEV_LOG" ]; then diff --git a/extras/rule_generator/write_net_rules b/extras/rule_generator/write_net_rules index cb346757cc4..644fbcecbae 100644 --- a/extras/rule_generator/write_net_rules +++ b/extras/rule_generator/write_net_rules @@ -1,12 +1,5 @@ #!/bin/sh -e -# -# Copyright (C) 2006 Marco d'Itri -# Copyright (C) 2007 Kay Sievers -# -# 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 version 2 of the License. -# + # This script is run to create persistent network device naming rules # based on properties of the device. # If the interface needs to be renamed, INTERFACE_NEW= will be printed @@ -22,6 +15,22 @@ # INTERFACE_NAME requested name supplied by external tool # INTERFACE_NEW new interface name returned by rule writer +# Copyright (C) 2006 Marco d'Itri +# Copyright (C) 2007 Kay Sievers +# +# 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, see . + # debug, if UDEV_LOG= if [ -n "$UDEV_LOG" ]; then if [ "$UDEV_LOG" -ge 7 ]; then diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c index d7dfe3ebeb3..3811ea542d5 100644 --- a/extras/scsi_id/scsi_id.c +++ b/extras/scsi_id/scsi_id.c @@ -2,12 +2,18 @@ * Copyright (C) IBM Corp. 2003 * Copyright (C) SUSE Linux Products GmbH, 2006 * - * Author: - * Patrick Mansfield + * 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 version 2 of the License. + * 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 . */ #include diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h index ff5b70d17b6..4475eaccd12 100644 --- a/extras/scsi_id/scsi_id.h +++ b/extras/scsi_id/scsi_id.h @@ -1,9 +1,18 @@ /* * Copyright (C) IBM Corp. 2003 * - * 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 version 2 of the License. + * 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, see . */ #define MAX_PATH_LEN 512 diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c index 22456b77320..dd5e1fdbf8f 100644 --- a/extras/scsi_id/scsi_serial.c +++ b/extras/scsi_id/scsi_serial.c @@ -1,12 +1,20 @@ /* * Copyright (C) IBM Corp. 2003 * - * Author: - * Patrick Mansfield + * Author: Patrick Mansfield * - * 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 version 2 of the License. + * 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, see . */ #include diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c index 42ccddff356..fabd09283de 100644 --- a/extras/usb_id/usb_id.c +++ b/extras/usb_id/usb_id.c @@ -3,12 +3,20 @@ * * Copyright (c) 2005 SUSE Linux Products GmbH, Germany * - * Author: - * Hannes Reinecke + * Author: Hannes Reinecke * - * 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 version 2 of the License. + * 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, see . */ #include