d3735449b8
- Rebase to tzdata-2015c
- Egypt's spring-forward transition is at 24:00 on April's last Thursday,
not 00:00 on April's last Friday. 2015's transition will therefore be o
Thursday, April 30 at 24:00, not Friday, April 24 at 00:00. Similar fix
apply to 2026, 2037, 2043, etc.
- Rebase javazic tool to match latest upstream OpenJDK version
38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
diff --git a/rebase-01.patch b/rebase-01.patch
|
|
new file mode 100644
|
|
index 0000000..bca6ed4
|
|
--- /dev/null
|
|
+++ b/rebase-01.patch
|
|
@@ -0,0 +1,31 @@
|
|
+--- sun/tools/javazic/Mappings.java.orig 2007-08-30 03:55:48.000000000 -0400
|
|
++++ sun/tools/javazic/Mappings.java 2015-04-13 12:39:44.000000000 -0400
|
|
+@@ -1,12 +1,12 @@
|
|
+ /*
|
|
+- * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved.
|
|
++ * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
|
|
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
+ *
|
|
+ * This code is free software; you can redistribute it and/or modify it
|
|
+ * under the terms of the GNU General Public License version 2 only, as
|
|
+- * published by the Free Software Foundation. Sun designates this
|
|
++ * published by the Free Software Foundation. Oracle designates this
|
|
+ * particular file as subject to the "Classpath" exception as provided
|
|
+- * by Sun in the LICENSE file that accompanied this code.
|
|
++ * by Oracle in the LICENSE file that accompanied this code.
|
|
+ *
|
|
+ * This code is distributed in the hope that it will be useful, but WITHOUT
|
|
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
+@@ -18,9 +18,9 @@
|
|
+ * 2 along with this work; if not, write to the Free Software Foundation,
|
|
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
+ *
|
|
+- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
|
+- * CA 95054 USA or visit www.sun.com if you need additional information or
|
|
+- * have any questions.
|
|
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
++ * or visit www.oracle.com if you need additional information or have any
|
|
++ * questions.
|
|
+ */
|
|
+
|
|
+ package sun.tools.javazic;
|