[neon/forks/kid3/Neon/release] debian: manually sync to ubuntu noble
Jonathan Riddell
null at kde.org
Tue Sep 3 12:29:33 BST 2024
Git commit c35556a4540f9744d2d59650d5e6c62485b90037 by Jonathan Riddell.
Committed on 03/09/2024 at 11:29.
Pushed by jriddell into branch 'Neon/release'.
manually sync to ubuntu noble
M +82 -7 debian/changelog
M +59 -33 debian/control
M +10 -4 debian/kid3-core.install
M +3 -1 debian/kid3-core.lintian-overrides
M +2 -2 debian/kid3-qt.install
M +3 -4 debian/kid3.install
M +5 -7 debian/rules
M +1 -1 debian/watch
https://invent.kde.org/neon/forks/kid3/-/commit/c35556a4540f9744d2d59650d5e6c62485b90037
diff --git a/debian/changelog b/debian/changelog
index 25e0984..8bcf51d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,95 @@
-kid3 (3.9.5-0neon) noble; urgency=medium
+kid3 (3.9.5-1build4) noble; urgency=medium
- * New release
+ * No-change rebuild against libqt5core5t64.
- -- Neon CI <neon at kde.org> Tue, 22 Jun 2021 04:54:04 +0000
+ -- Colin Watson <cjwatson at ubuntu.com> Mon, 15 Apr 2024 19:19:16 +0100
-kid3 (3.8.6-0neon) focal; urgency=medium
+kid3 (3.9.5-1build3) noble; urgency=medium
+
+ * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Sun, 31 Mar 2024 09:05:18 +0000
+
+kid3 (3.9.5-1build2) noble; urgency=medium
+
+ * No-change rebuild against libqt5core5t64
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Fri, 15 Mar 2024 04:59:24 +0000
+
+kid3 (3.9.5-1build1) noble; urgency=medium
+
+ * No-change rebuild against libflac12t64
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Mon, 11 Mar 2024 14:53:48 +0000
+
+kid3 (3.9.5-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Mon, 04 Mar 2024 11:50:54 +0100
+
+kid3 (3.9.4-2) unstable; urgency=medium
+
+ * Remove leftover pycache folder in dh_clean.
+ Closes: #1047566
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Tue, 22 Aug 2023 16:28:25 +0200
+
+kid3 (3.9.4-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Drop merged patch 01-python3.11.
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Mon, 10 Jul 2023 18:56:27 +0200
+
+kid3 (3.9.3-1) unstable; urgency=high
+
+ * New upstream release.
+ * Bump Standards-Version to 4.6.2.
+ * Add patch 01-python3.11 to fix a FTBFS with Python 3.11.
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Fri, 13 Jan 2023 09:30:07 +0100
+
+kid3 (3.9.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Remove merged patch ffmpeg-5.0.
+ * Bump Standards-Version to 4.6.1.
+ * Adjust lintian overrides.
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Mon, 08 Aug 2022 10:23:48 +0200
+
+kid3 (3.9.1-2) unstable; urgency=medium
+
+ * Acknowledge NMU from Sebastian Ramacher: Apply upstream patch to fix
+ build with ffmpeg 5.0.
+ Closes: #1004772
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Thu, 03 Mar 2022 16:01:37 +0100
+
+kid3 (3.9.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Adjust lintian overrides.
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Tue, 25 Jan 2022 11:29:43 +0100
+
+kid3 (3.9.0-1) unstable; urgency=medium
* New upstream release.
- -- Urs Fleisch <ufleisch at users.sourceforge.net> Sun, 20 Jun 2021 11:14:31 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org> Mon, 20 Dec 2021 14:15:23 +0100
-kid3 (3.8.6-0) unstable; urgency=low
+kid3 (3.8.7-1) unstable; urgency=medium
* New upstream release.
+ * Update homepage field.
+ * Update packages long description.
+ * Update debian/copyright year.
+ * Remove deprecated KDE4 stuff.
+ * Bump Standards-Version to 4.6.0.
- -- Urs Fleisch <ufleisch at users.sourceforge.net> Thu, 18 Mar 2021 08:21:47 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org> Thu, 19 Aug 2021 11:22:29 +0200
kid3 (3.8.5-3) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index b377e36..0ba77d6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,45 +1,69 @@
Source: kid3
Section: kde
Priority: optional
-Maintainer: Patrick Matthäi <pmatthaei at debian.org>
-Build-Depends: cmake,
- debhelper-compat (= 13),
- docbook-xsl,
- extra-cmake-modules,
- kdoctools-dev | libkf5doctools-dev,
- kio-dev | libkf5kio-dev,
- libavcodec-dev,
- libavformat-dev,
- libchromaprint-dev,
- libflac++-dev,
- libid3-3.8.3-dev,
- libreadline-dev,
- libtag1-dev,
- libvorbis-dev,
- pkg-config,
- python3,
- qml-module-qtquick2,
- qtdeclarative5-dev,
- qtdeclarative5-dev-tools,
- qtmultimedia5-dev,
- qttools5-dev,
- qttools5-dev-tools,
- xsltproc
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Patrick Matthäi <pmatthaei at debian.org>
+Build-Depends: debhelper-compat (= 13),
+ extra-cmake-modules,
+ libkf5kio-dev,
+ libkf5doctools-dev,
+ qtmultimedia5-dev,
+ qtdeclarative5-dev,
+ qttools5-dev,
+ qttools5-dev-tools,
+ qtdeclarative5-dev-tools,
+ qml-module-qtquick2,
+ cmake,
+ libid3-3.8.3-dev,
+ libflac++-dev,
+ libvorbis-dev,
+ libtag1-dev,
+ libchromaprint-dev,
+ libavformat-dev,
+ libavcodec-dev,
+ docbook-xsl,
+ pkg-config,
+ libreadline-dev,
+ xsltproc
Standards-Version: 4.6.2
Rules-Requires-Root: no
Homepage: https://kid3.kde.org/
Package: kid3-core
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kid3 (<< 3.8.7-0), kid3-cli (<< 3.8.7-0), kid3-qt (<< 3.8.7-0)
-Replaces: kid3 (<< 3.8.7-0), kid3-cli (<< 3.8.7-0), kid3-qt (<< 3.8.7-0)
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Breaks: kid3 (<< 3.8.5-2),
+ kid3-cli (<< 3.8.5-2),
+ kid3-qt (<< 3.8.5-2)
+Replaces: kid3 (<< 3.8.5-2),
+ kid3-cli (<< 3.8.5-2),
+ kid3-qt (<< 3.8.5-2)
Description: Audio tag editor core libraries and data
+ With Kid3, an ID3 tag editor for KDE you can:
+ * Edit ID3v1.1 tags in your MP3 files
+ * Edit all ID3v2.3 and ID3v2.4 frames in your MP3 files
+ * Convert between ID3v1.1, ID3v2.3 and ID3v2.4 tags
+ * Edit tags in MP3, Ogg/Vorbis, Opus, DSF, FLAC, MPC, APE, MP4/AAC, MP2,
+ Speex, TrueAudio, WavPack, WMA, WAV, AIFF files and tracker modules.
+ * Edit tags of multiple files, e.g. the artist, album, year and genre
+ of all files of an album typically have the same values and can be
+ set together
+ * Generate tags from filenames
+ * Generate tags from the contents of tag fields
+ * Generate filenames from tags
+ * Generate playlist files
+ * Automatic case conversion and string translation
+ * Import and export album data
+ * Import from gnudb.org, MusicBrainz, Discogs, Amazon
+ .
This package contains common libraries and data used by both kid3 and kid3-qt.
Package: kid3
Architecture: any
-Depends: kid3-core (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ kid3-core (= ${binary:Version})
Description: KDE audio tag editor
With Kid3, an ID3 tag editor for KDE you can:
* Edit ID3v1.1 tags in your MP3 files
@@ -62,10 +86,10 @@ Description: KDE audio tag editor
Package: kid3-qt
Architecture: any
-Depends: kid3-core (= ${binary:Version}),
- libqt5multimedia5-plugins,
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ kid3-core (= ${binary:Version}),
+ libqt5multimedia5-plugins
Description: Audio tag editor
With Kid3, an audio tag editor you can:
* Edit ID3v1.1 tags in your MP3 files
@@ -88,7 +112,9 @@ Description: Audio tag editor
Package: kid3-cli
Architecture: any
-Depends: kid3-core (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ kid3-core (= ${binary:Version})
Breaks: kid3 (<< 3.0.2-2)
Replaces: kid3 (<< 3.0.2-2)
Description: Command line audio tag editor
diff --git a/debian/kid3-core.install b/debian/kid3-core.install
index 2c43ed3..77a7142 100644
--- a/debian/kid3-core.install
+++ b/debian/kid3-core.install
@@ -1,4 +1,10 @@
-usr/lib/kid3/
-usr/share/dbus-1/interfaces/
-usr/share/kid3/qml/script/
-usr/share/man/
+usr/lib/kid3/*
+usr/share/dbus-1/interfaces/org.kde.Kid3.xml
+usr/share/kid3/translations/*
+usr/share/kid3/qml/script/*
+usr/share/man/*/man1/kid3-cli.1.gz
+usr/share/man/*/man1/kid3-qt.1.gz
+usr/share/man/*/man1/kid3.1.gz
+usr/share/man/man1/kid3-cli.1.gz
+usr/share/man/man1/kid3-qt.1.gz
+usr/share/man/man1/kid3.1.gz
diff --git a/debian/kid3-core.lintian-overrides b/debian/kid3-core.lintian-overrides
index 24cbe9c..c92e131 100644
--- a/debian/kid3-core.lintian-overrides
+++ b/debian/kid3-core.lintian-overrides
@@ -1 +1,3 @@
-kid3-core: file-references-package-build-path usr/lib/kid3/plugins/imports/Kid3/plugins.qmltypes
+kid3-core: groff-message 313: warning: macro 'AQ' not defined [usr/share/man/ca/man1/kid3.1.gz:1]
+kid3-core: arch-dep-package-has-big-usr-share *
+kid3-core: file-references-package-build-path [usr/lib/kid3/plugins/imports/Kid3/plugins.qmltypes]
diff --git a/debian/kid3-qt.install b/debian/kid3-qt.install
index cd527c3..f9c20f3 100644
--- a/debian/kid3-qt.install
+++ b/debian/kid3-qt.install
@@ -1,5 +1,5 @@
usr/bin/kid3-qt
+usr/share/doc/kid3-qt/*
usr/share/applications/org.kde.kid3-qt.desktop
-usr/share/doc/kid3-qt/
-usr/share/icons/hicolor/*/apps/kid3-qt.*
usr/share/metainfo/org.kde.kid3-qt.appdata.xml
+usr/share/icons/hicolor/*/apps/kid3-qt.*
diff --git a/debian/kid3.install b/debian/kid3.install
index 67e4f34..d81c17c 100644
--- a/debian/kid3.install
+++ b/debian/kid3.install
@@ -1,7 +1,6 @@
usr/bin/kid3
-usr/share/applications/org.kde.kid3.desktop
-usr/share/doc/HTML/*/kid3/
usr/share/icons/hicolor/*/apps/kid3.*
-usr/share/kid3/translations/
-usr/share/kxmlgui5/kid3/
+usr/share/applications/org.kde.kid3.desktop
usr/share/metainfo/org.kde.kid3.appdata.xml
+usr/share/doc/HTML/*/kid3/*
+usr/share/kxmlgui5/kid3/kid3ui.rc
diff --git a/debian/rules b/debian/rules
index aa5aff3..47d024c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ DEB_CMAKE_PREFIX = /usr
BASE_CMAKE_DEFS = -DKDE_INSTALL_BINDIR=$(DEB_CMAKE_PREFIX)/bin -Wno-dev -DWITH_FFMPEG=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
%:
- dh $@ --parallel --builddirectory=kid3-build
+ dh $@ --builddirectory=kid3-build
override_dh_auto_configure:
dh_auto_configure -- \
@@ -17,14 +17,12 @@ override_dh_auto_configure:
-DCMAKE_C_FLAGS="$(CFLAGS)" \
-DCMAKE_CXX_FLAGS="$(CXXFLAGS)"
-override_dh_auto_install:
- dh_auto_install
-
-override_dh_install:
- dh_install
-
override_dh_makeshlibs:
dh_makeshlibs --noscripts
+override_dh_clean:
+ rm -rf $(CURDIR)/src/test/__pycache__/
+ dh_clean
+
override_dh_compress:
dh_compress --exclude=.docbook
diff --git a/debian/watch b/debian/watch
index d22081b..974d902 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
+version=4
opts=pgpsigurlmangle=s/$/.sig/ \
http://sf.net/kid3/kid3-([\d.]*)\.tar\.gz
More information about the Neon-commits
mailing list