r14242 - in /branches/upstream/libpar-dist-perl/current: Changes META.yml lib/PAR/Dist.pm

[eloy at users.alioth.debian.org]

Author: eloy
Date: Thu Feb  7 09:09:03 2008
New Revision: 14242

URL: http://svn.debian.org/wsvn/?sc=1&rev=14242
Log:
[svn-upgrade] Integrating new upstream version, libpar-dist-perl (0.29)

Modified:
    branches/upstream/libpar-dist-perl/current/Changes
    branches/upstream/libpar-dist-perl/current/META.yml
    branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm

Modified: branches/upstream/libpar-dist-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-dist-perl/current/Changes?rev=14242&op=diff
==============================================================================
--- branches/upstream/libpar-dist-perl/current/Changes (original)
+++ branches/upstream/libpar-dist-perl/current/Changes Thu Feb  7 09:09:03 2008
@@ -1,3 +1,15 @@
+By: smueller on 2008/02/06
+    * Make file://foo.par URLs installable.
+    * This is 0.29.
+____________________________________________________________________________
+By: smueller on 2008/02/05
+    * Setting installation targets to undef with install_par
+      should remove them altogether now. This way, you can
+      make sure, some parts aren't installed. (Such as manpages
+      on win32)
+    * This is 0.28.
+    * Now hopefully back to bi-annual releases ;)
+____________________________________________________________________________
 By: smueller on 2008/02/04
     * No more signature. I keep breaking things with it.
     * This is 0.27.

Modified: branches/upstream/libpar-dist-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-dist-perl/current/META.yml?rev=14242&op=diff
==============================================================================
--- branches/upstream/libpar-dist-perl/current/META.yml (original)
+++ branches/upstream/libpar-dist-perl/current/META.yml Thu Feb  7 09:09:03 2008
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                PAR-Dist
-version:             0.27
+version:             0.29
 abstract:            Create and manipulate PAR distributions
 license:             ~
 author:              

Modified: branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm?rev=14242&op=diff
==============================================================================
--- branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm (original)
+++ branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm Thu Feb  7 09:09:03 2008
@@ -2,7 +2,7 @@
 require Exporter;
 use vars qw/$VERSION @ISA @EXPORT @EXPORT_OK/;
 
-$VERSION    = '0.27';
+$VERSION    = '0.29';
 @ISA	    = 'Exporter';
 @EXPORT	    = qw/
   blib_to_par
@@ -31,7 +31,7 @@
 
 =head1 VERSION
 
-This document describes version 0.26 of PAR::Dist, released Feb  3, 2008.
+This document describes version 0.28 of PAR::Dist, released Feb  5, 2008.
 
 =head1 SYNOPSIS
 
@@ -335,7 +335,10 @@
 The C<packlist_write> parameter is used to control where the F<.packlist>
 file is written to. (Necessary for uninstallation.)
 The C<packlist_read> parameter specifies a .packlist file to merge in if
-it exists.
+it exists. By setting any of the above installation targets to C<undef>,
+you can remove that target altogether. For example, passing
+C<inst_man1dir => undef, inst_man3dir => undef> means that the contained
+manual pages won't be installed. This is not available for the packlists.
 
 Finally, you may specify a C<custom_targets> parameter. Its value should be
 a reference to a hash of custom installation targets such as
@@ -488,7 +491,15 @@
     
     # insert user overrides
     foreach my $key (keys %$user) {
-        $target->{ $sources{$key} } = $user->{$key} if exists $sources{$key};
+        my $value = $user->{$key};
+        if (not defined $value and $key ne 'packlist_read' and $key ne 'packlist_write') {
+          # undef means "remove"
+          delete $target->{ $sources{$key} };
+        }
+        elsif (exists $sources{$key}) {
+          # overwrite stuff, don't let the user create new entries
+          $target->{ $sources{$key} } = $value;
+        }
     }
 
     return $target;
@@ -862,6 +873,11 @@
 my %escapes;
 sub _fetch {
     my %args = @_;
+
+    if ($args{dist} =~ s/^file:\/\///) {
+      return $args{dist} if -e $args{dist};
+      return;
+    }
     require LWP::Simple;
 
     $ENV{PAR_TEMP} ||= File::Spec->catdir(File::Spec->tmpdir, 'par');