[neon/qt6/qt6-multimedia/Neon/release] debian: lints and internal dep versions

Carlos De Maine null at kde.org
Sun Dec 10 02:27:23 GMT 2023


Git commit 69a9d1ddf4b6ad11f0a3c7407395d2cc6b26ee0e by Carlos De Maine.
Committed on 10/12/2023 at 03:27.
Pushed by carlosdem into branch 'Neon/release'.

lints and internal dep versions

M  +42   -20   debian/control
M  +0    -7    debian/copyright
A  +4    -0    debian/meta/cmake-ignore
A  +1    -0    debian/qt6-multimedia.lintian-overrides

https://invent.kde.org/neon/qt6/qt6-multimedia/-/commit/69a9d1ddf4b6ad11f0a3c7407395d2cc6b26ee0e

diff --git a/debian/control b/debian/control
index b4fe189..00500e1 100644
--- a/debian/control
+++ b/debian/control
@@ -34,16 +34,16 @@ Build-Depends: cmake,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
-               qt6-base-dev,
-               qt6-declarative-dev,
-               qt6-quick3d-dev,
-               qt6-shadertools-dev,
-               qt6-svg-dev,
+               qt6-base-dev (>= 6.6.1~),
+               qt6-declarative-dev (>= 6.6.1~),
+               qt6-quick3d-dev (>= 6.6.1~),
+               qt6-shadertools-dev (>= 6.6.1~),
+               qt6-svg-dev (>= 6.6.1~),
                xauth <!nocheck>,
                xvfb <!nocheck>
-Build-Depends-Indep: qt6-base-dev (>= 6.4~) <!nodoc>,
-                     qt6-documentation-tools (>= 6.4~) <!nodoc>,
-                     qt6-base-doc (>= 6.4~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
+                     qt6-base-doc (>= 6.6~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-multimedia
@@ -66,6 +66,18 @@ Depends: ffmpeg,
          qt6-declarative, 
          ${misc:Depends}, 
          ${shlibs:Depends}
+Provides: libqt6multimedia6,
+          libqt6multimediaquick6,
+          libqt6multimediawidgets6,
+          libqt6spatialaudio6,
+          qml6-module-qtmultimedia,
+          qml6-module-qtquick3d-spatialaudio,
+Replaces: libqt6multimedia6,
+          libqt6multimediaquick6,
+          libqt6multimediawidgets6,
+          libqt6spatialaudio6,
+          qml6-module-qtmultimedia,
+          qml6-module-qtquick3d-spatialaudio,
 Description: Qt 6 Multimedia library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -77,11 +89,17 @@ Package: qt6-multimedia-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libglib2.0-dev,
          qt6-base-dev,
          qt6-multimedia (= ${binary:Version}),
-         ${misc:Depends}
-Description: Qt 6 Multimedia - development files
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: qt6-multimedia-doc-html,
+          qt6-multimedia-examples,
+Replaces: qt6-multimedia-doc-dev,
+          qt6-multimedia-examples,
+         Description: Qt 6 Multimedia - development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
@@ -92,9 +110,13 @@ Package: qt6-multimedia-doc
 Architecture: all
 Section: kde
 X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-base-doc,
-         qt6-multimedia (= ${binary:Version}),
-         ${misc:Depends}
+         qt6-multimedia-dev (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: qt6-multimedia-doc-html
+Replaces: qt6-multimedia-doc-html
 Description: Qt 6 Multimedia - documentation files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -104,48 +126,48 @@ Description: Qt 6 Multimedia - documentation files
 
 Package: libqt6multimedia6
 Architecture: all
-Depends: qt6-multimedia
+Depends: qt6-multimedia, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6multimediaquick6
 Architecture: all
-Depends: qt6-multimedia
+Depends: qt6-multimedia, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6multimediawidgets6
 Architecture: all
-Depends: qt6-multimedia
+Depends: qt6-multimedia, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6spatialaudio6
 Architecture: all
-Depends: qt6-multimedia
+Depends: qt6-multimedia, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qml6-module-qtmultimedia
 Architecture: all
-Depends: qt6-multimedia
+Depends: qt6-multimedia, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qml6-module-qtquick3d-spatialaudio
 Architecture: all
-Depends: qt6-multimedia
+Depends: qt6-multimedia, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-multimedia-doc-html
 Architecture: all
-Depends: qt6-multimedia-doc
+Depends: qt6-multimedia-doc, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-multimedia-examples
 Architecture: all
-Depends: qt6-multimedia-dev
+Depends: qt6-multimedia-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index 3f29829..ac8aa25 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -39,13 +39,6 @@ Files: src/spatialaudio/*
 Copyright: 2022 The Qt Company Ltd.
 License: LGPL-3
 
-Files: conanfile.py
-       config.tests/*
-       tests/*
-       util/adt_generate_qt.m
-Copyright: 2016-2022 The Qt Company Ltd.
-License: GPL-3 with Qt-1.0 exception
-
 Files: config.tests/mmrenderer/*
 Copyright: 2016 BlackBerry Limited
 License: GPL-3 with Qt-1.0 exception
diff --git a/debian/meta/cmake-ignore b/debian/meta/cmake-ignore
new file mode 100644
index 0000000..75d221d
--- /dev/null
+++ b/debian/meta/cmake-ignore
@@ -0,0 +1,4 @@
+AVFoundation
+MMRendererCore
+MMRenderer
+WMF
diff --git a/debian/qt6-multimedia.lintian-overrides b/debian/qt6-multimedia.lintian-overrides
new file mode 100644
index 0000000..535828e
--- /dev/null
+++ b/debian/qt6-multimedia.lintian-overrides
@@ -0,0 +1 @@
+qt6-multimedia: package-name-doesnt-match-sonames libQt6Multimedia6 libQt6MultimediaQuick6 libQt6MultimediaWidgets6 libQt6Quick3DSpatialAudio6 libQt6SpatialAudio6


More information about the Neon-commits mailing list