From d004975b24f580f20c2c34e7572e771f05a043d5 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Tue, 31 May 2016 22:11:19 +0000 Subject: [PATCH] ICU-12564 Reverted r38761 and r38762. Files missed in the previous commit. X-SVN-Rev: 38777 --- icu4c/APIChangeReport.html | 5 ++--- icu4c/LICENSE | 5 +++-- icu4c/as_is/bomlist.py | 3 +-- icu4c/as_is/os390/unpax-icu.sh | 4 ++-- icu4c/as_is/os400/bldiculd.sh | 2 +- icu4c/as_is/os400/convertConfigure.sed | 4 ++-- icu4c/as_is/os400/cxxfilt.cpp | 2 +- icu4c/as_is/os400/fixup-icu.sh | 4 ++-- icu4c/as_is/os400/iculd.c | 2 +- icu4c/as_is/os400/unpax-icu.sh | 4 ++-- icu4c/icu4c.css | 4 ++-- icu4c/license.html | 2 +- icu4c/packaging/PACKAGES | 5 ++--- icu4c/packaging/README | 4 ++-- icu4c/packaging/rpm/icu.spec | 4 ++-- icu4c/readme.html | 15 +++++++++------ 16 files changed, 35 insertions(+), 34 deletions(-) diff --git a/icu4c/APIChangeReport.html b/icu4c/APIChangeReport.html index eca11a59cea..21b42c59d8b 100644 --- a/icu4c/APIChangeReport.html +++ b/icu4c/APIChangeReport.html @@ -1,7 +1,6 @@ @@ -671,7 +670,7 @@ (jump back to top)

