r54096 - in /trunk/liblocal-lib-perl: Changes MANIFEST META.yml Makefile.PL debian/changelog debian/clean debian/control debian/copyright debian/liblocal-lib-perl.examples debian/rules eg/ lib/local/lib.pm t/coderefs_in_inc.t t/de-dup.t

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Thu Mar 11 15:01:33 UTC 2010


Author: jawnsy-guest
Date: Thu Mar 11 15:01:25 2010
New Revision: 54096

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=54096
Log:
* New upstream release
* Standards-Version 3.8.4 (no changes)
* Use clean file instead of overriding dh_clean
* Use new DEP5 copyright format

Added:
    trunk/liblocal-lib-perl/debian/clean
    trunk/liblocal-lib-perl/t/coderefs_in_inc.t
      - copied unchanged from r54093, branches/upstream/liblocal-lib-perl/current/t/coderefs_in_inc.t
    trunk/liblocal-lib-perl/t/de-dup.t
      - copied unchanged from r54093, branches/upstream/liblocal-lib-perl/current/t/de-dup.t
Removed:
    trunk/liblocal-lib-perl/debian/liblocal-lib-perl.examples
    trunk/liblocal-lib-perl/eg/
Modified:
    trunk/liblocal-lib-perl/Changes
    trunk/liblocal-lib-perl/MANIFEST
    trunk/liblocal-lib-perl/META.yml
    trunk/liblocal-lib-perl/Makefile.PL
    trunk/liblocal-lib-perl/debian/changelog
    trunk/liblocal-lib-perl/debian/control
    trunk/liblocal-lib-perl/debian/copyright
    trunk/liblocal-lib-perl/debian/rules
    trunk/liblocal-lib-perl/lib/local/lib.pm

Modified: trunk/liblocal-lib-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/Changes?rev=54096&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/Changes (original)
+++ trunk/liblocal-lib-perl/Changes Thu Mar 11 15:01:25 2010
@@ -1,4 +1,21 @@
 Revision history for local::lib
+
+1.005001 2010-03-10
+
+        - I am an idiot.
+
+1.005000 2010-03-10
+
+        - More robust handling of running new toolchains on older perls. This
+          should sort out issues users have with bootstrapping on e.g. Solaris
+          and other traditional Unices. In addition, try to find a GNU tar
+          capable of dealing with @LongLink so bootstrapping doesn't fail.
+
+        - Warnings for missing PATH/PERL5LIB (as when not running interactively)
+          silenced by a patch from Marco Emilio Poleggi.
+
+        - Start of better docs for C<--self-contained> thanks to
+          markstos at cpan.org.
 
 1.004009 2009-11-07
 

Modified: trunk/liblocal-lib-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/MANIFEST?rev=54096&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/MANIFEST (original)
+++ trunk/liblocal-lib-perl/MANIFEST Thu Mar 11 15:01:25 2010
@@ -15,10 +15,11 @@
 MANIFEST			This list of files
 META.yml
 t/classmethod.t
+t/coderefs_in_inc.t
+t/de-dup.t
 t/dist/EUMM/lib/EUMM.pm
 t/dist/EUMM/Makefile.PL
 t/dist/MB/Build.PL
 t/dist/MB/lib/MB.pm
 t/install.t
 t/pipeline.t
-eg/scripted_install.pl

Modified: trunk/liblocal-lib-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/META.yml?rev=54096&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/META.yml (original)
+++ trunk/liblocal-lib-perl/META.yml Thu Mar 11 15:01:25 2010
@@ -19,7 +19,7 @@
     - t
     - xt
 requires:
-  CPAN: 1.80
+  CPAN: 1.82
   ExtUtils::CBuilder: 0
   ExtUtils::Install: 1.43
   ExtUtils::MakeMaker: 6.31
@@ -28,4 +28,4 @@
   perl: 5.8.1
 resources:
   license: http://dev.perl.org/licenses/
-version: 1.004009
+version: 1.005001

Modified: trunk/liblocal-lib-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/Makefile.PL?rev=54096&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/Makefile.PL (original)
+++ trunk/liblocal-lib-perl/Makefile.PL Thu Mar 11 15:01:25 2010
@@ -4,6 +4,37 @@
 use Cwd;
 use vars qw($bootstrapping $bootstrapping_args $no_manpages);
 use Config;
