Commit 728b397b authored by Stephane Mankowski's avatar Stephane Mankowski

Release Skrooge 2.22.1

parent 9511b74f
...@@ -196,9 +196,15 @@ SKGBudgetPluginWidget::SKGBudgetPluginWidget(QWidget* iParent, SKGDocument* iDoc ...@@ -196,9 +196,15 @@ SKGBudgetPluginWidget::SKGBudgetPluginWidget(QWidget* iParent, SKGDocument* iDoc
connect(ui.kUpBtn, &QToolButton::clicked, this, &SKGBudgetPluginWidget::onUp); connect(ui.kUpBtn, &QToolButton::clicked, this, &SKGBudgetPluginWidget::onUp);
connect(ui.kDownBtn, &QToolButton::clicked, this, &SKGBudgetPluginWidget::onDown); connect(ui.kDownBtn, &QToolButton::clicked, this, &SKGBudgetPluginWidget::onDown);
connect(ui.kBottomBtn, &QToolButton::clicked, this, &SKGBudgetPluginWidget::onBottom); connect(ui.kBottomBtn, &QToolButton::clicked, this, &SKGBudgetPluginWidget::onBottom);
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
connect(ui.kYearAuto, static_cast<void (QSpinBox::*)(const QString&)>(&QSpinBox::valueChanged), this, [ = ](const QString & text) {
ui.kRemovePrevious->setText(i18nc("Option", "Remove existing budgets for %1", text));
});
#else
connect(ui.kYearAuto, &QSpinBox::textChanged, this, [ = ](const QString & text) { connect(ui.kYearAuto, &QSpinBox::textChanged, this, [ = ](const QString & text) {
ui.kRemovePrevious->setText(i18nc("Option", "Remove existing budgets for %1", text)); ui.kRemovePrevious->setText(i18nc("Option", "Remove existing budgets for %1", text));
}); });
#endif
ui.kYearAuto->setValue(QDate::currentDate().year()); ui.kYearAuto->setValue(QDate::currentDate().year());
ui.kWidgetSelector->setSelectedMode(0); ui.kWidgetSelector->setSelectedMode(0);
......
...@@ -209,12 +209,11 @@ class Releasor(object): ...@@ -209,12 +209,11 @@ class Releasor(object):
f = open(os.path.join(self.workdingDir, 'skrooge-'+args.version+'/debian/control'), 'r') f = open(os.path.join(self.workdingDir, 'skrooge-'+args.version+'/debian/control'), 'r')
cf = f.read() cf = f.read()
f.close() f.close()
if self.ubuntuVersions[i] == 'eoan': print('# make changes for '+self.ubuntuVersions[i])
print('# make changes for '+self.ubuntuVersions[i]) f = open(os.path.join(self.workdingDir, 'skrooge-'+args.version+'/debian/control'), 'w')
f = open(os.path.join(self.workdingDir, 'skrooge-'+args.version+'/debian/control'), 'w') f.write(cf.replace('libqjson-dev, \n', '').replace('libqjson0, ', ''))
f.write(cf.replace('libqjson-dev, \n', '').replace('libqjson0, ', '')) f.close()
f.close()
with open(os.path.join(self.workdingDir, 'skrooge-'+args.version+'/debian/changelog'), 'w') as fileDebianChangelog: with open(os.path.join(self.workdingDir, 'skrooge-'+args.version+'/debian/changelog'), 'w') as fileDebianChangelog:
fileDebianChangelog.write('skrooge ('+args.version+'-0ubuntu1~'+ppa+str(i+1)+') '+self.ubuntuVersions[i]+'; urgency=medium\n') fileDebianChangelog.write('skrooge ('+args.version+'-0ubuntu1~'+ppa+str(i+1)+') '+self.ubuntuVersions[i]+'; urgency=medium\n')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment