diff --git a/debian/_base/dependencies/libart-lgpl/debian/changelog b/debian/_base/dependencies/libart-lgpl/debian/changelog index 33b74f296..cf3d8b43e 100644 --- a/debian/_base/dependencies/libart-lgpl/debian/changelog +++ b/debian/_base/dependencies/libart-lgpl/debian/changelog @@ -1,3 +1,10 @@ +libart-lgpl (4:14.1.6~pre1) forky; urgency=low + + * Install libraries according to multi-arch rules + * The epoch change is for historical reasons from the KDE3 era. + + -- Slávek Banko Mon, 02 Feb 2026 10:54:34 +0100 + libart-lgpl (2.3.22-0debian0) squeeze; urgency=low * Build patched/maintained TDE version instead of unmaintained upstream diff --git a/debian/_base/dependencies/libart-lgpl/debian/control b/debian/_base/dependencies/libart-lgpl/debian/control index 889ef88a2..d849c92d9 100644 --- a/debian/_base/dependencies/libart-lgpl/debian/control +++ b/debian/_base/dependencies/libart-lgpl/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Josselin Mouette -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build +Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build Standards-Version: 3.8.4 Package: libart-2.0-2 diff --git a/debian/_base/dependencies/libart-lgpl/debian/libart-2.0-2.install b/debian/_base/dependencies/libart-lgpl/debian/libart-2.0-2.install index be04efa71..e1e1de8a8 100644 --- a/debian/_base/dependencies/libart-lgpl/debian/libart-2.0-2.install +++ b/debian/_base/dependencies/libart-lgpl/debian/libart-2.0-2.install @@ -1 +1 @@ -debian/tmp/usr/lib/libart_lgpl_2.so.* +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libart_lgpl_2.so.* diff --git a/debian/_base/dependencies/libart-lgpl/debian/libart-2.0-dev.install b/debian/_base/dependencies/libart-lgpl/debian/libart-2.0-dev.install index 154d573e6..1e6792842 100644 --- a/debian/_base/dependencies/libart-lgpl/debian/libart-2.0-dev.install +++ b/debian/_base/dependencies/libart-lgpl/debian/libart-2.0-dev.install @@ -1,6 +1,6 @@ debian/tmp/usr/include -debian/tmp/usr/lib/pkgconfig debian/tmp/usr/bin/libart2-config -debian/tmp/usr/lib/libart_lgpl_2.a -debian/tmp/usr/lib/libart_lgpl_2.la -debian/tmp/usr/lib/libart_lgpl_2.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libart_lgpl_2.a +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libart_lgpl_2.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libart_lgpl_2.so diff --git a/debian/_base/dependencies/libart-lgpl/debian/rules b/debian/_base/dependencies/libart-lgpl/debian/rules index 8dcda8fda..fd52f1307 100755 --- a/debian/_base/dependencies/libart-lgpl/debian/rules +++ b/debian/_base/dependencies/libart-lgpl/debian/rules @@ -7,12 +7,19 @@ libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:s DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) +else + CMAKE_INSTALL_LIBDIR = lib +endif + # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ -DWITH_ALL_OPTIONS="ON" DEB_MAKE_CHECK_TARGET = check diff --git a/debian/_base/dependencies/libart-lgpl/debian/source.lintian-overrides b/debian/_base/dependencies/libart-lgpl/debian/source.lintian-overrides new file mode 100644 index 000000000..af3ee8007 --- /dev/null +++ b/debian/_base/dependencies/libart-lgpl/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. +libart-lgpl source: source-nmu-has-incorrect-version-number +libart-lgpl source: binary-nmu-debian-revision-in-source +libart-lgpl source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +libart-lgpl source: custom-compression-in-debian-source-options diff --git a/dilos/dependencies/libart-lgpl/debian/changelog b/dilos/dependencies/libart-lgpl/debian/changelog index 33b74f296..cf3d8b43e 100644 --- a/dilos/dependencies/libart-lgpl/debian/changelog +++ b/dilos/dependencies/libart-lgpl/debian/changelog @@ -1,3 +1,10 @@ +libart-lgpl (4:14.1.6~pre1) forky; urgency=low + + * Install libraries according to multi-arch rules + * The epoch change is for historical reasons from the KDE3 era. + + -- Slávek Banko Mon, 02 Feb 2026 10:54:34 +0100 + libart-lgpl (2.3.22-0debian0) squeeze; urgency=low * Build patched/maintained TDE version instead of unmaintained upstream diff --git a/dilos/dependencies/libart-lgpl/debian/control b/dilos/dependencies/libart-lgpl/debian/control index 889ef88a2..d849c92d9 100644 --- a/dilos/dependencies/libart-lgpl/debian/control +++ b/dilos/dependencies/libart-lgpl/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Josselin Mouette -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build +Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build Standards-Version: 3.8.4 Package: libart-2.0-2 diff --git a/dilos/dependencies/libart-lgpl/debian/libart-2.0-2.install b/dilos/dependencies/libart-lgpl/debian/libart-2.0-2.install index dd7b60408..e1e1de8a8 100644 --- a/dilos/dependencies/libart-lgpl/debian/libart-2.0-2.install +++ b/dilos/dependencies/libart-lgpl/debian/libart-2.0-2.install @@ -1 +1 @@ -debian/tmp/usr/lib/*/libart_lgpl_2.so.* +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libart_lgpl_2.so.* diff --git a/dilos/dependencies/libart-lgpl/debian/libart-2.0-dev.install b/dilos/dependencies/libart-lgpl/debian/libart-2.0-dev.install index e8eae4af5..1e6792842 100644 --- a/dilos/dependencies/libart-lgpl/debian/libart-2.0-dev.install +++ b/dilos/dependencies/libart-lgpl/debian/libart-2.0-dev.install @@ -1,6 +1,6 @@ debian/tmp/usr/include -debian/tmp/usr/lib/*/pkgconfig debian/tmp/usr/bin/libart2-config -debian/tmp/usr/lib/*/libart_lgpl_2.a -debian/tmp/usr/lib/*/libart_lgpl_2.la -debian/tmp/usr/lib/*/libart_lgpl_2.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libart_lgpl_2.a +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libart_lgpl_2.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libart_lgpl_2.so diff --git a/dilos/dependencies/libart-lgpl/debian/rules b/dilos/dependencies/libart-lgpl/debian/rules index 8988dc726..b7fc700f8 100755 --- a/dilos/dependencies/libart-lgpl/debian/rules +++ b/dilos/dependencies/libart-lgpl/debian/rules @@ -7,13 +7,19 @@ libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:s DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) +else + CMAKE_INSTALL_LIBDIR = lib +endif + # Build options 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" \ -DCMAKE_C_COMPILER=gcc \ - -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" DEB_MAKE_CHECK_TARGET = check diff --git a/dilos/dependencies/libart-lgpl/debian/source.lintian-overrides b/dilos/dependencies/libart-lgpl/debian/source.lintian-overrides new file mode 100644 index 000000000..af3ee8007 --- /dev/null +++ b/dilos/dependencies/libart-lgpl/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. +libart-lgpl source: source-nmu-has-incorrect-version-number +libart-lgpl source: binary-nmu-debian-revision-in-source +libart-lgpl source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +libart-lgpl source: custom-compression-in-debian-source-options diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/changelog b/ubuntu/_base/dependencies/libart-lgpl/debian/changelog index d9238f241..e5a061df5 100644 --- a/ubuntu/_base/dependencies/libart-lgpl/debian/changelog +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/changelog @@ -1,3 +1,10 @@ +libart-lgpl (4:14.1.6~pre1) resolute; urgency=low + + * Install libraries according to multi-arch rules + * The epoch change is for historical reasons from the KDE3 era. + + -- Slávek Banko Mon, 02 Feb 2026 10:54:34 +0100 + libart-lgpl (2.3.22-0ubuntu0) lucid; urgency=low * Build patched/maintained TDE version instead of unmaintained upstream diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-2.install b/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-2.install index be04efa71..e1e1de8a8 100644 --- a/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-2.install +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-2.install @@ -1 +1 @@ -debian/tmp/usr/lib/libart_lgpl_2.so.* +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libart_lgpl_2.so.* diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-dev.install b/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-dev.install index 154d573e6..1e6792842 100644 --- a/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-dev.install +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-dev.install @@ -1,6 +1,6 @@ debian/tmp/usr/include -debian/tmp/usr/lib/pkgconfig debian/tmp/usr/bin/libart2-config -debian/tmp/usr/lib/libart_lgpl_2.a -debian/tmp/usr/lib/libart_lgpl_2.la -debian/tmp/usr/lib/libart_lgpl_2.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libart_lgpl_2.a +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libart_lgpl_2.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libart_lgpl_2.so diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/rules b/ubuntu/_base/dependencies/libart-lgpl/debian/rules index 8dcda8fda..fd52f1307 100755 --- a/ubuntu/_base/dependencies/libart-lgpl/debian/rules +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/rules @@ -7,12 +7,19 @@ libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:s DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) +else + CMAKE_INSTALL_LIBDIR = lib +endif + # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ -DWITH_ALL_OPTIONS="ON" DEB_MAKE_CHECK_TARGET = check diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/source.lintian-overrides b/ubuntu/_base/dependencies/libart-lgpl/debian/source.lintian-overrides new file mode 100644 index 000000000..af3ee8007 --- /dev/null +++ b/ubuntu/_base/dependencies/libart-lgpl/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. +libart-lgpl source: source-nmu-has-incorrect-version-number +libart-lgpl source: binary-nmu-debian-revision-in-source +libart-lgpl source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +libart-lgpl source: custom-compression-in-debian-source-options