[neon/extras/phonon/Neon/unstable] debian: Revert "Revert "Initial repackage with dual build qt5 & qt6""
Carlos De Maine
null at kde.org
Sat Aug 19 22:01:08 BST 2023
Git commit 24d9591f064834c85bf96471c01d0ce6f0533939 by Carlos De Maine.
Committed on 19/08/2023 at 23:00.
Pushed by carlosdem into branch 'Neon/unstable'.
Revert "Revert "Initial repackage with dual build qt5 & qt6""
This reverts commit 5c2686c5bbcb88746ca9d22ad7fe806ccc12538a.
M +6 -0 debian/changelog
D +0 -1 debian/compat
M +120 -84 debian/control
D +0 -23 debian/expand_vars.awk
D +0 -2 debian/libphonon4qt5-4.install
D +0 -2 debian/libphonon4qt5-4.lintian-overrides
D +0 -0 debian/libphonon4qt5-data.install
D +0 -1 debian/libphonon4qt5experimental-dev.install
D +0 -2 debian/libphonon4qt5experimental4.install
D +0 -2 debian/meta/cmake-ignore
D +0 -1 debian/not-installed
D +0 -0 debian/patches/series
D +0 -5 debian/phonon4qt5.config
D +0 -7 debian/phonon4qt5.postinst
D +0 -2 debian/phonon4qt5settings.install
D +0 -19 debian/phononexperimental/README.Debian
D +0 -1 debian/po/POTFILES.in
D +0 -61 debian/po/de.po
D +0 -62 debian/po/fr.po
D +0 -63 debian/po/nl.po
D +0 -74 debian/po/pt.po
D +0 -63 debian/po/ru.po
D +0 -55 debian/po/templates.pot
R +1 -0 debian/qt5-phonon-dev.install [from: debian/libphonon4qt5-dev.install - 084% similarity]
A +7 -0 debian/qt5-phonon.install
A +6 -0 debian/qt6-phonon-dev.install
A +5 -0 debian/qt6-phonon.install
M +15 -27 debian/rules
D +0 -7 debian/salsa-ci.yml
D +0 -1 debian/source/local-options
https://invent.kde.org/neon/extras/phonon/-/commit/24d9591f064834c85bf96471c01d0ce6f0533939
diff --git a/debian/changelog b/debian/changelog
index 9b208dd..bb8b803 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qt6-phonon (4.11.1-5neon) UNRELEASED; urgency=medium
+
+ * Initial repackage with dual build qt5 & qt6
+
+ -- Carlos De Maine <neon at kde.org> Tue, 25 Jul 2023 15:41:22 +1000
+
phonon (4:4.11.1-4) UNRELEASED; urgency=medium
[ Debconf translation updates ]
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 48082f7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/debian/control b/debian/control
index 6802f79..b6a4f80 100644
--- a/debian/control
+++ b/debian/control
@@ -6,116 +6,152 @@ Uploaders: Modestas Vainius <modax at debian.org>,
Diane Trout <diane at ghic.org>,
Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
Maximiliano Curia <maxy at debian.org>,
-Build-Depends: cmake (>= 3.5~),
- debhelper (>= 12~),
- dpkg-dev (>= 1.15.5),
+Build-Depends: cmake,
+ debhelper-compat(= 13),
+ dpkg-dev,
kf6-extra-cmake-modules,
libglib2.0-dev,
- libpulse-dev (>= 0.9.21),
+ libpulse-dev,
libqt5opengl5-dev,
- pkg-kde-tools (>= 0.12),
+ pkg-kde-tools-neon,
qtbase5-dev,
qttools5-dev,
-Standards-Version: 4.4.1
+ qt6-5compat-dev,
+ qt6-base-dev,
+ qt6-tools-dev
+Standards-Version: 4.6.2
Homepage: https://phonon.kde.org/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/phonon
Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/phonon.git
-Package: libphonon4qt5-4
+Package: qt6-phonon
Architecture: any
-Multi-Arch: same
-Section: libs
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libphonon4qt5-data (>= ${source:Version}),
- ${misc:Depends}, ${shlibs:Depends}
-Description: multimedia framework from KDE using Qt 5 - core library
- Phonon is a Qt 5 multimedia API, which provides a task-oriented abstraction
+Section: kde
+X-Neon-MergedPackage: true
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: multimedia framework from KDE using Qt6 - core libraries
+ Phonon6 is a Qt6 multimedia API, which provides a task-oriented abstraction
layer for capturing, mixing, processing, and playing audio and video content.
.
- This package contains the core library of the Phonon cross-platform multimedia
- framework from KDE. It is required to run applications that use Phonon.
+ This package contains the core library of the Phonon6 cross-platform multimedia
+ framework from KDE. It is required to run applications that use Phonon6.
-Package: libphonon4qt5-data
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-Breaks: libphonon4qt5-4 (<< 4:4.11.1-3)
-Replaces: libphonon4qt5-4 (<< 4:4.11.1-3)
-Description: multimedia framework from KDE using Qt 5 - core library data
- Phonon is a Qt 5 multimedia API, which provides a task-oriented abstraction
+Package: qt6-phonon-dev
+Architecture: any
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-phonon (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: multimedia framework from KDE using Qt6 - development files
+ Phonon6 is a Qt6 multimedia API, which provides a task-oriented abstraction
layer for capturing, mixing, processing, and playing audio and video content.
.
- This package contains the shared data for the core Phonon library.
+ This package contains the development files needed to build Qt6 applications
+ using the Phonon6 cross-platform multimedia framework.
-Package: libphonon4qt5-dev
+Package: libphonon4qt6-4
+Architecture: all
+Depends: qt6-phonon
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libphonon4qt6-data
+Architecture: all
+Depends: qt6-phonon
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libphonon4qt6experimental4
+Architecture: all
+Depends: qt6-phonon
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: phonon4qt6
+Architecture: all
+Depends: qt6-phonon
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: phonon4qt6settings
+Architecture: all
+Depends: qt6-phonon
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libphonon4qt6-dev
+Architecture: all
+Depends: qt6-phonon-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libphonon4qt6experimental-dev
+Architecture: all
+Depends: qt6-phonon-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt5-phonon
Architecture: any
-Section: libdevel
-Depends: libphonon4qt5-4 (= ${binary:Version}),
- phonon4qt5-backend-null | phonon4qt5,
- qtbase5-dev,
- ${misc:Depends},
- ${shlibs:Depends}
-Description: multimedia framework from KDE using Qt 5 - development files
- Phonon is a Qt 5 multimedia API, which provides a task-oriented abstraction
+Section: kde
+X-Neon-MergedPackage: true
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: multimedia framework from KDE using Qt5 - core libraries
+ Phonon5is a Qt5 multimedia API, which provides a task-oriented abstraction
layer for capturing, mixing, processing, and playing audio and video content.
.
- This package contains the development files needed to build Qt 5 applications
- using the Phonon cross-platform multimedia framework.
+ This package contains the core libraries of the Phonon5 cross-platform multimedia
+ framework from KDE. It is required to run applications that use Phonon5.
-Package: libphonon4qt5experimental-dev
+Package: qt5-phonon-dev
Architecture: any
-Section: libdevel
-Depends: libphonon4qt5-dev, libphonon4qt5experimental4 (= ${binary:Version}), ${misc:Depends}
-Description: multimedia framework from KDE using Qt 5 - experimental development files
- Phonon is a Qt 5 multimedia API, which provides a task-oriented abstraction
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt5-phonon (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: multimedia framework from KDE using Qt5 - development files
+ Phonon5 is a Qt5 multimedia API, which provides a task-oriented abstraction
layer for capturing, mixing, processing, and playing audio and video content.
.
- This package contains the development files needed to build Phonon back-ends
- or internal applications which need the Phonon-Experimental library.
- Third-party applications should not depend on this library. Please read
- README.Debian if you are considering a build-dependency on this package.
+ This package contains the development files needed to build Qt5 applications
+ using the Phonon5 cross-platform multimedia framework.
+
+Package: libphonon4qt5-4
+Architecture: all
+Depends: qt5-phonon
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libphonon4qt5-data
+Architecture: all
+Depends: qt5-phonon
+Description: Dummy transitional
+ Transitional dummy package.
Package: libphonon4qt5experimental4
-Architecture: any
-Multi-Arch: same
-Section: libs
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libphonon4qt5-4 (= ${binary:Version}),
- ${misc:Depends}, ${shlibs:Depends}
-Provides: phonon4qt5experimental-abi-1
-Description: multimedia framework from KDE using Qt 5 - experimental library (internal)
- Phonon is a Qt 5 multimedia API, which provides a task-oriented abstraction
- layer for capturing, mixing, processing, and playing audio and video content.
- .
- This package contains the Phonon-Experimental library, which might be needed
- by Phonon back-ends or other internal applications. Third-party applications
- should not depend on this library. Please read README.Debian before using this
- library.
+Architecture: all
+Depends: qt5-phonon
+Description: Dummy transitional
+ Transitional dummy package.
Package: phonon4qt5
-Architecture: any
-Multi-Arch: same
-Depends: libphonon4qt5-4 (>= ${source:Version}),
- ${misc:Depends},
- ${phonon:Recommended-Backend-qt5} | phonon4qt5-backend
-Suggests: phonon4qt5-backend-gstreamer, phonon4qt5-backend-vlc
-Description: multimedia framework from KDE using Qt 5 - metapackage
- Phonon Qt 5 is a multimedia API, which provides a task-oriented abstraction
- layer for capturing, mixing, processing, and playing audio and video content.
- .
- This metapackage ensures that the system has a working Phonon configuration
- installed (the core library and at least one back-end).
+Architecture: all
+Depends: qt5-phonon
+Description: Dummy transitional
+ Transitional dummy package.
Package: phonon4qt5settings
-Architecture: any
-Depends: libphonon4qt5-4 (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends},
-Breaks: libphonon4qt5-bin
-Replaces: libphonon4qt5-bin
-Description: multimedia framework from KDE using Qt 5 - settings application
- Phonon is a Qt 5 multimedia API, which provides a task-oriented abstraction
- layer for capturing, mixing, processing, and playing audio and video content.
- .
- This package contains a graphical configuration for the Phonon cross-platform
- multimedia framework.
+Architecture: all
+Depends: qt5-phonon
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libphonon4qt5-dev
+Architecture: all
+Depends: qt5-phonon-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libphonon4qt5experimental-dev
+Architecture: all
+Depends: qt5-phonon-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/expand_vars.awk b/debian/expand_vars.awk
deleted file mode 100644
index 6609961..0000000
--- a/debian/expand_vars.awk
+++ /dev/null
@@ -1,23 +0,0 @@
-function readfile(file)
-{
- while (getline < file) {
- process()
- }
-}
-
-function process()
-{
- gsub(/#RECOMMENDED4QT5_BACKEND#/,recommended4qt5_backend);
- if (/^#INCLUDE [^#]+#$/) {
- readfile(substr($0,10,length($0)-9-1));
- return
- } else if (/^INCLUDE#: .+/) {
- readfile(substr($0,11,length($0)-10));
- return
- }
- print
-}
-
-{
- process()
-}
diff --git a/debian/libphonon4qt5-4.install b/debian/libphonon4qt5-4.install
deleted file mode 100644
index 9ccd06a..0000000
--- a/debian/libphonon4qt5-4.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libphonon4qt5.so.4
-usr/lib/*/libphonon4qt5.so.4.*
diff --git a/debian/libphonon4qt5-4.lintian-overrides b/debian/libphonon4qt5-4.lintian-overrides
deleted file mode 100644
index 92cfe85..0000000
--- a/debian/libphonon4qt5-4.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libphonon4qt5-4: symbols-declares-dependency-on-other-package phonon4qt5
-libphonon4qt5-4: shlibs-declares-dependency-on-other-package
diff --git a/debian/libphonon4qt5-data.install b/debian/libphonon4qt5-data.install
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/libphonon4qt5experimental-dev.install b/debian/libphonon4qt5experimental-dev.install
deleted file mode 100644
index 2da9a14..0000000
--- a/debian/libphonon4qt5experimental-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libphonon4qt5experimental.so
diff --git a/debian/libphonon4qt5experimental4.install b/debian/libphonon4qt5experimental4.install
deleted file mode 100644
index 0a2d90f..0000000
--- a/debian/libphonon4qt5experimental4.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libphonon4qt5experimental.so.4
-usr/lib/*/libphonon4qt5experimental.so.4.*
diff --git a/debian/meta/cmake-ignore b/debian/meta/cmake-ignore
deleted file mode 100644
index 23d6c32..0000000
--- a/debian/meta/cmake-ignore
+++ /dev/null
@@ -1,2 +0,0 @@
-QZeitgeist
-Qt5Declarative
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index 8512261..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/*/LC_MESSAGES/libphonon_qt.qm
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/phonon4qt5.config b/debian/phonon4qt5.config
deleted file mode 100644
index c1fc8b9..0000000
--- a/debian/phonon4qt5.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
diff --git a/debian/phonon4qt5.postinst b/debian/phonon4qt5.postinst
deleted file mode 100644
index 0ae7a18..0000000
--- a/debian/phonon4qt5.postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
diff --git a/debian/phonon4qt5settings.install b/debian/phonon4qt5settings.install
deleted file mode 100644
index 11fec18..0000000
--- a/debian/phonon4qt5settings.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/phononsettings
-usr/share/locale/*/LC_MESSAGES/phononsettings_qt.qm
diff --git a/debian/phononexperimental/README.Debian b/debian/phononexperimental/README.Debian
deleted file mode 100644
index 2f93a29..0000000
--- a/debian/phononexperimental/README.Debian
+++ /dev/null
@@ -1,19 +0,0 @@
-The Phonon-Experimental library
--------------------------------
-
-This library is for use by Phonon backends or other internal Phonon
-applications. It provides a testing ground for new but not-yet-finished
-features. External third party applications should NOT depend on this library
-because it might break in a myriad of ways and there is no API compatibility
-guarantees. Just stick with the core Phonon library (libphonon4 and its
-development package libphonon-dev) instead. What's more, the effective licence
-of the Phonon-Experimental library is GNU General Public Licence version 3 or
-later (in contrast to LGPL of libphonon).
-
-We (maintainers) reserve a right to pull this library from the archive if it
-ends up abused too much. You have been warned.
-
-Due to the nature of the libphononexperimental-dev package (see above), it does
-not depend on the libphonon-dev package. This is not a bug.
-
- -- Modestas Vainius <modax at debian.org> Sat, 05 Mar 2011 00:46:42 +0200
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
deleted file mode 100644
index 1863579..0000000
--- a/debian/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] phonon4qt5-backend-null.templates
diff --git a/debian/po/de.po b/debian/po/de.po
deleted file mode 100644
index a5b6ed6..0000000
--- a/debian/po/de.po
+++ /dev/null
@@ -1,61 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the phonon package.
-# Helge Kreutzmann <debian at helgefjell.de>, 2019.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phonon 4:4.10.3-3\n"
-"Report-Msgid-Bugs-To: phonon at packages.debian.org\n"
-"POT-Creation-Date: 2019-08-31 16:06+0000\n"
-"PO-Revision-Date: 2019-09-07 11:25+0200\n"
-"Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
-"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: title
-#. Description
-#: ../phonon4qt5-backend-null.templates:1001
-msgid "Warning: Phonon4Qt5 is not functional"
-msgstr "Warnung: Phonon4Qt5 funktioniert nicht"
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid "Missing back-end for Phonon4Qt5"
-msgstr "Fehlendes Backend für Phonon4Qt5"
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid ""
-"Applications using Phonon4Qt5 (the KF 5 multimedia framework) will produce "
-"no audio or video output, because only a dummy Phonon back-end is installed "
-"on this system. This is typically an unintended configuration."
-msgstr ""
-"Anwendungen, die Phonon4Qt5 (das KF-5-Multimedia-Rahmenwerk) verwenden, "
-"werden keine Audio- oder Videoausgabe erzeugen, da auf diesem System nur ein "
-"Pseudo-Phonon-Backend installiert ist. Dies ist typischerweise keine "
-"beabsichtigte Konfiguration."
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid ""
-"To restore full Phonon4Qt5 multimedia capabilities, install one of the real "
-"Phonon4Qt5 back-end packages which are currently available for this system:"
-msgstr ""
-"Um die vollen Multimedia-Möglichkeiten von Phonon4Qt5 wiederherzustellen, "
-"installieren Sie eines der echten Phonon4Qt5-Backend-Pakete, die derzeit auf "
-"dem System verfügbar sind:"
-
-#. Type: note
-#. Description
-#. Translators: do not translate variable names
-#. only translate "(recommended)" (the one in parenthesis)
-#: ../phonon4qt5-backend-null.templates:2001
-msgid "${recommended4qt5_backend} (recommended)${other_backends}"
-msgstr "${recommended4qt5_backend} (empfohlen)${other_backends}"
diff --git a/debian/po/fr.po b/debian/po/fr.po
deleted file mode 100644
index b52fc7b..0000000
--- a/debian/po/fr.po
+++ /dev/null
@@ -1,62 +0,0 @@
-# Translation of phonon debconf templates to French.
-# Copyright (C) 2019, French l10n team <debian-l10n-french at lists.debian.org>Y
-# This file is distributed under the same license as the phonon package.
-#
-# Jean-Pierre Giraud <jean-pierregiraud at neuf.fr>, 2019.
-msgid ""
-msgstr ""
-"Project-Id-Version: phonon\n"
-"Report-Msgid-Bugs-To: phonon at packages.debian.org\n"
-"POT-Creation-Date: 2019-08-31 16:06+0000\n"
-"PO-Revision-Date: 2019-09-16 12:44+0100\n"
-"Last-Translator: Jean-Pierre Giraud <jean-pierregiraud at neuf.fr>\n"
-"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 2.0\n"
-
-#. Type: title
-#. Description
-#: ../phonon4qt5-backend-null.templates:1001
-msgid "Warning: Phonon4Qt5 is not functional"
-msgstr "Attention : Phonon4Qt5 n'est pas fonctionnel"
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid "Missing back-end for Phonon4Qt5"
-msgstr "Il manque un dorsal pour Phonon4Qt5"
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid ""
-"Applications using Phonon4Qt5 (the KF 5 multimedia framework) will produce "
-"no audio or video output, because only a dummy Phonon back-end is installed "
-"on this system. This is typically an unintended configuration."
-msgstr ""
-"Les applications qui utilisent Phonon4Qt5 (le cadriciel multimédia de KF 5) "
-"ne produiront aucune sortie audio ou vidéo, parce que seul un dorsal factice "
-"de Phonon est installé sur ce système. C'est généralement une configuration "
-"non souhaitée."
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid ""
-"To restore full Phonon4Qt5 multimedia capabilities, install one of the real "
-"Phonon4Qt5 back-end packages which are currently available for this system:"
-msgstr ""
-"Pour rétablir les capacités multimédia complètes de Phonon4Qt5, installez un "
-"des paquets de dorsal réel qui sont disponibles pour ce système."
-
-#. Type: note
-#. Description
-#. Translators: do not translate variable names
-#. only translate "(recommended)" (the one in parenthesis)
-#: ../phonon4qt5-backend-null.templates:2001
-msgid "${recommended4qt5_backend} (recommended)${other_backends}"
-msgstr "${recommended4qt5_backend} (recommandé)${other_backends}"
diff --git a/debian/po/nl.po b/debian/po/nl.po
deleted file mode 100644
index 7eb4cbb..0000000
--- a/debian/po/nl.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the phonon package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phonon_4_4.11.1-1\n"
-"Report-Msgid-Bugs-To: phonon at packages.debian.org\n"
-"POT-Creation-Date: 2019-08-31 16:06+0000\n"
-"PO-Revision-Date: 2019-11-11 20:44+0100\n"
-"Language: nl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
-"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
-"X-Generator: Poedit 1.8.11\n"
-
-#. Type: title
-#. Description
-#: ../phonon4qt5-backend-null.templates:1001
-msgid "Warning: Phonon4Qt5 is not functional"
-msgstr "Waarschuwing: Phonon4Qt5 is niet functioneel"
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid "Missing back-end for Phonon4Qt5"
-msgstr "Er ontbreekt een backend voor Phonon4Qt5"
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid ""
-"Applications using Phonon4Qt5 (the KF 5 multimedia framework) will produce "
-"no audio or video output, because only a dummy Phonon back-end is installed "
-"on this system. This is typically an unintended configuration."
-msgstr ""
-"Toepassingen die gebruik maken van Phonon4Qt5 (het KF 5 multimedia-"
-"raamwerk) zullen geen audio- of video-uitvoer produceren, omdat er op het "
-"systeem enkel een dummy Phonon backend geïnstalleerd is. Dit is doorgaans "
-"een oneigenlijke configuratie."
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid ""
-"To restore full Phonon4Qt5 multimedia capabilities, install one of the real "
-"Phonon4Qt5 back-end packages which are currently available for this system:"
-msgstr ""
-"Om de volledige Phonon4Qt5 multimediamogelijkheden te herstellen, moet u "
-"een van de echte Phonon4Qt5 backend-pakketten installeren, welke momenteel "
-"voor dit systeem beschikbaar zijn:"
-
-#. Type: note
-#. Description
-#. Translators: do not translate variable names
-#. only translate "(recommended)" (the one in parenthesis)
-#: ../phonon4qt5-backend-null.templates:2001
-msgid "${recommended4qt5_backend} (recommended)${other_backends}"
-msgstr "${recommended4qt5_backend} (aanbevolen)${other_backends}"
diff --git a/debian/po/pt.po b/debian/po/pt.po
deleted file mode 100644
index d06aecd..0000000
--- a/debian/po/pt.po
+++ /dev/null
@@ -1,74 +0,0 @@
-# Translation of phonon debconf messages to European Portuguese
-# Copyright (C) 2011 the phonon's copyright holder
-# This file is distributed under the same license as the phonon package.
-#
-# Américo Monteiro <a_monteiro at netcabo.pt>, 2011 - 2020.
-msgid ""
-msgstr ""
-"Project-Id-Version: phonon 4_4.11.1-3\n"
-"Report-Msgid-Bugs-To: phonon at packages.debian.org\n"
-"POT-Creation-Date: 2019-08-31 16:06+0000\n"
-"PO-Revision-Date: 2020-06-07 17:54+0000\n"
-"Last-Translator: Américo Monteiro <a_monteiro at gmx.com>\n"
-"Language-Team: Portuguese <>\n"
-"Language: Pt\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. Type: title
-#. Description
-#: ../phonon4qt5-backend-null.templates:1001
-#| msgid "Warning: Phonon is not functional"
-msgid "Warning: Phonon4Qt5 is not functional"
-msgstr "Aviso: O Phonon4Qt5 não está funcional"
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-#| msgid "Missing back-end for Phonon"
-msgid "Missing back-end for Phonon4Qt5"
-msgstr "Back-end em falta para o Phonon4Qt5"
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-#| msgid ""
-#| "Applications using Phonon (the Qt 4 multimedia framework) will produce no "
-#| "audio or video output, because only a dummy Phonon back-end is installed "
-#| "on this system. This is typically an unintended configuration."
-msgid ""
-"Applications using Phonon4Qt5 (the KF 5 multimedia framework) will produce "
-"no audio or video output, because only a dummy Phonon back-end is installed "
-"on this system. This is typically an unintended configuration."
-msgstr ""
-"As aplicações que usam o Phonon4Qt5 (a estrutura multimédia do KF 5) não "
-"irão produzir saída de áudio ou vídeo desejada porque apenas está instalado "
-"um back-end fictício do Phonon neste sistema. Esta é tipicamente uma "
-"configuração não desejada."
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-#| msgid ""
-#| "To restore full Phonon multimedia capabilities, install one of the real "
-#| "Phonon back-end packages which are currently available for this system:"
-msgid ""
-"To restore full Phonon4Qt5 multimedia capabilities, install one of the real "
-"Phonon4Qt5 back-end packages which are currently available for this system:"
-msgstr ""
-"Para restaurar as capacidades multimédia totais do Phonon4Qt5, instale um "
-"dos pacotes de back-end reais do Phonon4Qt5 que estão atualmente disponíveis "
-"para este sistema:"
-
-#. Type: note
-#. Description
-#. Translators: do not translate variable names
-#. only translate "(recommended)" (the one in parenthesis)
-#: ../phonon4qt5-backend-null.templates:2001
-#| msgid "${recommended_backend} (recommended)${other_backends}"
-msgid "${recommended4qt5_backend} (recommended)${other_backends}"
-msgstr "${recommended4qt5_backend} (recomendado)${other_backends}"
-
diff --git a/debian/po/ru.po b/debian/po/ru.po
deleted file mode 100644
index 1be02d2..0000000
--- a/debian/po/ru.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# Russian translation of debconf template for phonon
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the phonon package.
-# Lev Lamberov <dogsleg at debian.org>, 2019
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phonon\n"
-"Report-Msgid-Bugs-To: phonon at packages.debian.org\n"
-"POT-Creation-Date: 2019-08-31 16:06+0000\n"
-"PO-Revision-Date: 2019-09-16 11:39+0500\n"
-"Language-Team: Debian L10N Russian <debian-l10n-russian at lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.3\n"
-"Last-Translator: Lev Lamberov <dogsleg at debian.org>\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
-"Language: ru\n"
-
-#. Type: title
-#. Description
-#: ../phonon4qt5-backend-null.templates:1001
-msgid "Warning: Phonon4Qt5 is not functional"
-msgstr "Внимание: Phonon4Qt5 не работает"
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid "Missing back-end for Phonon4Qt5"
-msgstr "Отсутствует движок для Phonon4Qt5"
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid ""
-"Applications using Phonon4Qt5 (the KF 5 multimedia framework) will produce "
-"no audio or video output, because only a dummy Phonon back-end is installed "
-"on this system. This is typically an unintended configuration."
-msgstr ""
-"Приложения, использующие Phonon4Qt5 (мультимедийная платформа KF 5), не "
-"будут выводить аудио или видео, поскольку в данной системе установлен лишь "
-"фиктивный движок Phonon. Обычно это непреднамеренная настройка."
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid ""
-"To restore full Phonon4Qt5 multimedia capabilities, install one of the real "
-"Phonon4Qt5 back-end packages which are currently available for this system:"
-msgstr ""
-"Для восстановления полных возможностей мультимедиа Phonon4Qt5 установите "
-"один из пакетов с действительным движком Phonon4Qt5, которые доступны для "
-"данной системы:"
-
-#. Type: note
-#. Description
-#. Translators: do not translate variable names
-#. only translate "(recommended)" (the one in parenthesis)
-#: ../phonon4qt5-backend-null.templates:2001
-msgid "${recommended4qt5_backend} (recommended)${other_backends}"
-msgstr "${recommended4qt5_backend} (рекомендуется)${other_backends}"
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
deleted file mode 100644
index dadd076..0000000
--- a/debian/po/templates.pot
+++ /dev/null
@@ -1,55 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the phonon package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: phonon\n"
-"Report-Msgid-Bugs-To: phonon at packages.debian.org\n"
-"POT-Creation-Date: 2019-08-31 16:06+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: title
-#. Description
-#: ../phonon4qt5-backend-null.templates:1001
-msgid "Warning: Phonon4Qt5 is not functional"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid "Missing back-end for Phonon4Qt5"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid ""
-"Applications using Phonon4Qt5 (the KF 5 multimedia framework) will produce "
-"no audio or video output, because only a dummy Phonon back-end is installed "
-"on this system. This is typically an unintended configuration."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../phonon4qt5-backend-null.templates:2001
-msgid ""
-"To restore full Phonon4Qt5 multimedia capabilities, install one of the real "
-"Phonon4Qt5 back-end packages which are currently available for this system:"
-msgstr ""
-
-#. Type: note
-#. Description
-#. Translators: do not translate variable names
-#. only translate "(recommended)" (the one in parenthesis)
-#: ../phonon4qt5-backend-null.templates:2001
-msgid "${recommended4qt5_backend} (recommended)${other_backends}"
-msgstr ""
diff --git a/debian/libphonon4qt5-dev.install b/debian/qt5-phonon-dev.install
similarity index 84%
rename from debian/libphonon4qt5-dev.install
rename to debian/qt5-phonon-dev.install
index b961330..bdcf2f4 100644
--- a/debian/libphonon4qt5-dev.install
+++ b/debian/qt5-phonon-dev.install
@@ -2,6 +2,7 @@ usr/include/phonon4qt5/phonon/
usr/include/phonon4qt5/KDE/Phonon/
usr/lib/*/cmake/phonon4qt5/
usr/lib/*/libphonon4qt5.so
+usr/lib/*/libphonon4qt5experimental.so
usr/lib/*/pkgconfig/
usr/lib/*/qt5/mkspecs/modules/
usr/lib/*/qt5/plugins/designer/
diff --git a/debian/qt5-phonon.install b/debian/qt5-phonon.install
new file mode 100644
index 0000000..362d9f6
--- /dev/null
+++ b/debian/qt5-phonon.install
@@ -0,0 +1,7 @@
+usr/lib/*/libphonon4qt5.so.4
+usr/lib/*/libphonon4qt5.so.4.*
+usr/lib/*/libphonon4qt5experimental.so.4
+usr/lib/*/libphonon4qt5experimental.so.4.*
+usr/bin/phononsettings
+usr/share/locale/*/LC_MESSAGES/phononsettings_qt.qm
+
diff --git a/debian/qt6-phonon-dev.install b/debian/qt6-phonon-dev.install
new file mode 100644
index 0000000..4792ec6
--- /dev/null
+++ b/debian/qt6-phonon-dev.install
@@ -0,0 +1,6 @@
+usr/include/
+usr/lib/*/cmake/
+usr/lib/*/libphonon4qt6.so
+usr/lib/*/libphonon4qt6experimental.so
+usr/lib/*/pkgconfig/
+usr/lib/*/qt6/plugins/designer/phonon4qt6widgets.so
diff --git a/debian/qt6-phonon.install b/debian/qt6-phonon.install
new file mode 100644
index 0000000..6bcde0b
--- /dev/null
+++ b/debian/qt6-phonon.install
@@ -0,0 +1,5 @@
+usr/lib/*/libphonon4qt6.so.4
+usr/lib/*/libphonon4qt6.so.4.*
+usr/lib/*/libphonon4qt6experimental.so.4
+usr/lib/*/libphonon4qt6experimental.so.4.*
+usr/share/locale/*/LC_MESSAGES/
diff --git a/debian/rules b/debian/rules
index 96db9f4..b68a536 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,36 +1,24 @@
#!/usr/bin/make -f
+# -*- makefile -*-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
-include /usr/share/dpkg/pkg-info.mk
-
-CMAKE_ARGS = -DPHONON_BUILD_QT5=ON -DPHONON_BUILD_QT6=OFF
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+QT6_CMAKE_ARGS = -DPHONON_BUILD_QT6=ON -DPHONON_BUILD_QT5=OFF
+QT5_CMAKE_ARGS = -DPHONON_BUILD_QT5=ON -DPHONON_BUILD_QT6=OFF
%:
- dh $@ --with kf5
+ dh $@
-RECOMMENDED_PHONON4_QT5_BACKEND := phonon4qt5-backend-vlc
+execute_after_dh_auto_clean:
+ rm -rf build-QT5
override_dh_auto_configure:
- dh_auto_configure -- $(CMAKE_ARGS)
-
-# shlibs is needed for library-packages.mk (strict shlibs) to work
-override_dh_makeshlibs:
- dh_makeshlibs -plibphonon4qt5-4 -V'libphonon4qt5-4 (>= $(DEB_VERSION_EPOCH_UPSTREAM)), phonon4qt5'
- dh_makeshlibs -V --remaining-packages
+ dh_auto_configure -- $(QT6_CMAKE_ARGS) -DUSE_QT_VERSION=6
+ dh_auto_configure --builddirectory=build-QT5 -- $(QT5_CMAKE_ARGS) -DUSE_QT_VERSION=5
-override_dh_shlibdeps:
- dh_shlibdeps -- -xphonon4qt5
+override_dh_auto_build:
+ dh_auto_build
+ dh_auto_build --builddirectory=build-QT5
-override_dh_gencontrol:
- # Expand some variables in maintainer scripts and debconf templates
- @for f in debian/*/DEBIAN/post* \
- debian/*/DEBIAN/pre* \
- debian/*/DEBIAN/config \
- debian/*/DEBIAN/templates; do \
- if [ -f "$$f" ]; then \
- cmd="awk -f debian/expand_vars.awk -v recommended4qt5_backend='$(RECOMMENDED_PHONON4_QT5_BACKEND)' -- $$f > $$f.tmp && cat $$f.tmp >| $$f && rm -f $$f.tmp"; \
- echo "$$cmd"; eval "$$cmd"; \
- fi; \
- done
- dh_gencontrol -- -Vphonon:Recommended-Backend-qt5=$(RECOMMENDED_PHONON4_QT5_BACKEND)
+override_dh_auto_install:
+ dh_auto_install
+ dh_auto_install --builddirectory=build-QT5
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
deleted file mode 100644
index f71bdf3..0000000
--- a/debian/salsa-ci.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-include:
- - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-variables:
- SALSA_CI_DISABLE_MISSING_BREAKS: 'no'
- SALSA_CI_DISABLE_RC_BUGS: 'no'
- SALSA_CI_REPROTEST_ARGS: '--variations=-build-path'
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes
More information about the Neon-commits
mailing list