diff options
88 files changed, 434 insertions, 166 deletions
diff --git a/debian/_base/dependencies/akode/debian/akode-dbg.lintian-overrides b/debian/_base/dependencies/akode/debian/akode-dbg.lintian-overrides new file mode 100644 index 000000000..45c1f71bb --- /dev/null +++ b/debian/_base/dependencies/akode/debian/akode-dbg.lintian-overrides @@ -0,0 +1,2 @@ +# We keep it for historical reasons. +akode-dbg: unknown-field Original-Maintainer diff --git a/debian/_base/dependencies/akode/debian/changelog b/debian/_base/dependencies/akode/debian/changelog index 9e455da61..b0d67a69c 100644 --- a/debian/_base/dependencies/akode/debian/changelog +++ b/debian/_base/dependencies/akode/debian/changelog @@ -1,3 +1,11 @@ +akode (4:14.1.6~pre1-0) trixie; urgency=low + + * Move akodeplay binary to a separate package. + * Install libraries according to multi-arch rules. + * The epoch change is for historical reasons from the KDE3 era. + + -- Slávek Banko <slavek.banko@axis.cz> Sun, 22 Feb 2026 15:55:51 +0100 + akode (2.0.2-6debian6.0.0+1) squeeze; urgency=low * Conversion to CMake diff --git a/debian/_base/dependencies/akode/debian/control b/debian/_base/dependencies/akode/debian/control index 0c28bc15a..ba31b5165 100644 --- a/debian/_base/dependencies/akode/debian/control +++ b/debian/_base/dependencies/akode/debian/control @@ -4,26 +4,43 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Isaac Clerencia <isaac@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Adeodato Simó <dato@net.com.org.es> -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libflac-dev (>= 1.1.1-3), libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev, libavformat-dev +Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libflac-dev (>= 1.1.1-3), libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev, libavformat-dev Standards-Version: 3.7.3 Package: libakode2 Section: libs Architecture: any -Depends: ${shlibs:Depends} +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: akode Replaces: akode -Enhances: libarts1c2, libarts1c2a-trinity +Recommends: libakode2-bin +Enhances: libarts1c2, libarts1c2a-trinity, libarts1t64-trinity +Description: akode plugin for aRts + aKode is a new multithreaded audio library that provides aRts with + plugins to play a variety of formats: Ogg Vorbis, Musepack (MPC), + FLAC and Speex. aKode also focuses on performance, and so it means a + big enhancement for users runing aRts in non-realtime mode. + +Package: libakode2-bin +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: akode, libakode2 (<< 4:14.1.6~) +Replaces: akode Description: akode plugin for aRts aKode is a new multithreaded audio library that provides aRts with plugins to play a variety of formats: Ogg Vorbis, Musepack (MPC), FLAC and Speex. aKode also focuses on performance, and so it means a big enhancement for users runing aRts in non-realtime mode. + . + This package contains the akodeplay binary for playing via akode. Package: libakode2-ffmpeg Section: libs Architecture: any -Depends: ${shlibs:Depends} +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: akode Replaces: akode Enhances: libarts1c2, libarts1c2a-trinity @@ -38,7 +55,8 @@ Description: ffmpeg plugins for akode Package: libakode2-mpeg Section: libs Architecture: any -Depends: ${shlibs:Depends} +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: akode Replaces: akode Enhances: libarts1c2, libarts1c2a-trinity @@ -53,7 +71,8 @@ Description: mpeg plugins for akode Package: libakode2-pulse Section: libs Architecture: any -Depends: ${shlibs:Depends} +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: akode Replaces: akode Enhances: libarts1c2, libarts1c2a-trinity @@ -68,7 +87,8 @@ Description: pulseaudio sink for akode Package: libakode2-jack Section: libs Architecture: any -Depends: ${shlibs:Depends} +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: akode Replaces: akode Enhances: libarts1c2, libarts1c2a-trinity @@ -83,7 +103,7 @@ Description: jack sink for akode Package: libakode-dev Section: libdevel Architecture: any -Depends: libakode2 (= ${binary:Version}), pkgconf, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, ${alsa-dev}, libsamplerate0-dev, libspeex-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, libakode2 (= ${binary:Version}), pkgconf, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, ${alsa-dev}, libsamplerate0-dev, libspeex-dev Replaces: kdemultimedia-dev (<< 4:3.5-rc1), libakode2 (<< 2.0-4) Description: development files for akode aKode is a new multithreaded audio library that provides aRts with @@ -96,8 +116,8 @@ Description: development files for akode Package: akode-dbg Section: libdevel Architecture: any -Priority: extra -Depends: libakode2 (= ${binary:Version}) +Priority: optional +Depends: ${shlibs:Depends}, ${misc:Depends}, libakode2 (= ${binary:Version}) Description: debugging symbols for akode This package contains the debugging symbols associated with akode. They will automatically be used by gdb for debugging akode-related diff --git a/debian/_base/dependencies/akode/debian/libakode-dev.install b/debian/_base/dependencies/akode/debian/libakode-dev.install index e61e3b46b..6318f96b8 100644 --- a/debian/_base/dependencies/akode/debian/libakode-dev.install +++ b/debian/_base/dependencies/akode/debian/libakode-dev.install @@ -1,15 +1,4 @@ debian/tmp/usr/bin/akode-config -debian/tmp/usr/lib/libakode.so -debian/tmp/usr/lib/libakode.la -debian/tmp/usr/lib/libakode_alsa_sink.la -debian/tmp/usr/lib/libakode_jack_sink.la -debian/tmp/usr/lib/libakode_mpc_decoder.la -debian/tmp/usr/lib/libakode_mpeg_decoder.la -debian/tmp/usr/lib/libakode_oss_sink.la -debian/tmp/usr/lib/libakode_pulse_sink.la -debian/tmp/usr/lib/libakode_src_resampler.la -debian/tmp/usr/lib/libakode_xiph_decoder.la -debian/tmp/usr/lib/pkgconfig/akode.pc debian/tmp/usr/include/akode/akode_export.h debian/tmp/usr/include/akode/fast_resampler.h debian/tmp/usr/include/akode/bytebuffer.h @@ -35,3 +24,14 @@ debian/tmp/usr/include/akode/akodelib.h debian/tmp/usr/include/akode/audioframe.h debian/tmp/usr/include/akode/pluginhandler.h debian/tmp/usr/include/akode/wav_decoder.h +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_alsa_sink.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_jack_sink.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_mpc_decoder.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_mpeg_decoder.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_oss_sink.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_pulse_sink.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_src_resampler.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_xiph_decoder.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/akode.pc diff --git a/debian/_base/dependencies/akode/debian/libakode-dev.lintian-overrides b/debian/_base/dependencies/akode/debian/libakode-dev.lintian-overrides new file mode 100644 index 000000000..3b6ede226 --- /dev/null +++ b/debian/_base/dependencies/akode/debian/libakode-dev.lintian-overrides @@ -0,0 +1,5 @@ +# The manual page is not available, this may be addressed sometime in the future. +libakode-dev: no-manual-page [usr/bin/akode-config] + +# We keep it for historical reasons. +libakode-dev: unknown-field Original-Maintainer diff --git a/debian/_base/dependencies/akode/debian/libakode2-bin.install b/debian/_base/dependencies/akode/debian/libakode2-bin.install new file mode 100644 index 000000000..c5e52bae4 --- /dev/null +++ b/debian/_base/dependencies/akode/debian/libakode2-bin.install @@ -0,0 +1 @@ +debian/tmp/usr/bin/akodeplay diff --git a/debian/_base/dependencies/akode/debian/libakode2-bin.lintian-overrides b/debian/_base/dependencies/akode/debian/libakode2-bin.lintian-overrides new file mode 100644 index 000000000..0b76b88ec --- /dev/null +++ b/debian/_base/dependencies/akode/debian/libakode2-bin.lintian-overrides @@ -0,0 +1,5 @@ +# The manual page is not available, this may be addressed sometime in the future. +libakode2-bin: no-manual-page [usr/bin/akodeplay] + +# We keep it for historical reasons. +libakode2-bin: unknown-field Original-Maintainer diff --git a/debian/_base/dependencies/akode/debian/libakode2-ffmpeg.install b/debian/_base/dependencies/akode/debian/libakode2-ffmpeg.install index 83c5e777b..ec8827c87 100644 --- a/debian/_base/dependencies/akode/debian/libakode2-ffmpeg.install +++ b/debian/_base/dependencies/akode/debian/libakode2-ffmpeg.install @@ -1 +1 @@ -debian/tmp/usr/lib/libakode_ffmpeg_decoder.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_ffmpeg_decoder.so diff --git a/debian/_base/dependencies/akode/debian/libakode2-ffmpeg.lintian-overrides b/debian/_base/dependencies/akode/debian/libakode2-ffmpeg.lintian-overrides new file mode 100644 index 000000000..0df0cc35e --- /dev/null +++ b/debian/_base/dependencies/akode/debian/libakode2-ffmpeg.lintian-overrides @@ -0,0 +1,5 @@ +# These are akode plugins, not regular shared libraries. +libakode2-ffmpeg: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_ffmpeg_decoder.so] + +# We keep it for historical reasons. +libakode2-ffmpeg: unknown-field Original-Maintainer diff --git a/debian/_base/dependencies/akode/debian/libakode2-jack.install b/debian/_base/dependencies/akode/debian/libakode2-jack.install index 937eebe69..0a1f0a5c9 100644 --- a/debian/_base/dependencies/akode/debian/libakode2-jack.install +++ b/debian/_base/dependencies/akode/debian/libakode2-jack.install @@ -1 +1 @@ -debian/tmp/usr/lib/libakode_jack_sink.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_jack_sink.so diff --git a/debian/_base/dependencies/akode/debian/libakode2-jack.lintian-overrides b/debian/_base/dependencies/akode/debian/libakode2-jack.lintian-overrides new file mode 100644 index 000000000..94c3d8b83 --- /dev/null +++ b/debian/_base/dependencies/akode/debian/libakode2-jack.lintian-overrides @@ -0,0 +1,5 @@ +# These are akode plugins, not regular shared libraries. +libakode2-jack: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_jack_sink.so] + +# We keep it for historical reasons. +libakode2-jack: unknown-field Original-Maintainer diff --git a/debian/_base/dependencies/akode/debian/libakode2-mpeg.install b/debian/_base/dependencies/akode/debian/libakode2-mpeg.install index b854280ea..ef50c6ff9 100644 --- a/debian/_base/dependencies/akode/debian/libakode2-mpeg.install +++ b/debian/_base/dependencies/akode/debian/libakode2-mpeg.install @@ -1 +1 @@ -debian/tmp/usr/lib/libakode_mpeg_decoder.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_mpeg_decoder.so diff --git a/debian/_base/dependencies/akode/debian/libakode2-mpeg.lintian-overrides b/debian/_base/dependencies/akode/debian/libakode2-mpeg.lintian-overrides new file mode 100644 index 000000000..402bd6083 --- /dev/null +++ b/debian/_base/dependencies/akode/debian/libakode2-mpeg.lintian-overrides @@ -0,0 +1,5 @@ +# These are akode plugins, not regular shared libraries. +libakode2-mpeg: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_mpeg_decoder.so] + +# We keep it for historical reasons. +libakode2-mpeg: unknown-field Original-Maintainer diff --git a/debian/_base/dependencies/akode/debian/libakode2-pulse.install b/debian/_base/dependencies/akode/debian/libakode2-pulse.install index 5dc1311de..8dc7ab0e0 100644 --- a/debian/_base/dependencies/akode/debian/libakode2-pulse.install +++ b/debian/_base/dependencies/akode/debian/libakode2-pulse.install @@ -1 +1 @@ -debian/tmp/usr/lib/libakode_pulse_sink.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_pulse_sink.so diff --git a/debian/_base/dependencies/akode/debian/libakode2-pulse.lintian-overrides b/debian/_base/dependencies/akode/debian/libakode2-pulse.lintian-overrides new file mode 100644 index 000000000..535c4753e --- /dev/null +++ b/debian/_base/dependencies/akode/debian/libakode2-pulse.lintian-overrides @@ -0,0 +1,5 @@ +# These are akode plugins, not regular shared libraries. +libakode2-pulse: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_pulse_sink.so] + +# We keep it for historical reasons. +libakode2-pulse: unknown-field Original-Maintainer diff --git a/debian/_base/dependencies/akode/debian/libakode2.install b/debian/_base/dependencies/akode/debian/libakode2.install index 4e7f7ff74..9c12d1a56 100644 --- a/debian/_base/dependencies/akode/debian/libakode2.install +++ b/debian/_base/dependencies/akode/debian/libakode2.install @@ -1,8 +1,7 @@ -debian/tmp/usr/bin/akodeplay -debian/tmp/usr/lib/libakode.so.2 -debian/tmp/usr/lib/libakode.so.2.0.0 -debian/tmp/usr/lib/libakode_alsa_sink.so -debian/tmp/usr/lib/libakode_mpc_decoder.so -debian/tmp/usr/lib/libakode_oss_sink.so -debian/tmp/usr/lib/libakode_src_resampler.so -debian/tmp/usr/lib/libakode_xiph_decoder.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode.so.2 +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode.so.2.0.0 +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_alsa_sink.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_mpc_decoder.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_oss_sink.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_src_resampler.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_xiph_decoder.so diff --git a/debian/_base/dependencies/akode/debian/libakode2.lintian b/debian/_base/dependencies/akode/debian/libakode2.lintian deleted file mode 100644 index 6ce3df3be..000000000 --- a/debian/_base/dependencies/akode/debian/libakode2.lintian +++ /dev/null @@ -1,8 +0,0 @@ -# These are akode plugins, not regular shared libraries. -libakode2: shlib-missing-in-control-file libakode_mpc_decoder.so usr/lib/libakode_mpc_decoder.so -libakode2: shlib-missing-in-control-file libakode_alsa_sink.so usr/lib/libakode_alsa_sink.so -libakode2: shlib-missing-in-control-file libakode_mpeg_decoder.so usr/lib/libakode_mpeg_decoder.so -libakode2: shlib-missing-in-control-file libakode_jack_sink.so usr/lib/libakode_jack_sink.so -libakode2: shlib-missing-in-control-file libakode_xiph_decoder.so usr/lib/libakode_xiph_decoder.so -libakode2: shlib-missing-in-control-file libakode_oss_sink.so usr/lib/libakode_oss_sink.so -libakode2: shlib-missing-in-control-file libakode_src_resampler.so usr/lib/libakode_src_resampler.so diff --git a/debian/_base/dependencies/akode/debian/libakode2.lintian-overrides b/debian/_base/dependencies/akode/debian/libakode2.lintian-overrides new file mode 100644 index 000000000..27f27c048 --- /dev/null +++ b/debian/_base/dependencies/akode/debian/libakode2.lintian-overrides @@ -0,0 +1,9 @@ +# These are akode plugins, not regular shared libraries. +libakode2: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_alsa_sink.so] +libakode2: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_mpc_decoder.so] +libakode2: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_oss_sink.so] +libakode2: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_src_resampler.so] +libakode2: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_xiph_decoder.so] + +# We keep it for historical reasons. +libakode2: unknown-field Original-Maintainer diff --git a/debian/_base/dependencies/akode/debian/rules b/debian/_base/dependencies/akode/debian/rules index aa92a8c09..4a74c66a5 100755 --- a/debian/_base/dependencies/akode/debian/rules +++ b/debian/_base/dependencies/akode/debian/rules @@ -3,7 +3,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/tde.mk -DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) +else + CMAKE_INSTALL_LIBDIR = lib +endif + ifeq (linux,$(DEB_HOST_ARCH_OS)) DEB_DH_GENCONTROL_ARGS=-- -Valsa-dev=libasound2-dev endif @@ -20,15 +25,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ -DWITH_ALL_OPTIONS="ON" \ -DWITH_LIBLTDL="OFF" \ -DWITH_FFMPEG_DECODER="ON" - -common-install-prehook-arch:: - grep -v libakode_alsa_sink debian/libakode2.install > debian/libakode2.install.kfreebsd-i386 - grep -v libakode_alsa_sink debian/libakode2.install > debian/libakode2.install.kfreebsd-amd64 - grep -v libakode_alsa_sink debian/libakode-dev.install > debian/libakode-dev.install.kfreebsd-i386 - grep -v libakode_alsa_sink debian/libakode-dev.install > debian/libakode-dev.install.kfreebsd-amd64 - -clean:: - rm -f debian/libakode2.install.kfreebsd* debian/libakode-dev.install.kfreebsd* diff --git a/debian/_base/dependencies/akode/debian/source/lintian-overrides b/debian/_base/dependencies/akode/debian/source/lintian-overrides new file mode 100644 index 000000000..a7cccf748 --- /dev/null +++ b/debian/_base/dependencies/akode/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. +akode source: source-nmu-has-incorrect-version-number +akode source: binary-nmu-debian-revision-in-source +akode source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +akode source: custom-compression-in-debian-source-options + +# We keep it for historical reasons. +akode source: unknown-field Original-Maintainer diff --git a/debian/_base/dependencies/avahi-tqt/debian/changelog b/debian/_base/dependencies/avahi-tqt/debian/changelog index 2401c4285..c8f5b5f78 100644 --- a/debian/_base/dependencies/avahi-tqt/debian/changelog +++ b/debian/_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-0debian0) squeeze; urgency=low * Initial build diff --git a/debian/_base/dependencies/avahi-tqt/debian/control b/debian/_base/dependencies/avahi-tqt/debian/control index e63f24b1b..985585f09 100644 --- a/debian/_base/dependencies/avahi-tqt/debian/control +++ b/debian/_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, 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/debian/_base/dependencies/avahi-tqt/debian/copyright b/debian/_base/dependencies/avahi-tqt/debian/copyright index 6771a11ab..839ed6f48 100644 --- a/debian/_base/dependencies/avahi-tqt/debian/copyright +++ b/debian/_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/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.install b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.install deleted file mode 100644 index 50e360b80..000000000 --- a/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libavahi-tqt.so.* diff --git a/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs deleted file mode 100644 index 967448229..000000000 --- a/debian/_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/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols deleted file mode 100644 index e530241ba..000000000 --- a/debian/_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/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install index 7f65054bd..e7ce03ce5 100644 --- a/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install +++ b/debian/_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/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.lintian-overrides b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.lintian-overrides new file mode 100644 index 000000000..bd0d708dd --- /dev/null +++ b/debian/_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/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.install b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.install new file mode 100644 index 000000000..a9de0b880 --- /dev/null +++ b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libavahi-tqt.so.* diff --git a/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.lintian-overrides b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.lintian-overrides new file mode 100644 index 000000000..72395a935 --- /dev/null +++ b/debian/_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/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.shlibs b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.shlibs new file mode 100644 index 000000000..295d281d6 --- /dev/null +++ b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.shlibs @@ -0,0 +1 @@ +libavahi-tqt 1 libavahi-tqt1 (>= 4:3.5.13~) diff --git a/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.symbols b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt1.symbols new file mode 100644 index 000000000..1689cc3eb --- /dev/null +++ b/debian/_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/debian/_base/dependencies/avahi-tqt/debian/rules b/debian/_base/dependencies/avahi-tqt/debian/rules index ea9c8dbd4..0a309b674 100755 --- a/debian/_base/dependencies/avahi-tqt/debian/rules +++ b/debian/_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/debian/_base/dependencies/avahi-tqt/debian/source/.gitignore b/debian/_base/dependencies/avahi-tqt/debian/source/.gitignore deleted file mode 100644 index e69de29bb..000000000 --- a/debian/_base/dependencies/avahi-tqt/debian/source/.gitignore +++ /dev/null diff --git a/debian/_base/dependencies/avahi-tqt/debian/source/lintian-overrides b/debian/_base/dependencies/avahi-tqt/debian/source/lintian-overrides new file mode 100644 index 000000000..48036b776 --- /dev/null +++ b/debian/_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 diff --git a/debian/_base/dependencies/libr/debian/changelog b/debian/_base/dependencies/libr/debian/changelog index e10d865e5..816d6af73 100644 --- a/debian/_base/dependencies/libr/debian/changelog +++ b/debian/_base/dependencies/libr/debian/changelog @@ -1,3 +1,9 @@ +libr (4:14.1.6~pre0-0) trixie; urgency=low + + * Install libraries according to multi-arch rules. + + -- Slávek Banko <slavek.banko@axis.cz> Mon, 23 Feb 2026 21:18:10 +0100 + libr (4:0.6.0-2debian8.0.0+6~d) jessie; urgency=low * Fix mangling of a critical elf library section on armhf diff --git a/debian/_base/dependencies/libr/debian/control b/debian/_base/dependencies/libr/debian/control index 0401c36b4..fb437131a 100644 --- a/debian/_base/dependencies/libr/debian/control +++ b/debian/_base/dependencies/libr/debian/control @@ -1,5 +1,5 @@ Source: libr -Priority: extra +Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkgconf, libgtk2.0-dev, binutils-dev, doxygen Standards-Version: 3.8.4 @@ -9,6 +9,7 @@ Homepage: http://www.compholio.com/elficon/ Package: libr1 Section: libs Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} Description: ELF binary resource library Store and retrieve resources from ELF binaries. diff --git a/debian/_base/dependencies/libr/debian/dirs b/debian/_base/dependencies/libr/debian/dirs deleted file mode 100644 index ca882bbb7..000000000 --- a/debian/_base/dependencies/libr/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/debian/_base/dependencies/libr/debian/libr-dev.dirs b/debian/_base/dependencies/libr/debian/libr-dev.dirs index 441fd8fc6..2405d8173 100644 --- a/debian/_base/dependencies/libr/debian/libr-dev.dirs +++ b/debian/_base/dependencies/libr/debian/libr-dev.dirs @@ -1,3 +1,2 @@ -usr/lib -usr/include usr/include/libr +usr/lib diff --git a/debian/_base/dependencies/libr/debian/libr-dev.install b/debian/_base/dependencies/libr/debian/libr-dev.install index 6fad4769a..fc8a1b7cb 100644 --- a/debian/_base/dependencies/libr/debian/libr-dev.install +++ b/debian/_base/dependencies/libr/debian/libr-dev.install @@ -1,9 +1,6 @@ -usr/include/* usr/include/libr/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/*.la -usr/lib/pkgconfig/* +usr/lib/$(DEB_HOST_MULTIARCH)/lib*.a +usr/lib/$(DEB_HOST_MULTIARCH)/lib*.so +usr/lib/$(DEB_HOST_MULTIARCH)/*.la +usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/* usr/share/man/man3/*.3 -#usr/share/pkgconfig/* - diff --git a/debian/_base/dependencies/libr/debian/libr-dev.lintian-overrides b/debian/_base/dependencies/libr/debian/libr-dev.lintian-overrides new file mode 100644 index 000000000..9f47b462b --- /dev/null +++ b/debian/_base/dependencies/libr/debian/libr-dev.lintian-overrides @@ -0,0 +1,2 @@ +# Man pages are generated automatically. +libr-dev: bad-whatis-entry diff --git a/debian/_base/dependencies/libr/debian/libr1.install b/debian/_base/dependencies/libr/debian/libr1.install index d0dbfd18a..48eab8981 100644 --- a/debian/_base/dependencies/libr/debian/libr1.install +++ b/debian/_base/dependencies/libr/debian/libr1.install @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/lib*.so.* diff --git a/debian/_base/dependencies/libr/debian/rules b/debian/_base/dependencies/libr/debian/rules index 0b16c81e9..95c91da90 100755 --- a/debian/_base/dependencies/libr/debian/rules +++ b/debian/_base/dependencies/libr/debian/rules @@ -3,8 +3,15 @@ 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 + # 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/debian/_base/dependencies/libr/debian/source.lintian-overrides b/debian/_base/dependencies/libr/debian/source/lintian-overrides index 71c1b8924..71c1b8924 100644 --- a/debian/_base/dependencies/libr/debian/source.lintian-overrides +++ b/debian/_base/dependencies/libr/debian/source/lintian-overrides diff --git a/ubuntu/_base/dependencies/akode/debian/akode-dbg.lintian-overrides b/ubuntu/_base/dependencies/akode/debian/akode-dbg.lintian-overrides new file mode 100644 index 000000000..45c1f71bb --- /dev/null +++ b/ubuntu/_base/dependencies/akode/debian/akode-dbg.lintian-overrides @@ -0,0 +1,2 @@ +# We keep it for historical reasons. +akode-dbg: unknown-field Original-Maintainer diff --git a/ubuntu/_base/dependencies/akode/debian/changelog b/ubuntu/_base/dependencies/akode/debian/changelog index 9e455da61..b0d67a69c 100644 --- a/ubuntu/_base/dependencies/akode/debian/changelog +++ b/ubuntu/_base/dependencies/akode/debian/changelog @@ -1,3 +1,11 @@ +akode (4:14.1.6~pre1-0) trixie; urgency=low + + * Move akodeplay binary to a separate package. + * Install libraries according to multi-arch rules. + * The epoch change is for historical reasons from the KDE3 era. + + -- Slávek Banko <slavek.banko@axis.cz> Sun, 22 Feb 2026 15:55:51 +0100 + akode (2.0.2-6debian6.0.0+1) squeeze; urgency=low * Conversion to CMake diff --git a/ubuntu/_base/dependencies/akode/debian/control b/ubuntu/_base/dependencies/akode/debian/control index 0c28bc15a..ba31b5165 100644 --- a/ubuntu/_base/dependencies/akode/debian/control +++ b/ubuntu/_base/dependencies/akode/debian/control @@ -4,26 +4,43 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Isaac Clerencia <isaac@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Adeodato Simó <dato@net.com.org.es> -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libflac-dev (>= 1.1.1-3), libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev, libavformat-dev +Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libflac-dev (>= 1.1.1-3), libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev, libavformat-dev Standards-Version: 3.7.3 Package: libakode2 Section: libs Architecture: any -Depends: ${shlibs:Depends} +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: akode Replaces: akode -Enhances: libarts1c2, libarts1c2a-trinity +Recommends: libakode2-bin +Enhances: libarts1c2, libarts1c2a-trinity, libarts1t64-trinity +Description: akode plugin for aRts + aKode is a new multithreaded audio library that provides aRts with + plugins to play a variety of formats: Ogg Vorbis, Musepack (MPC), + FLAC and Speex. aKode also focuses on performance, and so it means a + big enhancement for users runing aRts in non-realtime mode. + +Package: libakode2-bin +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: akode, libakode2 (<< 4:14.1.6~) +Replaces: akode Description: akode plugin for aRts aKode is a new multithreaded audio library that provides aRts with plugins to play a variety of formats: Ogg Vorbis, Musepack (MPC), FLAC and Speex. aKode also focuses on performance, and so it means a big enhancement for users runing aRts in non-realtime mode. + . + This package contains the akodeplay binary for playing via akode. Package: libakode2-ffmpeg Section: libs Architecture: any -Depends: ${shlibs:Depends} +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: akode Replaces: akode Enhances: libarts1c2, libarts1c2a-trinity @@ -38,7 +55,8 @@ Description: ffmpeg plugins for akode Package: libakode2-mpeg Section: libs Architecture: any -Depends: ${shlibs:Depends} +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: akode Replaces: akode Enhances: libarts1c2, libarts1c2a-trinity @@ -53,7 +71,8 @@ Description: mpeg plugins for akode Package: libakode2-pulse Section: libs Architecture: any -Depends: ${shlibs:Depends} +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: akode Replaces: akode Enhances: libarts1c2, libarts1c2a-trinity @@ -68,7 +87,8 @@ Description: pulseaudio sink for akode Package: libakode2-jack Section: libs Architecture: any -Depends: ${shlibs:Depends} +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: akode Replaces: akode Enhances: libarts1c2, libarts1c2a-trinity @@ -83,7 +103,7 @@ Description: jack sink for akode Package: libakode-dev Section: libdevel Architecture: any -Depends: libakode2 (= ${binary:Version}), pkgconf, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, ${alsa-dev}, libsamplerate0-dev, libspeex-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, libakode2 (= ${binary:Version}), pkgconf, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, ${alsa-dev}, libsamplerate0-dev, libspeex-dev Replaces: kdemultimedia-dev (<< 4:3.5-rc1), libakode2 (<< 2.0-4) Description: development files for akode aKode is a new multithreaded audio library that provides aRts with @@ -96,8 +116,8 @@ Description: development files for akode Package: akode-dbg Section: libdevel Architecture: any -Priority: extra -Depends: libakode2 (= ${binary:Version}) +Priority: optional +Depends: ${shlibs:Depends}, ${misc:Depends}, libakode2 (= ${binary:Version}) Description: debugging symbols for akode This package contains the debugging symbols associated with akode. They will automatically be used by gdb for debugging akode-related diff --git a/ubuntu/_base/dependencies/akode/debian/libakode-dev.install b/ubuntu/_base/dependencies/akode/debian/libakode-dev.install index e61e3b46b..6318f96b8 100644 --- a/ubuntu/_base/dependencies/akode/debian/libakode-dev.install +++ b/ubuntu/_base/dependencies/akode/debian/libakode-dev.install @@ -1,15 +1,4 @@ debian/tmp/usr/bin/akode-config -debian/tmp/usr/lib/libakode.so -debian/tmp/usr/lib/libakode.la -debian/tmp/usr/lib/libakode_alsa_sink.la -debian/tmp/usr/lib/libakode_jack_sink.la -debian/tmp/usr/lib/libakode_mpc_decoder.la -debian/tmp/usr/lib/libakode_mpeg_decoder.la -debian/tmp/usr/lib/libakode_oss_sink.la -debian/tmp/usr/lib/libakode_pulse_sink.la -debian/tmp/usr/lib/libakode_src_resampler.la -debian/tmp/usr/lib/libakode_xiph_decoder.la -debian/tmp/usr/lib/pkgconfig/akode.pc debian/tmp/usr/include/akode/akode_export.h debian/tmp/usr/include/akode/fast_resampler.h debian/tmp/usr/include/akode/bytebuffer.h @@ -35,3 +24,14 @@ debian/tmp/usr/include/akode/akodelib.h debian/tmp/usr/include/akode/audioframe.h debian/tmp/usr/include/akode/pluginhandler.h debian/tmp/usr/include/akode/wav_decoder.h +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_alsa_sink.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_jack_sink.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_mpc_decoder.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_mpeg_decoder.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_oss_sink.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_pulse_sink.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_src_resampler.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_xiph_decoder.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/akode.pc diff --git a/ubuntu/_base/dependencies/akode/debian/libakode-dev.lintian-overrides b/ubuntu/_base/dependencies/akode/debian/libakode-dev.lintian-overrides new file mode 100644 index 000000000..3b6ede226 --- /dev/null +++ b/ubuntu/_base/dependencies/akode/debian/libakode-dev.lintian-overrides @@ -0,0 +1,5 @@ +# The manual page is not available, this may be addressed sometime in the future. +libakode-dev: no-manual-page [usr/bin/akode-config] + +# We keep it for historical reasons. +libakode-dev: unknown-field Original-Maintainer diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-bin.install b/ubuntu/_base/dependencies/akode/debian/libakode2-bin.install new file mode 100644 index 000000000..c5e52bae4 --- /dev/null +++ b/ubuntu/_base/dependencies/akode/debian/libakode2-bin.install @@ -0,0 +1 @@ +debian/tmp/usr/bin/akodeplay diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-bin.lintian-overrides b/ubuntu/_base/dependencies/akode/debian/libakode2-bin.lintian-overrides new file mode 100644 index 000000000..0b76b88ec --- /dev/null +++ b/ubuntu/_base/dependencies/akode/debian/libakode2-bin.lintian-overrides @@ -0,0 +1,5 @@ +# The manual page is not available, this may be addressed sometime in the future. +libakode2-bin: no-manual-page [usr/bin/akodeplay] + +# We keep it for historical reasons. +libakode2-bin: unknown-field Original-Maintainer diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-ffmpeg.install b/ubuntu/_base/dependencies/akode/debian/libakode2-ffmpeg.install index 83c5e777b..ec8827c87 100644 --- a/ubuntu/_base/dependencies/akode/debian/libakode2-ffmpeg.install +++ b/ubuntu/_base/dependencies/akode/debian/libakode2-ffmpeg.install @@ -1 +1 @@ -debian/tmp/usr/lib/libakode_ffmpeg_decoder.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_ffmpeg_decoder.so diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-ffmpeg.lintian-overrides b/ubuntu/_base/dependencies/akode/debian/libakode2-ffmpeg.lintian-overrides new file mode 100644 index 000000000..0df0cc35e --- /dev/null +++ b/ubuntu/_base/dependencies/akode/debian/libakode2-ffmpeg.lintian-overrides @@ -0,0 +1,5 @@ +# These are akode plugins, not regular shared libraries. +libakode2-ffmpeg: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_ffmpeg_decoder.so] + +# We keep it for historical reasons. +libakode2-ffmpeg: unknown-field Original-Maintainer diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-jack.install b/ubuntu/_base/dependencies/akode/debian/libakode2-jack.install index 937eebe69..0a1f0a5c9 100644 --- a/ubuntu/_base/dependencies/akode/debian/libakode2-jack.install +++ b/ubuntu/_base/dependencies/akode/debian/libakode2-jack.install @@ -1 +1 @@ -debian/tmp/usr/lib/libakode_jack_sink.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_jack_sink.so diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-jack.lintian-overrides b/ubuntu/_base/dependencies/akode/debian/libakode2-jack.lintian-overrides new file mode 100644 index 000000000..94c3d8b83 --- /dev/null +++ b/ubuntu/_base/dependencies/akode/debian/libakode2-jack.lintian-overrides @@ -0,0 +1,5 @@ +# These are akode plugins, not regular shared libraries. +libakode2-jack: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_jack_sink.so] + +# We keep it for historical reasons. +libakode2-jack: unknown-field Original-Maintainer diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-mpeg.install b/ubuntu/_base/dependencies/akode/debian/libakode2-mpeg.install index b854280ea..ef50c6ff9 100644 --- a/ubuntu/_base/dependencies/akode/debian/libakode2-mpeg.install +++ b/ubuntu/_base/dependencies/akode/debian/libakode2-mpeg.install @@ -1 +1 @@ -debian/tmp/usr/lib/libakode_mpeg_decoder.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_mpeg_decoder.so diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-mpeg.lintian-overrides b/ubuntu/_base/dependencies/akode/debian/libakode2-mpeg.lintian-overrides new file mode 100644 index 000000000..402bd6083 --- /dev/null +++ b/ubuntu/_base/dependencies/akode/debian/libakode2-mpeg.lintian-overrides @@ -0,0 +1,5 @@ +# These are akode plugins, not regular shared libraries. +libakode2-mpeg: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_mpeg_decoder.so] + +# We keep it for historical reasons. +libakode2-mpeg: unknown-field Original-Maintainer diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-pulse.install b/ubuntu/_base/dependencies/akode/debian/libakode2-pulse.install index 5dc1311de..8dc7ab0e0 100644 --- a/ubuntu/_base/dependencies/akode/debian/libakode2-pulse.install +++ b/ubuntu/_base/dependencies/akode/debian/libakode2-pulse.install @@ -1 +1 @@ -debian/tmp/usr/lib/libakode_pulse_sink.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_pulse_sink.so diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-pulse.lintian-overrides b/ubuntu/_base/dependencies/akode/debian/libakode2-pulse.lintian-overrides new file mode 100644 index 000000000..535c4753e --- /dev/null +++ b/ubuntu/_base/dependencies/akode/debian/libakode2-pulse.lintian-overrides @@ -0,0 +1,5 @@ +# These are akode plugins, not regular shared libraries. +libakode2-pulse: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_pulse_sink.so] + +# We keep it for historical reasons. +libakode2-pulse: unknown-field Original-Maintainer diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2.install b/ubuntu/_base/dependencies/akode/debian/libakode2.install index 4e7f7ff74..9c12d1a56 100644 --- a/ubuntu/_base/dependencies/akode/debian/libakode2.install +++ b/ubuntu/_base/dependencies/akode/debian/libakode2.install @@ -1,8 +1,7 @@ -debian/tmp/usr/bin/akodeplay -debian/tmp/usr/lib/libakode.so.2 -debian/tmp/usr/lib/libakode.so.2.0.0 -debian/tmp/usr/lib/libakode_alsa_sink.so -debian/tmp/usr/lib/libakode_mpc_decoder.so -debian/tmp/usr/lib/libakode_oss_sink.so -debian/tmp/usr/lib/libakode_src_resampler.so -debian/tmp/usr/lib/libakode_xiph_decoder.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode.so.2 +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode.so.2.0.0 +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_alsa_sink.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_mpc_decoder.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_oss_sink.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_src_resampler.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libakode_xiph_decoder.so diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2.lintian b/ubuntu/_base/dependencies/akode/debian/libakode2.lintian deleted file mode 100644 index 6ce3df3be..000000000 --- a/ubuntu/_base/dependencies/akode/debian/libakode2.lintian +++ /dev/null @@ -1,8 +0,0 @@ -# These are akode plugins, not regular shared libraries. -libakode2: shlib-missing-in-control-file libakode_mpc_decoder.so usr/lib/libakode_mpc_decoder.so -libakode2: shlib-missing-in-control-file libakode_alsa_sink.so usr/lib/libakode_alsa_sink.so -libakode2: shlib-missing-in-control-file libakode_mpeg_decoder.so usr/lib/libakode_mpeg_decoder.so -libakode2: shlib-missing-in-control-file libakode_jack_sink.so usr/lib/libakode_jack_sink.so -libakode2: shlib-missing-in-control-file libakode_xiph_decoder.so usr/lib/libakode_xiph_decoder.so -libakode2: shlib-missing-in-control-file libakode_oss_sink.so usr/lib/libakode_oss_sink.so -libakode2: shlib-missing-in-control-file libakode_src_resampler.so usr/lib/libakode_src_resampler.so diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2.lintian-overrides b/ubuntu/_base/dependencies/akode/debian/libakode2.lintian-overrides new file mode 100644 index 000000000..27f27c048 --- /dev/null +++ b/ubuntu/_base/dependencies/akode/debian/libakode2.lintian-overrides @@ -0,0 +1,9 @@ +# These are akode plugins, not regular shared libraries. +libakode2: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_alsa_sink.so] +libakode2: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_mpc_decoder.so] +libakode2: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_oss_sink.so] +libakode2: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_src_resampler.so] +libakode2: sharedobject-in-library-directory-missing-soname [usr/lib/*/libakode_xiph_decoder.so] + +# We keep it for historical reasons. +libakode2: unknown-field Original-Maintainer diff --git a/ubuntu/_base/dependencies/akode/debian/rules b/ubuntu/_base/dependencies/akode/debian/rules index aa92a8c09..4a74c66a5 100755 --- a/ubuntu/_base/dependencies/akode/debian/rules +++ b/ubuntu/_base/dependencies/akode/debian/rules @@ -3,7 +3,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/tde.mk -DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) +else + CMAKE_INSTALL_LIBDIR = lib +endif + ifeq (linux,$(DEB_HOST_ARCH_OS)) DEB_DH_GENCONTROL_ARGS=-- -Valsa-dev=libasound2-dev endif @@ -20,15 +25,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ -DWITH_ALL_OPTIONS="ON" \ -DWITH_LIBLTDL="OFF" \ -DWITH_FFMPEG_DECODER="ON" - -common-install-prehook-arch:: - grep -v libakode_alsa_sink debian/libakode2.install > debian/libakode2.install.kfreebsd-i386 - grep -v libakode_alsa_sink debian/libakode2.install > debian/libakode2.install.kfreebsd-amd64 - grep -v libakode_alsa_sink debian/libakode-dev.install > debian/libakode-dev.install.kfreebsd-i386 - grep -v libakode_alsa_sink debian/libakode-dev.install > debian/libakode-dev.install.kfreebsd-amd64 - -clean:: - rm -f debian/libakode2.install.kfreebsd* debian/libakode-dev.install.kfreebsd* diff --git a/ubuntu/_base/dependencies/akode/debian/source/lintian-overrides b/ubuntu/_base/dependencies/akode/debian/source/lintian-overrides new file mode 100644 index 000000000..a7cccf748 --- /dev/null +++ b/ubuntu/_base/dependencies/akode/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. +akode source: source-nmu-has-incorrect-version-number +akode source: binary-nmu-debian-revision-in-source +akode source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +akode source: custom-compression-in-debian-source-options + +# We keep it for historical reasons. +akode source: unknown-field Original-Maintainer 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 e63f24b1b..985585f09 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, 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/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 diff --git a/ubuntu/_base/dependencies/libr/debian/changelog b/ubuntu/_base/dependencies/libr/debian/changelog index e10d865e5..816d6af73 100644 --- a/ubuntu/_base/dependencies/libr/debian/changelog +++ b/ubuntu/_base/dependencies/libr/debian/changelog @@ -1,3 +1,9 @@ +libr (4:14.1.6~pre0-0) trixie; urgency=low + + * Install libraries according to multi-arch rules. + + -- Slávek Banko <slavek.banko@axis.cz> Mon, 23 Feb 2026 21:18:10 +0100 + libr (4:0.6.0-2debian8.0.0+6~d) jessie; urgency=low * Fix mangling of a critical elf library section on armhf diff --git a/ubuntu/_base/dependencies/libr/debian/control b/ubuntu/_base/dependencies/libr/debian/control index 0401c36b4..fb437131a 100644 --- a/ubuntu/_base/dependencies/libr/debian/control +++ b/ubuntu/_base/dependencies/libr/debian/control @@ -1,5 +1,5 @@ Source: libr -Priority: extra +Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkgconf, libgtk2.0-dev, binutils-dev, doxygen Standards-Version: 3.8.4 @@ -9,6 +9,7 @@ Homepage: http://www.compholio.com/elficon/ Package: libr1 Section: libs Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} Description: ELF binary resource library Store and retrieve resources from ELF binaries. diff --git a/ubuntu/_base/dependencies/libr/debian/dirs b/ubuntu/_base/dependencies/libr/debian/dirs deleted file mode 100644 index ca882bbb7..000000000 --- a/ubuntu/_base/dependencies/libr/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/ubuntu/_base/dependencies/libr/debian/libr-dev.dirs b/ubuntu/_base/dependencies/libr/debian/libr-dev.dirs index 441fd8fc6..2405d8173 100644 --- a/ubuntu/_base/dependencies/libr/debian/libr-dev.dirs +++ b/ubuntu/_base/dependencies/libr/debian/libr-dev.dirs @@ -1,3 +1,2 @@ -usr/lib -usr/include usr/include/libr +usr/lib diff --git a/ubuntu/_base/dependencies/libr/debian/libr-dev.install b/ubuntu/_base/dependencies/libr/debian/libr-dev.install index 6fad4769a..fc8a1b7cb 100644 --- a/ubuntu/_base/dependencies/libr/debian/libr-dev.install +++ b/ubuntu/_base/dependencies/libr/debian/libr-dev.install @@ -1,9 +1,6 @@ -usr/include/* usr/include/libr/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/*.la -usr/lib/pkgconfig/* +usr/lib/$(DEB_HOST_MULTIARCH)/lib*.a +usr/lib/$(DEB_HOST_MULTIARCH)/lib*.so +usr/lib/$(DEB_HOST_MULTIARCH)/*.la +usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/* usr/share/man/man3/*.3 -#usr/share/pkgconfig/* - diff --git a/ubuntu/_base/dependencies/libr/debian/libr-dev.lintian-overrides b/ubuntu/_base/dependencies/libr/debian/libr-dev.lintian-overrides new file mode 100644 index 000000000..9f47b462b --- /dev/null +++ b/ubuntu/_base/dependencies/libr/debian/libr-dev.lintian-overrides @@ -0,0 +1,2 @@ +# Man pages are generated automatically. +libr-dev: bad-whatis-entry diff --git a/ubuntu/_base/dependencies/libr/debian/libr1.install b/ubuntu/_base/dependencies/libr/debian/libr1.install index d0dbfd18a..48eab8981 100644 --- a/ubuntu/_base/dependencies/libr/debian/libr1.install +++ b/ubuntu/_base/dependencies/libr/debian/libr1.install @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/lib*.so.* diff --git a/ubuntu/_base/dependencies/libr/debian/rules b/ubuntu/_base/dependencies/libr/debian/rules index 0b16c81e9..95c91da90 100755 --- a/ubuntu/_base/dependencies/libr/debian/rules +++ b/ubuntu/_base/dependencies/libr/debian/rules @@ -3,8 +3,15 @@ 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 + # 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/libr/debian/source.lintian-overrides b/ubuntu/_base/dependencies/libr/debian/source/lintian-overrides index 71c1b8924..71c1b8924 100644 --- a/ubuntu/_base/dependencies/libr/debian/source.lintian-overrides +++ b/ubuntu/_base/dependencies/libr/debian/source/lintian-overrides |