+
+# Solaris (and possibly other Unices) have a tar in /usr/bin that, among
+# other things, does not understand @LongLink. This can cause 
+# extraction to look like it succeeded, but it actually failed (because
+# the error message for the @LongLink failure scrolled offscreen).
+# Therefore, given the fact that GNU tar is the most widespread tar available,
+# and it actually supports the feature we want (I'd bet it originated in GNU
+# tar, but I digress), we'll look for GNU tar. If we don't find it, and the
+# user hasn't pointed us to a suitable tar, we'll bomb and tell them what to
+# do.
+
+my $have_gtar = 0;
+if($^O eq 'solaris') {
+  $have_gtar = 0;
+  for my $env_path (split /:/, $ENV{PATH}) {
+    $have_gtar = 1 if -x File::Spec->catfile($env_path, 'gtar');
+  }
+} else {
+  $have_gtar = 1;
+}
+if(exists $ENV{PERL_LL_TAR}) {
+  $have_gtar ||= -x $ENV{PERL_LL_TAR};
+}
+
+die <<'DEATH' unless $have_gtar;
+You are using Solaris (or another traditional Unix) that does not provide a sane
+tar, capable of dealing with the output of GNU tar. Please either set the
+PERL_LL_TAR environment variable to the location of a version of tar that
+understands the @LongLink convention or put a binary named gtar somewhere on
+your PATH.
+DEATH
 
 my $cwd;
 BEGIN {
@@ -47,13 +78,17 @@
     push(@ARGV,$ENV{PERL_MM_OPT});
     push(@ARGV, @libs);
 
+    # <mst> GODDAMN makepl_arg INSTALLDIRS=site
+    # <mst> we must set PERL_AUTOINSTALL_PREFER_CPAN too
+    $ENV{PERL_AUTOINSTALL_PREFER_CPAN} = 1;
+
     system($^X, '-MExtUtils::MakeMaker 6.31', '-e1');
     my $eumm = $? >> 8;
 
     system($^X, '-MExtUtils::Install 1.43', '-e1');
     my $eui = $? >> 8;
 
-    system($^X, '-MCPAN 1.80', '-e1');
+    system($^X, '-MCPAN 1.82', '-e1');
     my $cpan = $? >> 8;
     my $cpan_command = '';
 
@@ -67,6 +102,19 @@
          }
          return $orig->(@_);
        };
