Git commit 2df4f49bc4f235163a9dbbf09119fe4c1670d864 by Urs Fleisch. Committed on 24/01/2021 at 08:52. Pushed by ufleisch into branch 'master'.
Prepare for next release M +4 -4 CMakeLists.txt M +21 -0 ChangeLog M +1 -1 Doxyfile M +2 -0 buildlibs.sh M +19 -2 deb/changelog M +1 -1 deb/copyright M +0 -1 deb/source/lintian-overrides M +1 -1 deb/watch M +3 -3 doc/en/index.docbook M +1 -1 kid3.spec M +1 -1 packaging/craft/extragear/kid3/kid3.py M +1 -1 packaging/flatpak/org.kde.kid3-stable.json M +1 -0 src/app/org.kde.kid3.appdata.xml M +1 -1 translations/extract-merge.sh https://invent.kde.org/multimedia/kid3/commit/2df4f49bc4f235163a9dbbf09119fe4c1670d864 diff --git a/CMakeLists.txt b/CMakeLists.txt index b521f132..92d50265 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,11 +105,11 @@ endif() # Version information set(CPACK_PACKAGE_VERSION_MAJOR 3) set(CPACK_PACKAGE_VERSION_MINOR 8) -set(CPACK_PACKAGE_VERSION_PATCH 4) +set(CPACK_PACKAGE_VERSION_PATCH 5) set(KID3_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set(CPACK_PACKAGE_VERSION ${KID3_VERSION}) -#set(CPACK_PACKAGE_VERSION "git20200420") -set(RELEASE_YEAR 2020) +#set(CPACK_PACKAGE_VERSION "git20210123") +set(RELEASE_YEAR 2021) # Platform specific default installation paths if(APPLE) @@ -137,7 +137,7 @@ elseif(ANDROID) set(WITH_LIBDIR_DEFAULT ".") set(WITH_PLUGINSDIR_DEFAULT ".") set(QT_ANDROID_APP_VERSION ${KID3_VERSION}) - set(QT_ANDROID_APP_VERSION_CODE 20) + set(QT_ANDROID_APP_VERSION_CODE 21) else() set(WITH_DATAROOTDIR_DEFAULT "share") set(WITH_DOCDIR_DEFAULT "share/doc/kid3-qt") diff --git a/ChangeLog b/ChangeLog index 7c982813..38f4cd46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +Sun Jan 31 08:55:52 CET 2021 Urs Fleisch <[email protected]> + + * Release 3.8.5 + + * New: + + Language can be configured in "Appearance" tab of settings. + + New action "Edit/Invert Selection". + + kid3-cli: Command "config" to query and set configuration options. + + * Improved: + + Import multiple genres from Discogs and MusicBrainz. + + Support import from Discogs JSON API when token is provided. + + Snapshot builds can download the current translations. + + Mac: Allow code signing. + + * Fixed: + + Crash when adding Chapter frame. + + Support ID3v2 Podcast Category (TCAT) and Podcast Keywords (TKWD). + + Support for multiple genres with ID3v2.3.0. + + Support MP4 values with multiple strings with TagLib. + Sat Sep 26 16:36:24 CEST 2020 Urs Fleisch <[email protected]> * Release 3.8.4 diff --git a/Doxyfile b/Doxyfile index 7117c81e..00cd853c 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = kid3 # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 3.8.4 +PROJECT_NUMBER = 3.8.5 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/buildlibs.sh b/buildlibs.sh index c39fbc74..9ee78854 100755 --- a/buildlibs.sh +++ b/buildlibs.sh @@ -121,6 +121,8 @@ ${DATE} Urs Fleisch <[email protected]>\n\n\t* Release ${NEWVER}\ sed -i "s/\( \+set(QT_ANDROID_APP_VERSION_CODE \)\([0-9]\+\))/\1$NEWCODE)/" CMakeLists.txt fi sed -i "s,^ <releases>.*,&\n <release version=\"${NEWVER}\" date=\"${DATE_F}\"/>," src/app/org.kde.kid3.appdata.xml + sed -i -r "s/(for ver in \['${OLDVER}')\]:/\1, '${NEWVER}']/" packaging/craft/extragear/kid3/kid3.py + sed -i "s,https://download.kde.org/stable/kid3/${OLDVER}/kid3-${OLDVER}.tar.xz,https://download.kde.org/stable/kid3/${NEWVER}/kid3-${NEWVER}.tar.xz,"; packaging/flatpak/org.kde.kid3-stable.json cd - >/dev/null exit 0 fi # changeversion diff --git a/deb/changelog b/deb/changelog index 07a58967..1afec2c0 100644 --- a/deb/changelog +++ b/deb/changelog @@ -1,8 +1,25 @@ -kid3 (3.8.4-0) unstable; urgency=low +kid3 (3.8.5-0) unstable; urgency=low * New upstream release. - -- Urs Fleisch <[email protected]> Sat, 26 Sep 2020 16:36:24 +0200 + -- Urs Fleisch <[email protected]> Sun, 31 Jan 2021 08:55:52 +0100 + +kid3 (3.8.4-2) unstable; urgency=medium + + * Bump Standards-Version to 4.5.1. + * Update debian/watch file standard to version 4. + * Overwrite lintian warning file-references-package-build-path. Patches are + welcome! + + -- Patrick Matthäi <[email protected]> Thu, 19 Nov 2020 14:57:28 +0100 + +kid3 (3.8.4-1) unstable; urgency=medium + + * New upstream release. + * Adjust lintian overrides. + * Signature file has been renamed from asc to sig. + + -- Patrick Matthäi <[email protected]> Fri, 09 Oct 2020 14:45:27 +0200 kid3 (3.8.3-2) unstable; urgency=high diff --git a/deb/copyright b/deb/copyright index 96e63d50..85c0885f 100644 --- a/deb/copyright +++ b/deb/copyright @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Files: * -Copyright: 2003-2020, Urs Fleisch +Copyright: 2003-2021, Urs Fleisch License: GPL-2+ Files: src/core/model/expressionparser.cpp diff --git a/deb/source/lintian-overrides b/deb/source/lintian-overrides index a45a5ca8..5e4adef9 100644 --- a/deb/source/lintian-overrides +++ b/deb/source/lintian-overrides @@ -1,3 +1,2 @@ kid3 source: upstream-metadata-file-is-missing -kid3 source: testsuite-autopkgtest-missing kid3 source: inconsistent-appstream-metadata-license src/app/org.kde.kid3.appdata.xml (cc0-1.0 != gpl-2+) diff --git a/deb/watch b/deb/watch index 6b6de8e0..d22081b8 100644 --- a/deb/watch +++ b/deb/watch @@ -1,3 +1,3 @@ version=3 -opts=pgpsigurlmangle=s/$/.asc/ \ +opts=pgpsigurlmangle=s/$/.sig/ \ http://sf.net/kid3/kid3-([\d.]*)\.tar\.gz diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 80fefd0f..427f2046 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -24,13 +24,13 @@ </authorgroup> <copyright> -<year>2020</year> +<year>2021</year> <holder>Urs Fleisch</holder> </copyright> <legalnotice id="fdl-notice">&FDLNotice;</legalnotice> -<date>2020-09-26</date> -<releaseinfo>3.8.4</releaseinfo> +<date>2021-01-31</date> +<releaseinfo>3.8.5</releaseinfo> <abstract> <para> diff --git a/kid3.spec b/kid3.spec index d772c875..d2b8e195 100644 --- a/kid3.spec +++ b/kid3.spec @@ -1,7 +1,7 @@ %global gstversion 1.0 Name: kid3 -Version: 3.8.4 +Version: 3.8.5 Release: 1%{?dist} Summary: Efficient ID3 tag editor diff --git a/packaging/craft/extragear/kid3/kid3.py b/packaging/craft/extragear/kid3/kid3.py index 3e80cb95..c8cc5aef 100755 --- a/packaging/craft/extragear/kid3/kid3.py +++ b/packaging/craft/extragear/kid3/kid3.py @@ -7,7 +7,7 @@ class subinfo(info.infoclass): def setTargets(self): self.svnTargets['master'] = 'https://invent.kde.org/multimedia/kid3.git' - for ver in ['3.8.4']: + for ver in ['3.8.4', '3.8.5'] self.targets[ver] = f'https://download.kde.org/stable/kid3/{ver}/kid3-{ver}.tar.xz' self.targetInstSrc[ver] = 'kid3-' + ver self.targetDigestUrls[ver] = f'https://download.kde.org/stable/kid3/{ver}/kid3-{ver}.tar.xz.sha256' diff --git a/packaging/flatpak/org.kde.kid3-stable.json b/packaging/flatpak/org.kde.kid3-stable.json index 9127b3c8..ababa62f 100644 --- a/packaging/flatpak/org.kde.kid3-stable.json +++ b/packaging/flatpak/org.kde.kid3-stable.json @@ -119,7 +119,7 @@ "sources": [ { "type": "archive", - "url": "https://download.kde.org/stable/kid3/3.8.4/kid3-3.8.4.tar.xz"; + "url": "https://download.kde.org/stable/kid3/3.8.5/kid3-3.8.5.tar.xz"; /* , "sha256": "" */ } ] diff --git a/src/app/org.kde.kid3.appdata.xml b/src/app/org.kde.kid3.appdata.xml index 73d2f500..5a4daf4c 100644 --- a/src/app/org.kde.kid3.appdata.xml +++ b/src/app/org.kde.kid3.appdata.xml @@ -224,6 +224,7 @@ <update_contact>ufleisch_at_users.sourceforge.net</update_contact> <translation type="gettext">kid3</translation> <releases> + <release version="3.8.5" date="2021-01-31"/> <release version="3.8.4" date="2020-09-26"/> <release version="3.8.3" date="2020-05-10"/> <release version="3.8.2" date="2020-01-23"/> diff --git a/translations/extract-merge.sh b/translations/extract-merge.sh index 401fb72a..6a621332 100755 --- a/translations/extract-merge.sh +++ b/translations/extract-merge.sh @@ -5,7 +5,7 @@ BASEDIR="../src" # root of translatable sources PROJECT="kid3" # project name -PROJECTVERSION="3.8.4" # project version +PROJECTVERSION="3.8.5" # project version BUGADDR="https://bugs.kde.org"; # MSGID-Bugs WDIR=`pwd` # working dir
