diff options
Diffstat (limited to 'debian/_base/applications/tdeio')
30 files changed, 389 insertions, 39 deletions
diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- 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_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +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 | \ + 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 + 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; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/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/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/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/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/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/debian/_base/applications/tdeio/tdeio-appinfo/debian/changelog b/debian/_base/applications/tdeio/tdeio-appinfo/debian/changelog new file mode 100644 index 000000000..39785e5c7 --- /dev/null +++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/changelog @@ -0,0 +1,6 @@ +tdeio-appinfo-trinity (0.1.5-0) testing; urgency=low + + * First TDE release + + -- Michele Calgaro <michele.calgaro@yahoo.it> Sat, 25 Aug 2018 21:56:00 +0900 + diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/compat b/debian/_base/applications/tdeio/tdeio-appinfo/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/control b/debian/_base/applications/tdeio/tdeio-appinfo/debian/control new file mode 100644 index 000000000..3b616818e --- /dev/null +++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/control @@ -0,0 +1,16 @@ +Source: tdeio-appinfo-trinity +Section: tde +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +XSBC-Original-Maintainer: Robert Hogan <robert@roberthogan.net> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev +Standards-Version: 3.8.4 + +Package: tdeio-appinfo-trinity +Architecture: any +Depends: ${shlibs:Depends} +Description: TDEIO slave for the appinfo protocol + Adds support for the "appinfo:" protocol + to Konqueror and other TDE applications. + . + This enables you to perform appinfo: searches in TDE. diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/copyright b/debian/_base/applications/tdeio/tdeio-appinfo/debian/copyright new file mode 100644 index 000000000..f64b4fdd9 --- /dev/null +++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/copyright @@ -0,0 +1,11 @@ +This package was debianized by Michele Calgaro <michele.calgaro@yahoo.it> on +Sat, 08 May 2022 20:11:00 +0900 + +Copyright: + This program was initially written by Robert Hogan <robert@roberthogan.net> + +License: + You are free to distribute this software under the terms of + the GNU General Public License 2 or higher. + On Debian systems, the complete text of the GNU General Public + License can be found in the file `/usr/share/common-licenses/GPL'. diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/patches/series b/debian/_base/applications/tdeio/tdeio-appinfo/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/patches/series diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/rules b/debian/_base/applications/tdeio/tdeio-appinfo/debian/rules new file mode 100755 index 000000000..16f2fa011 --- /dev/null +++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib +else +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib +endif +export LD_LIBRARY_PATH + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/format b/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/options b/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/debian/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio/tdeio-apt/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)/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; \ diff --git a/debian/_base/applications/tdeio/tdeio-apt/debian/compat b/debian/_base/applications/tdeio/tdeio-apt/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/tdeio/tdeio-apt/debian/compat +++ b/debian/_base/applications/tdeio/tdeio-apt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/tdeio/tdeio-apt/debian/control b/debian/_base/applications/tdeio/tdeio-apt/debian/control index 11f3f9b0a..40ba4d9a5 100644 --- a/debian/_base/applications/tdeio/tdeio-apt/debian/control +++ b/debian/_base/applications/tdeio/tdeio-apt/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Emmanuel Bouthenot <kolter@openics.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-apt-trinity diff --git a/debian/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio/tdeio-ftps/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)/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; \ diff --git a/debian/_base/applications/tdeio/tdeio-ftps/debian/compat b/debian/_base/applications/tdeio/tdeio-ftps/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/tdeio/tdeio-ftps/debian/compat +++ b/debian/_base/applications/tdeio/tdeio-ftps/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/tdeio/tdeio-ftps/debian/control b/debian/_base/applications/tdeio/tdeio-ftps/debian/control index d1455f685..feb19c97d 100644 --- a/debian/_base/applications/tdeio/tdeio-ftps/debian/control +++ b/debian/_base/applications/tdeio/tdeio-ftps/debian/control @@ -2,7 +2,7 @@ Source: tdeio-ftps-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.3 Package: tdeio-ftps-trinity diff --git a/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio/tdeio-gopher/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)/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; \ diff --git a/debian/_base/applications/tdeio/tdeio-gopher/debian/compat b/debian/_base/applications/tdeio/tdeio-gopher/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/tdeio/tdeio-gopher/debian/compat +++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/tdeio/tdeio-gopher/debian/control b/debian/_base/applications/tdeio/tdeio-gopher/debian/control index 2752551e6..578f51c5a 100644 --- a/debian/_base/applications/tdeio/tdeio-gopher/debian/control +++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Albert Astals Cid <aacid@kde.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-gopher-trinity diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio/tdeio-locate/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)/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; \ diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/compat b/debian/_base/applications/tdeio/tdeio-locate/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/tdeio/tdeio-locate/debian/compat +++ b/debian/_base/applications/tdeio/tdeio-locate/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/control b/debian/_base/applications/tdeio/tdeio-locate/debian/control index 038d8ec01..aa71bd264 100644 --- a/debian/_base/applications/tdeio/tdeio-locate/debian/control +++ b/debian/_base/applications/tdeio/tdeio-locate/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, bzip2, python-all +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-locate-trinity diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/docs b/debian/_base/applications/tdeio/tdeio-locate/debian/docs new file mode 100644 index 000000000..76c3076c9 --- /dev/null +++ b/debian/_base/applications/tdeio/tdeio-locate/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README.md +TODO diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/rules b/debian/_base/applications/tdeio/tdeio-locate/debian/rules index c9e6b78b0..a6797f19a 100755 --- a/debian/_base/applications/tdeio/tdeio-locate/debian/rules +++ b/debian/_base/applications/tdeio/tdeio-locate/debian/rules @@ -1,35 +1,17 @@ #!/usr/bin/make -f -# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function -# Also include the main Trinity path -ifeq ("$(LD_LIBRARY_PATH)", "") -LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib -else -LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib -endif -export LD_LIBRARY_PATH - include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_KDE_APIDOX := yes - -CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ - -DLIB_SUFFIX="" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ - -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ - -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \ - -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DBUILD_ALL="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo - -DEB_INSTALL_DOCS_tdeio-locate-trinity := -XREADME -XNEWS -XTODO -XAUTHORS + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/debian/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio/tdeio-sword/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)/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; \ diff --git a/debian/_base/applications/tdeio/tdeio-sword/debian/compat b/debian/_base/applications/tdeio/tdeio-sword/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/tdeio/tdeio-sword/debian/compat +++ b/debian/_base/applications/tdeio/tdeio-sword/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/tdeio/tdeio-sword/debian/control b/debian/_base/applications/tdeio/tdeio-sword/debian/control index a0a34a244..dd1d46eaa 100644 --- a/debian/_base/applications/tdeio/tdeio-sword/debian/control +++ b/debian/_base/applications/tdeio/tdeio-sword/debian/control @@ -2,7 +2,7 @@ Source: tdeio-sword-trinity Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev Standards-Version: 3.7.2 Package: tdeio-sword-trinity diff --git a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio/tdeio-umountwrapper/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)/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; \ diff --git a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/compat b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/compat +++ b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/control b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/control index d0a6a58ce..e935d1c71 100644 --- a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/control +++ b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/control @@ -2,7 +2,7 @@ Source: tdeio-umountwrapper-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-umountwrapper-trinity |