r25156 - in /trunk/libfile-sharedir-perl/debian: changelog patches/fix-dist-path.patch

[dmn at users.alioth.debian.org]

Author: dmn
Date: Mon Sep 15 06:14:43 2008
New Revision: 25156

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=25156
Log:
fix spurious warning in fix-dist-path.patch in the case when the package uses the old schema

Modified:
    trunk/libfile-sharedir-perl/debian/changelog
    trunk/libfile-sharedir-perl/debian/patches/fix-dist-path.patch

Modified: trunk/libfile-sharedir-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-sharedir-perl/debian/changelog?rev=25156&op=diff
==============================================================================
--- trunk/libfile-sharedir-perl/debian/changelog (original)
+++ trunk/libfile-sharedir-perl/debian/changelog Mon Sep 15 06:14:43 2008
@@ -1,12 +1,10 @@
-libfile-sharedir-perl (0.05-1.2) UNRELEASED; urgency=high
-
-        TODO: investigate the warning during testsuite
+libfile-sharedir-perl (0.05-1.2) unstable; urgency=high
 
   * Non-maintainer upload.
   * add fix-dist-path.patch, fixing a regression in shared directory layout.
     Closes: #496122
 
- -- Damyan Ivanov <dmn at debian.org>  Mon, 15 Sep 2008 01:44:47 +0300
+ -- Damyan Ivanov <dmn at debian.org>  Mon, 15 Sep 2008 09:12:06 +0300
 
 libfile-sharedir-perl (0.05-1.1) unstable; urgency=low
 

Modified: trunk/libfile-sharedir-perl/debian/patches/fix-dist-path.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-sharedir-perl/debian/patches/fix-dist-path.patch?rev=25156&op=diff
==============================================================================
--- trunk/libfile-sharedir-perl/debian/patches/fix-dist-path.patch (original)
+++ trunk/libfile-sharedir-perl/debian/patches/fix-dist-path.patch Mon Sep 15 06:14:43 2008
@@ -102,7 +102,7 @@
  	my $short  = Class::Inspector->filename($module);
  	my $long   = Class::Inspector->loaded_filename($module);
  	$short =~ tr{/} {:} if $IS_MACOS;
-@@ -226,8 +300,40 @@ sub dist_file {
+@@ -226,8 +300,41 @@ sub dist_file {
  	my $dist = _DIST(shift);
  	my $file = _FILE(shift);
  
@@ -120,6 +120,7 @@
 +
 +	# If it exists, what should the path be
 +	my $dir  = _dist_dir_new( $dist );
++	return undef unless defined($dir);
 +	my $path = File::Spec->catfile( $dir, $file );
 +
 +	# Does the file exist
@@ -144,7 +145,7 @@
  		'auto', split( /-/, $dist ), $file,
  		);
  
-@@ -290,6 +396,12 @@ sub module_file {
+@@ -290,6 +397,12 @@ sub module_file {
  #####################################################################
  # Support Functions