[SCM] Debian packaging of libsoftware-license-perl branch, master, updated. 89531df455f5ddcd25a7d92e6aed7ce5fd0270b7

[Dominique Dumont]

The following commit has been merged in the master branch:
commit 89531df455f5ddcd25a7d92e6aed7ce5fd0270b7
Author: Dominique Dumont <dod at debian.org>
Date:   Tue Oct 4 13:25:46 2011 +0200

    use safer require

diff --git a/debian/patches/create-license-from-short-name b/debian/patches/create-license-from-short-name
index 47e6540..8814333 100644
--- a/debian/patches/create-license-from-short-name
+++ b/debian/patches/create-license-from-short-name
@@ -1,6 +1,6 @@
 --- a/lib/Software/License.pm
 +++ b/lib/Software/License.pm
-@@ -11,13 +11,35 @@
+@@ -11,13 +11,37 @@
  use Sub::Install ();
  use Text::Template ();
  
@@ -27,8 +27,10 @@
 +    Carp::croak "no license short name specified" unless $arg->{short_name};
 +    my $lic = $short_name{delete $arg->{short_name}} ;
 +    Carp::croak "Unknow license short name specified" unless $lic;
-+    my $lic_class = __PACKAGE__.'::'.$lic ;
-+    eval "require $lic_class;";
++
++    my $lic_file = my $lic_class = __PACKAGE__.'::'.$lic ;
++    $lic_file =~ s!::!/!g ;
++    require "$lic_file.pm";
 +    return $lic_class->new ($arg) ;
 +  }
 +  else {

-- 
Debian packaging of libsoftware-license-perl