diff --git a/timezone.changes b/timezone.changes index f17e1c8..a313247 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Nov 3 19:14:45 UTC 2009 - coolo@novell.com - -- updated patches to apply with fuzz=0 - ------------------------------------------------------------------- Mon Oct 26 17:20:13 CET 2009 - pbaudis@suse.cz diff --git a/tzdata-china.diff b/tzdata-china.diff index 7d77155..3afa07d 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -1,8 +1,6 @@ -Index: asia -=================================================================== ---- asia.orig -+++ asia -@@ -351,6 +351,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o +--- asia ++++ asia 2006/04/24 09:56:17 +@@ -240,6 +240,9 @@ 5:00 - KAST 1980 May 8:00 PRC C%sT @@ -12,11 +10,9 @@ Index: asia # Hong Kong (Xianggang) # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule HK 1946 only - Apr 20 3:30 1:00 S -Index: backward -=================================================================== ---- backward.orig -+++ backward -@@ -88,12 +88,11 @@ Link America/Mexico_City Mexico/General +--- backward ++++ backward 2006/04/24 09:56:17 +@@ -78,12 +78,11 @@ Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo @@ -30,13 +26,11 @@ Index: backward Link Asia/Seoul ROK Link Asia/Singapore Singapore Link Europe/Istanbul Turkey -Index: zone.tab -=================================================================== ---- zone.tab.orig -+++ zone.tab -@@ -145,11 +145,12 @@ CK -2114-15946 Pacific/Rarotonga +--- zone.tab ++++ zone.tab 2006/04/24 09:56:17 +@@ -135,11 +135,12 @@ CL -3327-07040 America/Santiago most locations - CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez + CL -2710-10927 Pacific/Easter Easter Island & Sala y Gomez CM +0403+00942 Africa/Douala -CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc. -CN +4545+12641 Asia/Harbin Heilongjiang (except Mohe), Jilin @@ -51,4 +45,4 @@ Index: zone.tab +CN +3929+07559 Asia/Kashgar China west Xinjiang CO +0436-07405 America/Bogota CR +0956-08405 America/Costa_Rica - CU +2308-08222 America/Havana + CS +4450+02030 Europe/Belgrade