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

[Carlos De Maine]

Git commit 3cc78e37ff847b0f54d8d543779d35a808145fb8 by Carlos De Maine.
Committed on 10/12/2023 at 09:35.
Pushed by carlosdem into branch 'Neon/release'.

lints and internal dep versions

M  +1    -1    debian/changelog
M  +23   -18   debian/control
M  +0    -4    debian/copyright
A  +1    -0    debian/qt6-virtualkeyboard.lintian-overrides
M  +0    -9    debian/rules

https://invent.kde.org/neon/qt6/qt6-virtualkeyboard/-/commit/3cc78e37ff847b0f54d8d543779d35a808145fb8

diff --git a/debian/changelog b/debian/changelog
index a717c0f..b0ca69a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -101,4 +101,4 @@ qt6-virtualkeyboard (6.2.2+dfsg-1) experimental; urgency=medium
 
   * Initial release (Closes: #999897)
 
- -- Patrick Franz <deltaone at debian.org>  Thu, 18 Nov 2021 09:01:30 +0100
\ No newline at end of file
+ -- Patrick Franz <deltaone at debian.org>  Thu, 18 Nov 2021 09:01:30 +0100
diff --git a/debian/control b/debian/control
index ff6de85..679adfd 100644
--- a/debian/control
+++ b/debian/control
@@ -18,14 +18,14 @@ Build-Depends: cmake,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.4.2+dfsg~),
-               qt6-declarative-dev (>= 6.4.2+dfsg~),
-               qt6-svg-dev (>= 6.4.2~),
+               qt6-base-dev (>= 6.6.1~),
+               qt6-declarative-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-virtualkeyboard
@@ -36,9 +36,16 @@ Package: qt6-virtualkeyboard
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
-Depends: qml6-module-qtquick-virtualkeyboard (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: libqt6virtualkeyboard6,
+          libqt6hunspellinputmethod6,
+          qml6-module-qtquick-virtualkeyboard,
+          qt6-virtualkeyboard-plugin,
+Replaces: libqt6virtualkeyboard6,
+          libqt6hunspellinputmethod6,
+          qml6-module-qtquick-virtualkeyboard,
+          qt6-virtualkeyboard-plugin,
 Description: Qt 6 Virtual Keyboard library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -53,11 +60,13 @@ Package: qt6-virtualkeyboard-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-base-dev,
          qt6-virtualkeyboard (= ${binary:Version}),
          ${misc:Depends}
-Breaks: libqt6virtualkeyboard6-dev (<< 6.4.2+dfsg-2~)
-Replaces: libqt6virtualkeyboard6-dev (<< 6.4.2+dfsg-2~)
+Breaks: libqt6virtualkeyboard6-dev,
+Provides: libqt6virtualkeyboard6-dev,
+Replaces: libqt6virtualkeyboard6-dev,
 Description: Qt 6 Virtual Keyboard - 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.
@@ -73,9 +82,11 @@ Package: qt6-virtualkeyboard-doc
 Architecture: all
 Section: kde
 X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-base-doc,
          qt6-virtualkeyboard-dev (= ${binary:Version}),
-         ${misc:Depends}
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Qt 6 Virtual Keyboard - 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.
@@ -93,12 +104,6 @@ Depends: qt6-virtualkeyboard
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt6virtualkeyboard6-dev
-Architecture: all
-Depends: qt6-virtualkeyboard-dev
-Description: Dummy transitional
- Transitional dummy package.
-
 Package: libqt6hunspellinputmethod6
 Architecture: all
 Depends: qt6-virtualkeyboard
diff --git a/debian/copyright b/debian/copyright
index 3bf4518..bf0951d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -54,10 +54,6 @@ Copyright: 2017 MyScript
            2017 The Qt Company Ltd.
 License: GPL-3
 
-Files: conanfile.py
-Copyright: 2021 The Qt Company Ltd.
-License: GPL-3 with Qt-1.0 exception
-
 License: GPL-3
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/qt6-virtualkeyboard.lintian-overrides b/debian/qt6-virtualkeyboard.lintian-overrides
new file mode 100644
index 0000000..fd03656
--- /dev/null
+++ b/debian/qt6-virtualkeyboard.lintian-overrides
@@ -0,0 +1 @@
+qt6-virtualkeyboard: package-name-doesnt-match-sonames libQt6HunspellInputMethod6 libQt6VirtualKeyboard6
diff --git a/debian/rules b/debian/rules
index 666e42d..ada2c2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,15 +12,6 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	extra_cmake_args += -DQT_HOST_PATH=/usr
 endif
 
-# Hack around #1040496. While I do not think this is serious it is indeed
-# important and might be fixed in Qt >= 6.5
-PARALLEL_OPTION = $(filter parallel=%,$(DEB_BUILD_OPTIONS))
-ifneq (,$(PARALLEL_OPTION))
-	NUMJOBS = $(patsubst parallel=%,%,$(PARALLEL_OPTION))
-	ifeq ($(NUMJOBS), 1)
-		DEB_BUILD_OPTIONS := $(subst parallel=1,parallel=2,$(DEB_BUILD_OPTIONS))
-	endif
-endif
 
 %:
 	dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja