r31546 - in /trunk/libdatetime-timezone-perl/debian: changelog rules tools/update-tzdata.sh

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Fri Mar  6 15:19:41 2009
New Revision: 31546

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=31546
Log:
debian/rules: improve prepare target: call to tools/parse_olson moved to
debian/tools/update-tzdata.sh, debian/tools/update-tzdata.sh now also
checks for the current upstream version of the Olsen DB.

Modified:
    trunk/libdatetime-timezone-perl/debian/changelog
    trunk/libdatetime-timezone-perl/debian/rules
    trunk/libdatetime-timezone-perl/debian/tools/update-tzdata.sh

Modified: trunk/libdatetime-timezone-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-timezone-perl/debian/changelog?rev=31546&op=diff
==============================================================================
--- trunk/libdatetime-timezone-perl/debian/changelog (original)
+++ trunk/libdatetime-timezone-perl/debian/changelog Fri Mar  6 15:19:41 2009
@@ -9,6 +9,9 @@
   * debian/control: remove libmodule-build-perl from Build-Depends, dh7
     prefers ExtUtils::MakeMaker.
   * debian/control: add ${perl:Depends} to Depends:.
+  * debian/rules: improve prepare target: call to tools/parse_olson moved to
+    debian/tools/update-tzdata.sh, debian/tools/update-tzdata.sh now also
+    checks for the current upstream version of the Olsen DB.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 16 Nov 2008 20:41:38 +0100
 

Modified: trunk/libdatetime-timezone-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-timezone-perl/debian/rules?rev=31546&op=diff
==============================================================================
--- trunk/libdatetime-timezone-perl/debian/rules (original)
+++ trunk/libdatetime-timezone-perl/debian/rules Fri Mar  6 15:19:41 2009
@@ -21,6 +21,6 @@
 binary: binary-arch binary-indep
 
 prepare:
-	perl -Ilib.bak tools/parse_olson --dir debian/tzdata --version 2008i --clean
+	sh debian/tools/update-tzdata.sh
 
 .PHONY: binary binary-arch binary-indep install clean build prepare

Modified: trunk/libdatetime-timezone-perl/debian/tools/update-tzdata.sh
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-timezone-perl/debian/tools/update-tzdata.sh?rev=31546&op=diff
==============================================================================
--- trunk/libdatetime-timezone-perl/debian/tools/update-tzdata.sh (original)
+++ trunk/libdatetime-timezone-perl/debian/tools/update-tzdata.sh Fri Mar  6 15:19:41 2009
@@ -5,33 +5,45 @@
     exit 1
 }
 
-test -f changelog && cd ..
+dh_testdir debian/changelog || die "You are not in the source package's root directory."
 
-test -f ../changelog && cd ../..
+debdbversion=$(head -n1 debian/changelog  | sed 's/^.*+\([0-9a-z]*\)).*$/\1/')
+updbversion=$(wget -q -O- ftp://elsie.nci.nih.gov/pub/ | grep tzdata | perl -pe 's/.+".+tzdata(.+)\.tar.gz".+/$1/')
 
-test -f debian/changelog || die "cannot find root directory for source package"
+if [ "$debdbversion" != "$updbversion" ] ; then
+    echo "Debian dbversion $debdbversion != upstream dbversion $updbversion."
+    echo "You might want to change the Debian dbversion in debian/changelog."
+    read -p "Continue with $debdbversion (y/N)? " CONTINUE
+    case $CONTINUE in
+        y|Y)
+            ;;
+        *)
+            die "Aborted on user request."
+            ;;
+    esac
+fi    
 
-dbversion=`head -n1 debian/changelog  | sed 's/^.*+\([0-9a-z]*\)).*$/\1/'`
+mkdir -p debian/tzdata || die "Cannot mkdir debian/tzdata."
 
-mkdir -p debian/tzdata || die "cannot mkdir debian/tzdata"
+pushd debian/tzdata || die "Cannot cd debian/tzdata."
 
-pushd debian/tzdata || die "cannot cd debian/tzdata"
-
-    file=tzdata$dbversion.tar.gz
+    file=tzdata$debdbversion.tar.gz
     url=ftp://elsie.nci.nih.gov/pub/$file
 
     rm -f *
     
     (
-        echo "These files was downloaded with debian/tools/update-tzdata.sh script"
+        echo "These files were downloaded with debian/tools/update-tzdata.sh script"
         echo "from $url"
         echo "at `date -R` by Debian maintainer" 
     ) > README
 
-    wget $url || die "cannot download"
+    wget $url || die "Cannot download $url."
 
-    tar zxvf $file || die "cannot unpack tzdata"
+    tar zxvf $file || die "Cannot unpack tzdata tarball."
     
-    rm -f $file || die "cannot remove archive"
+    rm -f $file || die "Cannot remove tzdata tarball."
 
 popd
+
+perl -Ilib.bak tools/parse_olson --dir debian/tzdata --version $debdbversion --clean