This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository tzdata.
commit 6791b80bcde2c7dff13de3bdcc71466d0d3ed875
Author: Aurelien Jarno <aurel...@aurel32.net>
Date: Mon Mar 14 21:28:12 2016 +0100
Drop the tzdata-java package. Closes: #814073.
---
debian/changelog | 1 +
debian/control | 17 +---
debian/patches/java.diff | 209 ---------------------------------------------
debian/patches/series | 1 -
debian/rules | 10 +--
debian/tzdata-java.install | 1 -
6 files changed, 3 insertions(+), 236 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 95e9661..e5b347a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ tzdata (2016b-1) UNRELEASED; urgency=medium
#814831.
* Update Japanese debconf translation, by Takuma Yamada. Closes:
#815386.
+ * Drop the tzdata-java package. Closes: #814073.
-- Aurelien Jarno <aure...@debian.org> Tue, 02 Feb 2016 12:29:58 +0100
diff --git a/debian/control b/debian/control
index 655f935..49f4e8a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tzdata
Section: localization
Priority: required
Build-Depends: debhelper (>= 9)
-Build-Depends-Indep: po-debconf, default-jre-headless, rdfind, symlinks
+Build-Depends-Indep: po-debconf, rdfind, symlinks
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Clint Adams <cl...@debian.org>, Aurelien Jarno
<aure...@debian.org>, Adam Conrad <adcon...@0c3.net>
Standards-Version: 3.9.6
@@ -22,18 +22,3 @@ Description: time zone and daylight-saving time data
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
-Section: java
-Priority: optional
-Multi-Arch: foreign
-Depends: ${misc: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.
diff --git a/debian/patches/java.diff b/debian/patches/java.diff
deleted file mode 100644
index 47db840..0000000
--- a/debian/patches/java.diff
+++ /dev/null
@@ -1,209 +0,0 @@
---- 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
diff --git a/debian/patches/series b/debian/patches/series
index 66ebf93..8118f66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
systemv.diff -p1
-java.diff -p1
diff --git a/debian/rules b/debian/rules
index af083b6..e5c8bc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,7 @@
export LC_ALL=C
TZGEN := $(CURDIR)/tzgen
-TZGEN_JAVA := $(CURDIR)/tzgen-java
VERSION := $(shell dpkg-parsechangelog | sed -e '/^Version/!d;s/^Version:
//g;s/.*://g;s/-.*//g')
-JHOME := /usr/lib/jvm/default-java/
TIMEZONES := africa \
antarctica \
@@ -20,9 +18,6 @@ TIMEZONES := africa \
systemv \
pacificnew
-TIMEZONES_JAVA := gmt \
- jdk11_backward
-
TEMPLATES_FILE := $(CURDIR)/debian/tzdata.templates
TEMPLATES_AREAS := Africa \
America \
@@ -56,9 +51,6 @@ override_dh_auto_build-indep:
rdfind -outputname /dev/null -makesymlinks true -removeidentinode false
$(TZGEN)
symlinks -r -s -c $(TZGEN)
- # Generate a java version
- $(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" ; \
@@ -100,5 +92,5 @@ override_dh_auto_install:
# Nothing to do.
override_dh_auto_clean:
- -rm -rf $(TZGEN) $(TZGEN_JAVA)
+ -rm -rf $(TZGEN)
dh_auto_clean
diff --git a/debian/tzdata-java.install b/debian/tzdata-java.install
deleted file mode 100644
index 6b115c7..0000000
--- a/debian/tzdata-java.install
+++ /dev/null
@@ -1 +0,0 @@
-tzgen-java/* usr/share/javazi/
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/tzdata.git
