Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1184898 -
 /incubator/ooo/trunk/main/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
Date: Sun, 16 Oct 2011 18:54:53 -0000
To: ooo-commits@incubator.apache.org
From: pfg@apache.org
Message-Id: <20111016185453.976292388847@eris.apache.org>

Author: pfg
Date: Sun Oct 16 18:54:53 2011
New Revision: 1184898

URL: http://svn.apache.org/viewvc?rev=1184898&view=rev
Log:
i118512 - Correct trademark and license of machine generated sRGB profiles.

Modified:
    incubator/ooo/trunk/main/icc/source/create_sRGB_profile/create_sRGB_profile.cpp

Modified: incubator/ooo/trunk/main/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/icc/source/create_sRGB_profile/create_sRGB_profile.cpp?rev=1184898&r1=1184897&r2=1184898&view=diff
==============================================================================
--- incubator/ooo/trunk/main/icc/source/create_sRGB_profile/create_sRGB_profile.cpp (original)
+++ incubator/ooo/trunk/main/icc/source/create_sRGB_profile/create_sRGB_profile.cpp Sun Oct 16 18:54:53 2011
@@ -115,22 +115,19 @@ const char * const TheHeader1[] =
 const char * const TheHeader2[] =
 {
     " *",
-    " * This file is part of OpenOffice.org.",
+    " * Copyright 2011 Apache 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.",
+    " * Licensed 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",
     " *",
-    " * 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).",
+    " *     http://www.apache.org/licenses/LICENSE-2.0",
     " *",
-    " * 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.",
+    " * 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.",
     " *",
     " ************************************************************************/",
     "",