r3885 - in tzdata/branches/glibc-branch-lenny/debian: . patches
Author: schizo
Date: 2009-10-19 17:04:16 +0000 (Mon, 19 Oct 2009)
New Revision: 3885
Added:
tzdata/branches/glibc-branch-lenny/debian/patches/argentinas-dst-2009.diff
Modified:
tzdata/branches/glibc-branch-lenny/debian/changelog
tzdata/branches/glibc-branch-lenny/debian/control
tzdata/branches/glibc-branch-lenny/debian/install
tzdata/branches/glibc-branch-lenny/debian/patches/quiltrc
tzdata/branches/glibc-branch-lenny/debian/patches/series
tzdata/branches/glibc-branch-lenny/debian/rules
Log:
2009o-0lenny1
Modified: tzdata/branches/glibc-branch-lenny/debian/changelog
===================================================================
--- tzdata/branches/glibc-branch-lenny/debian/changelog 2009-10-19 16:25:24 UTC (rev 3884)
+++ tzdata/branches/glibc-branch-lenny/debian/changelog 2009-10-19 17:04:16 UTC (rev 3885)
@@ -1,3 +1,12 @@
+tzdata (2009o-0lenny1) stable; urgency=low
+
+ * New upstream release.
+ * Rework rules to stop using tarball-in-tarball.
+ * debian/patches/argentinas-dst-2009.diff: patch from Margarita
+ Manterola to fix Argentina DST again. closes: #551195.
+
+ -- Clint Adams <schizo@debian.org> Mon, 19 Oct 2009 09:39:45 -0700
+
tzdata (2009l-0lenny1) stable; urgency=low
* New upstream release.
Modified: tzdata/branches/glibc-branch-lenny/debian/control
===================================================================
--- tzdata/branches/glibc-branch-lenny/debian/control 2009-10-19 16:25:24 UTC (rev 3884)
+++ tzdata/branches/glibc-branch-lenny/debian/control 2009-10-19 17:04:16 UTC (rev 3885)
@@ -9,7 +9,7 @@
Package: tzdata
Architecture: all
-Depends: debconf | debconf-2.0
+Depends: ${misc:Depends}, debconf | debconf-2.0
Replaces: libc0.1, libc0.3, libc6, libc6.1
Provides: tzdata-lenny
Description: time zone and daylight-saving time data
@@ -21,8 +21,9 @@
Package: tzdata-java
Architecture: all
+Section: java
Priority: optional
-Depends: tzdata (= ${binary:Version})
+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
Modified: tzdata/branches/glibc-branch-lenny/debian/install
===================================================================
--- tzdata/branches/glibc-branch-lenny/debian/install 2009-10-19 16:25:24 UTC (rev 3884)
+++ tzdata/branches/glibc-branch-lenny/debian/install 2009-10-19 17:04:16 UTC (rev 3885)
@@ -1,4 +1,4 @@
debian/tzconfig /usr/sbin
tzgen/* usr/share/zoneinfo/
-tzsource/iso3166.tab usr/share/zoneinfo/
-tzsource/zone.tab usr/share/zoneinfo/
+iso3166.tab usr/share/zoneinfo/
+zone.tab usr/share/zoneinfo/
Added: tzdata/branches/glibc-branch-lenny/debian/patches/argentinas-dst-2009.diff
===================================================================
--- tzdata/branches/glibc-branch-lenny/debian/patches/argentinas-dst-2009.diff (rev 0)
+++ tzdata/branches/glibc-branch-lenny/debian/patches/argentinas-dst-2009.diff 2009-10-19 17:04:16 UTC (rev 3885)
@@ -0,0 +1,19 @@
+--- tzdata.orig/southamerica 2009-10-16 13:23:49.000000000 +0000
++++ tzdata/southamerica 2009-10-16 13:24:14.000000000 +0000
+@@ -215,9 +215,14 @@
+ # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+ # </a>
+
++# Margarita Manterola:
++# Same as always, Argentina's government just decided to change its mind
++# regarding DST, 2 days in advance.
++# http://www.lanacion.com.ar/nota.asp?nota_id=1186963&pid=7542694&toi=6275
++
+ Rule Arg 2007 only - Dec 30 0:00 1:00 S
+-Rule Arg 2008 max - Mar Sun>=15 0:00 0 -
+-Rule Arg 2008 max - Oct Sun>=15 0:00 1:00 S
++Rule Arg 2008 2009 - Mar Sun>=15 0:00 0 -
++Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
+
+ # From Mariano Absatz (2004-05-21):
+ # Today it was officially published that the Province of Mendoza is changing
Modified: tzdata/branches/glibc-branch-lenny/debian/patches/quiltrc
===================================================================
--- tzdata/branches/glibc-branch-lenny/debian/patches/quiltrc 2009-10-19 16:25:24 UTC (rev 3884)
+++ tzdata/branches/glibc-branch-lenny/debian/patches/quiltrc 2009-10-19 17:04:16 UTC (rev 3885)
@@ -1,2 +1,2 @@
-QUILT_PATCHES="../debian/patches"
+QUILT_PATCHES="debian/patches"
QUILT_NO_DIFF_TIMESTAMPS=0
Modified: tzdata/branches/glibc-branch-lenny/debian/patches/series
===================================================================
--- tzdata/branches/glibc-branch-lenny/debian/patches/series 2009-10-19 16:25:24 UTC (rev 3884)
+++ tzdata/branches/glibc-branch-lenny/debian/patches/series 2009-10-19 17:04:16 UTC (rev 3885)
@@ -1,2 +1,3 @@
systemv.diff -p1
java.diff -p1
+argentinas-dst-2009.diff -p1
Modified: tzdata/branches/glibc-branch-lenny/debian/rules
===================================================================
--- tzdata/branches/glibc-branch-lenny/debian/rules 2009-10-19 16:25:24 UTC (rev 3884)
+++ tzdata/branches/glibc-branch-lenny/debian/rules 2009-10-19 17:04:16 UTC (rev 3885)
@@ -6,7 +6,6 @@
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')
EMDEBIAN := $(shell dpkg-parsechangelog | egrep '^Version: .*em[0-9]+')
@@ -48,21 +47,14 @@
SystemV \
Etc
-QUILT := quilt --quiltrc ../debian/patches/quiltrc
+QUILT := quilt --quiltrc debian/patches/quiltrc
build: build-stamp
build-stamp:
dh_testdir
- # Unpack the sources
- mkdir $(TZSOURCE)
- for x in $$(ls tzdata*.tar.gz); do \
- tar -xzvC $(TZSOURCE) -f $${x} ;\
- done
-
# Apply patches
- @cd $(TZSOURCE); \
- if $(QUILT) next >/dev/null 2>&1; then \
+ @if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
if $(QUILT) push -a -v > $(CURDIR)/patch-log 2>&1; then \
echo "successful."; \
@@ -76,14 +68,14 @@
# Build the "default" version
for zone in $(TIMEZONES); do \
- /usr/sbin/zic -d $(TZGEN) -L /dev/null -y $(TZSOURCE)/yearistype.sh $(TZSOURCE)/$${zone} ; \
+ /usr/sbin/zic -d $(TZGEN) -L /dev/null -y yearistype.sh $${zone} ; \
done
# Build the "posix" and "right" versions
ifeq ($(EMDEBIAN),)
for zone in $(TIMEZONES); do \
- /usr/sbin/zic -d $(TZGEN)/posix -L /dev/null -y $(TZSOURCE)/yearistype.sh $(TZSOURCE)/$${zone} ; \
- /usr/sbin/zic -d $(TZGEN)/right -L $(TZSOURCE)/leapseconds -y $(TZGEN)/yearistype.sh $(TZSOURCE)/$${zone} ; \
+ /usr/sbin/zic -d $(TZGEN)/posix -L /dev/null -y yearistype.sh $${zone} ; \
+ /usr/sbin/zic -d $(TZGEN)/right -L leapseconds -y $(TZGEN)/yearistype.sh $${zone} ; \
done
endif
@@ -91,8 +83,7 @@
/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)
+ $(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" ; \
@@ -133,7 +124,7 @@
clean:
dh_testdir
dh_testroot
- -rm -rf $(TZSOURCE) $(TZGEN) $(TZGEN_JAVA) .pc
+ -rm -rf $(TZGEN) $(TZGEN_JAVA) .pc
rm -f build-stamp
rm -f patch-log
dh_clean
Reply to: