From 5c16aba0d56f0dddeb8168220f2dbb023700af34 Mon Sep 17 00:00:00 2001 From: Robert Pufky Date: Fri, 29 Jul 2022 13:55:46 -0700 Subject: [PATCH] Update to digikam 7.7.0 release. Changes: * Updated deprecation message to final version (8.0). --- Makefile | 4 ++-- README.md | 14 +++++++------- RELEASE.md | 7 +++++++ migrate_to_ls | 15 --------------- startapp.sh | 22 +++++++++++----------- 5 files changed, 27 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index bd2e0ca..a084526 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ # # TODO: De-duplicate stable/unstable and finish simplifying build options. # -version = 7.6.0 -pre_release = 7.6.0 +version = 7.7.0 +pre_release = 7.7.0 BUILD_DIR = digikam-build STAGING_DIR = $(BUILD_DIR)/staging GPG_DIR = $(BUILD_DIR)/gpg diff --git a/README.md b/README.md index c69ef02..d3b2794 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ usage. ## Version Tags This image provides various versions that are available via tags. Use `stable` -or an explicit digikam version (e.g. 7.6.0), which will provide updates but +or an explicit digikam version (e.g. 7.7.0), which will provide updates but minimize unexpected changes. * `stable` will provide the latest officially released version of digikam. @@ -28,8 +28,8 @@ minimize unexpected changes. | Tag | Description | Comment | |--------|-------------------------|-----------------------------------------------------------------| -| latest | digikam container 7.6.0 | [7.6.0 Release](https://download.kde.org/stable/digikam/7.6.0/) | -| stable | digikam container 7.6.0 | [7.6.0 Release](https://download.kde.org/stable/digikam/7.6.0/) | +| latest | digikam container 7.7.0 | [7.7.0 Release](https://download.kde.org/stable/digikam/7.7.0/) | +| stable | digikam container 7.7.0 | [7.7.0 Release](https://download.kde.org/stable/digikam/7.7.0/) | * See detailed [release notes here][b2] for older container point releases. Only current and previous versions are kept. * Submit docker-related [bugs here][sl]. @@ -231,14 +231,14 @@ make * Shows all make options. ```bash -make digikam version=7.6.0 +make digikam version=7.7.0 ``` -* Build 'stable' version using appimage 7.6.0. +* Build 'stable' version using appimage 7.7.0. ```bash -make latest version=7.6.0 +make latest version=7.7.0 ``` -* builds 'latest' version using appimage 7.6.0. +* builds 'latest' version using appimage 7.7.0. ```bash make clean diff --git a/RELEASE.md b/RELEASE.md index d939c76..ece265b 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -5,6 +5,13 @@ Uses semantic versioning, with an additional container version number: ## Unreleased +## 7.7.0 +Digikam [7.7.0 release][9f]. + +Changes: +* Bump digikam release version. +* Updated deprecation message to final supported version (8.0). + ## 7.6.0 Digikam [7.6.0 relase][9f]. diff --git a/migrate_to_ls b/migrate_to_ls index 3c66f75..c66b6ca 100755 --- a/migrate_to_ls +++ b/migrate_to_ls @@ -3,21 +3,6 @@ # Migrate well-know config locations from rpufky to ls digikam config. # - - -BASE='.' -F_FORCE=0 -F_PLAYLISTS=0 -F_VIDEOS=0 -F_QUIET=0 -Y_DL='/usr/local/bin/youtube-dl' -Y_BASE='https://www.youtube.com/user/' -Y_OPT_QUIET='' -Y_OPT_DOWN='--no-overwrites --continue --ignore-errors' -Y_OPT_FORMAT='--format best --merge-output-format mkv' -Y_OPT_WRITE='--write-thumbnail --write-description --write-info-json --write-annotations' -Y_OPT_TEMPLATE='%(uploader_id)s/%(playlist)s/%(playlist_index)s_%(title)s/%(playlist_index)s-%(title)s.%(ext)s' - USAGE=" Migrate well-known config locations from rpufky to ls digikam config. diff --git a/startapp.sh b/startapp.sh index 6f0085a..3860573 100755 --- a/startapp.sh +++ b/startapp.sh @@ -6,17 +6,17 @@ export LANG=${LANG} update-locale LANG=${LANG} echo -echo "--------------------------------------------------------------------------------" -echo "| DEPRECATION WARNING |" -echo "--------------------------------------------------------------------------------" -echo "| |" -echo "| Support will end on the next major digikam release. See migration link. |" -echo "| |" -echo "| https://github.com/r-pufky/digikam/blob/master/migration.md |" -echo "| |" -echo "--------------------------------------------------------------------------------" -echo "| DEPRECATION WARNING |" -echo "--------------------------------------------------------------------------------" +echo "-------------------------------------------------------------------------" +echo "| DEPRECATION WARNING |" +echo "-------------------------------------------------------------------------" +echo "| |" +echo "| Support will end on the next major release (8.0). See migration link. |" +echo "| |" +echo "| https://github.com/r-pufky/digikam/blob/master/migration.md |" +echo "| |" +echo "-------------------------------------------------------------------------" +echo "| DEPRECATION WARNING |" +echo "-------------------------------------------------------------------------" echo exec /digikam/AppRun