+       # not yet -- apeiron, 2010-03-10 
+       #$CPAN::Config->{urllist} = ["http://cpan.shadowcatprojects.net"];
+       # <mst> all bootstrapped fine on one DH account
+       # <mst> on another, it tries to install man stuff into /usr/local
+       # <mst> cannot for the life of me figure out why
+       # <mst> (same fucking server as well)
+       # <mst> GOT THE BASTARD
+       # <mst> ExtUtils::ParseXS uses Module::Build
+       # <mst> but Module::Build depends on it
+       # <mst> so you need to set prefer_installer MM
+       # <mst> so cpan uses EU::ParseXS Makefile.PL
+       # <mst> since we already got EUMM, *that* works
+       $CPAN::Config->{prefer_installer} = "EUMM";
        CPAN::Config->load;
        unless ($done || -w $CPAN::Config->{keep_source_where}) {
          my $save = $CPAN::Config->{urllist};
@@ -127,7 +175,7 @@
 requires 'ExtUtils::CBuilder'; # this and ParseXS are needed for MB C_support
 requires 'ExtUtils::ParseXS';
 requires 'Module::Build' => '0.28'; # lib -> lib/perl5 change
-my $required_CPAN = '1.80';
+my $required_CPAN = '1.82';
 requires 'CPAN' => $required_CPAN; # sudo support + CPAN::HandleConfig
 
 # No, really. See

Modified: trunk/liblocal-lib-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/debian/changelog?rev=54096&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/debian/changelog (original)
+++ trunk/liblocal-lib-perl/debian/changelog Thu Mar 11 15:01:25 2010
@@ -1,3 +1,12 @@
+liblocal-lib-perl (1.005001-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Standards-Version 3.8.4 (no changes)
+  * Use clean file instead of overriding dh_clean
+  * Use new DEP5 copyright format
+
+ -- Jonathan Yu <jawnsy at cpan.org>  Thu, 11 Mar 2010 10:27:34 -0500
+
 liblocal-lib-perl (1.004009-1) unstable; urgency=low
 
   [ Jonathan Yu ]

Added: trunk/liblocal-lib-perl/debian/clean
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/debian/clean?rev=54096&op=file
==============================================================================
--- trunk/liblocal-lib-perl/debian/clean (added)
+++ trunk/liblocal-lib-perl/debian/clean Thu Mar 11 15:01:25 2010
@@ -1,0 +1,8 @@
+/t/var/splat
+t/dist/MB/Build
+t/dist/MB/_build
+t/dist/MB/blib
+t/dist/EUMM/Makefile
+t/dist/EUMM/pm_to_blib
+t/dist/EUMM/blib
+

Modified: trunk/liblocal-lib-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/debian/control?rev=54096&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/debian/control (original)
+++ trunk/liblocal-lib-perl/debian/control Thu Mar 11 15:01:25 2010
@@ -5,7 +5,7 @@
 Build-Depends-Indep: perl, libcapture-tiny-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jonathan Yu <jawnsy at cpan.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://search.cpan.org/dist/local-lib/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/liblocal-lib-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/liblocal-lib-perl/

Modified: trunk/liblocal-lib-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/debian/copyright?rev=54096&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/debian/copyright (original)
+++ trunk/liblocal-lib-perl/debian/copyright Thu Mar 11 15:01:25 2010
@@ -1,8 +1,7 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Matt S Trout <mst at shadowcat.co.uk>
-Upstream-Source: http://search.cpan.org/dist/local-lib/
-Upstream-Name: local-lib
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
+Maintainer: Matt S Trout <mst at shadowcat.co.uk>
+Source: http://search.cpan.org/dist/local-lib/
+Name: local-lib
 
 Files: *
 Copyright: 2007-2009, Matt S Trout <mst at shadowcat.co.uk>
@@ -11,30 +10,31 @@
  2007-2009, Torsten Raudssus <torsten at raudssus.de>
  2007-2009, Hans Dieter Pearcey <hdp at cpan.org>
  2007-2009, Curtis Jewell <csjewell at cpan.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: inc/Module/*
-Copyright: 2002-2009, Adam Kennedy <adamk at cpan.org>
- 2002-2009, Audrey Tang <autrijus at autrijus.org>
- 2002-2009, Brian Ingerson <ingy at cpan.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2002-2010, Adam Kennedy <adamk at cpan.org>
+ 2002-2010, Audrey Tang <autrijus at autrijus.org>
+ 2002-2010, Brian Ingerson <ingy at cpan.org>
+License: Artistic or GPL-1+
 
 Files: debian/*
-Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
-License: Artistic | GPL-1+
+Copyright: 2009-2010, Jonathan Yu <jawnsy at cpan.org>
+License: Artistic or GPL-1+
 
 License: Artistic
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Artistic License, which comes with Perl.
-    On Debian GNU/Linux systems, the complete text of the Artistic License
-    can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
 
 License: GPL-1+
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 1, or (at your option)
-    any later version.
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
+

Modified: trunk/liblocal-lib-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/debian/rules?rev=54096&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/debian/rules (original)
+++ trunk/liblocal-lib-perl/debian/rules Thu Mar 11 15:01:25 2010
@@ -3,13 +3,13 @@
 %:
 	dh $@
 
-override_dh_clean:
-	dh_clean
-	rm -rfv \
-		$(CURDIR)/t/var/splat \
-		$(CURDIR)/t/dist/MB/Build \
-		$(CURDIR)/t/dist/MB/_build \
-		$(CURDIR)/t/dist/MB/blib \
-		$(CURDIR)/t/dist/EUMM/Makefile \
-		$(CURDIR)/t/dist/EUMM/pm_to_blib \
-		$(CURDIR)/t/dist/EUMM/blib
+#override_dh_clean:
+#	dh_clean
+#	rm -rfv \
+#		$(CURDIR)/t/var/splat \
+#		$(CURDIR)/t/dist/MB/Build \
+#		$(CURDIR)/t/dist/MB/_build \
+#		$(CURDIR)/t/dist/MB/blib \
+#		$(CURDIR)/t/dist/EUMM/Makefile \
+#		$(CURDIR)/t/dist/EUMM/pm_to_blib \
+#		$(CURDIR)/t/dist/EUMM/blib

Modified: trunk/liblocal-lib-perl/lib/local/lib.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/lib/local/lib.pm?rev=54096&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/lib/local/lib.pm (original)
+++ trunk/liblocal-lib-perl/lib/local/lib.pm Thu Mar 11 15:01:25 2010
@@ -11,7 +11,7 @@
 use Carp ();
 use Config;
 
-our $VERSION = '1.004009'; # 1.4.9
+our $VERSION = '1.005001'; # 1.5.1
 my @KNOWN_FLAGS = (qw/--self-contained/);
 
 sub import {
@@ -55,11 +55,11 @@
     # over privlibexp and archlibexp
 
     @INC = _uniq(
+      $class->install_base_perl_path($arg_store{path}),
       $class->install_base_arch_path($arg_store{path}),
-      $class->install_base_perl_path($arg_store{path}),
       split( $Config{path_sep}, $perl5lib ),
-      $Config::Config{archlibexp},
       $Config::Config{privlibexp},
+      $Config::Config{archlibexp}
     );
 
     # We explicitly set PERL5LIB here to the above de-duped list to prevent
@@ -350,7 +350,7 @@
     PERL5LIB => join($Config{path_sep},
                   $class->install_base_perl_path($path),
                   $class->install_base_arch_path($path),
-                  ($ENV{PERL5LIB} ?
+                  (($ENV{PERL5LIB}||()) ?
                     ($interpolate == INTERPOLATE_ENV
                       ? ($ENV{PERL5LIB})
                       : (($^O ne 'MSWin32') ? '$PERL5LIB' : '%PERL5LIB%' ))
@@ -359,7 +359,7 @@
     PATH => join($Config{path_sep},
               $class->install_base_bin_path($path),
               ($interpolate == INTERPOLATE_ENV
-                ? $ENV{PATH}
+                ? ($ENV{PATH}||())
                 : (($^O ne 'MSWin32') ? '$PATH' : '%PATH%' ))
              ),
   )
@@ -397,7 +397,7 @@
 
 From the shell -
 
-  # Install LWP and it's missing dependencies to the 'my_lwp' directory
+  # Install LWP and its missing dependencies to the 'my_lwp' directory
   perl -MCPAN -Mlocal::lib=my_lwp -e 'CPAN::install(LWP)'
 
   # Install LWP and *all non-core* dependencies to the 'my_lwp' directory 
@@ -453,27 +453,9 @@
   echo 'eval $(perl -I$HOME/foo/lib/perl5 -Mlocal::lib=$HOME/foo)' >>~/.bashrc
 
 After writing your shell configuration file, be sure to re-read it to get the
-changed settings into your current shell's environment.
-
-  . ~/.bashrc
-
-If you are using C shell, you can do this as follows:
-
-  /bin/csh
-  echo $SHELL
-  /bin/csh
-  perl -I$HOME/perl5/lib/perl5 -Mlocal::lib >> ~/.cshrc
-
-  source ~/.cshrc
-
-You can also pass --bootstrap=~/foo to get a different location -
-
-  perl Makefile.PL --bootstrap=~/foo
-  make test && make install
-
-  echo 'eval $(perl -I$HOME/foo/lib/perl5 -Mlocal::lib=$HOME/foo)' >> ~/.bashrc
-
-  . ~/.bashrc
+changed settings into your current shell's environment. Bourne shells use C<.
+~/.bashrc> for this, whereas C shells use C<source ~/.cshrc>. Replace .bashrc or
+.cshrc with the name of the file you wrote above with the echo command.
 
 If you're on a slower machine, or are operating under draconian disk space
 limitations, you can disable the automatic generation of manpages from POD when
@@ -481,7 +463,7 @@
 
   perl Makefile.PL --bootstrap --no-manpages
 
-If you want to install multiple Perl module environments, say for application evelopment, 
+If you want to install multiple Perl module environments, say for application development, 
 install local::lib globally and then:
 
   cd ~/mydir1
@@ -585,6 +567,26 @@
 
 These values are then available for reference by any code after import.
 
+=head1 CREATING A SELF-CONTAINED SET OF MODULES
+
+You can use local::lib to prepare a directory which contains a module and all
+of its non-core dependencies.  The C<--self-contained> option ignores any
+globally installed modules when resolving dependencies, only considering
+modules installed in a "local::lib" directory or provided by core Perl.
+
+A use-case for this feature would be to prepare to deploy a whole "stack" of
+module dependencies on a new machine, even if you have copies of the same
+dependencies installed globally already.
+
+The C<--self-contained> option should be used like this: 
+
+  # Install LWP and *all non-core* dependencies to the 'my_lwp' directory 
+  perl -MCPAN -Mlocal::lib=--self-contained,my_lwp -e 'CPAN::install(LWP)'
+
+Note that some dependencies may involve C-based "XS" code even if your target
+module doesn't. The issue of dealing with XS vs Pure Perl code is beyond the scope
+of what local::lib provides. 
+
 =head1 METHODS
 
 =head2 ensure_directory_structure_for
@@ -785,10 +787,6 @@
 
 =head1 CONTRIBUTORS
 
-Chris Nehren <apeiron at cpan.org> now oversees maintenance of local::lib, in
-addition to providing doc patches and bootstrap fixes to prevent users from
-shooting themselves in the foot (it's more likely than you think).
-
 Patches to correctly output commands for csh style shells, as well as some
 documentation additions, contributed by Christopher Nehren <apeiron at cpan.org>.
 
@@ -811,11 +809,8 @@
 
 Patch to add Win32 support contributed by Curtis Jewell <csjewell at cpan.org>.
 
-kgish/#perl-help at irc.perl.org suggested revamping the section on sourcing the
-shell file to make it clearer to those quickly reading the POD.
-
-t0m and chrisa on #local-lib at irc.perl.org pointed out a PERL5LIB ordering issue
-with C<--self-contained>.
+Warnings for missing PATH/PERL5LIB (as when not running interactively) silenced
+by a patch from Marco Emilio Poleggi.
 
 =head1 COPYRIGHT
 




More information about the Pkg-perl-cvs-commits mailing list