Merge branch 'master' of github.com:webmin/webmin

This commit is contained in:
Jamie Cameron
2025-05-31 08:47:40 -07:00

View File

@@ -315,6 +315,14 @@ if (exists($minfo{'deb_replaces'})) {
}
}
# Build (standalone) list of breaks (not Webmin modules)
my @rbreaks = ( );
if (exists($minfo{'deb_breaks'})) {
foreach my $debbreak (split(/\s+/, $minfo{'deb_breaks'})) {
push(@rbreaks, $debbreak);
}
}
# Build (standalone) list of obsoletes (replaces+conflicts) (not Webmin modules)
if (exists($minfo{'deb_obsoletes'})) {
foreach my $debobsolete (split(/\s+/, $minfo{'deb_obsoletes'})) {
@@ -347,6 +355,7 @@ print $CONTROL "Recommends: $rrecom\n" if ($rrecom);
print $CONTROL "Suggests: ", join(", ", @rsuggests), "\n" if (@rsuggests);
print $CONTROL "Conflicts: ", join(", ", @rconflicts), "\n" if (@rconflicts);
print $CONTROL "Replaces: ", join(", ", @rreplaces), "\n" if (@rreplaces);
print $CONTROL "Breaks: ", join(", ", @rbreaks), "\n" if (@rbreaks);
print $CONTROL "Provides: ", join(", ", @rprovides), "\n" if (@rprovides);
print $CONTROL <<EOF;
Pre-Depends: bash, perl
@@ -526,7 +535,7 @@ if [ "$istheme" = "1" -a "\$1" != "upgrade" ]; then
fi
fi
# Run the pre-uninstall script, if we are not upgrading
if [ "$product" = "webmin" -a "\$1" = "0" -a -r "/usr/share/$product/$mod/uninstall.pl" ]; then
if [ "$product" = "webmin" -a "\$1" != "upgrade" -a -r "/usr/share/$product/$mod/uninstall.pl" ]; then
cd /usr/share/$product
WEBMIN_CONFIG=/etc/$product WEBMIN_VAR=/var/$product /usr/share/$product/run-uninstalls.pl $mod
fi