diff options
Diffstat (limited to 'ubuntu/_base/core/tdelibs')
9 files changed, 100 insertions, 20 deletions
diff --git a/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk index 5b4e8bfd7..aba508624 100644 --- a/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk @@ -57,6 +57,15 @@ 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 @@ -73,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .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 | \ @@ -193,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ @@ -214,7 +228,7 @@ debian/stamp-kde-apidox: common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(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)) diff --git a/ubuntu/_base/core/tdelibs/debian/compat b/ubuntu/_base/core/tdelibs/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdelibs/debian/compat +++ b/ubuntu/_base/core/tdelibs/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdelibs/debian/control b/ubuntu/_base/core/tdelibs/debian/control index 2bdf0200b..2af3ea23e 100644 --- a/ubuntu/_base/core/tdelibs/debian/control +++ b/ubuntu/_base/core/tdelibs/debian/control @@ -4,17 +4,18 @@ 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 (>= 0.4.41ubuntu2), debhelper (>= 9~), quilt, cmake, autotools-dev, - binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, gawk, +Build-Depends: 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, - libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev, - liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-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, libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev, libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, - sharutils, texinfo, libogg-dev, libtqtinterface-dev, + texinfo, libogg-dev, libtqtinterface-dev, lsb-release, base-files, sudo, libr-dev, libudev-dev, libltdl-dev, libmagic-dev, libpcsclite-dev, opensc-pkcs11 | opensc (<< 0.13.0-5), libpkcs11-helper1-dev, libcryptsetup-dev @@ -28,7 +29,7 @@ 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 Conflicts: 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 @@ -64,7 +65,7 @@ Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tde Depends: ${shlibs:Depends}, tdelibs-data-trinity, netpbm (>= 2:10.0-15.1) | tdelibs14-imagetops-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients -Recommends: xdg-user-dirs, consolekit | systemd +Recommends: hwdata, xdg-user-dirs, systemd | elogind | consolekit Suggests: fam, perl-suid Description: core libraries and binaries for all TDE applications This package contains all the shared libraries and common core binaries @@ -101,8 +102,9 @@ 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~), libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev, libaspell-dev, hspell, libbz2-dev, - libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, - libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev, + libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, + libopenexr-dev (>= 1.2.2-3), libpcre3-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, diff --git a/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules index eafe84957..533c0ed51 100755 --- a/ubuntu/_base/core/tdelibs/debian/rules +++ b/ubuntu/_base/core/tdelibs/debian/rules @@ -13,6 +13,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-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 version=Debian Package $(DEB_VERSION) @@ -105,3 +113,40 @@ binary-install/tdelibs14-trinity:: 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-trinity/opt/trinity/bin/tdecmshell.real install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/opt/trinity/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 + [ -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 ] || \ + mv debian/control.t64 debian/control +endif diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install index 92a201781..615399188 100644 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install @@ -1748,7 +1748,9 @@ debian/tmp/opt/trinity/share/apps/LICENSES/GPL_V3 debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V2 debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V3 debian/tmp/opt/trinity/share/apps/LICENSES/QPL_V1.0 +debian/tmp/opt/trinity/share/apps/LICENSES/MIT debian/tmp/opt/trinity/share/apps/proxyscout/eventsrc +debian/tmp/opt/trinity/share/apps/tdemarkdown debian/tmp/opt/trinity/share/autostart/tdeab2tdeabc.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/10.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/1.png @@ -1762,6 +1764,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/8.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/9.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/appheader.html debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/artistic-license.html +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/block_title_bottom.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/block_title_mid.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/block_title_top.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom1.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom2.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom-left.png @@ -1778,30 +1783,39 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/favicon.ico debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-license debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-license.html debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-notice.html +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/flat.css debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/footer.html debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/gpl-license debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/gpl-license.html debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/grad.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/headerbg.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/header.html -debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css -debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css -debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_gear_64.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo_bg.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-web.css debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kmenu.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/lgpl-license debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/lgpl-license.html debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/mainfooter.html debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/mainheader.html +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/print.css debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/qpl-license.html debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/shadow.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tabs.css +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde.css +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-web.css +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top.jpg +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-left.jpg debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-left.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-middle.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right-konqueror.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right.jpg +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-trinity.jpg debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-docbottom.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-doctop.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/x11-license.html @@ -1905,6 +1919,7 @@ debian/tmp/opt/trinity/share/services/tdetexteditor_insertfile.desktop debian/tmp/opt/trinity/share/services/tdetexteditor_isearch.desktop debian/tmp/opt/trinity/share/services/tdetexteditor_kdatatool.desktop debian/tmp/opt/trinity/share/services/kxzfilter.desktop +debian/tmp/opt/trinity/share/services/markdown_part.desktop debian/tmp/opt/trinity/share/services/metainfo.protocol debian/tmp/opt/trinity/share/services/mms.protocol debian/tmp/opt/trinity/share/services/mmst.protocol diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst index f2a8d925b..99078621c 100644 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst @@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace" case "$1" in upgrade|install) - ldconfig ;; abort-upgrade) diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm index aae9f3600..40c135b0c 100644 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm @@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace" case "$1" in remove) - ldconfig ;; abort-upgrade) diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install index ea03de057..949783b12 100644 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install @@ -769,6 +769,8 @@ debian/tmp/opt/trinity/lib/libtdefakes_pic.a debian/tmp/opt/trinity/lib/libtdefakes.so debian/tmp/opt/trinity/lib/libtdefx.la debian/tmp/opt/trinity/lib/libtdefx.so +debian/tmp/opt/trinity/lib/libtdehw.la +debian/tmp/opt/trinity/lib/libtdehw.so debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.la debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.la debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.la diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install index b5e80c4b4..245802daa 100644 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install @@ -195,6 +195,8 @@ debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.la debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.so +debian/tmp/opt/trinity/lib/trinity/libtdemarkdown.la +debian/tmp/opt/trinity/lib/trinity/libtdemarkdown.so debian/tmp/opt/trinity/lib/trinity/libtdemultipart.la debian/tmp/opt/trinity/lib/trinity/libtdemultipart.so debian/tmp/opt/trinity/lib/trinity/libshellscript.la @@ -240,11 +242,13 @@ debian/tmp/opt/trinity/lib/libtdeabc.so.1.2.0 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0.0.0 debian/tmp/opt/trinity/lib/libtdecore.so.14 -debian/tmp/opt/trinity/lib/libtdecore.so.14.0.0 +debian/tmp/opt/trinity/lib/libtdecore.so.14.1.0 debian/tmp/opt/trinity/lib/libtdefakes.so.14 debian/tmp/opt/trinity/lib/libtdefakes.so.14.0.0 debian/tmp/opt/trinity/lib/libtdefx.so.14 debian/tmp/opt/trinity/lib/libtdefx.so.14.0.0 +debian/tmp/opt/trinity/lib/libtdehw.so.14 +debian/tmp/opt/trinity/lib/libtdehw.so.14.1.0 debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.so debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.so debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.so |