[libtime-olsontz-data-perl] 01/01: patch template file as well

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libtime-olsontz-data-perl.

commit 9789739fc2def5a858f976ad1f43b7d875469e10
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Mar 20 12:45:00 2014 +0100

    patch template file as well
    
    (actually we probably only need to patch the template)
    
    Git-Dch: Ignore
---
 debian/patches/tzdata.patch | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/patches/tzdata.patch b/debian/patches/tzdata.patch
index a33e75f..32c15af 100644
--- a/debian/patches/tzdata.patch
+++ b/debian/patches/tzdata.patch
@@ -2,7 +2,7 @@ Description: use tzfiles from tzdata package
 Origin: vendor
 Forwarded: not-needed
 Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2014-03-19
+Last-Update: 2014-03-20
 
 --- a/lib/Time/OlsonTZ/Data.pm
 +++ b/lib/Time/OlsonTZ/Data.pm
@@ -31,3 +31,30 @@ Last-Update: 2014-03-19
  }
  
  =back
+--- a/lib/Time/OlsonTZ/Data.pm.tpl
++++ b/lib/Time/OlsonTZ/Data.pm.tpl
+@@ -42,6 +42,7 @@
+ { use 5.006; }
+ use warnings;
+ use strict;
++use File::Spec;
+ 
+ our $VERSION = "0.<?version_numeric?>";
+ 
+@@ -58,7 +59,6 @@
+ sub _data_file($) {
+ 	my($upath) = @_;
+ 	unless(defined $datadir) {
+-		require File::Spec;
+ 		($datavol, $datadir, undef) =
+ 			File::Spec->splitpath($INC{"Time/OlsonTZ/Data.pm"});
+ 	}
+@@ -278,7 +278,7 @@
+ 		Carp::croak("no such timezone `$tzname' ".
+ 			"in the Olson @{[olson_version]} database");
+ 	}
+-	return _data_file($tzname.".tz");
++	return File::Spec->catfile('/usr/share/zoneinfo', $tzname);
+ }
+ 
+ =back

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtime-olsontz-data-perl.git