[multimedia/kid3] /: Prepare for next release

Urs Fleisch null at kde.org
Wed Feb 17 07:41:20 GMT 2021


Git commit 294807007bf162d9ed1ad01f4f5fa75ab654bba3 by Urs Fleisch.
Committed on 17/02/2021 at 07:40.
Pushed by ufleisch into branch 'master'.

Prepare for next release

M  +2    -2    CMakeLists.txt
M  +12   -0    ChangeLog
M  +1    -1    Doxyfile
M  +1    -1    buildlibs.sh
M  +8    -2    deb/changelog
M  +2    -2    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/294807007bf162d9ed1ad01f4f5fa75ab654bba3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc9d6d12..fe1f1edb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,7 +106,7 @@ endif()
 # Version information
 set(CPACK_PACKAGE_VERSION_MAJOR 3)
 set(CPACK_PACKAGE_VERSION_MINOR 8)
-set(CPACK_PACKAGE_VERSION_PATCH 5)
+set(CPACK_PACKAGE_VERSION_PATCH 6)
 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 "git20210123")
@@ -138,7 +138,7 @@ elseif(ANDROID)
   set(WITH_LIBDIR_DEFAULT ".")
   set(WITH_PLUGINSDIR_DEFAULT ".")
   set(QT_ANDROID_APP_VERSION ${KID3_VERSION})
-  set(QT_ANDROID_APP_VERSION_CODE 21)
+  set(QT_ANDROID_APP_VERSION_CODE 22)
 else()
   set(WITH_DATAROOTDIR_DEFAULT "share")
   set(WITH_DOCDIR_DEFAULT "share/doc/kid3-qt")
diff --git a/ChangeLog b/ChangeLog
index c9652323..1c617fec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Mar 18 08:21:47 CET 2021  Urs Fleisch  <ufleisch at users.sourceforge.net>
+
+	* Release 3.8.6
+
+	* Improved:
+	  + Support Qt 6.
+
+	* Fixed:
+	  + Discogs import.
+	  + Amazon import.
+	  + Removed TrackType.org import.
+
 Sun Jan 31 08:55:52 CET 2021  Urs Fleisch  <ufleisch at users.sourceforge.net>
 
 	* Release 3.8.5
diff --git a/Doxyfile b/Doxyfile
index 00cd853c..4aec655a 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.5
+PROJECT_NUMBER         = 3.8.6
 
 # 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 c4df366f..c26ea8f2 100755
--- a/buildlibs.sh
+++ b/buildlibs.sh
@@ -121,7 +121,7 @@ ${DATE}  Urs Fleisch  <ufleisch at users.sourceforge.net>\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 -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
diff --git a/deb/changelog b/deb/changelog
index 1afec2c0..7c239158 100644
--- a/deb/changelog
+++ b/deb/changelog
@@ -1,8 +1,14 @@
-kid3 (3.8.5-0) unstable; urgency=low
+kid3 (3.8.6-0) unstable; urgency=low
 
   * New upstream release.
 
- -- Urs Fleisch <ufleisch at users.sourceforge.net>  Sun, 31 Jan 2021 08:55:52 +0100
+ -- Urs Fleisch <ufleisch at users.sourceforge.net>  Thu, 18 Mar 2021 08:21:47 +0100
+
+kid3 (3.8.5-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 01 Feb 2021 11:31:48 +0100
 
 kid3 (3.8.4-2) unstable; urgency=medium
 
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 8719ea2c..7e19e89b 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -29,8 +29,8 @@
 </copyright>
 <legalnotice id="fdl-notice">&FDLNotice;</legalnotice>
 
-<date>2021-01-31</date>
-<releaseinfo>3.8.5</releaseinfo>
+<date>2021-03-18</date>
+<releaseinfo>3.8.6</releaseinfo>
 
 <abstract>
 <para>
diff --git a/kid3.spec b/kid3.spec
index d2b8e195..ff281f86 100644
--- a/kid3.spec
+++ b/kid3.spec
@@ -1,7 +1,7 @@
 %global gstversion 1.0
 
 Name:           kid3
-Version:        3.8.5
+Version:        3.8.6
 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 c8cc5aef..4b56d0d2 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', '3.8.5']
+        for ver in ['3.8.4', '3.8.5', '3.8.6']:
             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 ababa62f..9242eac0 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.5/kid3-3.8.5.tar.xz"
+                    "url": "https://download.kde.org/stable/kid3/3.8.6/kid3-3.8.6.tar.xz"
                     /* , "sha256": "" */
                 }
             ]
diff --git a/src/app/org.kde.kid3.appdata.xml b/src/app/org.kde.kid3.appdata.xml
index 877c6ee3..976f0008 100644
--- a/src/app/org.kde.kid3.appdata.xml
+++ b/src/app/org.kde.kid3.appdata.xml
@@ -215,6 +215,7 @@
   <update_contact>ufleisch_at_users.sourceforge.net</update_contact>
   <translation type="gettext">kid3</translation>
   <releases>
+    <release version="3.8.6" date="2021-03-18"/>
     <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"/>
diff --git a/translations/extract-merge.sh b/translations/extract-merge.sh
index 6a621332..0e89ef47 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.5" # project version
+PROJECTVERSION="3.8.6" # project version
 BUGADDR="https://bugs.kde.org" # MSGID-Bugs
 WDIR=`pwd` # working dir
 


More information about the kde-doc-english mailing list