Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Post-release fixes (#1897)

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-05-26 18:23:29 +02:00
committed by GitHub
parent 55714bbcad 16f5670c83
commit 206ca6040e
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/dialogs/preferences.py
+3 -3
View File
@@ -546,7 +546,7 @@ class GuiPreferences(QDialog):
self.allowOpenDial = NSwitch(self) self.allowOpenDial = NSwitch(self)
self.allowOpenDial.setChecked(CONFIG.allowOpenDial) self.allowOpenDial.setChecked(CONFIG.allowOpenDial)
self.mainForm.addRow( 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.") self.tr("Highlight dialogue line with no closing quote.")
) )
@@ -583,8 +583,8 @@ class GuiPreferences(QDialog):
self.altDialogClose.setText(CONFIG.altDialogClose) self.altDialogClose.setText(CONFIG.altDialogClose)
self.mainForm.addRow( self.mainForm.addRow(
self.tr("Alternative dialog symbols"), [self.altDialogOpen, self.altDialogClose], self.tr("Alternative dialogue symbols"), [self.altDialogOpen, self.altDialogClose],
self.tr("Custom highlighting of dialog text.") self.tr("Custom highlighting of dialogue text.")
) )
self.highlightEmph = NSwitch(self) self.highlightEmph = NSwitch(self)
pkgutils.py
+7 -3
View File
@@ -632,8 +632,8 @@ def makeWindowsZip() -> None:
## ##
def makeDebianPackage( def makeDebianPackage(
signKey: str | None = None, sourceBuild: bool = False, signKey: str | None = None, sourceBuild: bool = False, distName: str = "unstable",
distName: str = "unstable", buildName: str = "", oldSetuptools: bool = False buildName: str = "", oldSetuptools: bool = False, forLaunchpad: bool = False
) -> str: ) -> str:
"""Build a Debian package.""" """Build a Debian package."""
print("") print("")
@@ -651,7 +651,10 @@ def makeDebianPackage(
pkgDate = email.utils.format_datetime(relDate.replace(hour=12, tzinfo=None)) pkgDate = email.utils.format_datetime(relDate.replace(hour=12, tzinfo=None))
print("") 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 pkgVers = f"{pkgVers}+{buildName}" if buildName else pkgVers
# Set Up Folder # Set Up Folder
@@ -862,6 +865,7 @@ def makeForLaunchpad(doSign: bool = False, isFirst: bool = False) -> None:
distName=codeName, distName=codeName,
buildName=buildName, buildName=buildName,
oldSetuptools=oldSetup, oldSetuptools=oldSetup,
forLaunchpad=True,
) )
dputCmd.append(dCmd) dputCmd.append(dCmd)