From d6a880d164973cd4d74c7cd73bee4d639e0a0f37 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Sun, 15 Feb 2026 01:27:15 +0100 Subject: DEB tdelibs: Changes to silence lintian reports. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + Added build and run time dependencies. + Removed no longer valid *BSD architectures. + Added overrides for version number and compression. + Added permission change on setuid binaries from 4711 to 4755. Signed-off-by: Slávek Banko --- debian/_base/core/tdelibs/debian/control | 27 +++++++++++----------- debian/_base/core/tdelibs/debian/rules | 9 +++++++- .../core/tdelibs/debian/source.lintian-overrides | 18 +++++++++++++++ .../debian/tdelibs-data-trinity.lintian-overrides | 8 +++++++ .../debian/tdelibs-trinity-dbg.lintian-overrides | 2 ++ .../debian/tdelibs-trinity.lintian-overrides | 5 ++++ .../tdelibs14-imagetops-trinity.lintian-overrides | 5 ++++ .../debian/tdelibs14-trinity-dev.lintian-overrides | 11 +++++++++ .../debian/tdelibs14-trinity-doc.lintian-overrides | 5 ++++ .../core/tdelibs/debian/tdelibs14-trinity.lintian | 15 ------------ .../debian/tdelibs14-trinity.lintian-overrides | 27 ++++++++++++++++++++++ .../core/tdelibs/debian/tdelibs14-trinity.postinst | 18 --------------- dilos/core/tdelibs/debian/control | 27 +++++++++++----------- dilos/core/tdelibs/debian/rules | 9 +++++++- dilos/core/tdelibs/debian/source.lintian-overrides | 18 +++++++++++++++ .../debian/tdelibs-data-trinity.lintian-overrides | 2 ++ .../debian/tdelibs-trinity-dbg.lintian-overrides | 2 ++ .../debian/tdelibs-trinity.lintian-overrides | 2 ++ .../tdelibs14-imagetops-trinity.lintian-overrides | 2 ++ .../debian/tdelibs14-trinity-dev.lintian-overrides | 8 +++++++ .../debian/tdelibs14-trinity-doc.lintian-overrides | 2 ++ .../core/tdelibs/debian/tdelibs14-trinity.lintian | 15 ------------ .../debian/tdelibs14-trinity.lintian-overrides | 21 +++++++++++++++++ .../core/tdelibs/debian/tdelibs14-trinity.postinst | 18 --------------- ubuntu/_base/core/tdelibs/debian/control | 27 +++++++++++----------- ubuntu/_base/core/tdelibs/debian/rules | 9 +++++++- .../core/tdelibs/debian/source.lintian-overrides | 18 +++++++++++++++ .../debian/tdelibs-data-trinity.lintian-overrides | 8 +++++++ .../debian/tdelibs-trinity-dbg.lintian-overrides | 2 ++ .../debian/tdelibs-trinity.lintian-overrides | 5 ++++ .../tdelibs14-imagetops-trinity.lintian-overrides | 5 ++++ .../debian/tdelibs14-trinity-dev.lintian-overrides | 11 +++++++++ .../debian/tdelibs14-trinity-doc.lintian-overrides | 5 ++++ .../core/tdelibs/debian/tdelibs14-trinity.lintian | 15 ------------ .../debian/tdelibs14-trinity.lintian-overrides | 27 ++++++++++++++++++++++ .../core/tdelibs/debian/tdelibs14-trinity.postinst | 18 --------------- 36 files changed, 285 insertions(+), 141 deletions(-) create mode 100644 debian/_base/core/tdelibs/debian/source.lintian-overrides create mode 100644 debian/_base/core/tdelibs/debian/tdelibs-data-trinity.lintian-overrides create mode 100644 debian/_base/core/tdelibs/debian/tdelibs-trinity-dbg.lintian-overrides create mode 100644 debian/_base/core/tdelibs/debian/tdelibs-trinity.lintian-overrides create mode 100644 debian/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.lintian-overrides create mode 100644 debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.lintian-overrides create mode 100644 debian/_base/core/tdelibs/debian/tdelibs14-trinity-doc.lintian-overrides delete mode 100644 debian/_base/core/tdelibs/debian/tdelibs14-trinity.lintian create mode 100644 debian/_base/core/tdelibs/debian/tdelibs14-trinity.lintian-overrides delete mode 100644 debian/_base/core/tdelibs/debian/tdelibs14-trinity.postinst create mode 100644 dilos/core/tdelibs/debian/source.lintian-overrides create mode 100644 dilos/core/tdelibs/debian/tdelibs-data-trinity.lintian-overrides create mode 100644 dilos/core/tdelibs/debian/tdelibs-trinity-dbg.lintian-overrides create mode 100644 dilos/core/tdelibs/debian/tdelibs-trinity.lintian-overrides create mode 100644 dilos/core/tdelibs/debian/tdelibs14-imagetops-trinity.lintian-overrides create mode 100644 dilos/core/tdelibs/debian/tdelibs14-trinity-dev.lintian-overrides create mode 100644 dilos/core/tdelibs/debian/tdelibs14-trinity-doc.lintian-overrides delete mode 100644 dilos/core/tdelibs/debian/tdelibs14-trinity.lintian create mode 100644 dilos/core/tdelibs/debian/tdelibs14-trinity.lintian-overrides delete mode 100644 dilos/core/tdelibs/debian/tdelibs14-trinity.postinst create mode 100644 ubuntu/_base/core/tdelibs/debian/source.lintian-overrides create mode 100644 ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.lintian-overrides create mode 100644 ubuntu/_base/core/tdelibs/debian/tdelibs-trinity-dbg.lintian-overrides create mode 100644 ubuntu/_base/core/tdelibs/debian/tdelibs-trinity.lintian-overrides create mode 100644 ubuntu/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.lintian-overrides create mode 100644 ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.lintian-overrides create mode 100644 ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-doc.lintian-overrides delete mode 100644 ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.lintian create mode 100644 ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.lintian-overrides delete mode 100644 ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.postinst diff --git a/debian/_base/core/tdelibs/debian/control b/debian/_base/core/tdelibs/debian/control index ee504fc92..6fcd28753 100644 --- a/debian/_base/core/tdelibs/debian/control +++ b/debian/_base/core/tdelibs/debian/control @@ -4,11 +4,11 @@ Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Daniel Schepler , Fathi Boudra , Sune Vuorela -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutils, +Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutils, binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), libacl1-dev, - libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], - aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev, + libattr1-dev, libasound2-dev [!hurd-i386], + aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcups2-dev | libcupsys2-dev, libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev, liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre2-dev, @@ -16,7 +16,7 @@ Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, shar libtiff-dev, libwebp-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, texinfo, libogg-dev, libtqt3-mt-dev, - lsb-release, base-files, sudo, libr-dev, + lsb-release, sudo, libr-dev, libudev-dev, libltdl-dev, libmagic-dev, libnm-dev, libpcsclite-dev, opensc-pkcs11 | opensc (<< 0.13.0-5), libpkcs11-helper1-dev, libcryptsetup-dev Build-Depends-Indep: doxygen, graphviz, gsfonts-x11 @@ -28,7 +28,7 @@ Architecture: all Replaces: kdelibs-trinity (<< 4:14.0.0~) Breaks: kdelibs-trinity (<< 4:14.0.0~) Provides: tdelibs -Depends: tdelibs14-trinity (>= ${source:Version}) | tdelibs14t64-trinity (>= ${source:Version}), +Depends: ${misc:Depends}, tdelibs14-trinity (>= ${source:Version}) | tdelibs14t64-trinity (>= ${source:Version}), tdelibs-data-trinity (>= ${source:Version}) Description: core libraries from the official Trinity release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical @@ -46,7 +46,7 @@ Architecture: all Replaces: kdelibs-data-trinity (<< 4:14.0.0~) Breaks: kdelibs-data-trinity (<< 4:14.0.0~) Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~), klinkstatus-trinity (<< 4:14.0.9~) -Depends: hicolor-icon-theme +Depends: ${misc:Depends}, hicolor-icon-theme Provides: tdelibs-data Description: core shared data for all TDE applications This package contains all the architecture independent data files @@ -61,9 +61,9 @@ Section: libs Architecture: any Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity -Depends: ${shlibs:Depends}, tdelibs-data-trinity, +Depends: ${shlibs:Depends}, ${misc:Depends}, tdelibs-data-trinity, netpbm (>= 2:10.0-15.1) | tdelibs14-imagetops-trinity, - libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients + libart-2.0-2 (>= 4:14.0.0~), perl, xauth Recommends: hwdata, xdg-user-dirs, systemd | elogind | consolekit Suggests: fam, perl-suid Conflicts: tdelibs4-trinity, tdelibs4c2-trinity (>> 4:1.0.0), tdelibs-bin-trinity (<< 4:3.3.3), tdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6) @@ -81,7 +81,7 @@ Description: core libraries and binaries for all TDE applications Package: tdelibs14-imagetops-trinity Section: libs Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: netpbm Conflicts: tdelibs14-trinity (<< 4:14.0.10~), netpbm (>= 2:10.0-15.1) Description: core libraries and binaries for all TDE applications @@ -99,7 +99,7 @@ Section: libdevel Architecture: any Replaces: kdelibs4-trinity-dev (<< 4:14.0.0~) Breaks: kdelibs4-trinity-dev (<< 4:14.0.0~) -Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~), +Depends: ${misc:Depends}, tdelibs14-trinity (= ${binary:Version}), libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev, libaspell-dev, hspell, libbz2-dev, libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, @@ -109,7 +109,7 @@ Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~), libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-client-dev (>= 0.4), libavahi-tqt-dev, libtqt3-mt-dev, libr-dev, libudev-dev, libdbus-1-tqt-dev, binutils-dev -Recommends: libcupsys2-dev | libcups2-dev +Recommends: libcups2-dev | libcupsys2-dev Provides: tdelibs-trinity-dev Description: development files for the TDE core libraries This package contains all the headers and other related files needed @@ -122,6 +122,7 @@ Description: development files for the TDE core libraries Package: tdelibs14-trinity-doc Section: doc Architecture: all +Depends: ${misc:Depends} Replaces: kdelibs4-trinity-doc (<< 4:14.0.0~) Breaks: kdelibs4-trinity-doc (<< 4:14.0.0~) Provides: tdelibs-trinity-doc @@ -138,9 +139,9 @@ Section: libdevel Architecture: any Replaces: kdelibs-trinity-dbg (<< 4:14.0.0~) Breaks: kdelibs-trinity-dbg (<< 4:14.0.0~) -Priority: extra +Priority: optional Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg -Depends: tdelibs14-trinity (= ${source:Version}), libc6-dbg [amd64] +Depends: ${misc:Depends}, tdelibs14-trinity (= ${binary:Version}), libc6-dbg [amd64] Description: debugging symbols for tdelibs This package contains the debugging symbols associated with tdelibs. They will automatically be used by gdb for debugging tdelibs-related diff --git a/debian/_base/core/tdelibs/debian/rules b/debian/_base/core/tdelibs/debian/rules index a330c6d12..5018f39c9 100755 --- a/debian/_base/core/tdelibs/debian/rules +++ b/debian/_base/core/tdelibs/debian/rules @@ -119,6 +119,13 @@ else endif install -p -D -m644 debian/tmp/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf + # fix permissions for setuid binaries - lintian executable-is-not-world-readable + chmod go+r \ + debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/fileshareset \ + debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/kgrantpty \ + debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/kpac_dhcp_helper \ + debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/start_tdeinit \ + # tdecmshell wrapper mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell.real @@ -135,7 +142,7 @@ ifeq ($(DEB_TIME64_API),true) [ -d $$a ] || [ -f $$a.t64 ] || \ (cp -a $$a debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity.$${a##*.} && mv $$a $$a.t64); \ done - sed -i -e "s/^tdelibs14-trinity /tdelibs14$(DEB_TIME64_SUFFIX)-trinity /" debian/tdelibs14t64-trinity.lintian + sed -i -e "s/^tdelibs14-trinity /tdelibs14$(DEB_TIME64_SUFFIX)-trinity /" debian/tdelibs14t64-trinity.lintian-overrides [ -f debian/control.t64 ] || \ sed -i.t64 \ -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ diff --git a/debian/_base/core/tdelibs/debian/source.lintian-overrides b/debian/_base/core/tdelibs/debian/source.lintian-overrides new file mode 100644 index 000000000..aa0339da0 --- /dev/null +++ b/debian/_base/core/tdelibs/debian/source.lintian-overrides @@ -0,0 +1,18 @@ +# We build for many distribution versions and therefore need +# the distribution version as part of the package version, +# which is unintentionally understood as NMU. +tdelibs-trinity source: source-nmu-has-incorrect-version-number +tdelibs-trinity source: binary-nmu-debian-revision-in-source +tdelibs-trinity source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +tdelibs-trinity source: custom-compression-in-debian-source-options + +# We keep it for historical reasons. +tdelibs-trinity source: unknown-field Original-Maintainer + +# The package may have an SO version with the t64 extension. +tdelibs-trinity source: version-substvar-for-external-package + +# Documentation files with long lines. +tdelibs-trinity source: source-is-missing diff --git a/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.lintian-overrides b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.lintian-overrides new file mode 100644 index 000000000..6d76d2d8e --- /dev/null +++ b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.lintian-overrides @@ -0,0 +1,8 @@ +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs-data-trinity: dir-or-file-in-opt + +# We keep it for historical reasons. +tdelibs-data-trinity: unknown-field Original-Maintainer + +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs-data-trinity: jar-not-in-usr-share [opt/trinity/share/apps/kjava/kjava.jar] diff --git a/debian/_base/core/tdelibs/debian/tdelibs-trinity-dbg.lintian-overrides b/debian/_base/core/tdelibs/debian/tdelibs-trinity-dbg.lintian-overrides new file mode 100644 index 000000000..f1e839003 --- /dev/null +++ b/debian/_base/core/tdelibs/debian/tdelibs-trinity-dbg.lintian-overrides @@ -0,0 +1,2 @@ +# We keep it for historical reasons. +tdelibs-trinity-dbg: unknown-field Original-Maintainer diff --git a/debian/_base/core/tdelibs/debian/tdelibs-trinity.lintian-overrides b/debian/_base/core/tdelibs/debian/tdelibs-trinity.lintian-overrides new file mode 100644 index 000000000..c05b2bc61 --- /dev/null +++ b/debian/_base/core/tdelibs/debian/tdelibs-trinity.lintian-overrides @@ -0,0 +1,5 @@ +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs-trinity: dir-or-file-in-opt + +# We keep it for historical reasons. +tdelibs-trinity: unknown-field Original-Maintainer diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.lintian-overrides b/debian/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.lintian-overrides new file mode 100644 index 000000000..a2034162c --- /dev/null +++ b/debian/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.lintian-overrides @@ -0,0 +1,5 @@ +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs14-imagetops-trinity: dir-or-file-in-opt + +# We keep it for historical reasons. +tdelibs14-imagetops-trinity: unknown-field Original-Maintainer diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.lintian-overrides b/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.lintian-overrides new file mode 100644 index 000000000..4053a4d85 --- /dev/null +++ b/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.lintian-overrides @@ -0,0 +1,11 @@ +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs14-trinity-dev: dir-or-file-in-opt + +# We keep it for historical reasons. +tdelibs14-trinity-dev: unknown-field Original-Maintainer + +# Actually, trigger is not unnecessary because of dynamic modules like tdepart. +tdelibs14-trinity-dev: package-has-unnecessary-activation-of-ldconfig-trigger + +# It was intended that the ltdl is embedded. +tdelibs14-trinity-dev: embedded-library ltdl [opt/trinity/lib/libtdecore.so] diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-trinity-doc.lintian-overrides b/debian/_base/core/tdelibs/debian/tdelibs14-trinity-doc.lintian-overrides new file mode 100644 index 000000000..68dc2e1cf --- /dev/null +++ b/debian/_base/core/tdelibs/debian/tdelibs14-trinity-doc.lintian-overrides @@ -0,0 +1,5 @@ +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs14-trinity-doc: dir-or-file-in-opt + +# We keep it for historical reasons. +tdelibs14-trinity-doc: unknown-field Original-Maintainer diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-trinity.lintian b/debian/_base/core/tdelibs/debian/tdelibs14-trinity.lintian deleted file mode 100644 index 6272877c3..000000000 --- a/debian/_base/core/tdelibs/debian/tdelibs14-trinity.lintian +++ /dev/null @@ -1,15 +0,0 @@ -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so -tdelibs14-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root -tdelibs14-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root -tdelibs14-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root -tdelibs14-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-trinity.lintian-overrides b/debian/_base/core/tdelibs/debian/tdelibs14-trinity.lintian-overrides new file mode 100644 index 000000000..87604f076 --- /dev/null +++ b/debian/_base/core/tdelibs/debian/tdelibs14-trinity.lintian-overrides @@ -0,0 +1,27 @@ +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs14-trinity: dir-or-file-in-opt + +# We keep it for historical reasons. +tdelibs14-trinity: unknown-field Original-Maintainer + +# Actually, trigger is not unnecessary because of dynamic modules like tdepart. +tdelibs14-trinity: package-has-unnecessary-activation-of-ldconfig-trigger + +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs14-trinity: package-modifies-ld.so-search-path + +# Deliberately installed setuid binaries. +tdelibs14-trinity: elevated-privileges 4755 root/root [opt/trinity/bin/fileshareset] +tdelibs14-trinity: elevated-privileges 4755 root/root [opt/trinity/bin/kgrantpty] +tdelibs14-trinity: elevated-privileges 4755 root/root [opt/trinity/bin/kpac_dhcp_helper] +tdelibs14-trinity: elevated-privileges 4755 root/root [opt/trinity/bin/start_tdeinit] + +# It was intended that the ltdl is embedded. +tdelibs14-trinity: embedded-library ltdl [opt/trinity/bin/tdeinit] +tdelibs14-trinity: embedded-library ltdl [opt/trinity/bin/tdeioslave] +tdelibs14-trinity: embedded-library ltdl [opt/trinity/lib/libtdecore.so.14.1.0] +tdelibs14-trinity: embedded-library ltdl [opt/trinity/lib/libtdeio.so.14.0.0] + +# Historical libraries preserved for compatibility. +tdelibs14-trinity: shared-library-lacks-prerequisites [opt/trinity/lib/libkjava.so.1.0.0] +tdelibs14-trinity: shared-library-lacks-prerequisites [opt/trinity/lib/libtdespell.so.14.0.0] diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-trinity.postinst b/debian/_base/core/tdelibs/debian/tdelibs14-trinity.postinst deleted file mode 100644 index 6dbf5d9e1..000000000 --- a/debian/_base/core/tdelibs/debian/tdelibs14-trinity.postinst +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -e - -case "$1" in - - upgrade|install) - ;; - - abort-upgrade) - ;; - - *) - ;; - -esac - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdelibs/debian/control b/dilos/core/tdelibs/debian/control index ea7a1a343..7db85ddfb 100644 --- a/dilos/core/tdelibs/debian/control +++ b/dilos/core/tdelibs/debian/control @@ -4,11 +4,11 @@ Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Daniel Schepler , Fathi Boudra , Sune Vuorela -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutils, +Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutils, binutils (>= 2.14.90.0.7), binutils-dev [!solaris-any], docbook-to-man, libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), libacl1-dev [!solaris-any], - libattr1-dev [!solaris-any], libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], - aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev, + libattr1-dev [!solaris-any], libasound2-dev [!hurd-i386 !solaris-any], + aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcups2-dev | libcupsys2-dev, libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev, liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre2-dev, @@ -16,7 +16,7 @@ Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, shar libtiff-dev, libwebp-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, texinfo, libogg-dev, libtqt3-mt-dev, - lsb-release, base-files, sudo, libr-dev [!solaris-any], + lsb-release, sudo, libr-dev [!solaris-any], libudev-dev [!solaris-any], libltdl-dev, libmagic-dev, libnm-dev, libpcsclite-dev, opensc-pkcs11 | opensc (<< 0.13.0-5), libpkcs11-helper1-dev, libcryptsetup-dev [!solaris-any], libiconv-dev [solaris-any] @@ -29,7 +29,7 @@ Architecture: all Replaces: kdelibs-trinity (<< 4:14.0.0~) Breaks: kdelibs-trinity (<< 4:14.0.0~) Provides: tdelibs -Depends: tdelibs14-trinity (>= ${source:Version}) | tdelibs14t64-trinity (>= ${source:Version}), +Depends: ${misc:Depends}, tdelibs14-trinity (>= ${source:Version}) | tdelibs14t64-trinity (>= ${source:Version}), tdelibs-data-trinity (>= ${source:Version}) Description: core libraries from the official Trinity release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical @@ -47,7 +47,7 @@ Architecture: all Replaces: kdelibs-data-trinity (<< 4:14.0.0~) Breaks: kdelibs-data-trinity (<< 4:14.0.0~) Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~), klinkstatus-trinity (<< 4:14.0.9~) -Depends: hicolor-icon-theme +Depends: ${misc:Depends}, hicolor-icon-theme Provides: tdelibs-data Description: core shared data for all TDE applications This package contains all the architecture independent data files @@ -62,9 +62,9 @@ Section: libs Architecture: any Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity -Depends: ${shlibs:Depends}, tdelibs-data-trinity, +Depends: ${shlibs:Depends}, ${misc:Depends}, tdelibs-data-trinity, netpbm (>= 2:10.0-15.1) | tdelibs14-imagetops-trinity, - libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients + libart-2.0-2 (>= 4:14.0.0~), perl, xauth Recommends: xdg-user-dirs, systemd | elogind | consolekit Suggests: fam, perl-suid Conflicts: tdelibs4-trinity, tdelibs4c2-trinity (>> 4:1.0.0), tdelibs-bin-trinity (<< 4:3.3.3), tdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6) @@ -82,7 +82,7 @@ Description: core libraries and binaries for all TDE applications Package: tdelibs14-imagetops-trinity Section: libs Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: netpbm Conflicts: tdelibs14-trinity (<< 4:14.0.10~), netpbm (>= 2:10.0-15.1) Description: core libraries and binaries for all TDE applications @@ -100,7 +100,7 @@ Section: libdevel Architecture: any Replaces: kdelibs4-trinity-dev (<< 4:14.0.0~) Breaks: kdelibs4-trinity-dev (<< 4:14.0.0~) -Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~), +Depends: ${misc:Depends}, tdelibs14-trinity (= ${binary:Version}), libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev [!solaris-any], libattr1-dev [!solaris-any], libaspell-dev, hspell, libbz2-dev, libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, @@ -110,7 +110,7 @@ Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~), libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-client-dev (>= 0.4), libavahi-tqt-dev, libtqt3-mt-dev, libr-dev [!solaris-any], libudev-dev [!solaris-any], libdbus-1-tqt-dev, binutils-dev [!solaris-any] -Recommends: libcupsys2-dev | libcups2-dev +Recommends: libcups2-dev | libcupsys2-dev Provides: tdelibs-trinity-dev Description: development files for the TDE core libraries This package contains all the headers and other related files needed @@ -123,6 +123,7 @@ Description: development files for the TDE core libraries Package: tdelibs14-trinity-doc Section: doc Architecture: all +Depends: ${misc:Depends} Replaces: kdelibs4-trinity-doc (<< 4:14.0.0~) Breaks: kdelibs4-trinity-doc (<< 4:14.0.0~) Provides: tdelibs-trinity-doc @@ -139,9 +140,9 @@ Section: libdevel Architecture: linux-any Replaces: kdelibs-trinity-dbg (<< 4:14.0.0~) Breaks: kdelibs-trinity-dbg (<< 4:14.0.0~) -Priority: extra +Priority: optional Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg -Depends: tdelibs14-trinity (= ${source:Version}), libc6-dbg [amd64] +Depends: ${misc:Depends}, tdelibs14-trinity (= ${binary:Version}), libc6-dbg [amd64] Description: debugging symbols for tdelibs This package contains the debugging symbols associated with tdelibs. They will automatically be used by gdb for debugging tdelibs-related diff --git a/dilos/core/tdelibs/debian/rules b/dilos/core/tdelibs/debian/rules index 3191873e6..ed69d2ec2 100755 --- a/dilos/core/tdelibs/debian/rules +++ b/dilos/core/tdelibs/debian/rules @@ -192,6 +192,13 @@ binary-install/tdelibs14$(DEB_TIME64_SUFFIX)-trinity:: #endif # install -p -D -m644 debian/tmp/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf + # fix permissions for setuid binaries - lintian executable-is-not-world-readable + chmod go+r \ + debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/usr/bin/fileshareset \ + debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/usr/bin/kgrantpty \ + debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/usr/bin/kpac_dhcp_helper \ + debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/usr/bin/start_tdeinit \ + # tdecmshell wrapper mv debian/tmp/usr/bin/tdecmshell debian/tmp/usr/bin/tdecmshell.real install -p -D -m755 debian/tmp/usr/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/usr/bin/tdecmshell.real @@ -208,7 +215,7 @@ ifeq ($(DEB_TIME64_API),true) [ -d $$a ] || [ -f $$a.t64 ] || \ (cp -a $$a debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity.$${a##*.} && mv $$a $$a.t64); \ done - sed -i -e "s/^tdelibs14-trinity /tdelibs14$(DEB_TIME64_SUFFIX)-trinity /" debian/tdelibs14t64-trinity.lintian + sed -i -e "s/^tdelibs14-trinity /tdelibs14$(DEB_TIME64_SUFFIX)-trinity /" debian/tdelibs14t64-trinity.lintian-overrides [ -f debian/control.t64 ] || \ sed -i.t64 \ -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ diff --git a/dilos/core/tdelibs/debian/source.lintian-overrides b/dilos/core/tdelibs/debian/source.lintian-overrides new file mode 100644 index 000000000..aa0339da0 --- /dev/null +++ b/dilos/core/tdelibs/debian/source.lintian-overrides @@ -0,0 +1,18 @@ +# We build for many distribution versions and therefore need +# the distribution version as part of the package version, +# which is unintentionally understood as NMU. +tdelibs-trinity source: source-nmu-has-incorrect-version-number +tdelibs-trinity source: binary-nmu-debian-revision-in-source +tdelibs-trinity source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +tdelibs-trinity source: custom-compression-in-debian-source-options + +# We keep it for historical reasons. +tdelibs-trinity source: unknown-field Original-Maintainer + +# The package may have an SO version with the t64 extension. +tdelibs-trinity source: version-substvar-for-external-package + +# Documentation files with long lines. +tdelibs-trinity source: source-is-missing diff --git a/dilos/core/tdelibs/debian/tdelibs-data-trinity.lintian-overrides b/dilos/core/tdelibs/debian/tdelibs-data-trinity.lintian-overrides new file mode 100644 index 000000000..f58290eb7 --- /dev/null +++ b/dilos/core/tdelibs/debian/tdelibs-data-trinity.lintian-overrides @@ -0,0 +1,2 @@ +# We keep it for historical reasons. +tdelibs-data-trinity: unknown-field Original-Maintainer diff --git a/dilos/core/tdelibs/debian/tdelibs-trinity-dbg.lintian-overrides b/dilos/core/tdelibs/debian/tdelibs-trinity-dbg.lintian-overrides new file mode 100644 index 000000000..f1e839003 --- /dev/null +++ b/dilos/core/tdelibs/debian/tdelibs-trinity-dbg.lintian-overrides @@ -0,0 +1,2 @@ +# We keep it for historical reasons. +tdelibs-trinity-dbg: unknown-field Original-Maintainer diff --git a/dilos/core/tdelibs/debian/tdelibs-trinity.lintian-overrides b/dilos/core/tdelibs/debian/tdelibs-trinity.lintian-overrides new file mode 100644 index 000000000..c4b9b0eaa --- /dev/null +++ b/dilos/core/tdelibs/debian/tdelibs-trinity.lintian-overrides @@ -0,0 +1,2 @@ +# We keep it for historical reasons. +tdelibs-trinity: unknown-field Original-Maintainer diff --git a/dilos/core/tdelibs/debian/tdelibs14-imagetops-trinity.lintian-overrides b/dilos/core/tdelibs/debian/tdelibs14-imagetops-trinity.lintian-overrides new file mode 100644 index 000000000..5c570030a --- /dev/null +++ b/dilos/core/tdelibs/debian/tdelibs14-imagetops-trinity.lintian-overrides @@ -0,0 +1,2 @@ +# We keep it for historical reasons. +tdelibs14-imagetops-trinity: unknown-field Original-Maintainer diff --git a/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.lintian-overrides b/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.lintian-overrides new file mode 100644 index 000000000..ab9318e36 --- /dev/null +++ b/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.lintian-overrides @@ -0,0 +1,8 @@ +# We keep it for historical reasons. +tdelibs14-trinity-dev: unknown-field Original-Maintainer + +# Actually, trigger is not unnecessary because of dynamic modules like tdepart. +tdelibs14-trinity-dev: package-has-unnecessary-activation-of-ldconfig-trigger + +# It was intended that the ltdl is embedded. +tdelibs14-trinity-dev: embedded-library ltdl [usr/lib/libtdecore.so] diff --git a/dilos/core/tdelibs/debian/tdelibs14-trinity-doc.lintian-overrides b/dilos/core/tdelibs/debian/tdelibs14-trinity-doc.lintian-overrides new file mode 100644 index 000000000..2a1f25693 --- /dev/null +++ b/dilos/core/tdelibs/debian/tdelibs14-trinity-doc.lintian-overrides @@ -0,0 +1,2 @@ +# We keep it for historical reasons. +tdelibs14-trinity-doc: unknown-field Original-Maintainer diff --git a/dilos/core/tdelibs/debian/tdelibs14-trinity.lintian b/dilos/core/tdelibs/debian/tdelibs14-trinity.lintian deleted file mode 100644 index 28b200869..000000000 --- a/dilos/core/tdelibs/debian/tdelibs14-trinity.lintian +++ /dev/null @@ -1,15 +0,0 @@ -tdelibs14-trinity binary: no-shlibs-control-file usr/lib/libtdeinit_kaddprinterwizard.so -tdelibs14-trinity binary: no-shlibs-control-file usr/lib/libtdeinit_cupsdconf.so -tdelibs14-trinity binary: no-shlibs-control-file usr/lib/libtdeinit_dcopserver.so -tdelibs14-trinity binary: no-shlibs-control-file usr/lib/libtdeinit_tdecmshell.so -tdelibs14-trinity binary: no-shlibs-control-file usr/lib/libtdeinit_tdeio_http_cache_cleaner.so -tdelibs14-trinity binary: no-shlibs-control-file usr/lib/libtdeinit_tdebuildsycoca.so -tdelibs14-trinity binary: no-shlibs-control-file usr/lib/libtdeinit_kded.so -tdelibs14-trinity binary: no-shlibs-control-file usr/lib/libtdeinit_kcookiejar.so -tdelibs14-trinity binary: no-shlibs-control-file usr/lib/libtdeinit_tdelauncher.so -tdelibs14-trinity binary: no-shlibs-control-file usr/lib/libtdeinit_tdeconf_update.so -tdelibs14-trinity binary: no-shlibs-control-file usr/lib/libtdeinit_tdeio_uiserver.so -tdelibs14-trinity binary: setuid-binary usr/bin/fileshareset 4755 root/root -tdelibs14-trinity binary: setuid-binary usr/bin/kgrantpty 4755 root/root -tdelibs14-trinity binary: setuid-binary usr/bin/kpac_dhcp_helper 4755 root/root -tdelibs14-trinity binary: setuid-binary usr/bin/start_tdeinit 4755 root/root diff --git a/dilos/core/tdelibs/debian/tdelibs14-trinity.lintian-overrides b/dilos/core/tdelibs/debian/tdelibs14-trinity.lintian-overrides new file mode 100644 index 000000000..923bc401c --- /dev/null +++ b/dilos/core/tdelibs/debian/tdelibs14-trinity.lintian-overrides @@ -0,0 +1,21 @@ +# We keep it for historical reasons. +tdelibs14-trinity: unknown-field Original-Maintainer + +# Actually, trigger is not unnecessary because of dynamic modules like tdepart. +tdelibs14-trinity: package-has-unnecessary-activation-of-ldconfig-trigger + +# Deliberately installed setuid binaries. +tdelibs14-trinity: elevated-privileges 4755 root/root [usr/bin/fileshareset] +tdelibs14-trinity: elevated-privileges 4755 root/root [usr/bin/kgrantpty] +tdelibs14-trinity: elevated-privileges 4755 root/root [usr/bin/kpac_dhcp_helper] +tdelibs14-trinity: elevated-privileges 4755 root/root [usr/bin/start_tdeinit] + +# It was intended that the ltdl is embedded. +tdelibs14-trinity: embedded-library ltdl [usr/bin/tdeinit] +tdelibs14-trinity: embedded-library ltdl [usr/bin/tdeioslave] +tdelibs14-trinity: embedded-library ltdl [usr/lib/libtdecore.so.14.1.0] +tdelibs14-trinity: embedded-library ltdl [usr/lib/libtdeio.so.14.0.0] + +# Historical libraries preserved for compatibility. +tdelibs14-trinity: shared-library-lacks-prerequisites [usr/lib/libkjava.so.1.0.0] +tdelibs14-trinity: shared-library-lacks-prerequisites [usr/lib/libtdespell.so.14.0.0] diff --git a/dilos/core/tdelibs/debian/tdelibs14-trinity.postinst b/dilos/core/tdelibs/debian/tdelibs14-trinity.postinst deleted file mode 100644 index 6dbf5d9e1..000000000 --- a/dilos/core/tdelibs/debian/tdelibs14-trinity.postinst +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -e - -case "$1" in - - upgrade|install) - ;; - - abort-upgrade) - ;; - - *) - ;; - -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdelibs/debian/control b/ubuntu/_base/core/tdelibs/debian/control index 1fe02d0ba..7308a64ff 100644 --- a/ubuntu/_base/core/tdelibs/debian/control +++ b/ubuntu/_base/core/tdelibs/debian/control @@ -4,11 +4,11 @@ Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Daniel Schepler , Fathi Boudra , Sune Vuorela -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutils, +Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutils, binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), libacl1-dev, - libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], - aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev, + libattr1-dev, libasound2-dev [!hurd-i386], + aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcups2-dev | libcupsys2-dev, libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev, liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre2-dev, @@ -16,7 +16,7 @@ Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, shar libtiff-dev, libwebp-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, texinfo, libogg-dev, libtqt3-mt-dev, - lsb-release, base-files, sudo, libr-dev, + lsb-release, sudo, libr-dev, libudev-dev, libltdl-dev, libmagic-dev, libnm-dev, libpcsclite-dev, opensc-pkcs11 | opensc (<< 0.13.0-5), libpkcs11-helper1-dev, libcryptsetup-dev Build-Depends-Indep: doxygen, graphviz, gsfonts-x11 @@ -28,7 +28,7 @@ Architecture: all Replaces: kdelibs-kde3 (<< 4:14.0.0~), kdelibs-trinity (<< 4:14.0.0~) Breaks: kdelibs-kde3 (<< 4:14.0.0~), kdelibs-trinity (<< 4:14.0.0~) Provides: tdelibs -Depends: tdelibs14-trinity (>= ${source:Version}) | tdelibs14t64-trinity (>= ${source:Version}), +Depends: ${misc:Depends}, tdelibs14-trinity (>= ${source:Version}) | tdelibs14t64-trinity (>= ${source:Version}), tdelibs-data-trinity (>= ${source:Version}) Description: core libraries from the official Trinity release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical @@ -46,7 +46,7 @@ Architecture: all Replaces: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~) Breaks: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~) Conflicts: kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~), klinkstatus-trinity (<< 4:14.0.9~) -Depends: hicolor-icon-theme +Depends: ${misc:Depends}, hicolor-icon-theme Provides: tdelibs-data Description: core shared data for all TDE applications This package contains all the architecture independent data files @@ -61,9 +61,9 @@ Section: libs Architecture: any Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity -Depends: ${shlibs:Depends}, tdelibs-data-trinity, +Depends: ${shlibs:Depends}, ${misc:Depends}, tdelibs-data-trinity, netpbm (>= 2:10.0-15.1) | tdelibs14-imagetops-trinity, - libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients + libart-2.0-2 (>= 4:14.0.0~), perl, xauth Recommends: hwdata, xdg-user-dirs, systemd | elogind | consolekit Suggests: fam, perl-suid Conflicts: tdelibs4-trinity, tdelibs4c2-trinity (>> 4:1.0.0), tdelibs-bin-trinity (<< 4:3.3.3), tdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6) @@ -81,7 +81,7 @@ Description: core libraries and binaries for all TDE applications Package: tdelibs14-imagetops-trinity Section: libs Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: netpbm Conflicts: tdelibs14-trinity (<< 4:14.0.10~), netpbm (>= 2:10.0-15.1) Description: core libraries and binaries for all TDE applications @@ -99,7 +99,7 @@ Section: libdevel Architecture: any Replaces: kdelibs4-kde3-dev (<< 4:14.0.0~), kdelibs4-trinity-dev (<< 4:14.0.0~) Breaks: kdelibs4-kde3-dev (<< 4:14.0.0~), kdelibs4-trinity-dev (<< 4:14.0.0~) -Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~), +Depends: ${misc:Depends}, tdelibs14-trinity (= ${binary:Version}), libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev, libaspell-dev, hspell, libbz2-dev, libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, @@ -109,7 +109,7 @@ Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~), libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-client-dev (>= 0.4), libavahi-tqt-dev, libtqt3-mt-dev, libr-dev, libudev-dev, libdbus-1-tqt-dev, binutils-dev -Recommends: libcupsys2-dev | libcups2-dev +Recommends: libcups2-dev | libcupsys2-dev Provides: tdelibs-trinity-dev Description: development files for the TDE core libraries This package contains all the headers and other related files needed @@ -122,6 +122,7 @@ Description: development files for the TDE core libraries Package: tdelibs14-trinity-doc Section: doc Architecture: all +Depends: ${misc:Depends} Replaces: kdelibs4-kde3-doc (<< 4:14.0.0~), kdelibs4-trinity-doc (<< 4:14.0.0~) Breaks: kdelibs4-kde3-doc (<< 4:14.0.0~), kdelibs4-trinity-doc (<< 4:14.0.0~) Provides: tdelibs-trinity-doc @@ -138,9 +139,9 @@ Section: libdevel Architecture: any Replaces: kdelibs-kde3-dbg (<< 4:14.0.0~), kdelibs-trinity-dbg (<< 4:14.0.0~) Breaks: kdelibs-kde3-dbg (<< 4:14.0.0~), kdelibs-trinity-dbg (<< 4:14.0.0~) -Priority: extra +Priority: optional Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg -Depends: tdelibs14-trinity (= ${source:Version}), libc6-dbg [amd64] +Depends: ${misc:Depends}, tdelibs14-trinity (= ${binary:Version}), libc6-dbg [amd64] Description: debugging symbols for tdelibs This package contains the debugging symbols associated with tdelibs. They will automatically be used by gdb for debugging tdelibs-related diff --git a/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules index 1c97fa744..820f575ed 100755 --- a/ubuntu/_base/core/tdelibs/debian/rules +++ b/ubuntu/_base/core/tdelibs/debian/rules @@ -119,6 +119,13 @@ else endif install -p -D -m644 debian/tmp/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/etc/ld.so.conf.d/trinitylibs-$(DEB_HOST_ARCH).conf + # fix permissions for setuid binaries - lintian executable-is-not-world-readable + chmod go+r \ + debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/fileshareset \ + debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/kgrantpty \ + debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/kpac_dhcp_helper \ + debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/start_tdeinit \ + # tdecmshell wrapper mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell.real @@ -135,7 +142,7 @@ ifeq ($(DEB_TIME64_API),true) [ -d $$a ] || [ -f $$a.t64 ] || \ (cp -a $$a debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity.$${a##*.} && mv $$a $$a.t64); \ done - sed -i -e "s/^tdelibs14-trinity /tdelibs14$(DEB_TIME64_SUFFIX)-trinity /" debian/tdelibs14t64-trinity.lintian + sed -i -e "s/^tdelibs14-trinity /tdelibs14$(DEB_TIME64_SUFFIX)-trinity /" debian/tdelibs14t64-trinity.lintian-overrides [ -f debian/control.t64 ] || \ sed -i.t64 \ -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ diff --git a/ubuntu/_base/core/tdelibs/debian/source.lintian-overrides b/ubuntu/_base/core/tdelibs/debian/source.lintian-overrides new file mode 100644 index 000000000..aa0339da0 --- /dev/null +++ b/ubuntu/_base/core/tdelibs/debian/source.lintian-overrides @@ -0,0 +1,18 @@ +# We build for many distribution versions and therefore need +# the distribution version as part of the package version, +# which is unintentionally understood as NMU. +tdelibs-trinity source: source-nmu-has-incorrect-version-number +tdelibs-trinity source: binary-nmu-debian-revision-in-source +tdelibs-trinity source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +tdelibs-trinity source: custom-compression-in-debian-source-options + +# We keep it for historical reasons. +tdelibs-trinity source: unknown-field Original-Maintainer + +# The package may have an SO version with the t64 extension. +tdelibs-trinity source: version-substvar-for-external-package + +# Documentation files with long lines. +tdelibs-trinity source: source-is-missing diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.lintian-overrides b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.lintian-overrides new file mode 100644 index 000000000..6d76d2d8e --- /dev/null +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.lintian-overrides @@ -0,0 +1,8 @@ +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs-data-trinity: dir-or-file-in-opt + +# We keep it for historical reasons. +tdelibs-data-trinity: unknown-field Original-Maintainer + +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs-data-trinity: jar-not-in-usr-share [opt/trinity/share/apps/kjava/kjava.jar] diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-trinity-dbg.lintian-overrides b/ubuntu/_base/core/tdelibs/debian/tdelibs-trinity-dbg.lintian-overrides new file mode 100644 index 000000000..f1e839003 --- /dev/null +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-trinity-dbg.lintian-overrides @@ -0,0 +1,2 @@ +# We keep it for historical reasons. +tdelibs-trinity-dbg: unknown-field Original-Maintainer diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-trinity.lintian-overrides b/ubuntu/_base/core/tdelibs/debian/tdelibs-trinity.lintian-overrides new file mode 100644 index 000000000..c05b2bc61 --- /dev/null +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-trinity.lintian-overrides @@ -0,0 +1,5 @@ +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs-trinity: dir-or-file-in-opt + +# We keep it for historical reasons. +tdelibs-trinity: unknown-field Original-Maintainer diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.lintian-overrides b/ubuntu/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.lintian-overrides new file mode 100644 index 000000000..a2034162c --- /dev/null +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.lintian-overrides @@ -0,0 +1,5 @@ +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs14-imagetops-trinity: dir-or-file-in-opt + +# We keep it for historical reasons. +tdelibs14-imagetops-trinity: unknown-field Original-Maintainer diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.lintian-overrides b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.lintian-overrides new file mode 100644 index 000000000..4053a4d85 --- /dev/null +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.lintian-overrides @@ -0,0 +1,11 @@ +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs14-trinity-dev: dir-or-file-in-opt + +# We keep it for historical reasons. +tdelibs14-trinity-dev: unknown-field Original-Maintainer + +# Actually, trigger is not unnecessary because of dynamic modules like tdepart. +tdelibs14-trinity-dev: package-has-unnecessary-activation-of-ldconfig-trigger + +# It was intended that the ltdl is embedded. +tdelibs14-trinity-dev: embedded-library ltdl [opt/trinity/lib/libtdecore.so] diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-doc.lintian-overrides b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-doc.lintian-overrides new file mode 100644 index 000000000..68dc2e1cf --- /dev/null +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-doc.lintian-overrides @@ -0,0 +1,5 @@ +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs14-trinity-doc: dir-or-file-in-opt + +# We keep it for historical reasons. +tdelibs14-trinity-doc: unknown-field Original-Maintainer diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.lintian b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.lintian deleted file mode 100644 index 6272877c3..000000000 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.lintian +++ /dev/null @@ -1,15 +0,0 @@ -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so -tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so -tdelibs14-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root -tdelibs14-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root -tdelibs14-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root -tdelibs14-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.lintian-overrides b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.lintian-overrides new file mode 100644 index 000000000..87604f076 --- /dev/null +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.lintian-overrides @@ -0,0 +1,27 @@ +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs14-trinity: dir-or-file-in-opt + +# We keep it for historical reasons. +tdelibs14-trinity: unknown-field Original-Maintainer + +# Actually, trigger is not unnecessary because of dynamic modules like tdepart. +tdelibs14-trinity: package-has-unnecessary-activation-of-ldconfig-trigger + +# We are intentionally installing to /opt, so we have to live with that for now. +tdelibs14-trinity: package-modifies-ld.so-search-path + +# Deliberately installed setuid binaries. +tdelibs14-trinity: elevated-privileges 4755 root/root [opt/trinity/bin/fileshareset] +tdelibs14-trinity: elevated-privileges 4755 root/root [opt/trinity/bin/kgrantpty] +tdelibs14-trinity: elevated-privileges 4755 root/root [opt/trinity/bin/kpac_dhcp_helper] +tdelibs14-trinity: elevated-privileges 4755 root/root [opt/trinity/bin/start_tdeinit] + +# It was intended that the ltdl is embedded. +tdelibs14-trinity: embedded-library ltdl [opt/trinity/bin/tdeinit] +tdelibs14-trinity: embedded-library ltdl [opt/trinity/bin/tdeioslave] +tdelibs14-trinity: embedded-library ltdl [opt/trinity/lib/libtdecore.so.14.1.0] +tdelibs14-trinity: embedded-library ltdl [opt/trinity/lib/libtdeio.so.14.0.0] + +# Historical libraries preserved for compatibility. +tdelibs14-trinity: shared-library-lacks-prerequisites [opt/trinity/lib/libkjava.so.1.0.0] +tdelibs14-trinity: shared-library-lacks-prerequisites [opt/trinity/lib/libtdespell.so.14.0.0] diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.postinst b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.postinst deleted file mode 100644 index 6dbf5d9e1..000000000 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.postinst +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -e - -case "$1" in - - upgrade|install) - ;; - - abort-upgrade) - ;; - - *) - ;; - -esac - -#DEBHELPER# - -exit 0 -- cgit v1.2.3