From 8fc13a7e118a3900c4aa73cdcadb38199a9b81e3 Mon Sep 17 00:00:00 2001 From: Martin Dvorak Date: Sat, 17 Feb 2024 20:25:19 +0100 Subject: [PATCH] Updating PAD.xml and Ubuntu release scripts & Makefile targets. --- PAD.xml | 16 +++++----- build/Makefile | 4 +-- build/debian/debian-ppa-aptly-build.sh | 6 ++-- .../ubuntu-launchpad-releases-from-mind.sh | 32 ++++++++++++++----- build/ubuntu/ubuntu-pbuilder-add-distros.sh | 13 ++++++-- 5 files changed, 47 insertions(+), 24 deletions(-) diff --git a/PAD.xml b/PAD.xml index d29d444f..d3047fe2 100644 --- a/PAD.xml +++ b/PAD.xml @@ -35,12 +35,12 @@ MindForger 2.0.0 - 01 - 30 + 02 + 16 2024 - - - + 0 + 0 + 0 Freeware Major Update Install and Uninstall @@ -71,9 +71,9 @@ notebook, knowledge, ai, markdown, ide, ml, nlp Thinking note taking application. MindForger is open, free, well performing thinking note taking application with Markdown editor which respects your privacy. - Are you drowning in information, but starving for knowledge? Where do you keep your private remarks like ideas, personal plans, exam preparation notes, gift tips, how-tos, dreams, business visions, finance strategies, meeting minutes and auto coach - Are you drowning in information, but starving for knowledge? Where do you keep your private remarks like ideas, personal plans, exam preparation notes, gift tips, how-tos, dreams, business visions, finance strategies, meeting minutes and auto coaching notes? Loads of documents, sketches and remarks spread around the file system, cloud, web and Post-it notes? Are you affraid of your knowledge privacy? Are you able to find particular remarks once - Are you drowning in information, but starving for knowledge? Where do you keep your private remarks like ideas, personal plans, exam preparation notes, gift tips, how-tos, dreams, business visions, finance strategies, meeting minutes and auto coaching notes? Loads of documents, sketches and remarks spread around the file system, cloud, web and Post-it notes? Are you affraid of your knowledge privacy? Are you able to find particular remarks once you create them? Do you know how are the remarks mutually related when you browse, read or write them? No? MindForger is open, free, well performing thinking note taking application with Markdown editor which respects your privacy. + Are you drowning in information, but starving for knowledge? Where do you keep your private remarks like ideas, personal plans, exam preparation notes, gift tips, how-tos, dreams, business visions, finance strategies, meeting minutes and auto coach + Are you drowning in information, but starving for knowledge? Where do you keep your private remarks like ideas, personal plans, exam preparation notes, gift tips, how-tos, dreams, business visions, finance strategies, meeting minutes and auto coaching notes? Loads of documents, sketches and remarks spread around the file system, cloud, web and Post-it notes? Are you affraid of your knowledge privacy? Are you able to find particular remarks once + Are you drowning in information, but starving for knowledge? Where do you keep your private remarks like ideas, personal plans, exam preparation notes, gift tips, how-tos, dreams, business visions, finance strategies, meeting minutes and auto coaching notes? Loads of documents, sketches and remarks spread around the file system, cloud, web and Post-it notes? Are you affraid of your knowledge privacy? Are you able to find particular remarks once you create them? Do you know how are the remarks mutually related when you browse, read or write them? No? MindForger is open, free, well performing thinking note taking application with Markdown editor which respects your privacy. diff --git a/build/Makefile b/build/Makefile index 3dc0dc4c..9fb34c8f 100644 --- a/build/Makefile +++ b/build/Makefile @@ -331,8 +331,8 @@ dist-dmg: ## build macOS Disk iMaGe .dmg package # obsolete repos: jessie-main .PHONY: dist-debian-ppa -dist-debian-aptly-create-ppa: ## create Debian PPA for current Debian release: DISTRO=bullseye - cd ./build/debian && ./debian-ppa-aptly-build.sh +dist-debian-aptly-create-ppa: ## create Debian PPA for all releases + cd ./debian && ./debian-ppa-aptly-build.sh # # ^ Debian diff --git a/build/debian/debian-ppa-aptly-build.sh b/build/debian/debian-ppa-aptly-build.sh index b07ec64e..61a6c2fe 100755 --- a/build/debian/debian-ppa-aptly-build.sh +++ b/build/debian/debian-ppa-aptly-build.sh @@ -21,17 +21,17 @@ # # This script builds MindForger/HSTR Debian PPA for a particular Debian release. -# - it adds all .deb pacakges in given directory to aptly repository. +# - it adds all .deb packages in given directory to aptly repository. # # Usage: # -# MF_DEBIAN_DISTRO_DIR=... MF_DEBIAN_RELEASE=... ./debian-aptly-add-deb.sh +# MF_DEBIAN_DISTRO_DIR=... MF_DEBIAN_RELEASE=... ./debian-ppa-aptly-build.sh # # Example: # # MF_DEBIAN_DEB_DIR=~/p/mindforger/debian/aptly/mindforger/12-bookworm \ # MF_DEBIAN_RELEASE=bookworm \ -# ./debian-release-aptly-build.sh +# ./debian-ppa-aptly-build.sh # # aptly abstractions hierarchy: # diff --git a/build/ubuntu/ubuntu-launchpad-releases-from-mind.sh b/build/ubuntu/ubuntu-launchpad-releases-from-mind.sh index f0cea487..8a35dac0 100755 --- a/build/ubuntu/ubuntu-launchpad-releases-from-mind.sh +++ b/build/ubuntu/ubuntu-launchpad-releases-from-mind.sh @@ -78,6 +78,18 @@ # https://www.debian.org/doc/debian-policy/ # +# ######################################################################## +# # Troubleshooting +# ######################################################################## + +# PROBLEM: build successfull, but .deb is NOT uploaded to Launchpad +# - check that .dsc file is signed using GPG +# - manually upload .dsc file from ~/p/mindforger/launchpad/* to Launchpad +# using dput: +# +# dput ppa:ultradvorka/productivity mindforger_2.0.6-0ubuntu1_source.changes +# + # ######################################################################## # # Configuration # ######################################################################## @@ -86,12 +98,16 @@ # - https://wiki.ubuntu.com/Releases # - obsolete: # precise quantal saucy precise utopic vivid wily yakkety artful cosmic kinetic -# - current : -# (trusty) xenial bionic (cosmic disco eoan) focal (groovy) (hirsute) (impish) jammy (kinetic) mantic -# - command (Bash tuple of distro names): +# - history (* LTS): +# trusty* xenial* bionic* (cosmic disco eoan) focal* (groovy hirsute impish) +# jammy* (kinetic lunar) mantic +# - current ~ Bash tuple below || ./ubuntu-launchpad-releases-from-mind.sh + manual upload: # trusty xenial bionic focal jammy mantic -# - done (use ./ubuntu-launchpad-releases-from-mind.sh ): -# focal jammy kinetic +# - NOT RELEASED (non-satisfying hunspell version - can be fixed by downgrade to libhunspell-dev (>= 1.6) in build/ubuntu/debian/control: +# trusty xenial +# +# +# # - TODO - required hunspell version not available on older Ubuntu versions: # ERROR: pbuilder-satisfydepends-dummy : Depends: libhunspell-dev (>= 1.6) but it is not going to be installed. # trusty xenial bionic mantic @@ -106,7 +122,7 @@ fi # environment variables export MAJOR_VERSION=2 export MINOR_VERSION=0 -export PATCH_VERSION=5 # patch version is incremented for every Ubuntu build @ Launchpad +export PATCH_VERSION=1 # patch version is incremented for every Ubuntu build @ Launchpad export MF_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" # semantic version export RM_CMD="rm -vrf " export CP_CMD="cp -vrf " @@ -114,8 +130,8 @@ export CP_CMD="cp -vrf " export OPT_VERBOSE="v" if [[ ${#} == 1 ]] then - export OPT_DO_PUSH="false" # "true" to upload src to bazaar - export OPT_DO_RELEASE="false" # "true" to dpush binary .deb to Launchpad and TRIGGER release + export OPT_DO_PUSH="true" # "true" to upload src to bazaar + export OPT_DO_RELEASE="true" # "true" to dpush binary .deb to Launchpad and TRIGGER release else #export OPT_DO_PUSH="false" # "true" to upload src to bazaar #export OPT_DO_RELEASE="false" # "true" to dpush binary .deb to Launchpad and TRIGGER release diff --git a/build/ubuntu/ubuntu-pbuilder-add-distros.sh b/build/ubuntu/ubuntu-pbuilder-add-distros.sh index 3cf310ea..069b99d7 100755 --- a/build/ubuntu/ubuntu-pbuilder-add-distros.sh +++ b/build/ubuntu/ubuntu-pbuilder-add-distros.sh @@ -18,9 +18,16 @@ # along with this program. If not, see . # https://wiki.ubuntu.com/Releases -# old: precise quantal saucy precise utopic vivid wily trusty (old GCC) yakkety artful cosmic disco eoan kinetic -# current: trusty xenial bionic focal jammy mantic -for DISTRO in bionic +# - obsolete: +# precise quantal saucy precise utopic vivid wily trusty (old GCC) +# yakkety artful cosmic disco eoan kinetic +# - current: +# trusty xenial bionic focal jammy mantic +# +# Distro is stored to: +# ~/pbuilder +# +for DISTRO in mantic do sudo pbuilder --create ${DISTRO} rm -vf ~/pbuilder/${DISTRO}-base.tgz