From 26487476fad1db0efa1cd7635a4fea49cb09a702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 25 Feb 2026 01:20:41 +0100 Subject: [PATCH] DEB dbus-tqt: Install libraries according to multi-arch rules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + Changes to silence lintian reports. + Added build time dependencies. + Added reason for epoch change to changelog. + Removed Replaces and Breaks referring to themselves. Signed-off-by: Slávek Banko --- .../_base/dependencies/dbus-tqt/debian/changelog | 8 +++++++- .../_base/dependencies/dbus-tqt/debian/control | 11 ++++------- .../_base/dependencies/dbus-tqt/debian/copyright | 2 +- .../dbus-tqt/debian/libdbus-tqt-1-1c2.install | 2 +- .../debian/libdbus-tqt-1-1c2.lintian-overrides | 4 ++++ .../dbus-tqt/debian/libdbus-tqt-1-dev.install | 4 ++-- debian/_base/dependencies/dbus-tqt/debian/rules | 15 ++++++++++----- .../dbus-tqt/debian/source/lintian-overrides | 9 +++++++++ dilos/dependencies/dbus-tqt/debian/changelog | 8 +++++++- dilos/dependencies/dbus-tqt/debian/control | 11 ++++------- dilos/dependencies/dbus-tqt/debian/copyright | 2 +- .../dbus-tqt/debian/libdbus-tqt-1-1c2.install | 2 +- .../debian/libdbus-tqt-1-1c2.lintian-overrides | 4 ++++ .../dbus-tqt/debian/libdbus-tqt-1-dev.install | 4 ++-- dilos/dependencies/dbus-tqt/debian/rules | 16 ++++++++++------ .../dbus-tqt/debian/source/lintian-overrides | 9 +++++++++ .../_base/dependencies/dbus-tqt/debian/changelog | 8 +++++++- .../_base/dependencies/dbus-tqt/debian/control | 11 ++++------- .../_base/dependencies/dbus-tqt/debian/copyright | 2 +- .../dbus-tqt/debian/libdbus-tqt-1-1c2.install | 2 +- .../debian/libdbus-tqt-1-1c2.lintian-overrides | 4 ++++ .../dbus-tqt/debian/libdbus-tqt-1-dev.install | 4 ++-- ubuntu/_base/dependencies/dbus-tqt/debian/rules | 15 ++++++++++----- .../dbus-tqt/debian/source/lintian-overrides | 9 +++++++++ 24 files changed, 114 insertions(+), 52 deletions(-) create mode 100644 debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.lintian-overrides create mode 100644 debian/_base/dependencies/dbus-tqt/debian/source/lintian-overrides create mode 100644 dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.lintian-overrides create mode 100644 dilos/dependencies/dbus-tqt/debian/source/lintian-overrides create mode 100644 ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.lintian-overrides create mode 100644 ubuntu/_base/dependencies/dbus-tqt/debian/source/lintian-overrides diff --git a/debian/_base/dependencies/dbus-tqt/debian/changelog b/debian/_base/dependencies/dbus-tqt/debian/changelog index 91871211a..28c1c9326 100644 --- a/debian/_base/dependencies/dbus-tqt/debian/changelog +++ b/debian/_base/dependencies/dbus-tqt/debian/changelog @@ -1,6 +1,12 @@ +dbus-tqt (4:14.1.6~pre0-0) forky; urgency=low + + * Removed Replaces and Breaks referring to themselves. + * The epoch change is for historical reasons from the KDE3 era. + + -- Slávek Banko Tue, 24 Feb 2026 18:48:38 +0100 + dbus-tqt (0.63.svn.0ubuntu0) maverick; urgency=low * Migrate to Trinity Qt [TQt] Interface -- Timothy Pearson Wed, 23 Mar 2011 17:11:00 -0600 - diff --git a/debian/_base/dependencies/dbus-tqt/debian/control b/debian/_base/dependencies/dbus-tqt/debian/control index 93f53bfbc..1f74ca026 100644 --- a/debian/_base/dependencies/dbus-tqt/debian/control +++ b/debian/_base/dependencies/dbus-tqt/debian/control @@ -3,15 +3,14 @@ Section: devel Priority: optional Maintainer: TDE Debian Team Uploaders: Sjoerd Simons , Sebastian Drge -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) +Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) Standards-Version: 3.8.3 Package: libdbus-tqt-1-1c2 Section: libs Architecture: any -Replaces: libdbus-tqt-1-1c2 (<< 4:14.0.0~) -Breaks: libdbus-tqt-1-1c2 (<< 4:14.0.0~) -Depends: ${shlibs:Depends} +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: dbus-tqt-1, dbus-tqt-1c2, libdbus-tqt-1-1 Description: simple interprocess messaging system (TQt-based shared library) D-BUS is a message bus, used for sending messages between applications. @@ -26,9 +25,7 @@ Description: simple interprocess messaging system (TQt-based shared library) Package: libdbus-tqt-1-dev Section: libdevel Architecture: any -Replaces: libdbus-tqt-1-dev (<< 4:14.0.0~) -Breaks: libdbus-tqt-1-dev (<< 4:14.0.0~) -Depends: libdbus-tqt-1-1c2 (= ${source:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev +Depends: ${misc:Depends}, libdbus-tqt-1-1c2 (= ${binary:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev Conflicts: dbus-tqt-1-dev Description: simple interprocess messaging system (TQt interface) D-BUS is a message bus, used for sending messages between applications. diff --git a/debian/_base/dependencies/dbus-tqt/debian/copyright b/debian/_base/dependencies/dbus-tqt/debian/copyright index 9541c0a8f..c5826691b 100644 --- a/debian/_base/dependencies/dbus-tqt/debian/copyright +++ b/debian/_base/dependencies/dbus-tqt/debian/copyright @@ -5,7 +5,7 @@ The source tarball was created by splitting out the qt3 bindings part from the dbus-qt3 git repository: http://gitweb.freedesktop.org/?p=dbus/dbus-qt3.git This package is dual-licensed under the Academic Free License, and the -GPL. For a description of the GPL, see /usr/share/common-licenses/GPL +GPL-2+. For a description of the GPL-2+, see /usr/share/common-licenses/GPL-2 on your Debian system. Portions of the package are only licensed under the GPL (notably diff --git a/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install b/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install index bf44f3563..853b74a2c 100644 --- a/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install +++ b/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install @@ -1 +1 @@ -debian/tmp/usr/lib/libdbus-tqt-*.so.* +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-tqt-*.so.* diff --git a/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.lintian-overrides b/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.lintian-overrides new file mode 100644 index 000000000..b34b13f0e --- /dev/null +++ b/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.lintian-overrides @@ -0,0 +1,4 @@ +# The name is incorrect from the KDE3 era and it is not possible to change +# it without changing the epoch, which is not desirable. The package will +# be removed soon, so we have to live with it for now. +libdbus-tqt-1-1c2: package-name-doesnt-match-sonames libdbus-tqt-1-0 diff --git a/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install b/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install index 6ee3e25c3..43eedb129 100644 --- a/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install +++ b/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install @@ -2,5 +2,5 @@ debian/tmp/usr/include/dbus*/dbus/dbus-qt.h debian/tmp/usr/include/dbus*/dbus/connection.h debian/tmp/usr/include/dbus*/dbus/server.h debian/tmp/usr/include/dbus*/dbus/message.h -debian/tmp/usr/lib/libdbus-tqt-*.so -debian/tmp/usr/lib/pkgconfig/*.pc +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-tqt-*.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*.pc diff --git a/debian/_base/dependencies/dbus-tqt/debian/rules b/debian/_base/dependencies/dbus-tqt/debian/rules index 98dff1416..79aa65f6e 100755 --- a/debian/_base/dependencies/dbus-tqt/debian/rules +++ b/debian/_base/dependencies/dbus-tqt/debian/rules @@ -1,12 +1,17 @@ #!/usr/bin/make -f -# Copyright © 2002,2003 Colin Walters -# Copyright © 2003 Daniel Stone -# Copyright © 2006 Sjoerd Simons +# Copyright © 2002,2003 Colin Walters +# Copyright © 2003 Daniel Stone +# Copyright © 2006 Sjoerd Simons -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk 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 + # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V @@ -16,4 +21,4 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DWITH_ALL_OPTIONS="ON" + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) diff --git a/debian/_base/dependencies/dbus-tqt/debian/source/lintian-overrides b/debian/_base/dependencies/dbus-tqt/debian/source/lintian-overrides new file mode 100644 index 000000000..12bc176bd --- /dev/null +++ b/debian/_base/dependencies/dbus-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-tqt source: source-nmu-has-incorrect-version-number +dbus-tqt source: binary-nmu-debian-revision-in-source +dbus-tqt source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +dbus-tqt source: custom-compression-in-debian-source-options diff --git a/dilos/dependencies/dbus-tqt/debian/changelog b/dilos/dependencies/dbus-tqt/debian/changelog index 91871211a..28c1c9326 100644 --- a/dilos/dependencies/dbus-tqt/debian/changelog +++ b/dilos/dependencies/dbus-tqt/debian/changelog @@ -1,6 +1,12 @@ +dbus-tqt (4:14.1.6~pre0-0) forky; urgency=low + + * Removed Replaces and Breaks referring to themselves. + * The epoch change is for historical reasons from the KDE3 era. + + -- Slávek Banko Tue, 24 Feb 2026 18:48:38 +0100 + dbus-tqt (0.63.svn.0ubuntu0) maverick; urgency=low * Migrate to Trinity Qt [TQt] Interface -- Timothy Pearson Wed, 23 Mar 2011 17:11:00 -0600 - diff --git a/dilos/dependencies/dbus-tqt/debian/control b/dilos/dependencies/dbus-tqt/debian/control index 93f53bfbc..1f74ca026 100644 --- a/dilos/dependencies/dbus-tqt/debian/control +++ b/dilos/dependencies/dbus-tqt/debian/control @@ -3,15 +3,14 @@ Section: devel Priority: optional Maintainer: TDE Debian Team Uploaders: Sjoerd Simons , Sebastian Drge -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) +Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) Standards-Version: 3.8.3 Package: libdbus-tqt-1-1c2 Section: libs Architecture: any -Replaces: libdbus-tqt-1-1c2 (<< 4:14.0.0~) -Breaks: libdbus-tqt-1-1c2 (<< 4:14.0.0~) -Depends: ${shlibs:Depends} +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: dbus-tqt-1, dbus-tqt-1c2, libdbus-tqt-1-1 Description: simple interprocess messaging system (TQt-based shared library) D-BUS is a message bus, used for sending messages between applications. @@ -26,9 +25,7 @@ Description: simple interprocess messaging system (TQt-based shared library) Package: libdbus-tqt-1-dev Section: libdevel Architecture: any -Replaces: libdbus-tqt-1-dev (<< 4:14.0.0~) -Breaks: libdbus-tqt-1-dev (<< 4:14.0.0~) -Depends: libdbus-tqt-1-1c2 (= ${source:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev +Depends: ${misc:Depends}, libdbus-tqt-1-1c2 (= ${binary:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev Conflicts: dbus-tqt-1-dev Description: simple interprocess messaging system (TQt interface) D-BUS is a message bus, used for sending messages between applications. diff --git a/dilos/dependencies/dbus-tqt/debian/copyright b/dilos/dependencies/dbus-tqt/debian/copyright index 9541c0a8f..c5826691b 100644 --- a/dilos/dependencies/dbus-tqt/debian/copyright +++ b/dilos/dependencies/dbus-tqt/debian/copyright @@ -5,7 +5,7 @@ The source tarball was created by splitting out the qt3 bindings part from the dbus-qt3 git repository: http://gitweb.freedesktop.org/?p=dbus/dbus-qt3.git This package is dual-licensed under the Academic Free License, and the -GPL. For a description of the GPL, see /usr/share/common-licenses/GPL +GPL-2+. For a description of the GPL-2+, see /usr/share/common-licenses/GPL-2 on your Debian system. Portions of the package are only licensed under the GPL (notably diff --git a/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install b/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install index 56fcdf6ac..853b74a2c 100644 --- a/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install +++ b/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install @@ -1 +1 @@ -debian/tmp/usr/lib/*/libdbus-tqt-*.so.* +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-tqt-*.so.* diff --git a/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.lintian-overrides b/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.lintian-overrides new file mode 100644 index 000000000..b34b13f0e --- /dev/null +++ b/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.lintian-overrides @@ -0,0 +1,4 @@ +# The name is incorrect from the KDE3 era and it is not possible to change +# it without changing the epoch, which is not desirable. The package will +# be removed soon, so we have to live with it for now. +libdbus-tqt-1-1c2: package-name-doesnt-match-sonames libdbus-tqt-1-0 diff --git a/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install b/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install index 12d5cd477..43eedb129 100644 --- a/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install +++ b/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install @@ -2,5 +2,5 @@ debian/tmp/usr/include/dbus*/dbus/dbus-qt.h debian/tmp/usr/include/dbus*/dbus/connection.h debian/tmp/usr/include/dbus*/dbus/server.h debian/tmp/usr/include/dbus*/dbus/message.h -debian/tmp/usr/lib/*/libdbus-tqt-*.so -debian/tmp/usr/lib/*/pkgconfig/*.pc +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-tqt-*.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*.pc diff --git a/dilos/dependencies/dbus-tqt/debian/rules b/dilos/dependencies/dbus-tqt/debian/rules index bd4c0e954..43b36b3af 100755 --- a/dilos/dependencies/dbus-tqt/debian/rules +++ b/dilos/dependencies/dbus-tqt/debian/rules @@ -1,21 +1,25 @@ #!/usr/bin/make -f -# Copyright © 2002,2003 Colin Walters -# Copyright © 2003 Daniel Stone -# Copyright © 2006 Sjoerd Simons +# Copyright © 2002,2003 Colin Walters +# Copyright © 2003 Daniel Stone +# Copyright © 2006 Sjoerd Simons 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 + # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_C_COMPILER=gcc \ - -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_APIDOX_HTML_DIRECTORY="usr/share/doc/libdbus-1-tqt/HTML" \ - -DWITH_ALL_OPTIONS="ON" + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) diff --git a/dilos/dependencies/dbus-tqt/debian/source/lintian-overrides b/dilos/dependencies/dbus-tqt/debian/source/lintian-overrides new file mode 100644 index 000000000..12bc176bd --- /dev/null +++ b/dilos/dependencies/dbus-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-tqt source: source-nmu-has-incorrect-version-number +dbus-tqt source: binary-nmu-debian-revision-in-source +dbus-tqt source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +dbus-tqt source: custom-compression-in-debian-source-options diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/changelog b/ubuntu/_base/dependencies/dbus-tqt/debian/changelog index 91871211a..28c1c9326 100644 --- a/ubuntu/_base/dependencies/dbus-tqt/debian/changelog +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/changelog @@ -1,6 +1,12 @@ +dbus-tqt (4:14.1.6~pre0-0) forky; urgency=low + + * Removed Replaces and Breaks referring to themselves. + * The epoch change is for historical reasons from the KDE3 era. + + -- Slávek Banko Tue, 24 Feb 2026 18:48:38 +0100 + dbus-tqt (0.63.svn.0ubuntu0) maverick; urgency=low * Migrate to Trinity Qt [TQt] Interface -- Timothy Pearson Wed, 23 Mar 2011 17:11:00 -0600 - diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/control b/ubuntu/_base/dependencies/dbus-tqt/debian/control index 93f53bfbc..1f74ca026 100644 --- a/ubuntu/_base/dependencies/dbus-tqt/debian/control +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/control @@ -3,15 +3,14 @@ Section: devel Priority: optional Maintainer: TDE Debian Team Uploaders: Sjoerd Simons , Sebastian Drge -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) +Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) Standards-Version: 3.8.3 Package: libdbus-tqt-1-1c2 Section: libs Architecture: any -Replaces: libdbus-tqt-1-1c2 (<< 4:14.0.0~) -Breaks: libdbus-tqt-1-1c2 (<< 4:14.0.0~) -Depends: ${shlibs:Depends} +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: dbus-tqt-1, dbus-tqt-1c2, libdbus-tqt-1-1 Description: simple interprocess messaging system (TQt-based shared library) D-BUS is a message bus, used for sending messages between applications. @@ -26,9 +25,7 @@ Description: simple interprocess messaging system (TQt-based shared library) Package: libdbus-tqt-1-dev Section: libdevel Architecture: any -Replaces: libdbus-tqt-1-dev (<< 4:14.0.0~) -Breaks: libdbus-tqt-1-dev (<< 4:14.0.0~) -Depends: libdbus-tqt-1-1c2 (= ${source:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev +Depends: ${misc:Depends}, libdbus-tqt-1-1c2 (= ${binary:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev Conflicts: dbus-tqt-1-dev Description: simple interprocess messaging system (TQt interface) D-BUS is a message bus, used for sending messages between applications. diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/copyright b/ubuntu/_base/dependencies/dbus-tqt/debian/copyright index 9541c0a8f..c5826691b 100644 --- a/ubuntu/_base/dependencies/dbus-tqt/debian/copyright +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/copyright @@ -5,7 +5,7 @@ The source tarball was created by splitting out the qt3 bindings part from the dbus-qt3 git repository: http://gitweb.freedesktop.org/?p=dbus/dbus-qt3.git This package is dual-licensed under the Academic Free License, and the -GPL. For a description of the GPL, see /usr/share/common-licenses/GPL +GPL-2+. For a description of the GPL-2+, see /usr/share/common-licenses/GPL-2 on your Debian system. Portions of the package are only licensed under the GPL (notably diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install b/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install index bf44f3563..853b74a2c 100644 --- a/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install @@ -1 +1 @@ -debian/tmp/usr/lib/libdbus-tqt-*.so.* +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-tqt-*.so.* diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.lintian-overrides b/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.lintian-overrides new file mode 100644 index 000000000..b34b13f0e --- /dev/null +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.lintian-overrides @@ -0,0 +1,4 @@ +# The name is incorrect from the KDE3 era and it is not possible to change +# it without changing the epoch, which is not desirable. The package will +# be removed soon, so we have to live with it for now. +libdbus-tqt-1-1c2: package-name-doesnt-match-sonames libdbus-tqt-1-0 diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install b/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install index 6ee3e25c3..43eedb129 100644 --- a/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install @@ -2,5 +2,5 @@ debian/tmp/usr/include/dbus*/dbus/dbus-qt.h debian/tmp/usr/include/dbus*/dbus/connection.h debian/tmp/usr/include/dbus*/dbus/server.h debian/tmp/usr/include/dbus*/dbus/message.h -debian/tmp/usr/lib/libdbus-tqt-*.so -debian/tmp/usr/lib/pkgconfig/*.pc +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-tqt-*.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*.pc diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/rules b/ubuntu/_base/dependencies/dbus-tqt/debian/rules index 98dff1416..79aa65f6e 100755 --- a/ubuntu/_base/dependencies/dbus-tqt/debian/rules +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/rules @@ -1,12 +1,17 @@ #!/usr/bin/make -f -# Copyright © 2002,2003 Colin Walters -# Copyright © 2003 Daniel Stone -# Copyright © 2006 Sjoerd Simons +# Copyright © 2002,2003 Colin Walters +# Copyright © 2003 Daniel Stone +# Copyright © 2006 Sjoerd Simons -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk 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 + # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V @@ -16,4 +21,4 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DWITH_ALL_OPTIONS="ON" + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/source/lintian-overrides b/ubuntu/_base/dependencies/dbus-tqt/debian/source/lintian-overrides new file mode 100644 index 000000000..12bc176bd --- /dev/null +++ b/ubuntu/_base/dependencies/dbus-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-tqt source: source-nmu-has-incorrect-version-number +dbus-tqt source: binary-nmu-debian-revision-in-source +dbus-tqt source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +dbus-tqt source: custom-compression-in-debian-source-options