DEB dbus-1-tqt: Install libraries according to multi-arch rules.HEADmaster

+ Changes to silence lintian reports.
+ Added SO version to binary package name.
+ Install libraries according to multi-arch rules.
+ Removed Replaces and Breaks referring to themselves.
+ The epoch change is for historical reasons from the KDE3 era.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

8 files changed, 44 insertions, 18 deletions

diff --git a/dilos/dependencies/dbus-1-tqt/debian/changelog b/dilos/dependencies/dbus-1-tqt/debian/changelog
index 6ade667cf..49e433d00 100644
--- a/dilos/dependencies/dbus-1-tqt/debian/changelog
+++ b/dilos/dependencies/dbus-1-tqt/debian/changelog
@@ -1,3 +1,12 @@
+dbus-1-tqt (4:14.1.6~pre0-0) forky; urgency=low
+
+  * Added SO version to binary package name.
+  * Install libraries according to multi-arch rules.
+  * Removed Replaces and Breaks referring to themselves.
+  * The epoch change is for historical reasons from the KDE3 era.
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Wed, 25 Feb 2026 10:31:10 +0100
+
 dbus-1-tqt (0.9-0ubuntu1) maverick; urgency=low
 
   * Initial package
diff --git a/dilos/dependencies/dbus-1-tqt/debian/control b/dilos/dependencies/dbus-1-tqt/debian/control
index 6bda799a7..7e28521e9 100644
--- a/dilos/dependencies/dbus-1-tqt/debian/control
+++ b/dilos/dependencies/dbus-1-tqt/debian/control
@@ -2,16 +2,14 @@ Source: dbus-1-tqt
 Section: devel
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, libdbus-1-dev (>= 0.90)
+Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, libdbus-1-dev (>= 0.90)
 Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 3.8.3
 
 Package: libdbus-1-tqt-dev
 Section: libdevel
 Architecture: any
-Replaces: libdbus-1-tqt-dev (<< 4:14.0.0~)
-Breaks: libdbus-1-tqt-dev (<< 4:14.0.0~)
-Depends: libdbus-1-tqt (= ${binary:Version}), libdbus-1-dev (>= 0.90), libtqt3-mt-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libdbus-1-tqt0 (= ${binary:Version}), libdbus-1-dev (>= 0.90), libtqt3-mt-dev
 Description: dbus bindings for the Trinity TQt interface
  D-BUS is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in
@@ -21,12 +19,14 @@ Description: dbus bindings for the Trinity TQt interface
  .
  See the dbus description for more information about D-BUS in general.
 
-Package: libdbus-1-tqt
+Package: libdbus-1-tqt0
 Section: libs
 Architecture: any
-Replaces: libdbus-1-tqt (<< 4:14.0.0~)
-Breaks: libdbus-1-tqt (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
+Multi-Arch: same
+Conflicts: libdbus-1-tqt
+Provides: libdbus-1-tqt
+Replaces: libdbus-1-tqt
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: dbus bindings for the Trinity TQt interface
  D-BUS is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in
@@ -39,11 +39,11 @@ Description: dbus bindings for the Trinity TQt interface
 Package: libdbus-1-tqt-doc
 Section: doc
 Architecture: all
-Replaces: libdbus-1-tqt-doc (<< 4:14.0.0~)
-Breaks: libdbus-1-tqt-doc (<< 4:14.0.0~)
+Depends: ${misc:Depends}
 Description: developer documentation for the libdbus-1-tqt libraries
  This package contains documentation for the libdbus-1-tqt libraries, of
- use more for developers creating applications which use the libdbus-1-tqt libraries, than regular users.
+ use more for developers creating applications which use the libdbus-1-tqt
+ libraries, than regular users.
  .
  This package is part of the provided bindings for the Trinity TQt interface.
  .
diff --git a/dilos/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.install b/dilos/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.install
index d057a773e..bdcda88e1 100644
--- a/dilos/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.install
+++ b/dilos/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/*/libdbus-1-tqt*.so
 debian/tmp/usr/bin/dbusxml2qt3
-debian/tmp/usr/lib/*/pkgconfig/dbus-1-tqt.pc
-debian/tmp/usr/lib/*/libdbus-1-tqt.la
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-1-tqt*.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-1-tqt.la
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/dbus-1-tqt.pc
diff --git a/dilos/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.lintian-overrides b/dilos/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.lintian-overrides
new file mode 100644
index 000000000..1c28d91dc
--- /dev/null
+++ b/dilos/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.lintian-overrides
@@ -0,0 +1,2 @@
+# The manual page is not available, this may be addressed sometime in the future.
+libdbus-1-tqt-dev: no-manual-page [usr/bin/dbusxml2qt3]
diff --git a/dilos/dependencies/dbus-1-tqt/debian/libdbus-1-tqt.install b/dilos/dependencies/dbus-1-tqt/debian/libdbus-1-tqt.install
deleted file mode 100644
index f4a142ab2..000000000
--- a/dilos/dependencies/dbus-1-tqt/debian/libdbus-1-tqt.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/libdbus-1-tqt*.so.*
diff --git a/dilos/dependencies/dbus-1-tqt/debian/libdbus-1-tqt0.install b/dilos/dependencies/dbus-1-tqt/debian/libdbus-1-tqt0.install
new file mode 100644
index 000000000..efb363498
--- /dev/null
+++ b/dilos/dependencies/dbus-1-tqt/debian/libdbus-1-tqt0.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-1-tqt*.so.*
diff --git a/dilos/dependencies/dbus-1-tqt/debian/rules b/dilos/dependencies/dbus-1-tqt/debian/rules
index 728eddf1b..7156de17e 100755
--- a/dilos/dependencies/dbus-1-tqt/debian/rules
+++ b/dilos/dependencies/dbus-1-tqt/debian/rules
@@ -3,13 +3,19 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 -include /usr/share/cdbs/1/class/tde.mk
 
+ifdef DEB_HOST_MULTIARCH
+  CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+  CMAKE_INSTALL_LIBDIR = lib
+endif
+
 DEB_KDE_APIDOX := yes
 
 # Build options
 DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_C_COMPILER=gcc \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
  -DWITH_ALL_OPTIONS="ON" \
- -DCMAKE_C_COMPILER=gcc \
- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
diff --git a/dilos/dependencies/dbus-1-tqt/debian/source/lintian-overrides b/dilos/dependencies/dbus-1-tqt/debian/source/lintian-overrides
new file mode 100644
index 000000000..c168f27a6
--- /dev/null
+++ b/dilos/dependencies/dbus-1-tqt/debian/source/lintian-overrides
@@ -0,0 +1,9 @@
+# We build for many distribution versions and therefore need
+# the distribution version as part of the package version,
+# which is unintentionally understood as NMU.
+dbus-1-tqt source: source-nmu-has-incorrect-version-number
+dbus-1-tqt source: binary-nmu-debian-revision-in-source
+dbus-1-tqt source: no-nmu-in-changelog
+
+# We want XZ regardless of the default compression.
+dbus-1-tqt source: custom-compression-in-debian-source-options