Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

2 files changed, 5 insertions, 70 deletions

diff --git a/abs/core/tzdata/PKGBUILD b/abs/core/tzdata/PKGBUILD
index 17d0d3c..dcedbd5 100644
--- a/abs/core/tzdata/PKGBUILD
+++ b/abs/core/tzdata/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121182 2011-04-29 06:58:28Z andyrtr $
+# $Id: PKGBUILD 130868 2011-07-08 14:35:26Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=tzdata
 pkgver=2011h
-pkgrel=1
+pkgrel=2
 _tzcode=2011g
 _tzdata=2011h
 pkgdesc="Sources for time zone and daylight saving time data"
@@ -17,6 +17,9 @@ options=('!emptydirs')
 source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \
         ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \
         Makefile.patch)
+md5sums=('ecb564279b28c5b184421c525d997d6c'
+         '546d27b6c1e5e1097bd512651815017f'
+         'a64ed97d1fc03c66ee8612c0d9f40507')
 
 build() {
   cd ${srcdir}
@@ -40,6 +43,3 @@ package() {
 
   rm "${pkgdir}/usr/share/zoneinfo/localtime"
 }
-md5sums=('ecb564279b28c5b184421c525d997d6c'
-         '546d27b6c1e5e1097bd512651815017f'
-         'a64ed97d1fc03c66ee8612c0d9f40507')
diff --git a/abs/core/tzdata/chile.patch b/abs/core/tzdata/chile.patch
deleted file mode 100644
index 38c389c..0000000
--- a/abs/core/tzdata/chile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-------- southamerica -------
-*** southamerica	Wed Mar  5 14:40:25 2008
---- southamerica	Wed Mar  5 14:40:25 2008
-***************
-*** 1,4 ****
-! # @(#)southamerica	8.15
-  # <pre>
-
-  # This data is by no means authoritative; if you think you know better,
---- 1,4 ----
-! # @(#)southamerica	8.18
-  # <pre>
-
-  # This data is by no means authoritative; if you think you know better,
-***************
-*** 759,764 ****
---- 759,784 ----
-  # America/Santiago.  The pre-1980 Pacific/Easter data are dubious,
-  # but we have no other source.
-
-+ # From German Poo-Caaman~o (2008-03-03):
-+ # Due to drought, Chile extends Daylight Time in three weeks.  This
-+ # is one-time change (Saturday 3/29 at 24:00 for America/Santiago
-+ # and Saturday 3/29 at 22:00 for Pacific/Easter)
-+ # The Supreme Decree is located at 
-+ # <a href="http://www.shoa.cl/servicios/supremo316.pdf">
-+ # http://www.shoa.cl/servicios/supremo316.pdf
-+ # </a>
-+ # and the instructions for 2008 are located in:
-+ # <a href="http://www.horaoficial.cl/cambio.htm">
-+ # http://www.horaoficial.cl/cambio.htm
-+ # </a>.
-+ 
-+ # From José Miguel Garrido (2008-03-05):
-+ # ...
-+ # You could see the announces of the change on 
-+ # <a href="http://www.shoa.cl/noticias/2008/04hora/hora.htm">
-+ # http://www.shoa.cl/noticias/2008/04hora/hora.htm
-+ # </a>.
-+ 
-  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-  Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
-  Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
-***************
-*** 789,795 ****
-  Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
-  Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
-  Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
-! Rule	Chile	2000	max	-	Mar	Sun>=9	3:00u	0	-
-  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
-  # (1996-09) says 1998-03-08.  Ignore these.
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
---- 809,819 ----
-  Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
-  Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
-  Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
-! Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
-! # N.B.: the end of March 29 in Chile is March 30 in Universal time,
-! # which is used below in specifying the transition.
-! Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
-! Rule	Chile	2009	max	-	Mar	Sun>=9	3:00u	0	-
-  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
-  # (1996-09) says 1998-03-08.  Ignore these.
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-