-sub srcfn ($$) { return &source_file_leafname($package, @_); }
-sub is_orig_file_of_vsn ($$) { return &is_orig_file_of_p_v($package, @_); }
+sub srcfn ($$) {
+ my ($vsn, $sfx) = @_;
+ return &source_file_leafname($package, $vsn, $sfx);
+}
+sub is_orig_file_of_vsn ($$) {
+ my ($f, $upstreamvsn) = @_;
+ return is_orig_file_of_p_v($f, $package, $upstreamvsn);
+}