r3886 - in tzdata/branches/glibc-branch-etch/debian: . patches
Author: schizo
Date: 2009-10-20 00:30:24 +0000 (Tue, 20 Oct 2009)
New Revision: 3886
Added:
tzdata/branches/glibc-branch-etch/debian/patches/argentinas-dst-2009.diff
Removed:
tzdata/branches/glibc-branch-etch/debian/files
Modified:
tzdata/branches/glibc-branch-etch/debian/changelog
tzdata/branches/glibc-branch-etch/debian/control
tzdata/branches/glibc-branch-etch/debian/install
tzdata/branches/glibc-branch-etch/debian/patches/quiltrc
tzdata/branches/glibc-branch-etch/debian/patches/series
tzdata/branches/glibc-branch-etch/debian/rules
Log:
2009o-0etch1
Modified: tzdata/branches/glibc-branch-etch/debian/changelog
===================================================================
--- tzdata/branches/glibc-branch-etch/debian/changelog 2009-10-19 17:04:16 UTC (rev 3885)
+++ tzdata/branches/glibc-branch-etch/debian/changelog 2009-10-20 00:30:24 UTC (rev 3886)
@@ -1,6 +1,15 @@
+tzdata (2009o-0etch1) oldstable; 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 12:19:24 -0700
+
tzdata (2009l-0etch1) oldstable; urgency=low
- * New upstream release.
+ * New upstream release.
- Updates Cairo DST for Ramadan. closes: #543139.
-- Clint Adams <schizo@debian.org> Sat, 22 Aug 2009 17:51:09 -0400
@@ -14,7 +23,7 @@
tzdata (2008e-1etch2) stable; urgency=low
- * Fix Argentinian timezone wrt DST. Closes: #501169
+ * Fix Argentinian timezone wrt DST. Closes: #501169
-- Aurelien Jarno <aurel32@debian.org> Mon, 06 Oct 2008 13:48:00 +0200
@@ -75,7 +84,7 @@
tzdata (2007a-2) unstable; urgency=low
- * Generate and ship /usr/share/zoneinfo/posixrules (closes: bug#409275).
+ * Generate and ship /usr/share/zoneinfo/posixrules (closes: bug#409275).
-- Aurelien Jarno <aurel32@debian.org> Thu, 1 Feb 2007 18:39:05 +0100
@@ -96,21 +105,21 @@
tzdata (2006n-1) unstable; urgency=low
[ Aurelien Jarno ]
- * New upstream release.
+ * New upstream release.
-- Aurelien Jarno <aurel32@debian.org> Sat, 21 Oct 2006 22:51:50 +0200
tzdata (2006m-1) unstable; urgency=low
[ Aurelien Jarno ]
- * New upstream release.
+ * New upstream release.
-- Aurelien Jarno <aurel32@debian.org> Sun, 8 Oct 2006 19:39:42 +0200
tzdata (2006l-1) unstable; urgency=low
[ Denis Barbier ]
- * New upstream release.
+ * New upstream release.
* debian/rules: Use debian/patches/quiltrc for quilt global settings.
-- Denis Barbier <barbier@debian.org> Tue, 19 Sep 2006 22:26:27 +0200
@@ -118,7 +127,7 @@
tzdata (2006k-1) unstable; urgency=low
[ Aurelien Jarno ]
- * New upstream release.
+ * New upstream release.
-- Aurelien Jarno <aurel32@debian.org> Tue, 29 Aug 2006 22:53:57 +0200
Modified: tzdata/branches/glibc-branch-etch/debian/control
===================================================================
--- tzdata/branches/glibc-branch-etch/debian/control 2009-10-19 17:04:16 UTC (rev 3885)
+++ tzdata/branches/glibc-branch-etch/debian/control 2009-10-20 00:30:24 UTC (rev 3886)
@@ -1,6 +1,5 @@
Source: tzdata
Section: libs
-Essential: yes
Priority: required
Build-Depends: debhelper (>= 4.0.0)
Build-Depends-Indep: quilt
Deleted: tzdata/branches/glibc-branch-etch/debian/files
===================================================================
--- tzdata/branches/glibc-branch-etch/debian/files 2009-10-19 17:04:16 UTC (rev 3885)
+++ tzdata/branches/glibc-branch-etch/debian/files 2009-10-20 00:30:24 UTC (rev 3886)
@@ -1 +0,0 @@
-tzdata_2007f-1etch1_all.deb libs required
Modified: tzdata/branches/glibc-branch-etch/debian/install
===================================================================
--- tzdata/branches/glibc-branch-etch/debian/install 2009-10-19 17:04:16 UTC (rev 3885)
+++ tzdata/branches/glibc-branch-etch/debian/install 2009-10-20 00:30:24 UTC (rev 3886)
@@ -1,3 +1,3 @@
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-etch/debian/patches/argentinas-dst-2009.diff
===================================================================
--- tzdata/branches/glibc-branch-etch/debian/patches/argentinas-dst-2009.diff (rev 0)
+++ tzdata/branches/glibc-branch-etch/debian/patches/argentinas-dst-2009.diff 2009-10-20 00:30:24 UTC (rev 3886)
@@ -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-etch/debian/patches/quiltrc
===================================================================
--- tzdata/branches/glibc-branch-etch/debian/patches/quiltrc 2009-10-19 17:04:16 UTC (rev 3885)
+++ tzdata/branches/glibc-branch-etch/debian/patches/quiltrc 2009-10-20 00:30:24 UTC (rev 3886)
@@ -1,2 +1,2 @@
-QUILT_PATCHES="../debian/patches"
+QUILT_PATCHES="debian/patches"
QUILT_NO_DIFF_TIMESTAMPS=0
Modified: tzdata/branches/glibc-branch-etch/debian/patches/series
===================================================================
--- tzdata/branches/glibc-branch-etch/debian/patches/series 2009-10-19 17:04:16 UTC (rev 3885)
+++ tzdata/branches/glibc-branch-etch/debian/patches/series 2009-10-20 00:30:24 UTC (rev 3886)
@@ -1 +1,2 @@
systemv.diff -p0
+argentinas-dst-2009.diff -p1
Modified: tzdata/branches/glibc-branch-etch/debian/rules
===================================================================
--- tzdata/branches/glibc-branch-etch/debian/rules 2009-10-19 17:04:16 UTC (rev 3885)
+++ tzdata/branches/glibc-branch-etch/debian/rules 2009-10-20 00:30:24 UTC (rev 3886)
@@ -5,7 +5,6 @@
export LC_ALL=C
TZGEN := $(CURDIR)/tzgen
-TZSOURCE := $(CURDIR)/tzsource
TIMEZONES := africa \
antarctica \
asia \
@@ -21,21 +20,14 @@
backward \
systemv
-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."; \
@@ -49,9 +41,9 @@
# Build
for zone in $(TIMEZONES); do \
- /usr/sbin/zic -d $(TZGEN) -L /dev/null -y $(TZSOURCE)/yearistype.sh $(TZSOURCE)/$${zone} ; \
- /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) -L /dev/null -y yearistype.sh $${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
# Generate a posixrules file
@@ -62,7 +54,7 @@
clean:
dh_testdir
dh_testroot
- -rm -rf $(TZSOURCE) $(TZGEN) .pc
+ -rm -rf $(TZGEN) .pc
rm -f build-stamp
rm -f patch-log
dh_clean
Reply to: