Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore non-freedesktopped desktop entry file #1639

Merged
merged 1 commit into from
Mar 13, 2023
Merged

Conversation

zenmonkeykstop
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop commented Mar 13, 2023

Description

Fixes #1638 .
This reverts commit 10225d7.

Both the new and old-style desktop files are required until a version of securedrop-workstation is available with Salt changes referencing the new file name.

Temporary reverts #1601

Test Plan

  • CI is passing
  • both files/securedrop-client.desktop and files/press.freedom.SecureDropClient.desktop are present in the repo.

This reverts commit 10225d7.

Both files are required until a version of securedrop-workstation
is available with Salt changes referencing the new file name.
@zenmonkeykstop zenmonkeykstop requested a review from a team as a code owner March 13, 2023 22:35
Copy link
Contributor

@gonzalo-bulnes gonzalo-bulnes left a comment

Choose a reason for hiding this comment

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

  • CI is passing
  • both files/securedrop-client.desktop and files/press.freedom.SecureDropClient.desktop are present in the repo.
  • both files have the same content

@gonzalo-bulnes
Copy link
Contributor

Merging into the release branch.

@gonzalo-bulnes gonzalo-bulnes merged commit a550297 into release/0.9.0 Mar 13, 2023
@gonzalo-bulnes gonzalo-bulnes deleted the fix-1638 branch March 13, 2023 22:58
@zenmonkeykstop zenmonkeykstop mentioned this pull request Mar 13, 2023
3 tasks
rocodes added a commit that referenced this pull request Mar 13, 2023
@rocodes rocodes mentioned this pull request Mar 14, 2023
16 tasks
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.

2 participants