DEB avahi-tqt: Install libraries according to multi-arch rules.r14.1.x

+ Update symbols file.
+ 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 <slavek.banko@axis.cz>
(cherry picked from commit 3b74e6f64f62363b793a1c6b1ee0115ecda117cc)

15 files changed, 73 insertions, 19 deletions

diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/changelog b/ubuntu/_base/dependencies/avahi-tqt/debian/changelog
index b5568caee..ed335f135 100644
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/changelog
+++ b/ubuntu/_base/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 <slavek.banko@axis.cz>  Mon, 23 Feb 2026 20:10:50 +0100
+
 avahi-tqt (0.6.30-0ubuntu0) maverick; urgency=low
 
   * Initial build
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/control b/ubuntu/_base/dependencies/avahi-tqt/debian/control
index 0f8152847..b92cf9ebf 100644
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/control
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/control
@@ -3,24 +3,24 @@ Section: net
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Build-Depends: tde-cdbs, debhelper (>= 10~), quilt,
+Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt,
                tde-cmake, ninja-build,
-               gcc,
                pkgconf,
                libtqtinterface-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},
          libtqtinterface-dev,
          libavahi-common-dev
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/copyright b/ubuntu/_base/dependencies/avahi-tqt/debian/copyright
index 6771a11ab..839ed6f48 100644
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/copyright
+++ b/ubuntu/_base/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 <lennart (at) poettering (dot) de>
+  Trent Lloyd <lathiat@bur.st>
+  Sebastien Estienne <sebastien.estienne@gmail.com>
+  Jakub Stachowski
+  James Willcox <snorp@snorp.net>
+  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 <http://www.gnu.org/licenses/>.
 
   See /usr/share/common-licenses/LGPL-2.1 on your debian system.
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.install b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
deleted file mode 100644
index 50e360b80..000000000
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libavahi-tqt.so.*
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs
deleted file mode 100644
index 967448229..000000000
--- a/ubuntu/_base/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/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
deleted file mode 100644
index e530241ba..000000000
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
+++ /dev/null
@@ -1,2 +0,0 @@
-libavahi-tqt.so.1 libavahi-tqt-1 #MINVER#
- avahi_qt_poll_get@Base 0.6.16
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
index 7f65054bd..e7ce03ce5 100644
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
+++ b/ubuntu/_base/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/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.lintian-overrides b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.lintian-overrides
new file mode 100644
index 000000000..bd0d708dd
--- /dev/null
+++ b/ubuntu/_base/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/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.install b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.install
new file mode 100644
index 000000000..a9de0b880
--- /dev/null
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libavahi-tqt.so.*
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.lintian-overrides b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.lintian-overrides
new file mode 100644
index 000000000..72395a935
--- /dev/null
+++ b/ubuntu/_base/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/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.shlibs b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.shlibs
new file mode 100644
index 000000000..295d281d6
--- /dev/null
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.shlibs
@@ -0,0 +1 @@
+libavahi-tqt 1 libavahi-tqt1 (>= 4:3.5.13~)
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.symbols b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.symbols
new file mode 100644
index 000000000..1689cc3eb
--- /dev/null
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.symbols
@@ -0,0 +1,6 @@
+libavahi-tqt.so.1 libavahi-tqt-1 #MINVER#
+ avahi_qt_poll_get@Base 0.6.16
+ _ZNK7TQGList5countEv@Base 4:3.5.13~
+ _ZTI7TQGList@Base 4:3.5.13~
+ _ZTS7TQGList@Base 4:3.5.13~
+ _ZTV7TQGList@Base 4:3.5.13~
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/rules b/ubuntu/_base/dependencies/avahi-tqt/debian/rules
index ea9c8dbd4..0a309b674 100755
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/rules
@@ -3,12 +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
+
 # 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 -Wl,-O1
 
 # 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" \
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/source/.gitignore b/ubuntu/_base/dependencies/avahi-tqt/debian/source/.gitignore
deleted file mode 100644
index e69de29bb..000000000
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/source/.gitignore
+++ /dev/null
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/source/lintian-overrides b/ubuntu/_base/dependencies/avahi-tqt/debian/source/lintian-overrides
new file mode 100644
index 000000000..48036b776
--- /dev/null
+++ b/ubuntu/_base/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