From 7bb3bbe6e2560604a2f925fec6ff7b4afd74e180 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 9 May 2003 17:58:21 +0000 Subject: [PATCH] * lib/install-sh: Update copyright notice and license to that of X11R6. This removes an advertising clause reported as Debian bug #191717. --- ChangeLog | 6 ++++++ lib/install-sh | 43 ++++++++++++++++++++++++++++++------------- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40c5215..a603863 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-05-09 Alexandre Duret-Lutz + + * lib/install-sh: Update copyright notice and license to that of + X11R6. This removes an advertising clause reported as Debian bug + #191717. + 2003-05-07 Alexandre Duret-Lutz * configure.in (ACLOCAL): Do not use -I, --acdir is enough. diff --git a/lib/install-sh b/lib/install-sh index 57a2fbd..e4f0039 100755 --- a/lib/install-sh +++ b/lib/install-sh @@ -1,21 +1,38 @@ #!/bin/sh # install - install a program, script, or datafile -# This originally came from X11R5 (mit/util/scripts/install.sh). -scriptversion=2003-01-17.15 +scriptversion=2003-05-09.19 -# Copyright 1991 by the Massachusetts Institute of Technology -# (FSF changes in the public domain.) +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. # -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it -- 2.7.4