INTEGRATION: CWS ooo19126 (1.3.4); FILE MERGED

2005/09/05 17:16:46 rt 1.3.4.1: #i54170# Change license header: remove SISSL

1 files changed, 22 insertions, 49 deletions

diff --git a/beanshell/bsh-2.0b1-src.patch b/beanshell/bsh-2.0b1-src.patch
index 7de798952935..89d629e0ea3c 100644
--- a/beanshell/bsh-2.0b1-src.patch
+++ b/beanshell/bsh-2.0b1-src.patch
@@ -46,66 +46,39 @@
 ***************
 *** 1 ****
 ! dummy
---- 1,70 ----
+--- 1,43 ----
 ! #*************************************************************************
 ! #
-! #   $RCSfile: bsh-2.0b1-src.patch,v $
-! #
-! #   $Revision: 1.3 $
-! #
-! #   last change: $Author: hr $ $Date: 2005-06-06 17:24:25 $
-! #
-! #   The Contents of this file are made available subject to the terms of
-! #   either of the following licenses
-! #
-! #          - GNU Lesser General Public License Version 2.1
-! #          - Sun Industry Standards Source License Version 1.1
-! #
-! #   Sun Microsystems Inc., October, 2000
-! #
-! #   GNU Lesser General Public License Version 2.1
-! #   =============================================
-! #   Copyright 2000 by Sun Microsystems, Inc.
-! #   901 San Antonio Road, Palo Alto, CA 94303, USA
-! #
-! #   This library is free software; you can redistribute it and/or
-! #   modify it under the terms of the GNU Lesser General Public
-! #   License version 2.1, as published by the Free Software Foundation.
-! #
-! #   This library 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
+! #   OpenOffice.org - a multi-platform office productivity suite
 ! #
+! #   $RCSfile: bsh-2.0b1-src.patch,v $
 ! #
-! #   Sun Industry Standards Source License Version 1.1
-! #   =================================================
-! #   The contents of this file are subject to the Sun Industry Standards
-! #   Source License Version 1.1 (the "License"); You may not use this file
-! #   except in compliance with the License. You may obtain a copy of the
-! #   License at http://www.openoffice.org/license.html.
+! #   $Revision: 1.4 $
 ! #
-! #   Software provided under this License is provided on an "AS IS" basis,
-! #   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-! #   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-! #   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-! #   See the License for the specific provisions governing your rights and
-! #   obligations concerning the Software.
+! #   last change: $Author: rt $ $Date: 2005-09-07 22:05:15 $
 ! #
-! #   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+! #   The Contents of this file are made available subject to
+! #   the terms of GNU Lesser General Public License Version 2.1.
 ! #
-! #   Copyright: 2000 by Sun Microsystems, Inc.
 ! #
-! #   All Rights Reserved.
+! #     GNU Lesser General Public License Version 2.1
+! #     =============================================
+! #     Copyright 2005 by Sun Microsystems, Inc.
+! #     901 San Antonio Road, Palo Alto, CA 94303, USA
 ! #
-! #   Contributor(s): _______________________________________
+! #     This library is free software; you can redistribute it and/or
+! #     modify it under the terms of the GNU Lesser General Public
+! #     License version 2.1, as published by the Free Software Foundation.
 ! #
+! #     This library 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
 ! #
 ! #*************************************************************************
 !