You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2011/12/08 14:02:29 UTC
svn commit: r1211862 - in /incubator/ooo/trunk/main/ucpp: makefile.mk
ucpp.patch
Author: jsc
Date: Thu Dec 8 13:02:29 2011
New Revision: 1211862
URL: http://svn.apache.org/viewvc?rev=1211862&view=rev
Log:
correct license text
Modified:
incubator/ooo/trunk/main/ucpp/makefile.mk
incubator/ooo/trunk/main/ucpp/ucpp.patch
Modified: incubator/ooo/trunk/main/ucpp/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucpp/makefile.mk?rev=1211862&r1=1211861&r2=1211862&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucpp/makefile.mk (original)
+++ incubator/ooo/trunk/main/ucpp/makefile.mk Thu Dec 8 13:02:29 2011
@@ -1,30 +1,23 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
PRJ=.
PRJNAME=ucpp
Modified: incubator/ooo/trunk/main/ucpp/ucpp.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucpp/ucpp.patch?rev=1211862&r1=1211861&r2=1211862&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucpp/ucpp.patch (original)
+++ incubator/ooo/trunk/main/ucpp/ucpp.patch Thu Dec 8 13:02:29 2011
@@ -1,34 +1,27 @@
--- misc/ucpp/makefile.mk 2011-09-21 14:52:57.436957300 +0200
+++ misc/build/ucpp/makefile.mk 2011-09-21 14:37:13.843986900 +0200
-@@ -1 +1,53 @@
+@@ -1 +1,46 @@
-dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#**************************************************************
+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org 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 version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
++# Licensed to the Apache Software Foundation (ASF) under one
++# or more contributor license agreements. See the NOTICE file
++# distributed with this work for additional information
++# regarding copyright ownership. The ASF licenses this file
++# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing,
++# software distributed under the License is distributed on an
++# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# KIND, either express or implied. See the License for the
++# specific language governing permissions and limitations
++# under the License.
++#
++#**************************************************************
+PRJ=..$/..$/..$/..
+
+PRJNAME=ucpp