[neon/qt6/qt6-base/Neon/unstable] debian: linting
Carlos De Maine
null at kde.org
Wed Nov 22 07:32:47 GMT 2023
Git commit 1d53766ede66c55f34e516e9ac3019169b006763 by Carlos De Maine.
Committed on 22/11/2023 at 08:32.
Pushed by carlosdem into branch 'Neon/unstable'.
linting
M +6 -6 debian/control
M +0 -70 debian/copyright
A +5 -0 debian/meta/cmake-ignore
M +0 -5 debian/not-installed
M +1 -0 debian/qt6-base.install
M +1 -3 debian/source/lintian-overrides
https://invent.kde.org/neon/qt6/qt6-base/-/commit/1d53766ede66c55f34e516e9ac3019169b006763
diff --git a/debian/control b/debian/control
index 1c5e89b..0c401d3 100644
--- a/debian/control
+++ b/debian/control
@@ -186,7 +186,7 @@ Depends: default-libmysqlclient-dev,
libxkbcommon-dev,
libxkbcommon-x11-dev,
qt6-base (= ${binary:Version}),
- qt6-base-dev-tools (= ${binary:Version}),
+ qt6-base-dev-tools,
unixodbc-dev,
${misc:Depends}
Recommends: libqt6opengl6-dev (= ${binary:Version})
@@ -207,7 +207,7 @@ Package: qt6-base-doc
Architecture: all
Section: kde
X-Neon-MergedPackage: true
-Depends: qt6-base-dev (= ${binary:Version}),
+Depends: qt6-base-dev,
${misc:Depends}
Suggests: cmake
Description: Qt 6 base documentation files
@@ -246,7 +246,7 @@ Description: Dummy transitional
Package: qt6-qpa-plugins
Architecture: all
-Depends: qt6-base
+Depends: qt6-base, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
@@ -273,7 +273,7 @@ Architecture: all
Depends: qt6-base-dev, ${misc:Depends}
Provides: qt6-base-dev
Description: Dummy transitional
- Transitional dummy package.
+ Transitional dummy package.
Package: libqt6openglwidgets6
Architecture: all
@@ -377,11 +377,11 @@ Architecture: all
Depends: qt6-base-dev, ${misc:Depends}
Provides: qt6-base-dev
Description: Dummy transitional
- Transitional dummy package.
+ Transitional dummy package.
Package: qt6-base-dev-tools
Architecture: all
Depends: qt6-base-dev, ${misc:Depends}
Provides: qt6-base-dev
Description: Dummy transitional
- Transitional dummy package.
+ Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index 151328b..1ca2cc7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -34,18 +34,6 @@ Files: *.qdoc
Copyright: 2016-2021 The Qt Company Ltd.
License: GFDL-NIV-1.3
-Files: conanfile.py
- config.tests/static_link_order/*
- mkspecs/features/data/dumpvcvars.bat
- qmake/*
- src/corelib/debug_script.py
- src/testlib/qemulationdetector_p.h
- src/tools/*
- tests/*
- util/*
-Copyright: 2016-2022 The Qt Company Ltd.
-License: GPL-3 with Qt-1.0 exception
-
Files: doc/src/snippets/*
examples/*
qmake/doc/snippets/*
@@ -112,64 +100,6 @@ Files: src/corelib/doc/snippets/code/src_corelib_text_qregularexpression.cpp
Copyright: 2016 Giuseppe D'Angelo <dangelog at gmail.com>
License: BSD-3-clause
-Files: examples/corelib/serialization/cbordump/main.cpp
- examples/corelib/serialization/convert/cborconverter.cpp
- examples/corelib/serialization/convert/cborconverter.h
- examples/corelib/serialization/convert/converter.h
- examples/corelib/serialization/convert/datastreamconverter.cpp
- examples/corelib/serialization/convert/datastreamconverter.h
- examples/corelib/serialization/convert/jsonconverter.cpp
- examples/corelib/serialization/convert/jsonconverter.h
- examples/corelib/serialization/convert/main.cpp
- examples/corelib/serialization/convert/nullconverter.cpp
- examples/corelib/serialization/convert/nullconverter.h
- examples/corelib/serialization/convert/textconverter.cpp
- examples/corelib/serialization/convert/textconverter.h
- examples/corelib/serialization/convert/xmlconverter.cpp
- examples/corelib/serialization/convert/xmlconverter.h
-Copyright: 2018 Intel Corporation
-License: BSD-3-clause
-
-Files: examples/network/network-chat/connection.cpp
- examples/network/network-chat/peermanager.cpp
- src/corelib/doc/snippets/code/src_corelib_global_qrandom.cpp
-Copyright: 2018 Intel Corporation
- 2016-2018 The Qt Company Ltd.
-License: BSD-3-clause
-
-Files: src/corelib/doc/snippets/code/src_corelib_io_qstorageinfo.cpp
-Copyright: 2014 Ivan Komissarov <ABBAPOH at gmail.com>
-License: BSD-3-clause
-
-Files: examples/widgets/itemviews/storageview/main.cpp
- examples/widgets/itemviews/storageview/storagemodel.cpp
- examples/widgets/itemviews/storageview/storagemodel.h
-Copyright: 2016 Ivan Komissarov <ABBAPOH at gmail.com>
- 2016 The Qt Company Ltd.
-License: BSD-3-clause
-
-Files: examples/network/dnslookup/dnslookup.cpp
- examples/network/dnslookup/dnslookup.h
- src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp
-Copyright: 2016 Jeremy Lainé <jeremy.laine at m4x.org>
-License: BSD-3-clause
-
-Files: src/corelib/doc/snippets/qversionnumber/main.cpp
-Copyright: 2016 Keith Gardner <kreios4004 at gmail.com>
- 2016 The Qt Company Ltd.
-License: BSD-3-clause
-
-Files: tests/auto/cmake/mockplugins/mock1plugin/qmock1plugin.h
- tests/auto/cmake/mockplugins/mock2plugin/qmock2plugin.h
- tests/auto/cmake/mockplugins/mock3plugin/qmock3plugin.h
- tests/auto/cmake/mockplugins/mock4plugin/qmock4plugin.h
- tests/auto/cmake/mockplugins/mock5plugin/qmock5plugin.h
- tests/auto/cmake/mockplugins/mock6plugin/qmock6plugin.h
- tests/auto/cmake/mockplugins/mockplugins1/qmockplugin.h
- tests/auto/cmake/mockplugins/mockplugins3/qmockauxplugin.h
- tests/auto/cmake/test_import_plugins/main.cpp
-Copyright: 2018 Kitware, Inc.
-License: BSD-3-clause
Files: examples/widgets/itemviews/flattreeview/main.cpp
src/corelib/doc/snippets/code/src_corelib_text_qanystringview.cpp
diff --git a/debian/meta/cmake-ignore b/debian/meta/cmake-ignore
new file mode 100644
index 0000000..68d12a3
--- /dev/null
+++ b/debian/meta/cmake-ignore
@@ -0,0 +1,5 @@
+Slog2
+DirectFB
+DB2, IBM DB2 client library, <https://www.ibm.com>
+Oracle, Oracle client library, <https://www.oracle.com>
+Mimer
\ No newline at end of file
diff --git a/debian/not-installed b/debian/not-installed
index 32269e4..f2416fc 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,7 +1,2 @@
-usr/bin/${DEB_HOST_MULTIARCH}-qmake6
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/extra-cmake-modules/COPYING-CMAKE-SCRIPTS
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/extra-cmake-modules/qt_attribution.json
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/kwin/COPYING-CMAKE-SCRIPTS
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/kwin/qt_attribution.json
usr/lib/qt6/bin/qmake
usr/lib/qt6/bin/qtpaths
diff --git a/debian/qt6-base.install b/debian/qt6-base.install
index 4021645..f1873c1 100644
--- a/debian/qt6-base.install
+++ b/debian/qt6-base.install
@@ -1,4 +1,5 @@
#!/usr/bin/dh-exec
+/usr/bin/
usr/lib/${DEB_HOST_MULTIARCH}/libQt6*.so.*
usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index ea1ce2f..bdcb457 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,5 +1,4 @@
# Binary data crafted to be used during tests
-qt6-base source: source-is-missing [tests/auto/corelib/plugin/qpluginloader/elftest/debugobj.so]
qt6-base source: binary-with-bad-dynamic-table [tests/auto/corelib/plugin/qpluginloader/elftest/debugobj.so]
# These are not static libraries, despite the .a extension
@@ -11,5 +10,4 @@ qt6-base source: unpack-message-for-source ar failed for tests/auto/corelib/io/q
qt6-base source: unpack-message-for-source ar failed for tests/auto/corelib/io/qdir/types/c.a
# Override some source-is-missing
-qt6-base source: source-is-missing [examples/widgets/richtext/textedit/example.html]
-qt6-base source: source-is-missing [tests/auto/corelib/text/qtextboundaryfinder/data/WordBreakTest.html]
+qt6-base source: source-is-missing tests/auto/corelib/plugin/qpluginloader/elftest/debugobj.so
\ No newline at end of file
More information about the Neon-commits
mailing list