[neon/forks/kid3/Neon/unstable] debian: sync to packaging in kde git repo
Jonathan Riddell
null at kde.org
Mon Jun 21 10:28:57 BST 2021
Git commit bf568eb3f603aa9c10e0cb9a05da771099415961 by Jonathan Riddell.
Committed on 21/06/2021 at 09:28.
Pushed by jriddell into branch 'Neon/unstable'.
sync to packaging in kde git repo
M +56 -14 debian/changelog
M +16 -28 debian/control
M +1 -1 debian/copyright
M +1 -1 debian/kid3-cli.install
D +0 -2 debian/kid3-cli.manpages
M +10 -3 debian/kid3-core.install
M +5 -5 debian/kid3-qt.install
D +0 -2 debian/kid3-qt.manpages
M +6 -6 debian/kid3.install
D +0 -2 debian/kid3.links
D +0 -2 debian/kid3.lintian-overrides
D +0 -2 debian/kid3.manpages
M +1 -9 debian/rules
M +1 -2 debian/source/lintian-overrides
M +3 -2 debian/watch
https://invent.kde.org/neon/forks/kid3/commit/bf568eb3f603aa9c10e0cb9a05da771099415961
diff --git a/debian/changelog b/debian/changelog
index b479a6d..4bcd559 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,66 @@
-kid3 (3.8.6-0neon) focal; urgency=medium
+kid3 (3.8.7-0) unstable; urgency=low
- * New release
+ * New upstream release.
+
+ -- Urs Fleisch <ufleisch at users.sourceforge.net> Sun, 20 Jun 2021 11:14:31 +0200
+
+kid3 (3.8.6-0) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Urs Fleisch <ufleisch at users.sourceforge.net> Thu, 18 Mar 2021 08:21:47 +0100
+
+kid3 (3.8.5-3) unstable; urgency=medium
+
+ * Add missing breaks and replaces from the last upload.
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Sat, 19 Jun 2021 13:17:06 +0200
+
+kid3 (3.8.5-2) unstable; urgency=medium
+
+ * Cleanup manpage installing. The old method is obsolet and buggy. All
+ manpages are now installed to the kid3-core package.
+ Closes: #990018
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Fri, 18 Jun 2021 15:56:17 +0200
+
+kid3 (3.8.5-1) unstable; urgency=medium
- -- Neon CI <neon at kde.org> Fri, 19 Mar 2021 04:54:04 +0000
+ * 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
+
+ * 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!
-kid3 (3.8.5-0neon) focal; urgency=medium
+ -- Patrick Matthäi <pmatthaei at debian.org> Thu, 19 Nov 2020 14:57:28 +0100
- * New release
+kid3 (3.8.4-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Adjust lintian overrides.
+ * Signature file has been renamed from asc to sig.
- -- Neon CI <neon at kde.org> Mon, 01 Feb 2021 04:54:03 +0000
+ -- Patrick Matthäi <pmatthaei at debian.org> Fri, 09 Oct 2020 14:45:27 +0200
-kid3 (3.8.4-0neon) focal; urgency=medium
+kid3 (3.8.3-2) unstable; urgency=high
- [ Jonathan Riddell ]
- * New release
+ * Fix FTBFS by reverting: Remove build path from plugins.qmltypes.
+ Closes: 964683
- [ Neon CI ]
- * New release
+ -- Patrick Matthäi <pmatthaei at debian.org> Fri, 10 Jul 2020 15:37:33 +0200
- -- Neon CI <neon at kde.org> Sun, 27 Sep 2020 04:54:07 +0000
+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
@@ -466,7 +508,7 @@ kid3 (1.2-1) unstable; urgency=low
kid3 (1.1-1) unstable; urgency=low
- * New usptream release:
+ * New upstream release:
- Add support for .oga (Closes: #498352)
* Add call to dh_icons and dh_desktop. (Closes: #454526)
* Update do debhelper compat 6.
@@ -477,7 +519,7 @@ kid3 (1.1-1) unstable; urgency=low
kid3 (1.0-1) unstable; urgency=low
- * New usptream release:
+ * New upstream release:
- Includes polish translation. (Closes: #465675)
* Add build-depend on libqt3-i18n to build translations.
* Update description in control file and manpages.
diff --git a/debian/control b/debian/control
index 201c156..a1f1834 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: kid3
Section: kde
Priority: optional
Maintainer: Patrick Matthäi <pmatthaei at debian.org>
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper (>= 9),
extra-cmake-modules,
- libkf5kio-dev,
- libkf5doctools-dev,
+ kio-dev | libkf5kio-dev,
+ kdoctools-dev | libkf5doctools-dev,
qtmultimedia5-dev,
qtdeclarative5-dev,
qttools5-dev,
@@ -23,35 +23,23 @@ Build-Depends: debhelper-compat (= 12),
docbook-xsl,
pkg-config,
libreadline-dev,
- xsltproc
-Standards-Version: 4.5.0
+ xsltproc,
+ python3
+Standards-Version: 4.2.1
Rules-Requires-Root: no
-Homepage: http://kid3.sourceforge.net/
+Homepage: https://kid3.kde.org/
Package: kid3-core
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Breaks: kid3 (<< 3.0.2-2)
-Replaces: kid3 (<< 3.0.2-2)
+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)
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, TrackType.org, MusicBrainz, Discogs, Amazon
- .
This package contains common libraries and data used by both kid3 and kid3-qt.
Package: kid3
@@ -75,7 +63,7 @@ Description: KDE audio tag editor
* Generate playlist files
* Automatic case conversion and string translation
* Import and export album data
- * Import from gnudb.org, TrackType.org, MusicBrainz, Discogs, Amazon
+ * Import from gnudb.org, MusicBrainz, Discogs, Amazon
.
This package uses KDE libraries, if you do not use KDE you should use kid3-qt.
@@ -101,7 +89,7 @@ Description: Audio tag editor
* Generate playlist files
* Automatic case conversion and string translation
* Import and export album data
- * Import from gnudb.org, TrackType.org, MusicBrainz, Discogs, Amazon
+ * Import from gnudb.org, MusicBrainz, Discogs, Amazon
.
This package does not use KDE libraries, if you use KDE you should use kid3.
@@ -128,7 +116,7 @@ Description: Command line audio tag editor
* Generate playlist files
* Automatic case conversion and string translation
* Import and export album data
- * Import from gnudb.org, TrackType.org, MusicBrainz, Discogs, Amazon
+ * Import from gnudb.org, MusicBrainz, Discogs, Amazon
.
This package contains a command line interface for Kid3, for a GUI you can
use kid3-qt or kid3.
diff --git a/debian/copyright b/debian/copyright
index 325b559..f0b0d7b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2003-2018, Urs Fleisch
+Copyright: 2003-2021, Urs Fleisch
License: GPL-2+
Files: src/core/model/expressionparser.cpp
diff --git a/debian/kid3-cli.install b/debian/kid3-cli.install
index c23ac52..522df6e 100644
--- a/debian/kid3-cli.install
+++ b/debian/kid3-cli.install
@@ -1 +1 @@
-/usr/bin/kid3-cli
+usr/bin/kid3-cli
diff --git a/debian/kid3-cli.manpages b/debian/kid3-cli.manpages
deleted file mode 100644
index 74d2d9d..0000000
--- a/debian/kid3-cli.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-deb/kid3-cli.1
-deb/kid3-cli.de.1
diff --git a/debian/kid3-core.install b/debian/kid3-core.install
index 62453ee..77a7142 100644
--- a/debian/kid3-core.install
+++ b/debian/kid3-core.install
@@ -1,3 +1,10 @@
-/usr/lib/kid3/*
-/usr/share/dbus-1/interfaces/org.kde.Kid3.xml
-/usr/share/kid3/qml/script/*
+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-qt.install b/debian/kid3-qt.install
index 2c81f12..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/icons/hicolor/*/apps/kid3-qt.*
-/usr/share/applications/org.kde.kid3-qt.desktop
-/usr/share/metainfo/org.kde.kid3-qt.appdata.xml
+usr/bin/kid3-qt
+usr/share/doc/kid3-qt/*
+usr/share/applications/org.kde.kid3-qt.desktop
+usr/share/metainfo/org.kde.kid3-qt.appdata.xml
+usr/share/icons/hicolor/*/apps/kid3-qt.*
diff --git a/debian/kid3-qt.manpages b/debian/kid3-qt.manpages
deleted file mode 100644
index c16af51..0000000
--- a/debian/kid3-qt.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-deb/kid3-qt.1
-deb/kid3-qt.de.1
diff --git a/debian/kid3.install b/debian/kid3.install
index c974ff4..d81c17c 100644
--- a/debian/kid3.install
+++ b/debian/kid3.install
@@ -1,6 +1,6 @@
-/usr/bin/kid3
-/usr/share/icons/hicolor/*/apps/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
+usr/bin/kid3
+usr/share/icons/hicolor/*/apps/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/kid3.links b/debian/kid3.links
deleted file mode 100644
index a25138d..0000000
--- a/debian/kid3.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/kde/HTML/en/common usr/share/doc/kde/HTML/en/kid3/common
-usr/share/doc/kde/HTML/en/common usr/share/doc/kde/HTML/de/kid3/common
diff --git a/debian/kid3.lintian-overrides b/debian/kid3.lintian-overrides
deleted file mode 100644
index ee77ddf..0000000
--- a/debian/kid3.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-kid3: package-contains-broken-symlink usr/share/doc/kde/HTML/de/kid3/common ../../en/common
-kid3: package-contains-broken-symlink usr/share/doc/kde/HTML/en/kid3/common ../common
diff --git a/debian/kid3.manpages b/debian/kid3.manpages
deleted file mode 100644
index c3f8fda..0000000
--- a/debian/kid3.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-deb/kid3.1
-deb/kid3.de.1
diff --git a/debian/rules b/debian/rules
index 60a757a..aa5aff3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,10 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DEB_CMAKE_PREFIX = /usr
-DEB_CONFIG_INSTALL_DIR = $(DEB_CMAKE_PREFIX)/share/kde4/config
-DEB_HTML_INSTALL_DIR = $(DEB_CMAKE_PREFIX)/share/doc/kde/HTML
BASE_CMAKE_DEFS = -DKDE_INSTALL_BINDIR=$(DEB_CMAKE_PREFIX)/bin -Wno-dev -DWITH_FFMPEG=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
%:
- dh $@ --builddirectory=kid3-build
+ dh $@ --parallel --builddirectory=kid3-build
override_dh_auto_configure:
dh_auto_configure -- \
@@ -19,17 +17,11 @@ override_dh_auto_configure:
-DCMAKE_C_FLAGS="$(CFLAGS)" \
-DCMAKE_CXX_FLAGS="$(CXXFLAGS)"
-override_dh_auto_build:
- dh_auto_build
- cp kid3-build/doc/en/kid3.1 kid3-build/doc/en/kid3-core.1
-
override_dh_auto_install:
dh_auto_install
override_dh_install:
dh_install
- sed '/This file was auto-generated by:/,+1 d' -i \
- $(CURDIR)/debian/kid3-core/usr/lib/kid3/plugins/imports/Kid3/plugins.qmltypes
override_dh_makeshlibs:
dh_makeshlibs --noscripts
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 50892d8..5e4adef 100644
--- a/debian/source/lintian-overrides
+++ b/debian/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/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/debian/watch b/debian/watch
index 79bc3c8..d22081b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
-version=4
-opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/@PACKAGE@/([\d.]+)/@PACKAGE at -([\d.]+).tar.xz
+version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
+http://sf.net/kid3/kid3-([\d.]*)\.tar\.gz
More information about the Neon-commits
mailing list