diff options
Diffstat (limited to 'dilos/core/tdelibs/debian')
| -rw-r--r-- | dilos/core/tdelibs/debian/cdbs/debian-tde.mk | 7 | ||||
| -rw-r--r-- | dilos/core/tdelibs/debian/compat | 2 | ||||
| -rw-r--r-- | dilos/core/tdelibs/debian/control | 4 | ||||
| -rwxr-xr-x | dilos/core/tdelibs/debian/rules | 46 | ||||
| -rw-r--r-- | dilos/core/tdelibs/debian/tdelibs-data-trinity.install | 25 | ||||
| -rw-r--r-- | dilos/core/tdelibs/debian/tdelibs-data-trinity.postinst | 1 | ||||
| -rw-r--r-- | dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm | 1 | ||||
| -rw-r--r-- | dilos/core/tdelibs/debian/tdelibs14-trinity.install | 2 |
8 files changed, 76 insertions, 12 deletions
diff --git a/dilos/core/tdelibs/debian/cdbs/debian-tde.mk b/dilos/core/tdelibs/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdelibs/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdelibs/debian/cdbs/debian-tde.mk @@ -82,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 | \ @@ -202,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)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/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; \ 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..4fbb784aa 100644 --- a/dilos/core/tdelibs/debian/control +++ b/dilos/core/tdelibs/debian/control @@ -4,7 +4,7 @@ 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: 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], @@ -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 diff --git a/dilos/core/tdelibs/debian/rules b/dilos/core/tdelibs/debian/rules index a463caa48..b693607f1 100755 --- a/dilos/core/tdelibs/debian/rules +++ b/dilos/core/tdelibs/debian/rules @@ -11,9 +11,16 @@ 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 +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) @@ -179,3 +186,40 @@ binary-install/tdelibs14-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 + +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/dilos/core/tdelibs/debian/tdelibs-data-trinity.install b/dilos/core/tdelibs/debian/tdelibs-data-trinity.install index 0abd36eb0..0a24cfe6f 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 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.install b/dilos/core/tdelibs/debian/tdelibs14-trinity.install index 607958946..2c8ee9899 100644 --- a/dilos/core/tdelibs/debian/tdelibs14-trinity.install +++ b/dilos/core/tdelibs/debian/tdelibs14-trinity.install @@ -195,6 +195,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 |