[multimedia/kid3] /: Prepare for next release

Urs Fleisch null at kde.org
Sun Sep 6 16:42:34 BST 2020


Git commit 27d55678858ab3755eb54c5d0aa4f4065f7e532c by Urs Fleisch.
Committed on 06/09/2020 at 15:41.
Pushed by ufleisch into branch 'master'.

Prepare for next release

M  +2    -2    CMakeLists.txt
M  +30   -0    ChangeLog
M  +2    -23   Doxyfile
M  +1    -1    buildlibs.sh
M  +17   -2    deb/changelog
M  +1    -1    deb/source/lintian-overrides
M  +2    -2    doc/en/index.docbook
M  +1    -1    kid3.spec
M  +1    -1    packaging/craft/extragear/kid3/kid3.py
M  +1    -0    src/app/org.kde.kid3.appdata.xml
M  +1    -1    translations/extract-merge.sh

https://invent.kde.org/multimedia/kid3/commit/27d55678858ab3755eb54c5d0aa4f4065f7e532c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 573f659d..b521f132 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,7 +105,7 @@ endif()
 # Version information
 set(CPACK_PACKAGE_VERSION_MAJOR 3)
 set(CPACK_PACKAGE_VERSION_MINOR 8)
-set(CPACK_PACKAGE_VERSION_PATCH 3)
+set(CPACK_PACKAGE_VERSION_PATCH 4)
 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")
@@ -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 19)
+  set(QT_ANDROID_APP_VERSION_CODE 20)
 else()
   set(WITH_DATAROOTDIR_DEFAULT "share")
   set(WITH_DOCDIR_DEFAULT "share/doc/kid3-qt")
diff --git a/ChangeLog b/ChangeLog
index a4589799..a90a20ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+Sat Sep 26 16:36:24 CEST 2020  Urs Fleisch  <ufleisch at users.sourceforge.net>
+
+	* Release 3.8.4
+
+	* New:
+	  + Section and file list shortcuts can be customized.
+	  + Activate parent/current folder with Ctrl-Up/Down (Command-Up/Down).
+	  + Go to parent item in file list when left arrow key is pressed.
+	  + Header context menu options for custom or automatic column widths.
+	  + Add flatpak support.
+
+	* Improved:
+	  + Support detection of tagged file types from contents when matching by
+	    extension does not succeed.
+	  + Show more details (type, bits, bitrate) for M4A, FLAC, AIFF, WAV.
+	  + Discogs import: Show year and format in album list.
+	  + Dialogs: Store window position and size in settings.
+	  + Mac: Enter key can activate entries in directory list.
+	  + Android: Only navigate between tagged files with [<], [>] buttons.
+
+	* Fixed:
+	  + Do not duplicate pictures when pasting tags.
+	  + Discogs import: Get year when language is not English.
+	  + Keyboard shortcuts settings: Display correctly depending on language
+	    and operating system.
+	  + Android: Accept genre changes when focus lost and Enter not pressed.
+	  + Android: Fix translation.
+	  + Mac: Unlock files when changing permissions.
+	  + Flatpak: Move to trash works in KDE version.
+
 Sun May 10 08:47:03 CEST 2020  Urs Fleisch  <ufleisch at users.sourceforge.net>
 
 	* Release 3.8.3
diff --git a/Doxyfile b/Doxyfile
index c97780d1..7117c81e 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.3
+PROJECT_NUMBER         = 3.8.4
 
 # 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
@@ -230,12 +230,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -1620,7 +1614,7 @@ COMPACT_LATEX          = NO
 # The default value is: a4.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-PAPER_TYPE             = a4wide
+PAPER_TYPE             = a4
 
 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
 # that should be included in the LaTeX output. To get the times font for
@@ -2050,12 +2044,6 @@ EXTERNAL_GROUPS        = YES
 
 EXTERNAL_PAGES         = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
