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.

Sign up for GitHub

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

Jump to bottom

Post release fixes #1897

Merged
merged 2 commits into from
May 26, 2024
Merged

Post release fixes #1897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc1af7
Fix some typos in new section of Preferences
vkbo May 26, 2024
16f5670
Remove tilde from GitHub package name
vkbo May 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions novelwriter/dialogs/preferences.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ def buildForm(self) -> None:
self.allowOpenDial = NSwitch(self)
self.allowOpenDial.setChecked(CONFIG.allowOpenDial)
self.mainForm.addRow(
self.tr("Allow open-ended sialogue"), self.allowOpenDial,
self.tr("Allow open-ended dialogue"), self.allowOpenDial,
self.tr("Highlight dialogue line with no closing quote.")
)

Expand Down Expand Up @@ -583,8 +583,8 @@ def buildForm(self) -> None:
self.altDialogClose.setText(CONFIG.altDialogClose)

self.mainForm.addRow(
self.tr("Alternative dialog symbols"), [self.altDialogOpen, self.altDialogClose],
self.tr("Custom highlighting of dialog text.")
self.tr("Alternative dialogue symbols"), [self.altDialogOpen, self.altDialogClose],
self.tr("Custom highlighting of dialogue text.")
)

self.highlightEmph = NSwitch(self)
Expand Down
10 changes: 7 additions & 3 deletions pkgutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,8 +632,8 @@ def makeWindowsZip() -> None:
##

def makeDebianPackage(
signKey: str | None = None, sourceBuild: bool = False,
distName: str = "unstable", buildName: str = "", oldSetuptools: bool = False
signKey: str | None = None, sourceBuild: bool = False, distName: str = "unstable",
buildName: str = "", oldSetuptools: bool = False, forLaunchpad: bool = False
) -> str:
"""Build a Debian package."""
print("")
Expand All @@ -651,7 +651,10 @@ def makeDebianPackage(
pkgDate = email.utils.format_datetime(relDate.replace(hour=12, tzinfo=None))
print("")

pkgVers = numVers.replace("a", "~a").replace("b", "~b").replace("rc", "~rc")
if forLaunchpad:
pkgVers = numVers.replace("a", "~a").replace("b", "~b").replace("rc", "~rc")
else:
pkgVers = numVers
pkgVers = f"{pkgVers}+{buildName}" if buildName else pkgVers

# Set Up Folder
Expand Down Expand Up @@ -862,6 +865,7 @@ def makeForLaunchpad(doSign: bool = False, isFirst: bool = False) -> None:
distName=codeName,
buildName=buildName,
oldSetuptools=oldSetup,
forLaunchpad=True,
)
dputCmd.append(dCmd)

Expand Down