[neon/extras/phonon/Neon/stable] debian: add back qt6 stuffs
Carlos De Maine
null at kde.org
Thu Nov 2 22:16:11 GMT 2023
Git commit a598d1274d89cc0d31f83bd6747c6ef2b9c527d5 by Carlos De Maine.
Committed on 02/11/2023 at 23:14.
Pushed by carlosdem into branch 'Neon/stable'.
add back qt6 stuffs
M +6 -0 debian/changelog
M +72 -3 debian/control
M +1 -1 debian/not-installed
A +6 -0 debian/qt6-phonon-dev.install
A +5 -0 debian/qt6-phonon.install
M +3 -3 debian/rules
https://invent.kde.org/neon/extras/phonon/-/commit/a598d1274d89cc0d31f83bd6747c6ef2b9c527d5
diff --git a/debian/changelog b/debian/changelog
index 9b208dd..345ff57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+phonon (4:4.12.0-0) 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/control b/debian/control
index 0d1c4e9..0375ff2 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,14 @@ Uploaders: Modestas Vainius <modax at debian.org>,
Build-Depends: cmake,
debhelper-compat(= 13),
dpkg-dev,
- extra-cmake-modules,
+ kf6-extra-cmake-modules,
libglib2.0-dev,
libpulse-dev,
libqt5opengl5-dev,
pkg-kde-tools-neon,
+ qt6-5compat-dev,
+ qt6-base-dev,
+ qt6-tools-dev,
qtbase5-dev,
qttools5-dev
Standards-Version: 4.6.2
@@ -21,6 +24,72 @@ 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: qt6-phonon
+Architecture: any
+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 Phonon6 cross-platform multimedia
+ framework from KDE. It is required to run applications that use Phonon6.
+
+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 development files needed to build Qt6 applications
+ using the Phonon6 cross-platform multimedia framework.
+
+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: kde
@@ -31,7 +100,7 @@ Replaces: libphonon4qt5-4 (<< ${source:Version}~ciBuild),
libphonon4qt5experimental4 (<< ${source:Version}~ciBuild),
phonon4qt5settings (<< ${source:Version}~ciBuild)
Description: multimedia framework from KDE using Qt5 - core libraries
- Phonon5 is a Qt5 multimedia API, which provides a task-oriented abstraction
+ 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 core libraries of the Phonon5 cross-platform multimedia
@@ -43,7 +112,7 @@ Section: kde
X-Neon-MergedPackage: true
Depends: qt5-phonon (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Replaces: libphonon4qt5-dev (<< ${source:Version}~ciBuild),
- libphonon4qt5experimental-dev (<< ${source:Version}~ciBuild)
+ libphonon4qt5experimental-dev
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.
diff --git a/debian/not-installed b/debian/not-installed
index 5eb397b..3733cf1 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1 +1 @@
-#usr/bin/phononsettings
+usr/bin/phononsettings
\ No newline at end of file
diff --git a/debian/qt6-phonon-dev.install b/debian/qt6-phonon-dev.install
new file mode 100644
index 0000000..ab33e3c
--- /dev/null
+++ b/debian/qt6-phonon-dev.install
@@ -0,0 +1,6 @@
+usr/include/phonon4qt6/
+usr/lib/*/cmake/phonon4qt6/
+usr/lib/*/libphonon4qt6.so
+usr/lib/*/libphonon4qt6experimental.so
+usr/lib/*/pkgconfig/phonon4qt6.pc
+usr/lib/*/qt6/plugins/designer/
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 d180167..b68a536 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
# -*- makefile -*-
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-#QT6_CMAKE_ARGS = -DPHONON_BUILD_QT6=ON -DPHONON_BUILD_QT5=OFF
+QT6_CMAKE_ARGS = -DPHONON_BUILD_QT6=ON -DPHONON_BUILD_QT5=OFF
QT5_CMAKE_ARGS = -DPHONON_BUILD_QT5=ON -DPHONON_BUILD_QT6=OFF
%:
@@ -12,7 +12,7 @@ execute_after_dh_auto_clean:
rm -rf build-QT5
override_dh_auto_configure:
-# dh_auto_configure -- $(QT6_CMAKE_ARGS) -DUSE_QT_VERSION=6
+ 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_auto_build:
@@ -20,5 +20,5 @@ override_dh_auto_build:
dh_auto_build --builddirectory=build-QT5
override_dh_auto_install:
-# dh_auto_install
+ dh_auto_install
dh_auto_install --builddirectory=build-QT5
More information about the Neon-commits
mailing list