[neon/extras/phonon-backend-vlc/Neon/stable] debian: clean up dual packageing

Carlos De Maine null at kde.org
Thu Nov 2 23:53:10 GMT 2023


Git commit f91d9d58cefe431783f61127391495a11c6459d7 by Carlos De Maine.
Committed on 03/11/2023 at 00:52.
Pushed by carlosdem into branch 'Neon/stable'.

clean up dual packageing

M  +25   -18   debian/control
R  +0    -0    debian/qt5-phonon-backend-vlc.install [from: debian/phonon4qt5-backend-vlc.install - 100% similarity]
M  +1    -1    debian/qt6-phonon-backend-vlc.install

https://invent.kde.org/neon/extras/phonon-backend-vlc/-/commit/f91d9d58cefe431783f61127391495a11c6459d7

diff --git a/debian/control b/debian/control
index 47aa55c..e6d49ce 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: qt6-phonon-backend-vlc
+Source: phonon-backend-vlc
 Section: sound
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
@@ -26,39 +26,50 @@ Homepage: https://invent.kde.org/libraries/phonon-vlc.git
 Vcs-Browser: https://invent.kde.org/libraries/phonon-vlc.git
 Vcs-Git: https://invent.kde.org/libraries/phonon-vlc.git
 
-Package: phonon4qt5-backend-vlc
+Package: phonon-backend-vlc
+Architecture: any
+Depends: qt5-phonon-backend-vlc,
+         qt6-phonon-backend-vlc
+Description: Phonon VLC backend - meta package for qt5 & qt6
+
+Package: qt5-phonon-backend-vlc
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: vlc-plugin-base,
+Depends: qtbase5,
+         vlc-plugin-base,
          vlc-plugin-video-output,
          ${misc:Depends},
          ${shlibs:Depends}
-Provides: phonon4qt5-backend
-Description: Phonon4Qt5 VLC backend
+Provides: phonon-backend-vlc
+Description: Qt5 Phonon VLC backend
  Phonon is the KF5 multimedia API, which provides a task-oriented
  abstraction layer for capturing, mixing, processing, and playing audio
  and video content.
  .
  This package contains VLC backend for Phonon4Qt5.
 
-Package: phonon-backend-vlc
+Package: phonon5-backend-vlc
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Description: Phonon VLC backend - transitional
- This dummy package can be safetly removed.
+Depends: qt5-phonon-backend-vlc,
+Description: Qt5 Phonon VLC backend - transitional
+ This dummy package can be safely removed.
 
+Package: phonon4qt5-backend-vlc
+Architecture: any
+Depends: qt5-phonon-backend-vlc,
+Description: Qt5 Phonon VLC backend - transitional
+ This dummy package can be safely removed.
 
 Package: qt6-phonon-backend-vlc
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: vlc-plugin-base,
+Depends: qt6-base,
+         vlc-plugin-base,
          vlc-plugin-video-output,
          ${misc:Depends},
          ${shlibs:Depends}
-Provides: qt6-phonon-backend
 Description: Qt6 Phonon VLC backend
  Phonon is the KF6 multimedia API, which provides a task-oriented
  abstraction layer for capturing, mixing, processing, and playing audio
@@ -69,15 +80,11 @@ Description: Qt6 Phonon VLC backend
 Package: phonon6-backend-vlc
 Architecture: any
 Depends: qt6-phonon-backend-vlc,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Phonon VLC backend - transitional
+Description: Qt6 Phonon VLC backend - transitional
  This dummy package can be safely removed.
 
 Package: phonon4qt6-backend-vlc
 Architecture: any
 Depends: qt6-phonon-backend-vlc,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Phonon VLC backend - transitional
+Description: Qt6 Phonon VLC backend - transitional
  This dummy package can be safetly removed.
diff --git a/debian/phonon4qt5-backend-vlc.install b/debian/qt5-phonon-backend-vlc.install
similarity index 100%
rename from debian/phonon4qt5-backend-vlc.install
rename to debian/qt5-phonon-backend-vlc.install
diff --git a/debian/qt6-phonon-backend-vlc.install b/debian/qt6-phonon-backend-vlc.install
index f320df7..7c179f6 100644
--- a/debian/qt6-phonon-backend-vlc.install
+++ b/debian/qt6-phonon-backend-vlc.install
@@ -1,2 +1,2 @@
-usr/share/locale/
 usr/lib/*/qt6/plugins/phonon4qt6_backend/phonon_vlc_qt6.so
+usr/share/locale/


More information about the Neon-commits mailing list