From 94959f110a880291d33fa0003c958e08f987c6b2 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Tue, 24 Feb 2026 09:54:14 +0100 Subject: DEB avahi-tqt (dilos): Install libraries according to multi-arch rules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + Install libraries according to multi-arch rules. + Rename the package to match the library name and SO version. + Changes to silence lintian reports. Since R14.1.6 – TDE/tde-cmake#140, the default location for /usr is according to default multi-arch location used by the distribution. Signed-off-by: Slávek Banko --- dilos/dependencies/avahi-tqt/debian/changelog | 9 +++++ dilos/dependencies/avahi-tqt/debian/control | 16 ++++---- dilos/dependencies/avahi-tqt/debian/copyright | 24 ++++++++++- .../avahi-tqt/debian/libavahi-tqt-1.install | 1 - .../avahi-tqt/debian/libavahi-tqt-1.shlibs | 1 - .../avahi-tqt/debian/libavahi-tqt-1.symbols | 47 ---------------------- .../avahi-tqt/debian/libavahi-tqt-dev.install | 8 ++-- .../debian/libavahi-tqt-dev.lintian-overrides | 2 + .../avahi-tqt/debian/libavahi-tqt1.install | 1 + .../debian/libavahi-tqt1.lintian-overrides | 2 + .../avahi-tqt/debian/libavahi-tqt1.shlibs | 1 + .../avahi-tqt/debian/libavahi-tqt1.symbols | 47 ++++++++++++++++++++++ dilos/dependencies/avahi-tqt/debian/rules | 9 ++++- .../avahi-tqt/debian/source/.gitignore | 0 .../avahi-tqt/debian/source/lintian-overrides | 12 ++++++ 15 files changed, 115 insertions(+), 65 deletions(-) delete mode 100644 dilos/dependencies/avahi-tqt/debian/libavahi-tqt-1.install delete mode 100644 dilos/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs delete mode 100644 dilos/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols create mode 100644 dilos/dependencies/avahi-tqt/debian/libavahi-tqt-dev.lintian-overrides create mode 100644 dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.install create mode 100644 dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.lintian-overrides create mode 100644 dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.shlibs create mode 100644 dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.symbols delete mode 100644 dilos/dependencies/avahi-tqt/debian/source/.gitignore create mode 100644 dilos/dependencies/avahi-tqt/debian/source/lintian-overrides diff --git a/dilos/dependencies/avahi-tqt/debian/changelog b/dilos/dependencies/avahi-tqt/debian/changelog index 2401c4285..c8f5b5f78 100644 --- a/dilos/dependencies/avahi-tqt/debian/changelog +++ b/dilos/dependencies/avahi-tqt/debian/changelog @@ -1,3 +1,12 @@ +avahi-tqt (4:14.1.6~pre0-0) forky; urgency=low + + * Update symbols file. + * Install libraries according to multi-arch rules. + * Rename the package to match the library name and SO version. + * The epoch change is for historical reasons from the KDE3 era. + + -- Slávek Banko Mon, 23 Feb 2026 20:10:50 +0100 + avahi-tqt (0.6.30-0debian0) squeeze; urgency=low * Initial build diff --git a/dilos/dependencies/avahi-tqt/debian/control b/dilos/dependencies/avahi-tqt/debian/control index e63f24b1b..985585f09 100644 --- a/dilos/dependencies/avahi-tqt/debian/control +++ b/dilos/dependencies/avahi-tqt/debian/control @@ -3,24 +3,24 @@ Section: net Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Ubuntu Developers -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, +Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, - gcc, pkgconf, libtqt3-mt-dev, libavahi-common-dev, libavahi-client-dev Standards-Version: 3.9.1 -Package: libavahi-tqt-1 +Package: libavahi-tqt1 Section: libs Architecture: any -Replaces: libavahi-tqt-1 (<< 4:14.0.0~) -Breaks: libavahi-tqt-1 (<< 4:14.0.0~) +Multi-Arch: same +Conflicts: libavahi-tqt-1 +Provides: libavahi-tqt-1 +Replaces: libavahi-tqt-1 Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same Description: Avahi TQt integration library Avahi is a fully LGPL framework for Multicast DNS Service Discovery. It allows programs to publish and discover services and hosts @@ -34,9 +34,7 @@ Description: Avahi TQt integration library Package: libavahi-tqt-dev Section: libdevel Architecture: any -Replaces: libavahi-tqt-dev (<< 4:14.0.0~) -Breaks: libavahi-tqt-dev (<< 4:14.0.0~) -Depends: libavahi-tqt-1 (= ${binary:Version}), +Depends: libavahi-tqt1 (= ${binary:Version}), ${misc:Depends}, libtqt3-mt-dev, libavahi-common-dev diff --git a/dilos/dependencies/avahi-tqt/debian/copyright b/dilos/dependencies/avahi-tqt/debian/copyright index 6771a11ab..839ed6f48 100644 --- a/dilos/dependencies/avahi-tqt/debian/copyright +++ b/dilos/dependencies/avahi-tqt/debian/copyright @@ -1,3 +1,24 @@ +avahi-tqt has been pulled into an independent package to preserve the +QT3/TQt interface for Avahi. + +Package was created by Timothy Pearson in 2011. + +Copyright 2011-2026 TDE Team + + +The main portion of Avahi is copyright: + Upstream Authors: + the Avahi developers + Lennart Poettering + Trent Lloyd + Sebastien Estienne + Jakub Stachowski + James Willcox + Collabora Ltd. + David A. Wheeler + Tom Tromey + Red Hat, Inc. + License: This library is free software; you can redistribute it and/or @@ -11,7 +32,6 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + License along with this library. If not, see . See /usr/share/common-licenses/LGPL-2.1 on your debian system. diff --git a/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-1.install b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-1.install deleted file mode 100644 index 39474806f..000000000 --- a/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/*/libavahi-tqt.so.* diff --git a/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs deleted file mode 100644 index 967448229..000000000 --- a/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs +++ /dev/null @@ -1 +0,0 @@ -libavahi-tqt 1 libavahi-tqt-1 (>= 0.6.16) diff --git a/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols deleted file mode 100644 index afdba4f4f..000000000 --- a/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols +++ /dev/null @@ -1,47 +0,0 @@ -libavahi-tqt.so.1 libavahi-tqt-1 #MINVER# - avahi_qt_poll_get@Base 0.6.16 - _ZN10AvahiWatch10tqt_invokeEiP9TQUObject@Base 0.6.16 - _ZN10AvahiWatch12tqt_propertyEiiP9TQVariant@Base 0.6.16 - _ZN10AvahiWatch16setWatchedEventsE15AvahiWatchEvent@Base 0.6.16 - _ZN10AvahiWatch16staticMetaObjectEv@Base 0.6.16 - _ZN10AvahiWatch19tqt_static_propertyEP8TQObjectiiP9TQVariant@Base 0.6.16 - _ZN10AvahiWatch5gotInEv@Base 0.6.16 - _ZN10AvahiWatch6gotOutEv@Base 0.6.16 - _ZN10AvahiWatch7metaObjE@Base 0.6.16 - _ZN10AvahiWatch8tqt_castEPKc@Base 0.6.16 - _ZN10AvahiWatch8tqt_emitEiP9TQUObject@Base 0.6.16 - _ZN10AvahiWatchC1Ei15AvahiWatchEventPFvPS_iS0_PvES2_@Base 0.6.16 - _ZN10AvahiWatchC2Ei15AvahiWatchEventPFvPS_iS0_PvES2_@Base 0.6.16 - _ZN10AvahiWatchD0Ev@Base 0.6.16 - _ZN10AvahiWatchD1Ev@Base 0.6.16 - _ZN10AvahiWatchD2Ev@Base 0.6.16 - _ZN12AvahiTimeout10tqt_invokeEiP9TQUObject@Base 0.6.16 - _ZN12AvahiTimeout12tqt_propertyEiiP9TQVariant@Base 0.6.16 - _ZN12AvahiTimeout16staticMetaObjectEv@Base 0.6.16 - _ZN12AvahiTimeout19tqt_static_propertyEP8TQObjectiiP9TQVariant@Base 0.6.16 - _ZN12AvahiTimeout6updateEPK7timeval@Base 0.6.16 - _ZN12AvahiTimeout7metaObjE@Base 0.6.16 - _ZN12AvahiTimeout7timeoutEv@Base 0.6.16 - _ZN12AvahiTimeout8tqt_castEPKc@Base 0.6.16 - _ZN12AvahiTimeout8tqt_emitEiP9TQUObject@Base 0.6.16 - _ZN12AvahiTimeoutC1EPK7timevalPFvPS_PvES4_@Base 0.6.16 - _ZN12AvahiTimeoutC2EPK7timevalPFvPS_PvES4_@Base 0.6.16 - _ZN12AvahiTimeoutD0Ev@Base 0.6.16 - _ZN12AvahiTimeoutD1Ev@Base 0.6.16 - _ZN12AvahiTimeoutD2Ev@Base 0.6.16 - _ZNK10AvahiWatch10metaObjectEv@Base 0.6.16 - _ZNK10AvahiWatch9classNameEv@Base 0.6.16 - _ZNK12AvahiTimeout10metaObjectEv@Base 0.6.16 - _ZNK12AvahiTimeout9classNameEv@Base 0.6.16 - _ZNK7TQGList5countEv@Base 0.6.16 - _ZTI10AvahiWatch@Base 0.6.16 - _ZTI12AvahiTimeout@Base 0.6.16 - _ZTI7TQGList@Base 0.6.16 - _ZTS10AvahiWatch@Base 0.6.16 - _ZTS12AvahiTimeout@Base 0.6.16 - _ZTS7TQGList@Base 0.6.16 - _ZTV10AvahiWatch@Base 0.6.16 - _ZTV12AvahiTimeout@Base 0.6.16 - _ZTV7TQGList@Base 0.6.16 - _etext@Base 0.6.16 - _lib_version@Base 0.6.16 diff --git a/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install index f132ac21a..e7ce03ce5 100644 --- a/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install +++ b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install @@ -1,5 +1,5 @@ debian/tmp/usr/include/avahi-tqt/qt-watch.h -debian/tmp/usr/lib/*/libavahi-tqt.so -debian/tmp/usr/lib/*/libavahi-tqt.la -debian/tmp/usr/lib/*/libavahi-tqt.a -debian/tmp/usr/lib/*/pkgconfig/avahi-tqt.pc +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libavahi-tqt.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libavahi-tqt.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libavahi-tqt.a +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/avahi-tqt.pc diff --git a/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-dev.lintian-overrides b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-dev.lintian-overrides new file mode 100644 index 000000000..bd0d708dd --- /dev/null +++ b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt-dev.lintian-overrides @@ -0,0 +1,2 @@ +# We keep it for historical reasons. +libavahi-tqt-dev: unknown-field Original-Maintainer diff --git a/dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.install b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.install new file mode 100644 index 000000000..a9de0b880 --- /dev/null +++ b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libavahi-tqt.so.* diff --git a/dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.lintian-overrides b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.lintian-overrides new file mode 100644 index 000000000..72395a935 --- /dev/null +++ b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.lintian-overrides @@ -0,0 +1,2 @@ +# We keep it for historical reasons. +libavahi-tqt1: unknown-field Original-Maintainer diff --git a/dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.shlibs b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.shlibs new file mode 100644 index 000000000..295d281d6 --- /dev/null +++ b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.shlibs @@ -0,0 +1 @@ +libavahi-tqt 1 libavahi-tqt1 (>= 4:3.5.13~) diff --git a/dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.symbols b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.symbols new file mode 100644 index 000000000..afdba4f4f --- /dev/null +++ b/dilos/dependencies/avahi-tqt/debian/libavahi-tqt1.symbols @@ -0,0 +1,47 @@ +libavahi-tqt.so.1 libavahi-tqt-1 #MINVER# + avahi_qt_poll_get@Base 0.6.16 + _ZN10AvahiWatch10tqt_invokeEiP9TQUObject@Base 0.6.16 + _ZN10AvahiWatch12tqt_propertyEiiP9TQVariant@Base 0.6.16 + _ZN10AvahiWatch16setWatchedEventsE15AvahiWatchEvent@Base 0.6.16 + _ZN10AvahiWatch16staticMetaObjectEv@Base 0.6.16 + _ZN10AvahiWatch19tqt_static_propertyEP8TQObjectiiP9TQVariant@Base 0.6.16 + _ZN10AvahiWatch5gotInEv@Base 0.6.16 + _ZN10AvahiWatch6gotOutEv@Base 0.6.16 + _ZN10AvahiWatch7metaObjE@Base 0.6.16 + _ZN10AvahiWatch8tqt_castEPKc@Base 0.6.16 + _ZN10AvahiWatch8tqt_emitEiP9TQUObject@Base 0.6.16 + _ZN10AvahiWatchC1Ei15AvahiWatchEventPFvPS_iS0_PvES2_@Base 0.6.16 + _ZN10AvahiWatchC2Ei15AvahiWatchEventPFvPS_iS0_PvES2_@Base 0.6.16 + _ZN10AvahiWatchD0Ev@Base 0.6.16 + _ZN10AvahiWatchD1Ev@Base 0.6.16 + _ZN10AvahiWatchD2Ev@Base 0.6.16 + _ZN12AvahiTimeout10tqt_invokeEiP9TQUObject@Base 0.6.16 + _ZN12AvahiTimeout12tqt_propertyEiiP9TQVariant@Base 0.6.16 + _ZN12AvahiTimeout16staticMetaObjectEv@Base 0.6.16 + _ZN12AvahiTimeout19tqt_static_propertyEP8TQObjectiiP9TQVariant@Base 0.6.16 + _ZN12AvahiTimeout6updateEPK7timeval@Base 0.6.16 + _ZN12AvahiTimeout7metaObjE@Base 0.6.16 + _ZN12AvahiTimeout7timeoutEv@Base 0.6.16 + _ZN12AvahiTimeout8tqt_castEPKc@Base 0.6.16 + _ZN12AvahiTimeout8tqt_emitEiP9TQUObject@Base 0.6.16 + _ZN12AvahiTimeoutC1EPK7timevalPFvPS_PvES4_@Base 0.6.16 + _ZN12AvahiTimeoutC2EPK7timevalPFvPS_PvES4_@Base 0.6.16 + _ZN12AvahiTimeoutD0Ev@Base 0.6.16 + _ZN12AvahiTimeoutD1Ev@Base 0.6.16 + _ZN12AvahiTimeoutD2Ev@Base 0.6.16 + _ZNK10AvahiWatch10metaObjectEv@Base 0.6.16 + _ZNK10AvahiWatch9classNameEv@Base 0.6.16 + _ZNK12AvahiTimeout10metaObjectEv@Base 0.6.16 + _ZNK12AvahiTimeout9classNameEv@Base 0.6.16 + _ZNK7TQGList5countEv@Base 0.6.16 + _ZTI10AvahiWatch@Base 0.6.16 + _ZTI12AvahiTimeout@Base 0.6.16 + _ZTI7TQGList@Base 0.6.16 + _ZTS10AvahiWatch@Base 0.6.16 + _ZTS12AvahiTimeout@Base 0.6.16 + _ZTS7TQGList@Base 0.6.16 + _ZTV10AvahiWatch@Base 0.6.16 + _ZTV12AvahiTimeout@Base 0.6.16 + _ZTV7TQGList@Base 0.6.16 + _etext@Base 0.6.16 + _lib_version@Base 0.6.16 diff --git a/dilos/dependencies/avahi-tqt/debian/rules b/dilos/dependencies/avahi-tqt/debian/rules index 0f226c7b6..21d6d1345 100755 --- a/dilos/dependencies/avahi-tqt/debian/rules +++ b/dilos/dependencies/avahi-tqt/debian/rules @@ -3,6 +3,12 @@ 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 + # Ensure at build time that the library has no dependencies on undefined # symbols, and speed up loading. export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs @@ -10,10 +16,11 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs # Build options DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DWITH_ALL_OPTIONS="ON" \ -DCMAKE_C_COMPILER=gcc \ - -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \ -DWITH_GCC_VISIBILITY="OFF" diff --git a/dilos/dependencies/avahi-tqt/debian/source/.gitignore b/dilos/dependencies/avahi-tqt/debian/source/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/dilos/dependencies/avahi-tqt/debian/source/lintian-overrides b/dilos/dependencies/avahi-tqt/debian/source/lintian-overrides new file mode 100644 index 000000000..48036b776 --- /dev/null +++ b/dilos/dependencies/avahi-tqt/debian/source/lintian-overrides @@ -0,0 +1,12 @@ +# We build for many distribution versions and therefore need +# the distribution version as part of the package version, +# which is unintentionally understood as NMU. +avahi-tqt source: source-nmu-has-incorrect-version-number +avahi-tqt source: binary-nmu-debian-revision-in-source +avahi-tqt source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +avahi-tqt source: custom-compression-in-debian-source-options + +# We keep it for historical reasons. +avahi-tqt source: unknown-field Original-Maintainer -- cgit v1.2.3