-Contents generated by StableAPI tool on Tue Mar 08 21:25:12 PST 2016
Copyright (C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html +Contents generated by StableAPI tool on Tue Mar 08 21:25:12 PST 2016
Copyright (C) 2016, International Business Machines Corporation, All Rights Reserved.

diff --git a/icu4c/LICENSE b/icu4c/LICENSE index 143af2c9474..aa7c47ee370 100644 --- a/icu4c/LICENSE +++ b/icu4c/LICENSE @@ -2,8 +2,9 @@ COPYRIGHT AND PERMISSION NOTICE -Copyright (C) 2016 and later: Unicode, Inc. and others. -License & terms of use: http://www.unicode.org/copyright.html +Copyright (c) 1995-2016 International Business Machines Corporation and others + +All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/icu4c/as_is/bomlist.py b/icu4c/as_is/bomlist.py index 209b2ce095e..22bf38bbeed 100644 --- a/icu4c/as_is/bomlist.py +++ b/icu4c/as_is/bomlist.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright (C) 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html +# Copyright (C) 2011 IBM Corporation and Others. All Rights Reserved. # # run in icu/ # will create file icu/as_is/bomlist.txt diff --git a/icu4c/as_is/os390/unpax-icu.sh b/icu4c/as_is/os390/unpax-icu.sh index cdbad85a609..f13d8c1581e 100755 --- a/icu4c/as_is/os390/unpax-icu.sh +++ b/icu4c/as_is/os390/unpax-icu.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html +# Copyright (C) 2001-2010, International Business Machines +# Corporation and others. All Rights Reserved. # # Authors: # Ami Fixler diff --git a/icu4c/as_is/os400/bldiculd.sh b/icu4c/as_is/os400/bldiculd.sh index 4ed6ad74231..710b6ff423d 100755 --- a/icu4c/as_is/os400/bldiculd.sh +++ b/icu4c/as_is/os400/bldiculd.sh @@ -1,5 +1,5 @@ #!/bin/sh -# /* Copyright (C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html */ +# /* Copyright (C) 2011-2012 IBM Corporation and Others. All Rights Reserved */ icc -o iculd iculd.c icc -o cxxfilt cxxfilt.cpp diff --git a/icu4c/as_is/os400/convertConfigure.sed b/icu4c/as_is/os400/convertConfigure.sed index 9f847824c11..731aa1d3389 100644 --- a/icu4c/as_is/os400/convertConfigure.sed +++ b/icu4c/as_is/os400/convertConfigure.sed @@ -1,5 +1,5 @@ -# Copyright (C) 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html +# Copyright (C) 2006-2011, International Business Machines Corporation +# and others. All Rights Reserved. # # Use "test -x" instead of "test -f" most of the time. # due to how executables are created in a different file system. diff --git a/icu4c/as_is/os400/cxxfilt.cpp b/icu4c/as_is/os400/cxxfilt.cpp index 3a506af4d3c..4cf49b7c9a9 100644 --- a/icu4c/as_is/os400/cxxfilt.cpp +++ b/icu4c/as_is/os400/cxxfilt.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html */ +/* Copyright (C) 2012 IBM Corporation and Others. All Rights Reserved */ #include #include diff --git a/icu4c/as_is/os400/fixup-icu.sh b/icu4c/as_is/os400/fixup-icu.sh index 5f00ed6d971..092c748a511 100755 --- a/icu4c/as_is/os400/fixup-icu.sh +++ b/icu4c/as_is/os400/fixup-icu.sh @@ -1,6 +1,6 @@ #!/usr/bin/qsh -# Copyright (C) 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html +# Copyright (C) 2000-2011, International Business Machines +# Corporation and others. All Rights Reserved. # # Authors: # Ami Fixler diff --git a/icu4c/as_is/os400/iculd.c b/icu4c/as_is/os400/iculd.c index 62344a868fa..5ff30b5d734 100644 --- a/icu4c/as_is/os400/iculd.c +++ b/icu4c/as_is/os400/iculd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html */ +/* Copyright (C) 2011 IBM Corporation and Others. All Rights Reserved */ /** Input: diff --git a/icu4c/as_is/os400/unpax-icu.sh b/icu4c/as_is/os400/unpax-icu.sh index c1eac35f189..16e1cbab1dd 100755 --- a/icu4c/as_is/os400/unpax-icu.sh +++ b/icu4c/as_is/os400/unpax-icu.sh @@ -1,6 +1,6 @@ #!/usr/bin/qsh -# Copyright (C) 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html +# Copyright (C) 2000-2011, International Business Machines +# Corporation and others. All Rights Reserved. # # Authors: # Ami Fixler diff --git a/icu4c/icu4c.css b/icu4c/icu4c.css index 67ef6e35361..58fe1f3a44f 100644 --- a/icu4c/icu4c.css +++ b/icu4c/icu4c.css @@ -1,7 +1,7 @@ /* * Default CSS style sheet for the ICU4C Open Source readme - * Copyright (C) 2016 and later: Unicode, Inc. and others. - * License & terms of use: http://www.unicode.org/copyright.html + * Copyright (C) 2005-2014, International Business Machines + * Corporation and others. All Rights Reserved. */ /* Global styles */ diff --git a/icu4c/license.html b/icu4c/license.html index 90172e468af..41694069053 100644 --- a/icu4c/license.html +++ b/icu4c/license.html @@ -12,7 +12,7 @@ Update links and software appropriately.

- Copyright (C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html + Copyright (c) 1995-2016 International Business Machines Corporation and others diff --git a/icu4c/packaging/PACKAGES b/icu4c/packaging/PACKAGES index a52a8e184eb..12b352331e2 100644 --- a/icu4c/packaging/PACKAGES +++ b/icu4c/packaging/PACKAGES @@ -1,6 +1,5 @@ -Copyright (C) 2016 and later: Unicode, Inc. and others. -License & terms of use: http://www.unicode.org/copyright.html - +Copyright (C) 2000-2003, International Business Machines +Corporation and others. All Rights Reserved. ICU is packaged into a number of small, interdependent packages. This file describes what these packages are, what their name should be like, and what their contents are. It is useful as a reference and a diff --git a/icu4c/packaging/README b/icu4c/packaging/README index db8e39bedbf..1bfe85adf72 100644 --- a/icu4c/packaging/README +++ b/icu4c/packaging/README @@ -1,5 +1,5 @@ -Copyright (C) 2016 and later: Unicode, Inc. and others. -License & terms of use: http://www.unicode.org/copyright.html +Copyright (C) 2000-2003, International Business Machines +Corporation and others. All Rights Reserved. This directory contains information, input files and scripts for packaging ICU using specific packaging tools. We assume that the diff --git a/icu4c/packaging/rpm/icu.spec b/icu4c/packaging/rpm/icu.spec index df4f61d1335..6a1e63bd324 100644 --- a/icu4c/packaging/rpm/icu.spec +++ b/icu4c/packaging/rpm/icu.spec @@ -1,5 +1,5 @@ -# Copyright (C) 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html +# Copyright (C) 2000-2005, International Business Machines +# Corporation and others. All Rights Reserved. # # RPM specification file for ICU. # diff --git a/icu4c/readme.html b/icu4c/readme.html index 461bfb0b4c4..70aec692f60 100644 --- a/icu4c/readme.html +++ b/icu4c/readme.html @@ -5,7 +5,7 @@ ReadMe for ICU 57.1 + "Copyright (c) 1997-2016 IBM Corporation and others. All Rights Reserved." />

Last updated: 2016-Mar-21
- Copyright © 2016 and later: Unicode, Inc. and others. - All Rights Reserved.

+ Copyright © 1997-2016 International Business Machines Corporation and + others. All Rights Reserved.

@@ -1857,8 +1857,11 @@ gnumake
-

Copyright © 2016 and later: Unicode, Inc. and others. - All Rights Reserved.
-

+

Copyright © 1997-2016 International Business Machines Corporation and + others. All Rights Reserved.
+ IBM Globalization Center of Competency - San José
+ 4400 North First Street
+ San José, CA 95134
+ USA