r3028 - in tzdata/trunk/debian: . patches
Author: aurel32
Date: 2008-07-31 12:10:25 +0000 (Thu, 31 Jul 2008)
New Revision: 3028
Added:
tzdata/trunk/debian/patches/java.diff
tzdata/trunk/debian/tzdata-java.install
Modified:
tzdata/trunk/debian/changelog
tzdata/trunk/debian/control
tzdata/trunk/debian/patches/series
tzdata/trunk/debian/rules
Log:
* Build a tzdata-java package, using javazic from openjdk-6.
Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog 2008-07-31 12:09:42 UTC (rev 3027)
+++ tzdata/trunk/debian/changelog 2008-07-31 12:10:25 UTC (rev 3028)
@@ -1,3 +1,9 @@
+tzdata (2008e-2) unstable; urgency=low
+
+ * Build a tzdata-java package, using javazic from openjdk-6.
+
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 29 Jul 2008 20:42:30 +0200
+
tzdata (2008e-1) unstable; urgency=low
* New upstream release.
Modified: tzdata/trunk/debian/control
===================================================================
--- tzdata/trunk/debian/control 2008-07-31 12:09:42 UTC (rev 3027)
+++ tzdata/trunk/debian/control 2008-07-31 12:10:25 UTC (rev 3028)
@@ -2,7 +2,7 @@
Section: libs
Priority: required
Build-Depends: debhelper (>= 4.0.0)
-Build-Depends-Indep: quilt, po-debconf
+Build-Depends-Indep: quilt, po-debconf, openjdk-6-jre-headless
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>
Standards-Version: 3.8.0
@@ -18,3 +18,16 @@
globe. It is updated periodically to reflect changes made by
political bodies to time zone boundaries, UTC offsets, and
daylight-saving rules.
+
+Package: tzdata-java
+Architecture: all
+Priority: optional
+Depends: tzdata (= ${binary:Version})
+Description: time zone and daylight-saving time data for use by java runtimes
+ This package contains data required for the implementation of
+ standard local time for many representative locations around the
+ globe. It is updated periodically to reflect changes made by
+ political bodies to time zone boundaries, UTC offsets, and
+ daylight-saving rules.
+ .
+ This package contains the data for use by Java runtimes.
Added: tzdata/trunk/debian/patches/java.diff
===================================================================
--- tzdata/trunk/debian/patches/java.diff (rev 0)
+++ tzdata/trunk/debian/patches/java.diff 2008-07-31 12:10:25 UTC (rev 3028)
@@ -0,0 +1,209 @@
+--- tzdata.orig/gmt 1970-01-01 01:00:00.000000000 +0100
++++ tzdata/gmt 2008-07-31 13:52:42.000000000 +0200
+@@ -0,0 +1,27 @@
++#
++# Copyright 2000-2005 Sun Microsystems, Inc. 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
++# particular file as subject to the "Classpath" exception as provided
++# by Sun 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
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 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.
++#
++
++# Zone NAME GMTOFF RULES FORMAT [UNTIL]
++Zone GMT 0:00 - GMT
+--- tzdata.orig/jdk11_backward 1970-01-01 01:00:00.000000000 +0100
++++ tzdata/jdk11_backward 2008-07-31 13:52:42.000000000 +0200
+@@ -0,0 +1,80 @@
++#
++# Copyright 2000-2006 Sun Microsystems, Inc. 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
++# particular file as subject to the "Classpath" exception as provided
++# by Sun 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
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 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.
++#
++# JDK 1.1.x compatible time zone IDs
++#
++
++Link Australia/Darwin ACT
++Link Australia/Sydney AET
++Link America/Argentina/Buenos_Aires AGT
++Link Africa/Cairo ART
++Link America/Anchorage AST
++Link America/Sao_Paulo BET
++Link Asia/Dhaka BST
++Link Africa/Harare CAT
++Link America/St_Johns CNT
++Link America/Chicago CST
++Link Asia/Shanghai CTT
++Link Africa/Addis_Ababa EAT
++Link Europe/Paris ECT
++Link America/New_York EST
++Link Pacific/Honolulu HST
++Link America/Indianapolis IET
++Link Asia/Calcutta IST
++Link Asia/Tokyo JST
++Link Pacific/Apia MIT
++Link America/Denver MST
++Link Asia/Yerevan NET
++Link Pacific/Auckland NST
++Link Asia/Karachi PLT
++Link America/Phoenix PNT
++Link America/Puerto_Rico PRT
++Link America/Los_Angeles PST
++Link Pacific/Guadalcanal SST
++Link Asia/Saigon VST
++
++# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
++Rule SystemV min 1973 - Apr lastSun 2:00 1:00 D
++Rule SystemV min 1973 - Oct lastSun 2:00 0 S
++Rule SystemV 1974 only - Jan 6 2:00 1:00 D
++Rule SystemV 1974 only - Nov lastSun 2:00 0 S
++Rule SystemV 1975 only - Feb 23 2:00 1:00 D
++Rule SystemV 1975 only - Oct lastSun 2:00 0 S
++Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D
++Rule SystemV 1976 max - Oct lastSun 2:00 0 S
++
++# Zone NAME GMTOFF RULES/SAVE FORMAT [UNTIL]
++Zone SystemV/AST4ADT -4:00 SystemV A%sT
++Zone SystemV/EST5EDT -5:00 SystemV E%sT
++Zone SystemV/CST6CDT -6:00 SystemV C%sT
++Zone SystemV/MST7MDT -7:00 SystemV M%sT
++Zone SystemV/PST8PDT -8:00 SystemV P%sT
++Zone SystemV/YST9YDT -9:00 SystemV Y%sT
++Zone SystemV/AST4 -4:00 - AST
++Zone SystemV/EST5 -5:00 - EST
++Zone SystemV/CST6 -6:00 - CST
++Zone SystemV/MST7 -7:00 - MST
++Zone SystemV/PST8 -8:00 - PST
++Zone SystemV/YST9 -9:00 - YST
++Zone SystemV/HST10 -10:00 - HST
+--- tzdata.orig/jdk11_full_backward 1970-01-01 01:00:00.000000000 +0100
++++ tzdata/jdk11_full_backward 2008-07-31 13:52:42.000000000 +0200
+@@ -0,0 +1,93 @@
++#
++# Copyright 2001-2006 Sun Microsystems, Inc. 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
++# particular file as subject to the "Classpath" exception as provided
++# by Sun 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
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 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.
++#
++# JDK 1.1.x compatible time zone IDs
++#
++
++Link Australia/Darwin ACT
++Link Australia/Sydney AET
++Link America/Argentina/Buenos_Aires AGT
++Link Africa/Cairo ART
++Link America/Anchorage AST
++Link America/Sao_Paulo BET
++Link Asia/Dhaka BST
++Link Africa/Harare CAT
++Link America/St_Johns CNT
++Link America/Chicago CST
++Link Asia/Shanghai CTT
++Link Africa/Addis_Ababa EAT
++Link Europe/Paris ECT
++Link America/New_York EST
++Link Pacific/Honolulu HST
++Link America/Indiana/Indianapolis IET
++Link Asia/Calcutta IST
++Link Asia/Tokyo JST
++Link Pacific/Apia MIT
++Link America/Denver MST
++Link Asia/Yerevan NET
++Link Pacific/Auckland NST
++Link Asia/Karachi PLT
++Link America/Phoenix PNT
++Link America/Puerto_Rico PRT
++Link America/Los_Angeles PST
++Link Pacific/Guadalcanal SST
++Link Asia/Saigon VST
++
++# The follwong link is required to generate J2SE 1.2.x and 1.3.x
++# compatible zones. In the Olson public source, MET is defined as
++# GMT+1:00 with the C-Eur rules. In J2SE, MET is defined as an alias
++# of Asia/Tehran. This line must be removed if a full set of Olson
++# zones is generated. Otherwise, MET appears twice in the
++# ZoneInfoMappings.IDs table.
++Link Asia/Tehran MET
++
++# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
++Rule SystemV min 1973 - Apr lastSun 2:00 1:00 D
++Rule SystemV min 1973 - Oct lastSun 2:00 0 S
++Rule SystemV 1974 only - Jan 6 2:00 1:00 D
++Rule SystemV 1974 only - Nov lastSun 2:00 0 S
++Rule SystemV 1975 only - Feb 23 2:00 1:00 D
++Rule SystemV 1975 only - Oct lastSun 2:00 0 S
++Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D
++Rule SystemV 1976 max - Oct lastSun 2:00 0 S
++
++# Zone NAME GMTOFF RULES/SAVE FORMAT [UNTIL]
++Zone SystemV/AST4ADT -4:00 SystemV A%sT
++Zone SystemV/EST5EDT -5:00 SystemV E%sT
++Zone SystemV/CST6CDT -6:00 SystemV C%sT
++Zone SystemV/MST7MDT -7:00 SystemV M%sT
++Zone SystemV/PST8PDT -8:00 SystemV P%sT
++Zone SystemV/YST9YDT -9:00 SystemV Y%sT
++Zone SystemV/AST4 -4:00 - AST
++Zone SystemV/EST5 -5:00 - EST
++Zone SystemV/CST6 -6:00 - CST
++Zone SystemV/MST7 -7:00 - MST
++Zone SystemV/PST8 -8:00 - PST
++Zone SystemV/YST9 -9:00 - YST
++Zone SystemV/HST10 -10:00 - HST
++
++#
++# For the UTC change in Mustang
++#
++Link GMT UTC
Modified: tzdata/trunk/debian/patches/series
===================================================================
--- tzdata/trunk/debian/patches/series 2008-07-31 12:09:42 UTC (rev 3027)
+++ tzdata/trunk/debian/patches/series 2008-07-31 12:10:25 UTC (rev 3028)
@@ -1 +1,2 @@
systemv.diff -p1
+java.diff -p1
Modified: tzdata/trunk/debian/rules
===================================================================
--- tzdata/trunk/debian/rules 2008-07-31 12:09:42 UTC (rev 3027)
+++ tzdata/trunk/debian/rules 2008-07-31 12:10:25 UTC (rev 3028)
@@ -5,7 +5,13 @@
export LC_ALL=C
TZGEN := $(CURDIR)/tzgen
+TZGEN_JAVA := $(CURDIR)/tzgen-java
TZSOURCE := $(CURDIR)/tzsource
+
+VERSION := $(shell dpkg-parsechangelog | sed -e '/^Version/!d;s/^Version: //g;s/.*://g;s/-.*//g')
+
+JHOME := /usr/lib/jvm/java-6-openjdk
+
TIMEZONES := africa \
antarctica \
asia \
@@ -20,6 +26,8 @@
solar89 \
backward \
systemv
+TIMEZONES_JAVA := gmt \
+ jdk11_backward
TEMPLATES_FILE := $(CURDIR)/debian/templates
TEMPLATES_AREAS := Africa \
@@ -71,6 +79,10 @@
# Generate a posixrules file
/usr/sbin/zic -d $(TZGEN) -p America/New_York
+ # Generate a java version
+ cd $(TZSOURCE) && \
+ $(JHOME)/bin/java -jar $(JHOME)/jre/lib/javazic.jar -V $(VERSION) -d ../tzgen-java $(TIMEZONES) $(TIMEZONES_JAVA)
+
# Generate the templates file
( echo "Template: tzdata/Areas" ; \
echo "Type: select" ; \
@@ -109,7 +121,7 @@
clean:
dh_testdir
dh_testroot
- -rm -rf $(TZSOURCE) $(TZGEN) .pc
+ -rm -rf $(TZSOURCE) $(TZGEN) $(TZGEN_JAVA) .pc
rm -f build-stamp
rm -f patch-log
dh_clean
Added: tzdata/trunk/debian/tzdata-java.install
===================================================================
--- tzdata/trunk/debian/tzdata-java.install (rev 0)
+++ tzdata/trunk/debian/tzdata-java.install 2008-07-31 12:10:25 UTC (rev 3028)
@@ -0,0 +1 @@
+tzgen-java/* usr/share/javazi/
Reply to: