Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21187
Modified Files:
Tag: shlibs
ChangeLog PkgVersion.pm
Log Message:
Added RunTimeDepends to PkgVersion just need to make Shlibs.pm aware of it now
for dup checking.
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.128.2.47
retrieving revision 1.128.2.48
diff -u -d -r1.128.2.47 -r1.128.2.48
--- PkgVersion.pm 9 Feb 2005 03:02:02 -0000 1.128.2.47
+++ PkgVersion.pm 9 Feb 2005 03:12:12 -0000 1.128.2.48
@@ -1458,12 +1458,19 @@
# in pkglist()
sub get_binary_depends {
my $self = shift;
- my ($depspec);
+ my ($depspec1, $depspec2, $depspec);
# TODO: modify dependency list on the fly to account for minor
# library versions
- $depspec = $self->pkglist_default("Depends", "");
+ $depspec1 = $self->pkglist_default("RunTimeDepends", "");
+ $depspec2 = $self->pkglist_default("Depends", "");
+
+ if ($depspec1 && $depspec2) {
+ $depspec = $depspec1.", ".$depspec2;
+ } else {
+ $depspec = $depspec1.$depspec2
+ }
return &collapse_space($depspec);
}
@@ -2367,7 +2374,6 @@
## Might need follow_skip but then need to change fullname
find({ wanted => $wanted, follow_fast => 1, no_chdir => 1 },
"$destdir"."$basepath");
- ### get_binary_depends above.
my @shlib_deps = Fink::Shlibs->get_shlibs($pkgname, @filelist);
### foreach loop and push into @$struct
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.305.2.45
retrieving revision 1.305.2.46
diff -u -d -r1.305.2.45 -r1.305.2.46
--- ChangeLog 9 Feb 2005 02:04:27 -0000 1.305.2.45
+++ ChangeLog 9 Feb 2005 03:12:12 -0000 1.305.2.46
@@ -3,7 +3,8 @@
* Shlibs.pm: Removed ref to {SHLIB_DEPS} and added comment for upcoming
RunTimeDepends
* PkgVersion.pm: Removed refs to {SHLIB_DEPS}, added check for
- AddShlibDeps to run auto adding of depends for deb file creation
+ AddShlibDeps to run auto adding of depends for deb file creation. Added
+ RunTimeDepends to PkgVersion.pm.
2005-02-08 Daniel Macks <[EMAIL PROTECTED]>
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
