Git commit d44f940d3c4eb42a950840032a144a68f346b643 by Urs Fleisch. Committed on 19/01/2020 at 11:35. Pushed by ufleisch into branch 'master'.
Prepare for next release M +3 -3 CMakeLists.txt M +10 -0 ChangeLog M +1 -1 Doxyfile M +1 -3 buildlibs.sh M +6 -0 deb/changelog M +3 -3 doc/en/index.docbook M +1 -1 kid3.spec M +1 -0 src/app/kid3.appdata.xml M +1 -1 translations/extract-merge.sh https://invent.kde.org/kde/kid3/commit/d44f940d3c4eb42a950840032a144a68f346b643 diff --git a/CMakeLists.txt b/CMakeLists.txt index b674017e..2256f0a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,11 +101,11 @@ endif() # Version information set(CPACK_PACKAGE_VERSION_MAJOR 3) set(CPACK_PACKAGE_VERSION_MINOR 8) -set(CPACK_PACKAGE_VERSION_PATCH 1) +set(CPACK_PACKAGE_VERSION_PATCH 2) 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 "git20191214") -set(RELEASE_YEAR 2019) +set(RELEASE_YEAR 2020) # Platform specific default installation paths if(APPLE) @@ -133,7 +133,7 @@ elseif(ANDROID) set(WITH_LIBDIR_DEFAULT ".") set(WITH_PLUGINSDIR_DEFAULT ".") set(QT_ANDROID_APP_VERSION ${KID3_VERSION}) - set(QT_ANDROID_APP_VERSION_CODE 17) + set(QT_ANDROID_APP_VERSION_CODE 18) else() set(WITH_DATAROOTDIR_DEFAULT "share") set(WITH_DOCDIR_DEFAULT "share/doc/kid3-qt") diff --git a/ChangeLog b/ChangeLog index 60811043..4d8bd5eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Thu Jan 23 12:18:05 CET 2020 Urs Fleisch <[email protected]> + + * Release 3.8.2 + + * New: + + Catalan, Portuguese and Ukrainian translations. + + * Fixed: + + Crash when removing M4A atoms. + Mon Dec 23 17:38:53 CET 2019 Urs Fleisch <[email protected]> * Release 3.8.1 diff --git a/Doxyfile b/Doxyfile index da7bd8ed..bcc2a7e9 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.1 +PROJECT_NUMBER = 3.8.2 # 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 1bb27772..15721abc 100755 --- a/buildlibs.sh +++ b/buildlibs.sh @@ -105,10 +105,8 @@ if test "$1" = "changeversion"; then sed -i "1 i\ kid3 (${NEWVER}-0) unstable; urgency=low\n\n * New upstream release.\n\n\ -- Urs Fleisch <[email protected]> ${DATE_R}\n" deb/changelog - sed -i "s/^<releaseinfo>${OLDVER}<\/releaseinfo>$/<releaseinfo>${NEWVER}<\/releaseinfo>/; s/^<year>[0-9]\+<\/year>$/<year>${DATE_Y}<\/year>/; s/^<date>[0-9-]\+<\/date>$/<date>${DATE_F}<\/date>/" doc/de/index.docbook sed -i "s/^<releaseinfo>${OLDVER}<\/releaseinfo>$/<releaseinfo>${NEWVER}<\/releaseinfo>/; s/^<year>[0-9]\+<\/year>$/<year>${DATE_Y}<\/year>/; s/^<date>[0-9-]\+<\/date>$/<date>${DATE_F}<\/date>/" doc/en/index.docbook - sed -i "s/PROJECTVERSION=\"${OLDVER}\"/PROJECTVERSION=\"${NEWVER}\"/" po/extract-merge.sh - sed -i "s/Project-Id-Version: Kid3 ${OLDVER}/Project-Id-Version: Kid3 ${NEWVER}/" po/*.po* + sed -i "s/PROJECTVERSION=\"${OLDVER}\"/PROJECTVERSION=\"${NEWVER}\"/" translations/extract-merge.sh sed -i "s/^Version: ${OLDVER}$/Version: ${NEWVER}/" kid3.spec sed -i "s/^Copyright 2003-[0-9]\+ Urs Fleisch <[email protected]>$/Copyright 2003-${DATE_Y} Urs Fleisch <[email protected]>/" deb/copyright sed -i "1 i\ diff --git a/deb/changelog b/deb/changelog index 371b0d4c..be09c34b 100644 --- a/deb/changelog +++ b/deb/changelog @@ -1,3 +1,9 @@ +kid3 (3.8.2-0) unstable; urgency=low + + * New upstream release. + + -- Urs Fleisch <[email protected]> Thu, 23 Jan 2020 12:18:05 +0100 + kid3 (3.8.1-0) unstable; urgency=low * New upstream release. diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 350b928c..d56a2958 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -24,13 +24,13 @@ </authorgroup> <copyright> -<year>2019</year> +<year>2020</year> <holder>Urs Fleisch</holder> </copyright> <legalnotice id="fdl-notice">&FDLNotice;</legalnotice> -<date>2019-12-23</date> -<releaseinfo>3.8.1</releaseinfo> +<date>2020-01-23</date> +<releaseinfo>3.8.2</releaseinfo> <abstract> <para> diff --git a/kid3.spec b/kid3.spec index b2ffcf60..b77b1d9a 100644 --- a/kid3.spec +++ b/kid3.spec @@ -6,7 +6,7 @@ Name: kid3 License: GPL Group: Applications/Multimedia Summary: Efficient ID3 tag editor -Version: 3.8.1 +Version: 3.8.2 Release: 1%{?dist} URL: http://kid3.sourceforge.net/ Source0: http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz diff --git a/src/app/kid3.appdata.xml b/src/app/kid3.appdata.xml index 81b203fe..2e633d00 100644 --- a/src/app/kid3.appdata.xml +++ b/src/app/kid3.appdata.xml @@ -96,6 +96,7 @@ <update_contact>ufleisch_at_users.sourceforge.net</update_contact> <translation type="gettext">kid3</translation> <releases> + <release version="3.8.2" date="2020-01-23"/> <release version="3.8.1" date="2019-12-23"/> </releases> </component> diff --git a/translations/extract-merge.sh b/translations/extract-merge.sh index 424a15f8..069550d1 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.1" # project version +PROJECTVERSION="3.8.2" # project version BUGADDR="http://sourceforge.net/p/kid3/bugs/"; # MSGID-Bugs WDIR=`pwd` # working dir
