Merge branch 'dev/1.50.0'

dvorka · Jan 18, 2020 · b41e8a9 · b41e8a9
2 parents 647bbf5 + 7f63052
commit b41e8a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/app/src/qt/orloj_presenter.cpp b/app/src/qt/orloj_presenter.cpp
@@ -165,7 +165,7 @@ int dialogSaveOrCancel()
         "Do you want to save Note changes?"};
     QPushButton* discard = msgBox.addButton("&Discard changes", QMessageBox::DestructiveRole);
     QPushButton* autosave = msgBox.addButton("Do not ask && &autosave", QMessageBox::AcceptRole);
-    QPushButton* edit = msgBox.addButton("Continue &editation", QMessageBox::YesRole);
+    QPushButton* edit = msgBox.addButton("Continue &editing", QMessageBox::YesRole);
     QPushButton* save = msgBox.addButton("&Save", QMessageBox::ActionRole);
     msgBox.exec();
 

diff --git a/build/ubuntu/ubuntu-launchpad-releases.sh b/build/ubuntu/ubuntu-launchpad-releases.sh
@@ -126,10 +126,11 @@ function releaseForParticularUbuntuVersion() {
     cd mindforger && cp -rvf ${MFSRC}/build/ubuntu/debian .
     createChangelog ./debian/changelog
 
-    # 4.1) build MF dependencies
+    echo "4.1) build MF dependencies"
+    rm -rvf deps/cmark-gfm/build
     cd deps/cmark-gfm && mkdir -v build && cd build && cmake -DCMARK_TESTS=OFF -DCMARK_SHARED=OFF .. && cmake --build . && cd ../../..
 
-    # 4.2) Qt: generate makefile using qmake
+    echo "4.2) Qt: generate makefile using qmake"
     echo -e "\n# qmake ######################################################"
     cd ..
     mv mindforger ${MF}
@@ -187,7 +188,7 @@ function releaseForParticularUbuntuVersion() {
     # recently added /ppa to fix the path and package rejections
     # MF PPA w/ 64b build only
     dput ppa:ultradvorka/productivity ${MFRELEASE}_source.changes
-    # HSTR PPA w/ 64b 32b and ARM builds
+    # SKIP: HSTR PPA w/ 64b 32b and ARM builds
     #dput ppa:ultradvorka/ppa ${MFRELEASE}_source.changes
 }
 
@@ -203,12 +204,12 @@ fi
 
 export ARG_BAZAAR_MSG="MindForger 1.50.0 release."
 export ARG_MAJOR_VERSION=1.50.
-export ARG_MINOR_VERSION=0 # minor version is incremented for every Ubuntu version
+export ARG_MINOR_VERSION=4 # minor version is incremented for every Ubuntu version
 
 # https://wiki.ubuntu.com/Releases
 # old: precise quantal saucy precise utopic vivid wily trusty (old GCC) yakkety artful cosmic
-# current: trusty xenial bionic disco eoan
-for UBUNTU_VERSION in trusty xenial bionic disco eoan
+# current: (trusty) xenial bionic disco eoan
+for UBUNTU_VERSION in xenial bionic disco eoan
 do
     echo "Releasing MF for Ubuntu version: ${UBUNTU_VERSION}"
     releaseForParticularUbuntuVersion ${UBUNTU_VERSION} ${ARG_MAJOR_VERSION}${ARG_MINOR_VERSION} "${ARG_BAZAAR_MSG}"