From 474c29fd852576aadf508d94f5ffa6a184b3cf7d Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Tue, 12 May 2009 10:55:30 +0200 Subject: More license updates Clarify some license notices to specifically refer to GPLv2+ instead of only referring to GPL without version. (Most of the sloppy license headers slipped in unnoticed; the changes were acked by Felix Blyakher on behalf of SGI on 8 April 2009.) Add license headers to a number of small files which were only licenses as GPLv2+ implicitly so far. Refer to this package as "this program" rather than "Attr" throughout the license notices; this simplifies sharing files among packages. --- libattr/Makefile | 8 +++----- libattr/attr_copy_action.c | 5 ++--- libattr/attr_copy_check.c | 8 ++++---- libattr/attr_copy_fd.c | 20 ++++++++++---------- libattr/attr_copy_file.c | 8 ++++---- libattr/libattr.c | 16 ++++++++-------- libattr/syscalls.c | 16 ++++++++-------- 7 files changed, 39 insertions(+), 42 deletions(-) (limited to 'libattr') diff --git a/libattr/Makefile b/libattr/Makefile index fe8c10b..c084130 100644 --- a/libattr/Makefile +++ b/libattr/Makefile @@ -2,20 +2,18 @@ # Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. # Copyright (C) 2009 Andreas Gruenbacher # -# This file is part of Attr. -# -# Attr is free software: you can redistribute it and/or modify it +# 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. # -# Attr is distributed in the hope that it will be useful, +# 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 Attr. If not, see . +# along with this program. If not, see . # TOPDIR = .. diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c index df511c7..0d7aca5 100644 --- a/libattr/attr_copy_action.c +++ b/libattr/attr_copy_action.c @@ -11,9 +11,8 @@ 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 Lesser General Public - License along with this library; 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 Lesser General Public License + along with this manual. If not, see . */ #include diff --git a/libattr/attr_copy_check.c b/libattr/attr_copy_check.c index c181270..ca0ac72 100644 --- a/libattr/attr_copy_check.c +++ b/libattr/attr_copy_check.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2003 Andreas Gruenbacher , SuSE Linux AG. +/* + Copyright (C) 2003 Andreas Gruenbacher , SuSE Linux AG. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -10,9 +11,8 @@ 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 Lesser General Public - License along with this library; 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 Lesser General Public License + along with this manual. If not, see . */ /* Copy extended attributes between files - default check callback */ diff --git a/libattr/attr_copy_fd.c b/libattr/attr_copy_fd.c index 1c48810..14b7368 100644 --- a/libattr/attr_copy_fd.c +++ b/libattr/attr_copy_fd.c @@ -1,18 +1,18 @@ /* Copyright (C) 2002 Andreas Gruenbacher , SuSE Linux AG. - 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 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 - Lesser 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 Lesser General Public + License for more details. 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + License along with this program. If not, see + . */ /* Copy extended attributes between files. */ diff --git a/libattr/attr_copy_file.c b/libattr/attr_copy_file.c index a142d18..2efc224 100644 --- a/libattr/attr_copy_file.c +++ b/libattr/attr_copy_file.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2002 Andreas Gruenbacher , SuSE Linux AG. +/* + Copyright (C) 2002 Andreas Gruenbacher , SuSE Linux AG. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -10,9 +11,8 @@ 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 Lesser General Public - License along with this library; 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 Lesser General Public License + along with this manual. If not, see . */ /* Copy extended attributes between files. */ diff --git a/libattr/libattr.c b/libattr/libattr.c index a77dd84..e343155 100644 --- a/libattr/libattr.c +++ b/libattr/libattr.c @@ -2,18 +2,18 @@ * Copyright (c) 2001-2003,2005 Silicon Graphics, Inc. * All Rights Reserved. * - * 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. + * 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 would be useful, + * 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. + * 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 the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . */ #include diff --git a/libattr/syscalls.c b/libattr/syscalls.c index 6291c23..cbfec57 100644 --- a/libattr/syscalls.c +++ b/libattr/syscalls.c @@ -2,18 +2,18 @@ * Copyright (c) 2001-2002 Silicon Graphics, Inc. * All Rights Reserved. * - * 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. + * 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 would be useful, + * 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. + * 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 the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . */ /* -- cgit v1.2.3