[neon/qt6/qt6-multimedia/Neon/release] debian: lintings

[Carlos De Maine]

Git commit 815b69b925b80f3a83405416015e3c3ed2dfbdb5 by Carlos De Maine.
Committed on 14/12/2023 at 06:01.
Pushed by carlosdem into branch 'Neon/release'.

lintings

M  +2    -9    debian/control
M  +26   -24   debian/copyright
M  +0    -15   debian/source/lintian-overrides

https://invent.kde.org/neon/qt6/qt6-multimedia/-/commit/815b69b925b80f3a83405416015e3c3ed2dfbdb5

diff --git a/debian/control b/debian/control
index 3a5029f..48f548f 100644
--- a/debian/control
+++ b/debian/control
@@ -63,6 +63,7 @@ Depends: ffmpeg,
          gstreamer1.0-plugins-good, 
          gstreamer1.0-plugins-ugly,
          gstreamer1.0-vaapi,
+         qt6-base,
          qt6-declarative, 
          ${misc:Depends}, 
          ${shlibs:Depends}
@@ -72,12 +73,6 @@ Provides: libqt6multimedia6,
           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.
@@ -97,8 +92,6 @@ Depends: libglib2.0-dev,
          ${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.
@@ -112,7 +105,7 @@ Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-base-doc,
-         qt6-multimedia-dev (= ${binary:Version}),
+         qt6-multimedia-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: qt6-multimedia-doc-html
diff --git a/debian/copyright b/debian/copyright
index ac8aa25..4dfa150 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,11 +8,37 @@ Copyright: 2016-2022 The Qt Company Ltd.
            2016 Jolla Ltd.
 License: LGPL-3 or GPL-2
 
+Files: *.qdoc
+Copyright: 2015-2021 The Qt Company Ltd.
+License: GFDL-NIV-1.3
+
+Files: config.tests/mmrenderer/*
+Copyright: 2016 BlackBerry Limited
+License: GPL-3 with Qt-1.0 exception
+
 Files: debian/*
 Copyright: 2021-2022 Patrick Franz <deltaone at debian.org>
            2022 Lu YaNing <dluyaning at gmail.com>
 License: LGPL-3 or GPL-2
 
+Files: examples/*
+       src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp
+Copyright: 2015-2022 The Qt Company Ltd.
+License: BSD-3-clause
+
+Files: examples/multimedia/spectrum/3rdparty/fftreal/*
+Copyright: 2003-2005 Laurent de Soras
+License: LGPL-2.1
+
+Files: examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pas
+Copyright: 1999 Laurent de Soras
+License: custom-fftreal
+ Source code may be freely used for any purpose, including commercial
+ applications. Programs must display in their "About" dialog-box (or
+ documentation) a text telling they use these routines by Laurent de Soras.
+ Modified source code can be distributed, but modifications must be clearly
+ indicated.
+
 Files: src/plugins/multimedia/android/mediacapture/qandroidcamerasession.cpp
        src/plugins/multimedia/android/mediacapture/qandroidcamerasession_p.h
        src/plugins/multimedia/android/wrappers/jni/androidcamera.cpp
@@ -39,31 +65,7 @@ Files: src/spatialaudio/*
 Copyright: 2022 The Qt Company Ltd.
 License: LGPL-3
 
-Files: config.tests/mmrenderer/*
-Copyright: 2016 BlackBerry Limited
-License: GPL-3 with Qt-1.0 exception
-
-Files: examples/*
-       src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp
-Copyright: 2015-2022 The Qt Company Ltd.
-License: BSD-3-clause
-
-Files: examples/multimedia/spectrum/3rdparty/fftreal/*
-Copyright: 2003-2005 Laurent de Soras
-License: LGPL-2.1
 
-Files: examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pas
-Copyright: 1999 Laurent de Soras
-License: custom-fftreal
- Source code may be freely used for any purpose, including commercial
- applications. Programs must display in their "About" dialog-box (or
- documentation) a text telling they use these routines by Laurent de Soras.
- Modified source code can be distributed, but modifications must be clearly
- indicated.
-
-Files: *.qdoc
-Copyright: 2015-2021 The Qt Company Ltd.
-License: GFDL-NIV-1.3
 
 Files: src/3rdparty/eigen/*
 Copyright: eigen3 developers
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 57e89f5..e69de29 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,15 +0,0 @@
-# Lintian gives a false positive for the globbing order.
-# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=970274
-qt6-multimedia source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/multimedia/audiodevices/doc/src/audiodevices.qdoc
-qt6-multimedia source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/multimedia/audiooutput/doc/src/audiooutput.qdoc
-qt6-multimedia source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
-qt6-multimedia source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/multimedia/audiosource/doc/src/audiosource.qdoc
-qt6-multimedia source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/multimedia/declarative-camera/doc/src/declarative-camera.qdoc
-qt6-multimedia source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/multimedia/spectrum/doc/src/spectrum.qdoc
-qt6-multimedia source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/multimedia/video/doc/src/qmlvideo.qdoc
-qt6-multimedia source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/multimedia/video/mediaplayer/doc/src/mediaplayer.qdoc
-qt6-multimedia source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/multimedia/video/recorder/doc/src/recorder.qdoc
-qt6-multimedia source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/multimediawidgets/camera/doc/src/camera.qdoc
-qt6-multimedia source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/multimediawidgets/player/doc/src/player.qdoc
-qt6-multimedia source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc
-qt6-multimedia source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc