[SCM] Debian packaging of libdatetime-timezone-perl branch, master, updated. debian/1.40-1+2011l-4-g5cc4064

[gregor herrmann]

The following commit has been merged in the master branch:
commit 200095a2521da1b9f82b640120104cbefe5f75bc
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Oct 18 16:39:31 2011 +0200

    Update URL of Olson database in several places.

diff --git a/debian/README.source b/debian/README.source
index 2489cd8..a9f5122 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -28,7 +28,7 @@ How to work out what the olson database version is/should be
 has an 'olson_version' method that will return what the olson 
 database version in our code is.
 * To see the actual current Olsdon database version number see
-http://elsie.nci.nih.gov/pub/. Look for the tarfile which will
+ftp://ftp.iana.org/tz/releases/. Look for the tarfile which will
 have the version number embedded in its name.
 
 How to update the time zone database
diff --git a/debian/control b/debian/control
index c89587f..3227bb3 100644
--- a/debian/control
+++ b/debian/control
@@ -33,4 +33,4 @@ Description: framework exposing the Olson time zone database to Perl
  zone calculations.
  .
  The Olson time zone database is the best available source for worldwide time
- zone information and is available from <URL:ftp://elsie.nci.nih.gov/pub/>.
+ zone information and is available from <URL:ftp://ftp.iana.org/tz/releases/>.
diff --git a/debian/tools/update-tzdata.sh b/debian/tools/update-tzdata.sh
index d81736d..34ca124 100644
--- a/debian/tools/update-tzdata.sh
+++ b/debian/tools/update-tzdata.sh
@@ -5,13 +5,14 @@ die () {
     exit 1
 }
 
-#HOST=elsie.nci.nih.gov
-HOST=munnari.oz.au
+#HOST=elsie.nci.nih.gov/pub
+#HOST=munnari.oz.au
+HOST=ftp.iana.org/tz/releases
 
 dh_testdir debian/changelog || die "You are not in the source package's root directory."
 
 debdbversion=$(head -n1 debian/changelog  | sed 's/^.*+\([0-9a-z]*\)).*$/\1/')
-updbversion=$(wget -q -O- ftp://${HOST}/pub/ | grep tzdata | perl -pe 's/.+".+tzdata(.+)\.tar.gz".+/$1/')
+updbversion=$(wget -q -O- ftp://${HOST}/ | grep tzdata | perl -pe 's/.+".+tzdata(.+)\.tar.gz".+/$1/')
 
 if [ "$debdbversion" != "$updbversion" ] ; then
     echo "Debian dbversion $debdbversion != upstream dbversion $updbversion."
@@ -31,7 +32,7 @@ mkdir -p debian/tzdata || die "Cannot mkdir debian/tzdata."
 pushd debian/tzdata || die "Cannot cd debian/tzdata."
 
     file=tzdata$debdbversion.tar.gz
-    url=ftp://${HOST}/pub/$file
+    url=ftp://${HOST}/$file
 
     rm -f *
     

-- 
Debian packaging of libdatetime-timezone-perl