[neon/qt6/qt6-speech/Neon/release] debian: linting

Carlos De Maine null at kde.org
Thu Dec 14 07:06:35 GMT 2023


Git commit 8beca84bd0353dff80c175233d0b6a5354719a32 by Carlos De Maine.
Committed on 14/12/2023 at 08:06.
Pushed by carlosdem into branch 'Neon/release'.

linting

M  +8    -18   debian/control
M  +4    -4    debian/copyright

https://invent.kde.org/neon/qt6/qt6-speech/-/commit/8beca84bd0353dff80c175233d0b6a5354719a32

diff --git a/debian/control b/debian/control
index 5dd5784..13eb0a6 100644
--- a/debian/control
+++ b/debian/control
@@ -23,10 +23,6 @@ Build-Depends: cmake,
 Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
                      qt6-documentation-tools (>= 6.6~) <!nodoc>,
                      qt6-base-doc (>= 6.6~) <!nodoc>,
-Architecture: any
-X-Neon-MergedPackage: true
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-speech
@@ -43,10 +39,6 @@ Provides: libqt6texttospeech6,
           qt6-speech-flite-plugin,
           qt6-speech-speechd-plugin,
           qml6-module-qttexttospeech,
-Replaces: libqt6texttospeech6,
-          qt6-speech-flite-plugin,
-          qt6-speech-speechd-plugin,
-          qml6-module-qttexttospeech,
 Description: Qt 6 Speech library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -64,9 +56,8 @@ Depends: qt6-speech (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: libqt6texttospeech6-dev,
-Provides: libqt6texttospeech6-dev,
-          qt6-speech-examples,
 Replaces: libqt6texttospeech6-dev,
+Provides: libqt6texttospeech6-dev ,
           qt6-speech-examples,
 Description: Qt 6 Speech library - development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -81,11 +72,10 @@ Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-base-doc,
-         qt6-speech-dev (= ${binary:Version}),
+         qt6-speech-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: qt6-speech-doc-html,
-Replaces: qt6-speech-doc-html,
 Description: Qt 6 Speech library - 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.
@@ -95,36 +85,36 @@ Description: Qt 6 Speech library - documentation files
 
 Package: libqt6texttospeech6
 Architecture: all
-Depends: qt6-speech
+Depends: qt6-speech, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-speech-flite-plugin
 Architecture: all
-Depends: qt6-speech
+Depends: qt6-speech, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-speech-speechd-plugin
 Architecture: all
-Depends: qt6-speech
+Depends: qt6-speech, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qml6-module-qttexttospeech
 Architecture: all
-Depends: qt6-speech
+Depends: qt6-speech, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-speech-doc-html
 Architecture: all
-Depends: qt6-speech-doc
+Depends: qt6-speech-doc, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-speech-examples
 Architecture: all
-Depends: qt6-speech-dev
+Depends: qt6-speech-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index 9ef69a2..6b0ba8d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,10 +6,6 @@ Files: *
 Copyright: 2015-2022 The Qt Company Ltd.
 License: LGPL-3 or GPL-2
 
-Files: examples/*
-Copyright: 2015-2022 The Qt Company Ltd.
-License: BSD-3-clause
-
 Files: *.qdoc
 Copyright: 2015-2022 The Qt Company Ltd.
 License: GFDL-NIV-1.3
@@ -18,6 +14,10 @@ Files: debian/*
 Copyright: 2022 Patrick Franz <deltaone at debian.org>
 License: LGPL-3 or GPL-2
 
+Files: examples/*
+Copyright: 2015-2022 The Qt Company Ltd.
+License: BSD-3-clause
+
 License: LGPL-3
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License version 3


More information about the Neon-commits mailing list