From 6d1e532162ab0cd21ea7319c04b2ec00db6d960d Mon Sep 17 00:00:00 2001 From: Andre Meyering Date: Sat, 1 Jul 2023 12:26:00 +0200 Subject: [PATCH] release: Release MediaElch v2.10.2 --- .github/ISSUE_TEMPLATE/bug_report.md | 4 ++-- .../ISSUE_TEMPLATE/scraper-does-not-work.md | 4 ++-- CHANGELOG.md | 13 +++---------- CMakeLists.txt | 2 +- MediaElch.plist | 6 +++--- MediaElch.pro | 2 +- Version.h | 4 ++-- debian/changelog | 8 +++++++- docs/admin/release.md | 16 ++++++++-------- obs/MediaElch.changes | 19 ++++++++++++------- obs/MediaElch.spec | 2 +- obs/README.md | 2 +- 12 files changed, 43 insertions(+), 39 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 5a11b70be5..33310f7d2c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,8 +24,8 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **MediaElch Version:** - - [ ] 2.10.1-dev (nightly) - - [ ] 2.10.0 stable + - [ ] 2.10.3-dev (nightly) + - [ ] 2.10.2 stable **Operating System:** diff --git a/.github/ISSUE_TEMPLATE/scraper-does-not-work.md b/.github/ISSUE_TEMPLATE/scraper-does-not-work.md index 961b68e8ad..fc5454dd56 100644 --- a/.github/ISSUE_TEMPLATE/scraper-does-not-work.md +++ b/.github/ISSUE_TEMPLATE/scraper-does-not-work.md @@ -22,8 +22,8 @@ assignees: '' Add a list of information that is not loaded correctly. **MediaElch Version:** - - [ ] 2.10.1-dev (nightly) - - [ ] 2.10.0 stable + - [ ] 2.10.3-dev (nightly) + - [ ] 2.10.2 stable **Operating System:** - [ ] Windows diff --git a/CHANGELOG.md b/CHANGELOG.md index 6de1be8de7..c50f44c2a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 2.10.2 - tbd +## 2.10.2 - 2023-07-01 ### Notes @@ -25,27 +25,19 @@ - Fix title and actor scraping (#1592) - Remove `On Sale!` from title if ADE sets it -### Changed - - - … - ### Added - Movie renamer: It is now possible to use a movie's TMDb ID as placeholder (#1542) - Custom Movie Scraper: You can now load movie tags as well (#1162) - A new TV scraper for fernsehserien.de was added (#1135) -### Removed - - - … - ### Internal Improvements and Changes - MediaElch now requires CMake 3.15 or later - QML and QtQuick are no longer required - The movie scrapers have been refactored to allow parallel downloads in the future as well as preview images in the search dialog. - - + ### Changes for Package Maintainers If you package MediaElch, e.g. for some Linux distributions, these notes may be important for you: @@ -53,6 +45,7 @@ If you package MediaElch, e.g. for some Linux distributions, these notes may be - QML and QtQuick are no longer required and can be removed from MediaElch's dependencies. This includes the `declarative` module and everything QML and QtQuick related. + ## 2.10.0 - Benzar (2023-02-05) ### Notes diff --git a/CMakeLists.txt b/CMakeLists.txt index 903c0b5e27..18baf349dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR) project( mediaelch - VERSION 2.10.1 + VERSION 2.10.2 DESCRIPTION "Media Manager for Kodi" HOMEPAGE_URL "https://mediaelch.github.io/" ) diff --git a/MediaElch.plist b/MediaElch.plist index 9d38f3184a..3d845f6dec 100644 --- a/MediaElch.plist +++ b/MediaElch.plist @@ -7,11 +7,11 @@ CFBundlePackageType APPL CFBundleGetInfoString - 2.10.1 + 2.10.2 CFBundleVersion - 2.10.1 + 2.10.2 CFBundleShortVersionString - 2.10.1 + 2.10.2 CFBundleExecutable MediaElch CFBundleHelpBookFolder diff --git a/MediaElch.pro b/MediaElch.pro index 1a2ce984c7..d10a5359bc 100644 --- a/MediaElch.pro +++ b/MediaElch.pro @@ -4,7 +4,7 @@ equals(QT_MAJOR_VERSION, 5) { lessThan(QT_MINOR_VERSION, 6): error(Qt 5.6 or higher is required!) } equals(QT_MAJOR_VERSION, 6) { - lessThan(QT_MINOR_VERSION, 2): error("Qt 6.2 is required as 6.0 and 6.1 do not support QMultiMedia!") + lessThan(QT_MINOR_VERSION, 3): error("Qt 6.3 is required as 6.0 and 6.1 do not support QMultiMedia!") } contains(CONFIG, USE_EXTERN_QUAZIP) { DEFINES += EXTERN_QUAZIP diff --git a/Version.h b/Version.h index b5b241e214..cd21b5be4b 100644 --- a/Version.h +++ b/Version.h @@ -9,8 +9,8 @@ namespace mediaelch { namespace constants { constexpr char AppName[] = "MediaElch"; -constexpr char AppVersionStr[] = "2.10.1"; // major.minor.patch -constexpr char AppVersionFullStr[] = "2.10.1-dev"; // major.minor.patch-identifier +constexpr char AppVersionStr[] = "2.10.2"; // major.minor.patch +constexpr char AppVersionFullStr[] = "2.10.2"; // major.minor.patch[-identifier] constexpr char VersionName[] = "Benzar"; constexpr char OrganizationName[] = "kvibes"; diff --git a/debian/changelog b/debian/changelog index a5d016497b..30ee9bbac7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mediaelch (2.10.2-1) bionic; urgency=medium + + * next release + + -- Andre Meyering Sat, 01 Jul 2023 12:30:00 +0100 + mediaelch (2.10.0-1) bionic; urgency=medium * next release @@ -18,7 +24,7 @@ mediaelch (2.8.16-1) bionic; urgency=medium mediaelch (2.8.14-1) xenial; urgency=medium - * next release + * next release -- Andre Meyering Sun, 06 Feb 2022 13:46:14 +0100 diff --git a/docs/admin/release.md b/docs/admin/release.md index 2e93698819..c81ae1f6d4 100644 --- a/docs/admin/release.md +++ b/docs/admin/release.md @@ -1,8 +1,8 @@ # Release a new MediaElch version -__State__: last updated 2023-05-11 +__State__: last updated 2023-07-01 -This page and its children are used by MediaElch's maintainers and contain information +This page is used by MediaElch's maintainers and contains information on how to release a new version, where to publish them, etc. **If you are an enduser of MediaElch then please skip this part.** @@ -15,8 +15,8 @@ git clone https://github.com/Komet/MediaElch.git ## Update Translations -There may have been updates to MediaElch's translation files on transifex which -have not been inlcuded in the current master branch. +There may have been updates to MediaElch's translation files on Transifex which +have not been included in the current master branch. See [transifex.md](transifex.md) @@ -49,10 +49,10 @@ they should have been added right with the corresponding commits. But better check all commit messages since the last version tag: ```sh -# Print all commits between the git tag v2.8.18 and the current master branch -git log --oneline v2.10.1..master +# Print all commits between a git tag and the current master branch +git log --oneline v2.10.2..master # Count the number of commits since the last version -git log --oneline v2.10.1..master | wc -l +git log --oneline v2.10.2..master | wc -l ``` @@ -90,7 +90,7 @@ add a Git tag (see next section), it includes the latest documentation state. 1. Commit your changes (MediaElch version and changelogs). 2. Add a version tag and push your changes - - `git tag -a v2.10.1 -m "MediaElch Version 2.10.1"` + - `git tag -a v2.10.2 -m "MediaElch Version 2.10.2"` - `git push origin master` (or better: Create a pull request) - `git push --tags` - `git checkout release && git merge master && git push origin release` diff --git a/obs/MediaElch.changes b/obs/MediaElch.changes index 4d86f9aed2..3fa42b155d 100644 --- a/obs/MediaElch.changes +++ b/obs/MediaElch.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 01 12:30:00 UTC 2023 - Andre Meyering + +- Update to MediaElch v2.10.2 + ------------------------------------------------------------------- Sun Jan 22 12:30:00 UTC 2023 - Andre Meyering @@ -31,7 +36,7 @@ Mon May 3 18:26:18 UTC 2021 - Andre Meyering ------------------------------------------------------------------- Mon Apr 26 16:21:21 UTC 2021 - Andre Meyering -- Fix spec file +- Fix spec file ------------------------------------------------------------------- Mon Apr 26 15:36:48 UTC 2021 - Andre Meyering @@ -41,17 +46,17 @@ Mon Apr 26 15:36:48 UTC 2021 - Andre Meyering ------------------------------------------------------------------- Fri Jan 22 12:40:07 UTC 2021 - Andre Meyering -- Update MediaElch to v2.8.6 +- Update MediaElch to v2.8.6 ------------------------------------------------------------------- Sat Jan 9 10:43:21 UTC 2021 - Andre Meyering -- Fix compiler error on openSUSE Leap 15.1 +- Fix compiler error on openSUSE Leap 15.1 ------------------------------------------------------------------- Sat Jan 9 10:07:06 UTC 2021 - Andre Meyering -- Update MediaElch to v2.8.4 +- Update MediaElch to v2.8.4 ------------------------------------------------------------------- Sun Dec 20 12:22:15 UTC 2020 - Andre Meyering @@ -61,7 +66,7 @@ Sun Dec 20 12:22:15 UTC 2020 - Andre Meyering ------------------------------------------------------------------- Sun Dec 20 12:03:09 UTC 2020 - Andre Meyering -- Update MediaElch to v2.8.2 +- Update MediaElch to v2.8.2 ------------------------------------------------------------------- Tue Dec 15 07:59:23 UTC 2020 - Andre Meyering @@ -71,12 +76,12 @@ Tue Dec 15 07:59:23 UTC 2020 - Andre Meyering ------------------------------------------------------------------- Sun Dec 13 16:40:18 UTC 2020 - Andre Meyering -- Updated MediaElch to v2.8.0 +- Updated MediaElch to v2.8.0 ------------------------------------------------------------------- Sat Apr 18 13:49:02 UTC 2020 - info@andremeyering.de -- Updated MediaElch to v2.6.6 +- Updated MediaElch to v2.6.6 ------------------------------------------------------------------- Sat Feb 8 12:44:59 UTC 2020 - info@andremeyering.de diff --git a/obs/MediaElch.spec b/obs/MediaElch.spec index 5b18d9cfaa..9df731bc58 100644 --- a/obs/MediaElch.spec +++ b/obs/MediaElch.spec @@ -3,7 +3,7 @@ # Name: MediaElch -Version: 2.10.0 +Version: 2.10.2 Release: 1%{?dist} License: LGPL-3.0-only Summary: A Media Manager for Kodi diff --git a/obs/README.md b/obs/README.md index b4fa788f26..fd1891abae 100644 --- a/obs/README.md +++ b/obs/README.md @@ -72,7 +72,7 @@ osc commit ```sh rm MediaElch-*.tar.gz -export ME_VERSION=2.10.1 +export ME_VERSION=2.10.2 # Clone latest version. Shallow clone is enough. git clone --depth=1 --recursive https://github.com/Komet/MediaElch.git # Exclude .git, documentation and build folder.