Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv24226
Modified Files:
ChangeLog Validation.pm
Log Message:
scrollkeeper is a dummy on top of rarian-compat, so allow the actual dependency
Index: Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -d -r1.279 -r1.280
--- Validation.pm 29 Feb 2008 23:10:13 -0000 1.279
+++ Validation.pm 6 Mar 2008 05:57:57 -0000 1.280
@@ -1826,8 +1826,11 @@
foreach (qw/ preinst postinst prerm postrm /) {
next if $deb_control->{package} eq "scrollkeeper"; # circular
dep
next if $deb_control->{package} eq "rarian-compat"; # circular
dep (new-world scrollkeeper)
- if (grep { /^\s*scrollkeeper-update/ } @{$dpkg_script->{$_}}
and not exists $control_processed->{depends_pkgs}->{scrollkeeper}) {
- print "Error: Calling scrollkeeper-update in $_
requires \"Depends:scrollkeeper\"\n";
+ if (grep { /^\s*scrollkeeper-update/ } @{$dpkg_script->{$_}}
and not (
+ exists
$control_processed->{depends_pkgs}->{'rarian-compat'} or
+ exists
$control_processed->{depends_pkgs}->{'scrollkeeper'}
+ )) {
+ print "Error: Calling scrollkeeper-update in $_
requires \"Depends:rarian-compat\" or \"Depends:scrollkeeper\" \n";
$looks_good = 0;
}
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1528
retrieving revision 1.1529
diff -u -d -r1.1528 -r1.1529
--- ChangeLog 2 Mar 2008 18:55:50 -0000 1.1528
+++ ChangeLog 6 Mar 2008 05:57:57 -0000 1.1529
@@ -1,3 +1,7 @@
+2008-03-06 Daniel Macks <[EMAIL PROTECTED]>
+
+ * Validation.pm: rarian-compat is replacing scrollkeeper
+
2008-03-02 Daniel Macks <[EMAIL PROTECTED]>
* PkgVersion.pm: Don't create blank shlibs files in .deb
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
