summaryrefslogtreecommitdiffstats
path: root/dilos/core/tdelibs
diff options
context:
space:
mode:
Diffstat (limited to 'dilos/core/tdelibs')
-rw-r--r--dilos/core/tdelibs/debian/cdbs/debian-tde.mk246
-rw-r--r--dilos/core/tdelibs/debian/cdbs/versions.pl19
-rw-r--r--dilos/core/tdelibs/debian/compat2
-rw-r--r--dilos/core/tdelibs/debian/control22
-rwxr-xr-xdilos/core/tdelibs/debian/rules64
-rw-r--r--dilos/core/tdelibs/debian/tdelibs-data-trinity.install26
-rw-r--r--dilos/core/tdelibs/debian/tdelibs-data-trinity.postinst1
-rw-r--r--dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm1
-rw-r--r--dilos/core/tdelibs/debian/tdelibs14-trinity-dev.install25
-rw-r--r--dilos/core/tdelibs/debian/tdelibs14-trinity.install4
10 files changed, 106 insertions, 304 deletions
diff --git a/dilos/core/tdelibs/debian/cdbs/debian-tde.mk b/dilos/core/tdelibs/debian/cdbs/debian-tde.mk
deleted file mode 100644
index e2b1dc666..000000000
--- a/dilos/core/tdelibs/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
- cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
- touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$(DEB_HOST_MULTIARCH))
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
- ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
- cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
- else
- cdbs_kde_enable_final =
- endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
- cdbs_kde_enable_final =
- cdbs_kde_enable_debug = --enable-debug=yes
-else
- cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
- cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
- --with-qt-dir=/usr/share/qt3 \
- --disable-rpath \
- --with-xinerama \
- $(cdbs_kde_enable_final) \
- $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
- $(MAKE) -f admin/Makefile.common dist
-endif
- debian/rules clean
-
-.tdepkginfo:
- echo "# TDE package information" >.tdepkginfo
- dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
- dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
- date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
- if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
- for f in $$(find debian/man -name '*.sgml'); do \
- docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
- done
- for f in $$(find debian/man -name '*.man'); do \
- soelim -I debian/man $$f \
- > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
- done
- touch debian/stamp-man-pages
-
-common-binary-indep::
- ( set -e; \
- tmpf=`mktemp debian/versions.XXXXXX`; \
- perl debian/cdbs/versions.pl >$$tmpf; \
- for p in $(DEB_INDEP_PACKAGES); do \
- cat $$tmpf >>debian/$$p.substvars; \
- done; \
- rm -f $$tmpf )
-
-common-binary-arch::
- ( set -e; \
- tmpf=`mktemp debian/versions.XXXXXX`; \
- perl debian/cdbs/versions.pl >$$tmpf; \
- for p in $(DEB_ARCH_PACKAGES); do \
- cat $$tmpf >>debian/$$p.substvars; \
- done; \
- rm -f $$tmpf )
- # update multi-arch path in install files
- ls -d debian/* | \
- grep -E "(install|links)$$" | \
- while read a; do \
- [ -d $$a ] || [ -f $$a.arch ] || \
- ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
- sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
- done
-
-clean::
- rm -rf debian/man/out
- -rmdir debian/man
- rm -f debian/stamp-man-pages
- rm -rf debian/shlibs-check
- # revert multi-arch path in install files
- ls -d debian/* | \
- grep -E "(install|links)$$" | \
- while read a; do \
- [ ! -f $$a.arch ] || \
- mv $$a.arch $$a; \
- done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
- if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
- if test -e debian/$(cdbs_curpkg).lintian; then \
- install -p -D -m644 debian/$(cdbs_curpkg).lintian \
- debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
- fi
- if test -e debian/$(cdbs_curpkg).presubj; then \
- install -p -D -m644 debian/$(cdbs_curpkg).presubj \
- debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
- fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
- set -e; \
- for doc in `cd $(DEB_DESTDIR)/usr/share/doc/tde/HTML/en; find . -name index.docbook`; do \
- pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
- echo Building $$pkg HTML docs...; \
- mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \
- cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \
- /usr/bin/meinproc $(DEB_DESTDIR)/usr/share/doc/tde/HTML/en/$$pkg/index.docbook; \
- done
- for pkg in $(DOC_HTML_PRUNE) ; do \
- rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \
- done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
- $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
- touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
- $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
- -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
- if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
- cd $(DEB_SRCDIR); \
- find . -name Makefile.in -print | \
- xargs --no-run-if-empty rm -f; \
- rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
- configure configure.files configure.in stamp-h.in \
- subdirs; \
- fi
-endif
- rm -f .tdepkginfo
- rm -f debian/stamp-kde-apidox
- rm -f debian/stamp-cvs-make
-
-endif
diff --git a/dilos/core/tdelibs/debian/cdbs/versions.pl b/dilos/core/tdelibs/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/dilos/core/tdelibs/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/dilos/core/tdelibs/debian/compat b/dilos/core/tdelibs/debian/compat
index ec635144f..f599e28b8 100644
--- a/dilos/core/tdelibs/debian/compat
+++ b/dilos/core/tdelibs/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/dilos/core/tdelibs/debian/control b/dilos/core/tdelibs/debian/control
index 2b07b8517..ea7a1a343 100644
--- a/dilos/core/tdelibs/debian/control
+++ b/dilos/core/tdelibs/debian/control
@@ -4,23 +4,23 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, sharutils,
+Build-Depends: 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,
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), libpcre3-dev,
+ libopenexr-dev (>= 1.2.2-4.1), libpcre2-dev,
libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev,
- libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
+ libtiff-dev, libwebp-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
- texinfo, libogg-dev, libtqtinterface-dev,
+ texinfo, libogg-dev, libtqt3-mt-dev,
lsb-release, base-files, sudo, libr-dev [!solaris-any],
- libudev-dev [!solaris-any], libltdl-dev, libmagic-dev, libpcsclite-dev,
+ 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]
-Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11
Standards-Version: 3.8.3
Package: tdelibs-trinity
@@ -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}),
+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
@@ -89,7 +89,7 @@ Description: core libraries and binaries for all TDE applications
This package contains the imagetops binary needed for print filters.
.
This binary has been included as part of newer versions of the netpbm
- package. Therefore, to avoid conflict, it was separated from the
+ package. Therefore, to avoid conflict, it was separated from the
tdelibs14-trinity package into a separate package.
.
This package is part of TDE, and a component of the TDE libraries module.
@@ -104,11 +104,11 @@ Depends: tdelibs14-trinity (= ${source: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,
- libopenexr-dev (>= 1.2.2-3), libpcre3-dev,
+ libopenexr-dev (>= 1.2.2-3), libpcre2-dev,
liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
libsasl2-dev, libxcomposite-dev,
libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
- libavahi-client-dev (>= 0.4), libavahi-tqt-dev, libtqtinterface-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
Provides: tdelibs-trinity-dev
@@ -141,7 +141,7 @@ Replaces: kdelibs-trinity-dbg (<< 4:14.0.0~)
Breaks: kdelibs-trinity-dbg (<< 4:14.0.0~)
Priority: extra
Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg
-Depends: tdelibs14-trinity (= ${source:Version}), libtqtinterface-dbg, libc6-dbg [amd64]
+Depends: tdelibs14-trinity (= ${source: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 a463caa48..24ec272a3 100755
--- a/dilos/core/tdelibs/debian/rules
+++ b/dilos/core/tdelibs/debian/rules
@@ -10,9 +10,15 @@ endif
export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX = t64
+else
+DEB_TIME64_SUFFIX =
+endif
+
DEB_KDE_APIDOX := yes
@@ -36,6 +42,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_LIBART="ON" \
-DWITH_LIBIDN="ON" \
-DWITH_TIFF="ON" \
+ -DWITH_WEBP="ON" \
-DWITH_JASPER="ON" \
-DWITH_OPENEXR="ON" \
-DWITH_AVAHI="ON" \
@@ -175,7 +182,52 @@ ifeq (linux,$(DEB_HOST_ARCH_OS))
echo "libasound2-trinity-dev=libasound2-trinity-dev" >> debian/tdelibs14-trinity-dev.substvars
endif
-binary-install/tdelibs14-trinity::
+binary-install/tdelibs14$(DEB_TIME64_SUFFIX)-trinity::
mv debian/tmp/usr/bin/tdecmshell debian/tmp/usr/bin/tdecmshell.real
- install -p -D -m755 debian/tmp/usr/bin/tdecmshell.real debian/tdelibs14-trinity/usr/bin/tdecmshell.real
- install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/usr/bin/tdecmshell
+ install -p -D -m755 debian/tmp/usr/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/usr/bin/tdecmshell.real
+ install -p -D -m755 debian/tdecmshell debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/usr/bin/tdecmshell
+
+post-patches::
+ dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+ # update library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "/tdelibs14-trinity\." | \
+ grep -v "\.t64$$" | \
+ while read a; do \
+ [ -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
+ [ -f debian/control.t64 ] || \
+ sed -i.t64 \
+ -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+ -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(tdelibs\\)4c2a-trinity\\( \|$$\)/\\1:\\2\\34c2a-trinity, \\314-trinity\\4/" \
+ -e "s/\\(tdelibs14\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+ debian/control
+endif
+
+clean::
+ dh_testdir
+ dh_clean
+
+ifeq ($(DEB_TIME64_API),true)
+ # revert library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "\.t64$$" | \
+ while read a; do \
+ mv $$a $${a%.t64}; \
+ done
+ ls -d debian/* | \
+ grep -E "/tdelibs14$(DEB_TIME64_SUFFIX)-trinity\." | \
+ xargs -r rm
+ [ -f debian/control.t64 ] || \
+ sed -i.t64 \
+ -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+ -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(tdelibs\\)4c2a-trinity\\( \|$$\)/\\1:\\2\\34c2a-trinity, \\314-trinity\\4/" \
+ -e "s/\\(tdelibs14\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+ debian/control
+else
+ [ ! -f debian/control.t64 ] || \
+ mv debian/control.t64 debian/control
+endif
diff --git a/dilos/core/tdelibs/debian/tdelibs-data-trinity.install b/dilos/core/tdelibs/debian/tdelibs-data-trinity.install
index 0abd36eb0..c67017892 100644
--- a/dilos/core/tdelibs/debian/tdelibs-data-trinity.install
+++ b/dilos/core/tdelibs/debian/tdelibs-data-trinity.install
@@ -1748,7 +1748,9 @@ debian/tmp/usr/share/apps/LICENSES/GPL_V3
debian/tmp/usr/share/apps/LICENSES/LGPL_V2
debian/tmp/usr/share/apps/LICENSES/LGPL_V3
debian/tmp/usr/share/apps/LICENSES/QPL_V1.0
+debian/tmp/usr/share/apps/LICENSES/MIT
debian/tmp/usr/share/apps/proxyscout/eventsrc
+debian/tmp/usr/share/apps/tdemarkdown
debian/tmp/usr/share/autostart/tdeab2tdeabc.desktop
debian/tmp/usr/share/doc/tde/HTML/en/common/10.png
debian/tmp/usr/share/doc/tde/HTML/en/common/1.png
@@ -1762,6 +1764,9 @@ debian/tmp/usr/share/doc/tde/HTML/en/common/8.png
debian/tmp/usr/share/doc/tde/HTML/en/common/9.png
debian/tmp/usr/share/doc/tde/HTML/en/common/appheader.html
debian/tmp/usr/share/doc/tde/HTML/en/common/artistic-license.html
+debian/tmp/usr/share/doc/tde/HTML/en/common/block_title_bottom.png
+debian/tmp/usr/share/doc/tde/HTML/en/common/block_title_mid.png
+debian/tmp/usr/share/doc/tde/HTML/en/common/block_title_top.png
debian/tmp/usr/share/doc/tde/HTML/en/common/bottom1.png
debian/tmp/usr/share/doc/tde/HTML/en/common/bottom2.png
debian/tmp/usr/share/doc/tde/HTML/en/common/bottom-left.png
@@ -1778,30 +1783,39 @@ debian/tmp/usr/share/doc/tde/HTML/en/common/favicon.ico
debian/tmp/usr/share/doc/tde/HTML/en/common/fdl-license
debian/tmp/usr/share/doc/tde/HTML/en/common/fdl-license.html
debian/tmp/usr/share/doc/tde/HTML/en/common/fdl-notice.html
+debian/tmp/usr/share/doc/tde/HTML/en/common/flat.css
debian/tmp/usr/share/doc/tde/HTML/en/common/footer.html
debian/tmp/usr/share/doc/tde/HTML/en/common/gpl-license
debian/tmp/usr/share/doc/tde/HTML/en/common/gpl-license.html
debian/tmp/usr/share/doc/tde/HTML/en/common/grad.png
debian/tmp/usr/share/doc/tde/HTML/en/common/headerbg.png
debian/tmp/usr/share/doc/tde/HTML/en/common/header.html
-debian/tmp/usr/share/doc/tde/HTML/en/common/tde-common.css
-debian/tmp/usr/share/doc/tde/HTML/en/common/tde-default.css
-debian/tmp/usr/share/doc/tde/HTML/en/common/tde-docs.css
debian/tmp/usr/share/doc/tde/HTML/en/common/kde_gear_64.png
-debian/tmp/usr/share/doc/tde/HTML/en/common/tde-localised.css.template
debian/tmp/usr/share/doc/tde/HTML/en/common/kde_logo_bg.png
debian/tmp/usr/share/doc/tde/HTML/en/common/kde_logo.png
-debian/tmp/usr/share/doc/tde/HTML/en/common/tde-web.css
debian/tmp/usr/share/doc/tde/HTML/en/common/kmenu.png
debian/tmp/usr/share/doc/tde/HTML/en/common/lgpl-license
debian/tmp/usr/share/doc/tde/HTML/en/common/lgpl-license.html
debian/tmp/usr/share/doc/tde/HTML/en/common/mainfooter.html
debian/tmp/usr/share/doc/tde/HTML/en/common/mainheader.html
+debian/tmp/usr/share/doc/tde/HTML/en/common/print.css
debian/tmp/usr/share/doc/tde/HTML/en/common/qpl-license.html
debian/tmp/usr/share/doc/tde/HTML/en/common/shadow.png
+debian/tmp/usr/share/doc/tde/HTML/en/common/tabs.css
+debian/tmp/usr/share/doc/tde/HTML/en/common/tde-common.css
+debian/tmp/usr/share/doc/tde/HTML/en/common/tde.css
+debian/tmp/usr/share/doc/tde/HTML/en/common/tde-default.css
+debian/tmp/usr/share/doc/tde/HTML/en/common/tde-docs.css
+debian/tmp/usr/share/doc/tde/HTML/en/common/tde-localised.css.template
+debian/tmp/usr/share/doc/tde/HTML/en/common/tde-web.css
+debian/tmp/usr/share/doc/tde/HTML/en/common/top.jpg
+debian/tmp/usr/share/doc/tde/HTML/en/common/top-left.jpg
debian/tmp/usr/share/doc/tde/HTML/en/common/top-left.png
debian/tmp/usr/share/doc/tde/HTML/en/common/top-middle.png
debian/tmp/usr/share/doc/tde/HTML/en/common/top-right-konqueror.png
+debian/tmp/usr/share/doc/tde/HTML/en/common/top-right.jpg
+debian/tmp/usr/share/doc/tde/HTML/en/common/top-right.png
+debian/tmp/usr/share/doc/tde/HTML/en/common/top-trinity.jpg
debian/tmp/usr/share/doc/tde/HTML/en/common/web-docbottom.png
debian/tmp/usr/share/doc/tde/HTML/en/common/web-doctop.png
debian/tmp/usr/share/doc/tde/HTML/en/common/x11-license.html
@@ -1905,6 +1919,7 @@ debian/tmp/usr/share/services/tdetexteditor_insertfile.desktop
debian/tmp/usr/share/services/tdetexteditor_isearch.desktop
debian/tmp/usr/share/services/tdetexteditor_kdatatool.desktop
debian/tmp/usr/share/services/kxzfilter.desktop
+debian/tmp/usr/share/services/markdown_part.desktop
debian/tmp/usr/share/services/metainfo.protocol
debian/tmp/usr/share/services/mms.protocol
debian/tmp/usr/share/services/mmst.protocol
@@ -1929,6 +1944,7 @@ debian/tmp/usr/share/services/tga.kimgio
debian/tmp/usr/share/services/tiff.kimgio
debian/tmp/usr/share/services/webdav.protocol
debian/tmp/usr/share/services/webdavs.protocol
+debian/tmp/usr/share/services/webp.kimgio
debian/tmp/usr/share/services/xbm.kimgio
debian/tmp/usr/share/services/xcf.kimgio
debian/tmp/usr/share/services/xpm.kimgio
diff --git a/dilos/core/tdelibs/debian/tdelibs-data-trinity.postinst b/dilos/core/tdelibs/debian/tdelibs-data-trinity.postinst
index 6a6af3c3f..8c563a3d2 100644
--- a/dilos/core/tdelibs/debian/tdelibs-data-trinity.postinst
+++ b/dilos/core/tdelibs/debian/tdelibs-data-trinity.postinst
@@ -11,7 +11,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace"
case "$1" in
upgrade|install)
-# ldconfig
;;
abort-upgrade)
diff --git a/dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm b/dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm
index 5b639eb3e..40c135b0c 100644
--- a/dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm
+++ b/dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm
@@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace"
case "$1" in
remove)
-# ldconfig
;;
abort-upgrade)
diff --git a/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.install b/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.install
index a00ec2307..cae5bfd82 100644
--- a/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.install
+++ b/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.install
@@ -120,7 +120,6 @@ debian/tmp/usr/include/tdeactionshortcutlist.h
debian/tmp/usr/include/kactivelabel.h
debian/tmp/usr/include/kallocator.h
debian/tmp/usr/include/kanimwidget.h
-debian/tmp/usr/include/kapp.h
debian/tmp/usr/include/tdeapplication.h
debian/tmp/usr/include/karchive.h
debian/tmp/usr/include/kar.h
@@ -183,7 +182,7 @@ debian/tmp/usr/include/tdeconfigdialogmanager.h
debian/tmp/usr/include/tdeconfig.h
debian/tmp/usr/include/tdeconfigskeleton.h
debian/tmp/usr/include/kcpuinfo.h
-debian/tmp/usr/include/kcrash.h
+debian/tmp/usr/include/tdecrash.h
debian/tmp/usr/include/kcursor.h
debian/tmp/usr/include/kcustommenueditor.h
debian/tmp/usr/include/kdatagramsocket.h
@@ -218,8 +217,8 @@ debian/tmp/usr/include/kde_file.h
#[!solaris-any] debian/tmp/usr/include/tdesensordevice.h
#[!solaris-any] debian/tmp/usr/include/tdestoragedevice.h
debian/tmp/usr/include/tdelibs_export.h
-debian/tmp/usr/include/kdemacros.h
debian/tmp/usr/include/tde.pot
+debian/tmp/usr/include/tdemacros.h
debian/tmp/usr/include/tdeprint/driver.h
debian/tmp/usr/include/tdeprint/kiconselectaction.h
debian/tmp/usr/include/tdeprint/kmjob.h
@@ -237,7 +236,7 @@ debian/tmp/usr/include/tdeprint/kprintdialogpage.h
debian/tmp/usr/include/tdeprint/lpr/lprhandler.h
debian/tmp/usr/include/tdeprint/lpr/lprsettings.h
debian/tmp/usr/include/tdeprint/lpr/printcapentry.h
-debian/tmp/usr/include/kdesktopfile.h
+debian/tmp/usr/include/tdedesktopfile.h
debian/tmp/usr/include/tdesu/client.h
debian/tmp/usr/include/tdesu/defaults.h
debian/tmp/usr/include/tdesu/kcookie.h
@@ -295,7 +294,7 @@ debian/tmp/usr/include/tdefontdialog.h
debian/tmp/usr/include/tdefontrequester.h
debian/tmp/usr/include/kgenericfactory.h
debian/tmp/usr/include/kgenericfactory.tcc
-debian/tmp/usr/include/kglobalaccel.h
+debian/tmp/usr/include/tdeglobalaccel.h
debian/tmp/usr/include/tdeglobal.h
debian/tmp/usr/include/tdeglobalsettings.h
debian/tmp/usr/include/kguiitem.h
@@ -325,7 +324,7 @@ debian/tmp/usr/include/kimiface.h
debian/tmp/usr/include/tdeimproxy.h
debian/tmp/usr/include/tdeimproxyiface.h
debian/tmp/usr/include/kinputdialog.h
-debian/tmp/usr/include/kinstance.h
+debian/tmp/usr/include/tdeinstance.h
debian/tmp/usr/include/tdeio/authinfo.h
debian/tmp/usr/include/tdeiobuffer.h
debian/tmp/usr/include/tdeio/chmodjob.h
@@ -486,9 +485,9 @@ debian/tmp/usr/include/tdepopupmenu.h
debian/tmp/usr/include/kpreviewwidgetbase.h
debian/tmp/usr/include/kprintaction.h
debian/tmp/usr/include/kprinter.h
-debian/tmp/usr/include/kprocctrl.h
-debian/tmp/usr/include/kprocess.h
-debian/tmp/usr/include/kprocio.h
+debian/tmp/usr/include/tdeprocctrl.h
+debian/tmp/usr/include/tdeprocess.h
+debian/tmp/usr/include/tdeprocio.h
debian/tmp/usr/include/kprogress.h
debian/tmp/usr/include/kprogressbox.h
debian/tmp/usr/include/kpropertiesdialog.h
@@ -547,7 +546,7 @@ debian/tmp/usr/include/tdeshortcutdialog.h
debian/tmp/usr/include/tdeshortcut.h
debian/tmp/usr/include/tdeshortcutlist.h
debian/tmp/usr/include/kshred.h
-debian/tmp/usr/include/ksimpleconfig.h
+debian/tmp/usr/include/tdesimpleconfig.h
debian/tmp/usr/include/ksmimecrypto.h
debian/tmp/usr/include/ksockaddr.h
debian/tmp/usr/include/tdesocketaddress.h
@@ -595,13 +594,12 @@ debian/tmp/usr/include/ksslsigners.h
debian/tmp/usr/include/ksslutils.h
debian/tmp/usr/include/ksslx509map.h
debian/tmp/usr/include/ksslx509v3.h
-debian/tmp/usr/include/kstandarddirs.h
+debian/tmp/usr/include/tdestandarddirs.h
debian/tmp/usr/include/tdestartupinfo.h
debian/tmp/usr/include/kstaticdeleter.h
debian/tmp/usr/include/kstatusbar.h
debian/tmp/usr/include/tdestdaccel.h
debian/tmp/usr/include/kstdaction.h
-debian/tmp/usr/include/kstddirs.h
debian/tmp/usr/include/kstdguiitem.h
debian/tmp/usr/include/kstreamsocket.h
debian/tmp/usr/include/kstringhandler.h
@@ -665,8 +663,7 @@ debian/tmp/usr/include/tdetoolbarlabelaction.h
debian/tmp/usr/include/tdetoolbarradiogroup.h
debian/tmp/usr/include/ktrader.h
debian/tmp/usr/include/ktypelist.h
-debian/tmp/usr/include/kuniqueapp.h
-debian/tmp/usr/include/kuniqueapplication.h
+debian/tmp/usr/include/tdeuniqueapplication.h
debian/tmp/usr/include/tdeunittest/module.h
debian/tmp/usr/include/tdeunittest/runner.h
debian/tmp/usr/include/tdeunittest/tester.h
diff --git a/dilos/core/tdelibs/debian/tdelibs14-trinity.install b/dilos/core/tdelibs/debian/tdelibs14-trinity.install
index 607958946..40039c4da 100644
--- a/dilos/core/tdelibs/debian/tdelibs14-trinity.install
+++ b/dilos/core/tdelibs/debian/tdelibs14-trinity.install
@@ -139,6 +139,8 @@ debian/tmp/usr/lib/*/trinity/kimg_tga.la
debian/tmp/usr/lib/*/trinity/kimg_tga.so
debian/tmp/usr/lib/*/trinity/kimg_tiff.la
debian/tmp/usr/lib/*/trinity/kimg_tiff.so
+debian/tmp/usr/lib/*/trinity/kimg_webp.la
+debian/tmp/usr/lib/*/trinity/kimg_webp.so
debian/tmp/usr/lib/*/trinity/kimg_xcf.la
debian/tmp/usr/lib/*/trinity/kimg_xcf.so
debian/tmp/usr/lib/*/trinity/kimg_xview.la
@@ -195,6 +197,8 @@ debian/tmp/usr/lib/*/trinity/libtdeprint_management_module.la
debian/tmp/usr/lib/*/trinity/libtdeprint_management_module.so
debian/tmp/usr/lib/*/trinity/libtdehtmlpart.la
debian/tmp/usr/lib/*/trinity/libtdehtmlpart.so
+debian/tmp/usr/lib/*/trinity/libtdemarkdown.la
+debian/tmp/usr/lib/*/trinity/libtdemarkdown.so
debian/tmp/usr/lib/*/trinity/libtdemultipart.la
debian/tmp/usr/lib/*/trinity/libtdemultipart.so
debian/tmp/usr/lib/*/trinity/libshellscript.la