Skip to content

Fixed conflict with KDE's elisa#158

Merged
chipp merged 1 commit into
mainfrom
fix-elisa-deb-conflict
May 26, 2026
Merged

Fixed conflict with KDE's elisa#158
chipp merged 1 commit into
mainfrom
fix-elisa-deb-conflict

Conversation

@chipp
Copy link
Copy Markdown
Owner

@chipp chipp commented May 26, 2026

No description provided.

@chipp chipp marked this pull request as ready for review May 26, 2026 14:35
Copy link
Copy Markdown
Owner Author

chipp commented May 26, 2026

This stack of pull requests is managed by Graphite. Learn more about stacking.

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates the Debian packaging script to prefix package names with lisa-. However, the current implementation only declares Conflicts and Replaces for the elisa service. The reviewer correctly pointed out that all renamed services (elisa, elisheba, and isabel) will encounter file conflicts during upgrades, and suggested unconditionally declaring these fields for all services to ensure a smooth upgrade path.

Comment thread scripts/package_deb.sh
Comment on lines +57 to +62
if [ "$service" = "elisa" ]; then
cat >> "$package_root/DEBIAN/control" <<EOF
Conflicts: elisa
Replaces: elisa
EOF
fi
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Since all services (elisa, elisheba, and isabel) are being renamed to have the lisa- prefix (e.g., lisa-elisheba, lisa-isabel), they will all encounter file conflicts during upgrades if the old packages are already installed (since they install files to the same paths like /usr/bin/$service).

To ensure a smooth upgrade path and prevent dpkg file conflict errors for all services, we should unconditionally declare Conflicts and Replaces against the old $service name, rather than limiting this only to elisa.

Suggested change
if [ "$service" = "elisa" ]; then
cat >> "$package_root/DEBIAN/control" <<EOF
Conflicts: elisa
Replaces: elisa
EOF
fi
cat >> "$package_root/DEBIAN/control" <<EOF
Conflicts: $service
Replaces: $service
EOF

@chipp chipp merged commit fdc9c8c into main May 26, 2026
14 checks passed
Copy link
Copy Markdown
Owner Author

chipp commented May 26, 2026

Merge activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant