diff -Nru skrooge-2.22.0/CMakeLists.txt skrooge-2.22.1/CMakeLists.txt --- skrooge-2.22.0/CMakeLists.txt 2020-04-09 14:30:33.000000000 +0000 +++ skrooge-2.22.1/CMakeLists.txt 2020-04-09 15:45:00.000000000 +0000 @@ -104,7 +104,7 @@ SET(GRANTLEE_VERSION ${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}.${Grantlee5_VERSION_PATCH}) MESSAGE( STATUS " GRANTLEE VERSION : " ${GRANTLEE_VERSION}) -SET(SKG_VERSION "2.22.0") +SET(SKG_VERSION "2.22.1") SET(SKG_BETA "") SET(SOVERSION 2) diff -Nru skrooge-2.22.0/debian/changelog skrooge-2.22.1/debian/changelog --- skrooge-2.22.0/debian/changelog 2020-04-09 14:31:55.000000000 +0000 +++ skrooge-2.22.1/debian/changelog 2020-04-09 15:46:15.000000000 +0000 @@ -1,4 +1,4 @@ -skrooge (2.22.0-0ubuntu1~beta2) disco; urgency=medium +skrooge (2.22.1-0ubuntu1~beta2) disco; urgency=medium *Correction bug 417163: Date 31/12 => 02/12 *Correction bug 418686: no sounds from Skrooge flatpak app *Correction bug 419006: kdeapps "nightly" flatpak isn't using latest KDE/Qt runtime version 5.14 @@ -12,7 +12,7 @@ *Correction: Fix "coinmarketcap" source (need an API key) *Correction: Remove warning due to QML dashboard *Feature: Add new source "cryptocompare" (need an API key) - -- Stephane MANKOWSKI (Perso) Thu, 09 Apr 2020 16:31:42 +0100 + -- Stephane MANKOWSKI (Perso) Thu, 09 Apr 2020 17:46:00 +0100 skrooge (2.21.0) Binary files /tmp/tmpSVX6IU/30wSRpugeN/skrooge-2.22.0/images/splash.png and /tmp/tmpSVX6IU/pMkXlQJIp9/skrooge-2.22.1/images/splash.png differ diff -Nru skrooge-2.22.0/plugins/skrooge/skrooge_budget/skgbudgetpluginwidget.cpp skrooge-2.22.1/plugins/skrooge/skrooge_budget/skgbudgetpluginwidget.cpp --- skrooge-2.22.0/plugins/skrooge/skrooge_budget/skgbudgetpluginwidget.cpp 2020-04-09 14:27:49.000000000 +0000 +++ skrooge-2.22.1/plugins/skrooge/skrooge_budget/skgbudgetpluginwidget.cpp 2020-04-09 15:42:25.000000000 +0000 @@ -196,9 +196,15 @@ connect(ui.kUpBtn, &QToolButton::clicked, this, &SKGBudgetPluginWidget::onUp); connect(ui.kDownBtn, &QToolButton::clicked, this, &SKGBudgetPluginWidget::onDown); connect(ui.kBottomBtn, &QToolButton::clicked, this, &SKGBudgetPluginWidget::onBottom); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + connect(ui.kYearAuto, static_cast(&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) { ui.kRemovePrevious->setText(i18nc("Option", "Remove existing budgets for %1", text)); }); +#endif ui.kYearAuto->setValue(QDate::currentDate().year()); ui.kWidgetSelector->setSelectedMode(0); diff -Nru skrooge-2.22.0/scripts/skrooge-release.py skrooge-2.22.1/scripts/skrooge-release.py --- skrooge-2.22.0/scripts/skrooge-release.py 2020-04-09 14:27:49.000000000 +0000 +++ skrooge-2.22.1/scripts/skrooge-release.py 2020-04-09 15:42:25.000000000 +0000 @@ -209,12 +209,11 @@ f = open(os.path.join(self.workdingDir, 'skrooge-'+args.version+'/debian/control'), 'r') cf = f.read() f.close() - - if self.ubuntuVersions[i] == 'eoan': - print('# make changes for '+self.ubuntuVersions[i]) - f = open(os.path.join(self.workdingDir, 'skrooge-'+args.version+'/debian/control'), 'w') - f.write(cf.replace('libqjson-dev, \n', '').replace('libqjson0, ', '')) - f.close() + + print('# make changes for '+self.ubuntuVersions[i]) + f = open(os.path.join(self.workdingDir, 'skrooge-'+args.version+'/debian/control'), 'w') + f.write(cf.replace('libqjson-dev, \n', '').replace('libqjson0, ', '')) + f.close() 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') diff -Nru skrooge-2.22.0/tests/scripts/init.sh skrooge-2.22.1/tests/scripts/init.sh --- skrooge-2.22.0/tests/scripts/init.sh 2020-04-09 14:30:38.000000000 +0000 +++ skrooge-2.22.1/tests/scripts/init.sh 2020-04-09 15:45:06.000000000 +0000 @@ -55,7 +55,7 @@ #initialisation unset LANG -export TESTDIR="/data/skrooge-release_2.22.0/skrooge-2.22.0/tests" +export TESTDIR="/data/skrooge-release_2.22.1/skrooge-2.22.1/tests" export IN="${TESTDIR}/input/" export OUT="${TESTDIR}/output/" export REF="${TESTDIR}/ref/" @@ -69,8 +69,8 @@ rm -Rf "${KDEHOME}" > /dev/null 2>&1 mkdir -p "${OUT}/${EXE}" > /dev/null 2>&1 -EXEPATH="/data/skrooge-release_2.22.0/skrooge-2.22.0/build/bin" -LIBPATH="/data/skrooge-release_2.22.0/skrooge-2.22.0/build/lib" +EXEPATH="/data/skrooge-release_2.22.1/skrooge-2.22.1/build/bin" +LIBPATH="/data/skrooge-release_2.22.1/skrooge-2.22.1/build/lib" if [ "$TERM" = "cygwin" ] ; then export EXE=${EXE}.exe @@ -81,7 +81,7 @@ export LIBPATH=`echo "$LIBPATH" | sed -e "s,C:,/c/,g"` fi -export EXE="/data/skrooge-release_2.22.0/skrooge-2.22.0/build/bin/"${EXE} +export EXE="/data/skrooge-release_2.22.1/skrooge-2.22.1/build/bin/"${EXE} export PATH="$EXEPATH":"$LIBPATH":$PATH #kbuildsycoca4