I have already a backport for squeeze attached. Will now check changes
from squeeze to unstable to check for an unblock request or then
uploading to t-p-u.

Bests
Salvatore
diff -Nru liblocal-lib-perl-1.006005/debian/changelog liblocal-lib-perl-1.006005/debian/changelog
--- liblocal-lib-perl-1.006005/debian/changelog	2010-07-14 18:03:02.000000000 +0200
+++ liblocal-lib-perl-1.006005/debian/changelog	2011-01-07 09:37:07.000000000 +0100
@@ -1,3 +1,12 @@
+liblocal-lib-perl (1.006005-1+squeeze1) testing-proposed-updates; urgency=low
+
+  * Update my email address.
+  * Patch Makefile.PL with fix-ftbfs-609192.patch to avoids CPAN client
+    configuration when not required which causes FTBFS if building user
+    home directory is not writeable (Closes: #609192).
+
+ -- Salvatore Bonaccorso <car...@debian.org>  Fri, 07 Jan 2011 09:36:54 +0100
+
 liblocal-lib-perl (1.006005-1) unstable; urgency=low
 
   * New upstream release
diff -Nru liblocal-lib-perl-1.006005/debian/control liblocal-lib-perl-1.006005/debian/control
--- liblocal-lib-perl-1.006005/debian/control	2010-07-14 18:03:02.000000000 +0200
+++ liblocal-lib-perl-1.006005/debian/control	2011-01-07 09:33:48.000000000 +0100
@@ -5,7 +5,7 @@
 Build-Depends-Indep: perl (>= 5.10), libcapture-tiny-perl
 Maintainer: Debian Perl Group <pkg-perl-maintain...@lists.alioth.debian.org>
 Uploaders: Jonathan Yu <jaw...@cpan.org>, gregor herrmann <gre...@debian.org>,
- Salvatore Bonaccorso <salvatore.bonacco...@gmail.com>
+ Salvatore Bonaccorso <car...@debian.org>
 Standards-Version: 3.9.0
 Homepage: http://search.cpan.org/dist/local-lib/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/liblocal-lib-perl/
diff -Nru liblocal-lib-perl-1.006005/debian/patches/fix-ftbfs-609192.patch liblocal-lib-perl-1.006005/debian/patches/fix-ftbfs-609192.patch
--- liblocal-lib-perl-1.006005/debian/patches/fix-ftbfs-609192.patch	1970-01-01 01:00:00.000000000 +0100
+++ liblocal-lib-perl-1.006005/debian/patches/fix-ftbfs-609192.patch	2011-01-07 09:39:15.000000000 +0100
@@ -0,0 +1,97 @@
+Description: Fix FTBFS when homedirectory of building user is not
+ writeable.
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/609192
+Forwarded: no
+Author: Salvatore Bonaccorso <car...@debian.org>
+Reviewed-by: Salvatore Bonaccorso <car...@debian.org>
+Last-Update: 2011-01-07
+
+--- liblocal-lib-perl-1.006005.orig/Makefile.PL
++++ liblocal-lib-perl-1.006005/Makefile.PL
+@@ -92,7 +92,8 @@ DEATH
+     my $cpan = $? >> 8;
+     my $cpan_command = '';
+ 
+-    system($^X, '-MCPAN', '-e',
++    my $did_cpan_config = 0;
++    my $cpan_config_command =
+       'my $done; require ExtUtils::MakeMaker;
+        my $orig = ExtUtils::MakeMaker->can("prompt");
+        *ExtUtils::MakeMaker::prompt = sub ($;$) {
+@@ -121,8 +122,7 @@ DEATH
+          delete @{$CPAN::Config}{keys %$CPAN::Config};
+          $CPAN::Config->{urllist} = $save;
+          CPAN::Config->init;
+-       }'
+-    );
++       }';
+ 
+     $ENV{PERL_MM_USE_DEFAULT} = 1;
+ 
+@@ -138,6 +138,8 @@ DEATH
+       $cpan_command .= 'force("install","CPAN"); ';
+     }
+     if(length $cpan_command) {
++      system($^X, '-MCPAN', '-e', $cpan_config_command);
++      $did_cpan_config++;
+       system($^X, '-MCPAN', '-e', $cpan_command);
+     }
+     if ($cpan) {
+@@ -147,6 +149,8 @@ DEATH
+       # if we call this code directly, the changes get written to
+       # $BOOTSTRAP/lib/perl5/CPAN/Config.pm, not where the user expects them to
+       # be in their ~/.cpan/CPAN/MyConfig.pm.
++      system($^X, '-MCPAN', '-e', $cpan_config_command)
++        unless $did_cpan_config;
+       system($^X, '-MCPAN',
+         '-e', 
+         q[CPAN::HandleConfig->load;],
+@@ -172,9 +176,7 @@ all_from 'lib/local/lib.pm';
+ 
+ requires 'ExtUtils::MakeMaker' => '6.31'; # version INSTALL_BASE was added
+ requires 'ExtUtils::Install' => '1.43'; # ditto
+-requires 'ExtUtils::CBuilder'; # this and ParseXS are needed for MB C_support
+-requires 'ExtUtils::ParseXS';
+-requires 'Module::Build' => '0.28'; # lib -> lib/perl5 change
++requires 'Module::Build' => '0.36'; # PERL_MB_OPT
+ my $required_CPAN = '1.82';
+ requires 'CPAN' => $required_CPAN; # sudo support + CPAN::HandleConfig
+ 
+@@ -200,25 +202,27 @@ delete $ENV{PERL5_CPAN_IS_RUNNING} if $n
+     # It will already be installed by the time we reach here if bootstrapping,
+     # otherwise, if we're running from CPAN then it will be installed soon
+     # enough, and we'll come back here..
+-    if (!$@) {
+-        CPAN::HandleConfig->load;
+-        for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
+-            if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
+-                die <<"DEATH";
++    if (!$@ ) {
++        CPAN::HandleConfig->require_myconfig_or_config;
++        if ( $CPAN::Config ) {
++            for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
++                if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
++                    die <<"DEATH";
+ WHOA THERE! It looks like you've got $CPAN::Config->{$eumm_setting} set. This is
+ known to cause problems with local::lib. Please either remove this setting or
+ clear out your .cpan directory.
+ DEATH
++                }
+             }
+-        }
+ 
+-        for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
+-            if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
+-                die <<"DEATH";
++            for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
++                if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
++                    die <<"DEATH";
+ WHOA THERE! It looks like you've got $CPAN::Config->{$mb_setting} set. This is
+ known to cause problems with local::lib. Please either remove this setting or
+ clear out your .cpan directory.
+ DEATH
++                }
+             }
+         }
+     }
diff -Nru liblocal-lib-perl-1.006005/debian/patches/series liblocal-lib-perl-1.006005/debian/patches/series
--- liblocal-lib-perl-1.006005/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ liblocal-lib-perl-1.006005/debian/patches/series	2011-01-07 09:36:46.000000000 +0100
@@ -0,0 +1 @@
+fix-ftbfs-609192.patch

Attachment: signature.asc
Description: Digital signature

Reply via email to