@@ -2069,15 +2057,6 @@ PERL_PATH              = /usr/bin/perl
 
 CLASS_DIAGRAMS         = YES
 
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
diff --git a/buildlibs.sh b/buildlibs.sh
index 36e8271e..b6c03a63 100755
--- a/buildlibs.sh
+++ b/buildlibs.sh
@@ -109,7 +109,7 @@ kid3 (${NEWVER}-0) unstable; urgency=low\n\n  * New upstream release.\n\n\
  -- Urs Fleisch <ufleisch at users.sourceforge.net>  ${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/en/index.docbook
   sed -i "s/PROJECTVERSION=\"${OLDVER}\"/PROJECTVERSION=\"${NEWVER}\"/" translations/extract-merge.sh
-  sed -i "s/^Version:      ${OLDVER}$/Version:      ${NEWVER}/" kid3.spec
+  sed -i "s/^Version:        ${OLDVER}$/Version:        ${NEWVER}/" kid3.spec
   sed -i "s/^Copyright 2003-[0-9]\+ Urs Fleisch <ufleisch at users.sourceforge.net>$/Copyright 2003-${DATE_Y} Urs Fleisch <ufleisch at users.sourceforge.net>/" deb/copyright
   sed -i "1 i\
 ${DATE}  Urs Fleisch  <ufleisch at users.sourceforge.net>\n\n\t* Release ${NEWVER}\n" ChangeLog
diff --git a/deb/changelog b/deb/changelog
index 5441887e..07a58967 100644
--- a/deb/changelog
+++ b/deb/changelog
@@ -1,8 +1,23 @@
-kid3 (3.8.3-0) unstable; urgency=low
+kid3 (3.8.4-0) unstable; urgency=low
 
   * New upstream release.
 
- -- Urs Fleisch <ufleisch at users.sourceforge.net>  Sun, 10 May 2020 20:47:03 +0200
+ -- Urs Fleisch <ufleisch at users.sourceforge.net>  Sat, 26 Sep 2020 16:36:24 +0200
+
+kid3 (3.8.3-2) unstable; urgency=high
+
+  * Fix FTBFS by reverting: Remove build path from plugins.qmltypes.
+    Closes: 964683
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 10 Jul 2020 15:37:33 +0200
+
+kid3 (3.8.3-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Adjust install files.
+  * Bump compat level to 13.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 15 May 2020 12:27:59 +0200
 
 kid3 (3.8.2-2) unstable; urgency=medium
 
diff --git a/deb/source/lintian-overrides b/deb/source/lintian-overrides
index 50892d8a..a45a5ca8 100644
--- a/deb/source/lintian-overrides
+++ b/deb/source/lintian-overrides
@@ -1,3 +1,3 @@
 kid3 source: upstream-metadata-file-is-missing
 kid3 source: testsuite-autopkgtest-missing
-kid3 source: inconsistent-appstream-metadata-license src/app/kid3.appdata.xml (cc0-1.0 != gpl-2+)
+kid3 source: inconsistent-appstream-metadata-license src/app/org.kde.kid3.appdata.xml (cc0-1.0 != gpl-2+)
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 50560df2..92f2acaf 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -29,8 +29,8 @@
 </copyright>
 <legalnotice id="fdl-notice">&FDLNotice;</legalnotice>
 
-<date>2020-05-10</date>
-<releaseinfo>3.8.3</releaseinfo>
+<date>2020-09-26</date>
+<releaseinfo>3.8.4</releaseinfo>
 
 <abstract>
 <para>
diff --git a/kid3.spec b/kid3.spec
index f631747a..d772c875 100644
--- a/kid3.spec
+++ b/kid3.spec
@@ -1,7 +1,7 @@
 %global gstversion 1.0
 
 Name:           kid3
-Version:        3.8.3
+Version:        3.8.4
 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 196f86c2..07c6015b 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.3']:
+        for ver in ['3.8.4']:
             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/src/app/org.kde.kid3.appdata.xml b/src/app/org.kde.kid3.appdata.xml
index 1d300d94..365f30f2 100644
--- a/src/app/org.kde.kid3.appdata.xml
+++ b/src/app/org.kde.kid3.appdata.xml
@@ -212,6 +212,7 @@
   <update_contact>ufleisch_at_users.sourceforge.net</update_contact>
   <translation type="gettext">kid3</translation>
   <releases>
+    <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"/>
     <release version="3.8.1" date="2019-12-23"/>
diff --git a/translations/extract-merge.sh b/translations/extract-merge.sh
index 630c31e4..401fb72a 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.3" # project version
+PROJECTVERSION="3.8.4" # project version
 BUGADDR="https://bugs.kde.org" # MSGID-Bugs
 WDIR=`pwd` # working dir
 


More information about the kde-doc-english mailing list