diff options
Diffstat (limited to 'dilos')
418 files changed, 1388 insertions, 10939 deletions
diff --git a/dilos/common/cmake/debian/cdbs/debian-tde.mk b/dilos/common/cmake/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/common/cmake/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/common/cmake/debian/cdbs/versions.pl b/dilos/common/cmake/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/common/cmake/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/common/cmake/debian/compat b/dilos/common/cmake/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/dilos/common/cmake/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/dilos/core/tde-i18n/debian/compat b/dilos/core/tde-i18n/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tde-i18n/debian/compat +++ b/dilos/core/tde-i18n/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tde-i18n/debian/control b/dilos/core/tde-i18n/debian/control index f5b6bb982..33461f159 100644 --- a/dilos/core/tde-i18n/debian/control +++ b/dilos/core/tde-i18n/debian/control @@ -2,7 +2,7 @@ Source: tde-i18n-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, tdelibs-trinity-dev Standards-Version: 3.8.4 Package: tde-i18n-trinity @@ -10,7 +10,7 @@ Architecture: all Section: tde Replaces: kde-i18n-trinity (<< 4:14.0.0~) Breaks: kde-i18n-trinity (<< 4:14.0.0~) -Depends: tdelibs14-trinity +Depends: tdelibs-trinity Suggests: tde-trinity Provides: tde-i18n-trinity Description: All languages (all) internationalized (i18n) files for TDE diff --git a/dilos/core/tde-i18n/debian/control-lang b/dilos/core/tde-i18n/debian/control-lang index 5d409c28d..2fce8baf8 100644 --- a/dilos/core/tde-i18n/debian/control-lang +++ b/dilos/core/tde-i18n/debian/control-lang @@ -4,7 +4,7 @@ Architecture: all Section: tde Replaces: kde-i18n-@pkg_lang@-trinity (<< 4:14.0.0~) Breaks: kde-i18n-@pkg_lang@-trinity (<< 4:14.0.0~) -Depends: tdelibs14-trinity +Depends: tdelibs-trinity Suggests: tde-trinity Provides: tde-i18n-trinity Description: @lang_desc@ (@lang@) internationalized (i18n) files for TDE diff --git a/dilos/core/tde-i18n/debian/control-source b/dilos/core/tde-i18n/debian/control-source index 984fed2a5..b959dad00 100644 --- a/dilos/core/tde-i18n/debian/control-source +++ b/dilos/core/tde-i18n/debian/control-source @@ -2,5 +2,5 @@ Source: tde-i18n-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, tdelibs-trinity-dev Standards-Version: 3.8.4 diff --git a/dilos/core/tde-i18n/debian/rules b/dilos/core/tde-i18n/debian/rules index 1631906ea..0303b4496 100755 --- a/dilos/core/tde-i18n/debian/rules +++ b/dilos/core/tde-i18n/debian/rules @@ -149,6 +149,7 @@ binary-indep: build install dh_installdocs dh_installmenu dh_installchangelogs + dh_link dh_strip $(if $(wildcard /usr/bin/dh_strip_nondeterminism),\ dh_strip_nondeterminism) diff --git a/dilos/core/tdeaccessibility/debian/cdbs/debian-tde.mk b/dilos/core/tdeaccessibility/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdeaccessibility/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/tdeaccessibility/debian/cdbs/versions.pl b/dilos/core/tdeaccessibility/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdeaccessibility/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/tdeaccessibility/debian/compat b/dilos/core/tdeaccessibility/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdeaccessibility/debian/compat +++ b/dilos/core/tdeaccessibility/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdeaccessibility/debian/control b/dilos/core/tdeaccessibility/debian/control index ab53ac888..3652b026e 100644 --- a/dilos/core/tdeaccessibility/debian/control +++ b/dilos/core/tdeaccessibility/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: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev Standards-Version: 3.8.4 Package: tdeaccessibility-trinity diff --git a/dilos/core/tdeaccessibility/debian/rules b/dilos/core/tdeaccessibility/debian/rules index fd328cd5c..a64e978a4 100755 --- a/dilos/core/tdeaccessibility/debian/rules +++ b/dilos/core/tdeaccessibility/debian/rules @@ -1,8 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_DH_SHLIBDEPS_ARGS += --dpkg-shlibdeps-params=--ignore-missing-info diff --git a/dilos/core/tdeaddons/debian/cdbs/debian-tde.mk b/dilos/core/tdeaddons/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdeaddons/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/tdeaddons/debian/cdbs/versions.pl b/dilos/core/tdeaddons/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdeaddons/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/tdeaddons/debian/compat b/dilos/core/tdeaddons/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdeaddons/debian/compat +++ b/dilos/core/tdeaddons/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdeaddons/debian/control b/dilos/core/tdeaddons/debian/control index 4bae36960..b20ba256f 100644 --- a/dilos/core/tdeaddons/debian/control +++ b/dilos/core/tdeaddons/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: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev, libiconv-dev [solaris-any] +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb++-dev | libdb5.3++-dev | libdb4.8++-dev, libogg-dev, dh-python, libiconv-dev [solaris-any] Standards-Version: 3.8.4 Package: tdeaddons-trinity @@ -152,7 +152,7 @@ Architecture: all Section: tde Replaces: knewsticker-scripts-trinity (<< 4:14.0.0~) Breaks: knewsticker-scripts-trinity (<< 4:14.0.0~) -Depends: ${perl:Depends}, python-all, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl +Depends: ${perl:Depends}, ${python3:Depends}, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl Recommends: knewsticker-trinity Enhances: knewsticker-trinity Description: scripts for KNewsTicker, the Trinity news ticker @@ -171,7 +171,7 @@ Architecture: any Section: tde Replaces: konq-plugins-trinity (<< 4:14.0.0~) Breaks: konq-plugins-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends}, libjpeg-turbo-progs | libjpeg-progs, python-all, rsync, unison +Depends: ${shlibs:Depends}, ${python3:Depends}, libjpeg-turbo-progs | libjpeg-progs, rsync, unison Recommends: akregator-trinity, ark-trinity, imagemagick Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html Enhances: konqueror-trinity, akregator-trinity diff --git a/dilos/core/tdeaddons/debian/kicker-applets-trinity.lintian b/dilos/core/tdeaddons/debian/kicker-applets-trinity.lintian deleted file mode 100644 index 705d74139..000000000 --- a/dilos/core/tdeaddons/debian/kicker-applets-trinity.lintian +++ /dev/null @@ -1,3 +0,0 @@ -# Call is inserted by debhelper and is correct. -kicker-applets-trinity: postinst-has-useless-call-to-ldconfig -kicker-applets-trinity: postrm-has-useless-call-to-ldconfig diff --git a/dilos/core/tdeaddons/debian/rules b/dilos/core/tdeaddons/debian/rules index 4417239b1..2b61126b7 100755 --- a/dilos/core/tdeaddons/debian/rules +++ b/dilos/core/tdeaddons/debian/rules @@ -1,8 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include/tde DEB_CONFIGURE_MANDIR := /usr/share/man @@ -33,11 +32,15 @@ DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter binary-install/tdeaddons-tdefile-plugins-trinity:: install -p -D -m644 renamedlgplugins/README \ - debian/tdeaddons-tdefile-plugins-trinity/usr/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins + debian/$(cdbs_curpkg)/usr/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins binary-install/knewsticker-scripts-trinity:: - chmod 755 debian/knewsticker-scripts-trinity/usr/share/apps/knewsticker/scripts/*.pl - chmod 755 debian/knewsticker-scripts-trinity/usr/share/apps/knewsticker/scripts/*.py + chmod 755 debian/$(cdbs_curpkg)/usr/share/apps/knewsticker/scripts/*.pl + chmod 755 debian/$(cdbs_curpkg)/usr/share/apps/knewsticker/scripts/*.py + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/share/apps/knewsticker/scripts binary-install/kate-plugins-trinity:: - chmod 755 debian/kate-plugins-trinity/usr/share/apps/kate/scripts/html-tidy.sh + chmod 755 debian/$(cdbs_curpkg)/usr/share/apps/kate/scripts/html-tidy.sh + +binary-install/konq-plugins-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/share/apps/imagerotation diff --git a/dilos/core/tdeadmin/debian/cdbs/debian-tde.mk b/dilos/core/tdeadmin/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdeadmin/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/tdeadmin/debian/cdbs/versions.pl b/dilos/core/tdeadmin/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdeadmin/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/tdeadmin/debian/compat b/dilos/core/tdeadmin/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdeadmin/debian/compat +++ b/dilos/core/tdeadmin/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdeadmin/debian/control b/dilos/core/tdeadmin/debian/control index b534daf54..9bd2e1392 100644 --- a/dilos/core/tdeadmin/debian/control +++ b/dilos/core/tdeadmin/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: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man Standards-Version: 3.8.4 Package: tdeadmin-trinity diff --git a/dilos/core/tdeadmin/debian/rules b/dilos/core/tdeadmin/debian/rules index f5bb91a19..d79086f1b 100755 --- a/dilos/core/tdeadmin/debian/rules +++ b/dilos/core/tdeadmin/debian/rules @@ -1,8 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include DEB_CONFIGURE_MANDIR := /usr/share/man diff --git a/dilos/core/tdeartwork/debian/cdbs/debian-tde.mk b/dilos/core/tdeartwork/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdeartwork/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/tdeartwork/debian/cdbs/versions.pl b/dilos/core/tdeartwork/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdeartwork/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/tdeartwork/debian/compat b/dilos/core/tdeartwork/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdeartwork/debian/compat +++ b/dilos/core/tdeartwork/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdeartwork/debian/control b/dilos/core/tdeartwork/debian/control index 5dade582e..43ebb5c8d 100644 --- a/dilos/core/tdeartwork/debian/control +++ b/dilos/core/tdeartwork/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: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies [!solaris-any] +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies [!solaris-any] Build-Conflicts: nvidia-glx Standards-Version: 3.8.4 diff --git a/dilos/core/tdeartwork/debian/rules b/dilos/core/tdeartwork/debian/rules index 91e06c45d..659c8505c 100755 --- a/dilos/core/tdeartwork/debian/rules +++ b/dilos/core/tdeartwork/debian/rules @@ -1,8 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include DEB_CONFIGURE_MANDIR := /usr/share/man diff --git a/dilos/core/tdebase/debian/cdbs/debian-tde.mk b/dilos/core/tdebase/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdebase/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/tdebase/debian/cdbs/versions.pl b/dilos/core/tdebase/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdebase/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/tdebase/debian/compat b/dilos/core/tdebase/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdebase/debian/compat +++ b/dilos/core/tdebase/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdebase/debian/control b/dilos/core/tdebase/debian/control index f0e692dc5..09d02befa 100644 --- a/dilos/core/tdebase/debian/control +++ b/dilos/core/tdebase/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev [!solaris-any], libudev-dev [!solaris-any], libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev, libcpp [solaris-any] -Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, init, libtirpc-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any] | libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev [!solaris-any], libudev-dev [!solaris-any], libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev, libcpp [solaris-any] +Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, tdelibs14-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 @@ -324,6 +324,7 @@ Architecture: any Replaces: kicker-trinity (<< 4:14.0.0~) Breaks: kicker-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends}, kcontrol-trinity (>= ${source:Version}), tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~) +Recommends: desktop-file-utils Suggests: khelpcenter-trinity, kicker-applets-trinity, menu Conflicts: tdebase-libs-trinity (<< 4:3.0.0), kcontrol-trinity (<< 4:14.0.8~) Description: desktop panel for TDE diff --git a/dilos/core/tdebase/debian/kate-trinity.install b/dilos/core/tdebase/debian/kate-trinity.install index d20f25d78..3c9977a76 100644 --- a/dilos/core/tdebase/debian/kate-trinity.install +++ b/dilos/core/tdebase/debian/kate-trinity.install @@ -19,14 +19,12 @@ debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/highlighting.png debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/modified.png debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/modmod.png debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/modonhd.png -debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/null.png debian/tmp/usr/share/apps/kate/icons/crystalsvg/32x32/actions/highlighting.png debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/curfiledir.png debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/indent.png debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/modified.png debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/modmod.png debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/modonhd.png -debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/null.png debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/unindent.png debian/tmp/usr/share/apps/kate/icons/locolor/22x22/actions/indent.png debian/tmp/usr/share/apps/kate/icons/locolor/22x22/actions/unindent.png diff --git a/dilos/core/tdebase/debian/kcontrol-trinity.install b/dilos/core/tdebase/debian/kcontrol-trinity.install index 36523c40e..7d69f16f2 100644 --- a/dilos/core/tdebase/debian/kcontrol-trinity.install +++ b/dilos/core/tdebase/debian/kcontrol-trinity.install @@ -5,9 +5,10 @@ debian/tmp/usr/bin/keditfiletype debian/tmp/usr/bin/tdefontinst debian/tmp/usr/bin/tdefontview debian/tmp/usr/bin/klocaldomainurifilterhelper -debian/tmp/usr/bin/tderandrtray -#debian/tmp/usr/bin/tdehwdevicetray debian/tmp/usr/bin/krdb +#debian/tmp/usr/bin/tdehwdevicetray +debian/tmp/usr/bin/tderandrtray +debian/tmp/usr/bin/tdesyndaemon debian/tmp/usr/lib/*/trinity/fontthumbnail.la debian/tmp/usr/lib/*/trinity/fontthumbnail.so debian/tmp/usr/lib/*/trinity/kaccess.la @@ -195,6 +196,7 @@ debian/tmp/usr/share/applications/tde/smbstatus.desktop debian/tmp/usr/share/applications/tde/sound.desktop debian/tmp/usr/share/applications/tde/spellchecking.desktop debian/tmp/usr/share/applications/tde/style.desktop +debian/tmp/usr/share/applications/tde/touchpad.desktop debian/tmp/usr/share/applications/tde/useragent.desktop debian/tmp/usr/share/applications/tde/xserver.desktop debian/tmp/usr/share/applnk/.hidden/energy.desktop diff --git a/dilos/core/tdebase/debian/kdesktop-trinity.postinst b/dilos/core/tdebase/debian/kdesktop-trinity.postinst deleted file mode 100644 index 65da715e5..000000000 --- a/dilos/core/tdebase/debian/kdesktop-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kdesktop-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/khelpcenter-trinity.install b/dilos/core/tdebase/debian/khelpcenter-trinity.install index 06d3a6618..29e4df751 100644 --- a/dilos/core/tdebase/debian/khelpcenter-trinity.install +++ b/dilos/core/tdebase/debian/khelpcenter-trinity.install @@ -36,6 +36,7 @@ debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man9.desktop debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/mann.desktop debian/tmp/usr/share/apps/khelpcenter/plugins/support.desktop debian/tmp/usr/share/apps/khelpcenter/plugins/quickstart.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/releasenotes.desktop debian/tmp/usr/share/apps/khelpcenter/plugins/visualdict.desktop debian/tmp/usr/share/apps/khelpcenter/plugins/userguide.desktop debian/tmp/usr/share/apps/khelpcenter/plugins/welcome.desktop @@ -99,6 +100,9 @@ debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/quickstart/index.docbook debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/releasenotes/common debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.cache.bz2 debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/releasenotes/*.docbook +debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.x/*.docbook +debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.1.x/*.docbook +debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.2.x/*.docbook debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/shadow1.png debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/support.docbook debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png diff --git a/dilos/core/tdebase/debian/khelpcenter-trinity.lintian b/dilos/core/tdebase/debian/khelpcenter-trinity.lintian index 4266f0f44..a45804dd0 100644 --- a/dilos/core/tdebase/debian/khelpcenter-trinity.lintian +++ b/dilos/core/tdebase/debian/khelpcenter-trinity.lintian @@ -1,3 +1 @@ khelpcenter-trinity: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so -khelpcenter-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so -khelpcenter-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so diff --git a/dilos/core/tdebase/debian/khelpcenter-trinity.postinst b/dilos/core/tdebase/debian/khelpcenter-trinity.postinst deleted file mode 100644 index 4a906880c..000000000 --- a/dilos/core/tdebase/debian/khelpcenter-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for khelpcenter-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/klipper-trinity.install b/dilos/core/tdebase/debian/klipper-trinity.install index 9bd8f433f..d5e9e42a0 100644 --- a/dilos/core/tdebase/debian/klipper-trinity.install +++ b/dilos/core/tdebase/debian/klipper-trinity.install @@ -6,6 +6,7 @@ debian/tmp/usr/lib/*/trinity/klipper_panelapplet.so debian/tmp/usr/lib/*/trinity/klipper.so debian/tmp/usr/lib/*/libtdeinit_klipper.so debian/tmp/usr/share/applications/tde/klipper.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/copy-full-path.desktop debian/tmp/usr/share/apps/tdeconf_update/klipper-1-2.pl debian/tmp/usr/share/apps/tdeconf_update/klipper-trinity1.sh debian/tmp/usr/share/apps/tdeconf_update/klipperrc.upd diff --git a/dilos/core/tdebase/debian/klipper-trinity.lintian b/dilos/core/tdebase/debian/klipper-trinity.lintian index 4aacfafd0..8c37b9b6e 100644 --- a/dilos/core/tdebase/debian/klipper-trinity.lintian +++ b/dilos/core/tdebase/debian/klipper-trinity.lintian @@ -1,3 +1 @@ klipper-trinity: no-shlibs-control-file usr/lib/libtdeinit_klipper.so -klipper-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so -klipper-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so diff --git a/dilos/core/tdebase/debian/klipper-trinity.postinst b/dilos/core/tdebase/debian/klipper-trinity.postinst deleted file mode 100644 index adf32323b..000000000 --- a/dilos/core/tdebase/debian/klipper-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for klipper-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/kmenuedit-trinity.lintian b/dilos/core/tdebase/debian/kmenuedit-trinity.lintian index f085ffc8c..d3b412257 100644 --- a/dilos/core/tdebase/debian/kmenuedit-trinity.lintian +++ b/dilos/core/tdebase/debian/kmenuedit-trinity.lintian @@ -1,4 +1,2 @@ kmenuedit-trinity: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so kmenuedit-trinity: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so -kmenuedit-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so -kmenuedit-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so diff --git a/dilos/core/tdebase/debian/kmenuedit-trinity.postinst b/dilos/core/tdebase/debian/kmenuedit-trinity.postinst deleted file mode 100644 index 29bc5b6b5..000000000 --- a/dilos/core/tdebase/debian/kmenuedit-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kmenuedit-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/konqueror-trinity.docs b/dilos/core/tdebase/debian/konqueror-trinity.docs index c023d564b..e00f630aa 100644 --- a/dilos/core/tdebase/debian/konqueror-trinity.docs +++ b/dilos/core/tdebase/debian/konqueror-trinity.docs @@ -1 +1 @@ -libkonq/SERVICEMENUS +libkonq/SERVICEMENUS.md diff --git a/dilos/core/tdebase/debian/konqueror-trinity.install b/dilos/core/tdebase/debian/konqueror-trinity.install index 2a8b14323..0a2dc0e27 100644 --- a/dilos/core/tdebase/debian/konqueror-trinity.install +++ b/dilos/core/tdebase/debian/konqueror-trinity.install @@ -143,11 +143,11 @@ debian/tmp/usr/share/apps/konqueror/servicemenus/text-xslt-print.desktop debian/tmp/usr/share/apps/konqueror/servicemenus/edit-as-root.desktop debian/tmp/usr/share/apps/konqueror/tiles/bluemorning.png debian/tmp/usr/share/apps/konqueror/tiles/canvas.png -debian/tmp/usr/share/apps/konqueror/tiles/kde4ever.png debian/tmp/usr/share/apps/konqueror/tiles/kenwimer.png debian/tmp/usr/share/apps/konqueror/tiles/noise.png debian/tmp/usr/share/apps/konqueror/tiles/paper_flieder.png debian/tmp/usr/share/apps/konqueror/tiles/redfiber.png +debian/tmp/usr/share/apps/konqueror/tiles/trinity4ever.png debian/tmp/usr/share/autostart/konqy_preload.desktop debian/tmp/usr/share/config.kcfg/keditbookmarks.kcfg debian/tmp/usr/share/config.kcfg/konq_listview.kcfg diff --git a/dilos/core/tdebase/debian/konsole-trinity.install b/dilos/core/tdebase/debian/konsole-trinity.install index 9882b34d1..a2387b9d8 100644 --- a/dilos/core/tdebase/debian/konsole-trinity.install +++ b/dilos/core/tdebase/debian/konsole-trinity.install @@ -58,6 +58,8 @@ debian/tmp/usr/share/apps/konsole/su.desktop debian/tmp/usr/share/apps/konsole/sumc.desktop debian/tmp/usr/share/apps/konsole/syscolor.schema debian/tmp/usr/share/apps/konsole/tips +debian/tmp/usr/share/apps/konsole/Solarized.schema +debian/tmp/usr/share/apps/konsole/SolarizedLight.schema debian/tmp/usr/share/apps/konsole/Transparent_darkbg.schema debian/tmp/usr/share/apps/konsole/Transparent_lightbg.schema debian/tmp/usr/share/apps/konsole/Transparent_MC.schema diff --git a/dilos/core/tdebase/debian/konsole-trinity.lintian b/dilos/core/tdebase/debian/konsole-trinity.lintian index 6a55d9e64..218aec8fe 100644 --- a/dilos/core/tdebase/debian/konsole-trinity.lintian +++ b/dilos/core/tdebase/debian/konsole-trinity.lintian @@ -1,3 +1 @@ konsole-trinity: no-shlibs-control-file usr/lib/libtdeinit_konsole.so -konsole-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so -konsole-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so diff --git a/dilos/core/tdebase/debian/konsole-trinity.postinst b/dilos/core/tdebase/debian/konsole-trinity.postinst index 6e38c4939..dc2328977 100644 --- a/dilos/core/tdebase/debian/konsole-trinity.postinst +++ b/dilos/core/tdebase/debian/konsole-trinity.postinst @@ -24,9 +24,6 @@ case "$1" in configure) update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /usr/bin/konsole 35 \ --slave /usr/share/man/man1/x-terminal-emulator.1 x-terminal-emulator.1 /usr/share/man/man1/konsole.1 - - # force ldconfig due to tdeinit library -# ldconfig ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/dilos/core/tdebase/debian/ksmserver-trinity.lintian b/dilos/core/tdebase/debian/ksmserver-trinity.lintian index a6dfd1fe6..2126fe400 100644 --- a/dilos/core/tdebase/debian/ksmserver-trinity.lintian +++ b/dilos/core/tdebase/debian/ksmserver-trinity.lintian @@ -1,2 +1 @@ ksmserver-trinity: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so -ksmserver-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so diff --git a/dilos/core/tdebase/debian/ksmserver-trinity.postinst b/dilos/core/tdebase/debian/ksmserver-trinity.postinst index f4b160056..e40921e73 100644 --- a/dilos/core/tdebase/debian/ksmserver-trinity.postinst +++ b/dilos/core/tdebase/debian/ksmserver-trinity.postinst @@ -26,9 +26,6 @@ case "$1" in x-session-manager /usr/bin/starttde 40 \ --slave /usr/share/man/man1/x-session-manager.1 \ x-session-manager.1 "/usr/share/man/man1/starttde.1" - - # force ldconfig due to tdeinit library -# ldconfig ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/dilos/core/tdebase/debian/libkonq4-trinity.docs b/dilos/core/tdebase/debian/libkonq4-trinity.docs index c023d564b..e00f630aa 100644 --- a/dilos/core/tdebase/debian/libkonq4-trinity.docs +++ b/dilos/core/tdebase/debian/libkonq4-trinity.docs @@ -1 +1 @@ -libkonq/SERVICEMENUS +libkonq/SERVICEMENUS.md diff --git a/dilos/core/tdebase/debian/patches/disable_default_tdm_theme.diff b/dilos/core/tdebase/debian/patches/disable_default_tdm_theme.diff index e50536e78..cea1576e4 100644 --- a/dilos/core/tdebase/debian/patches/disable_default_tdm_theme.diff +++ b/dilos/core/tdebase/debian/patches/disable_default_tdm_theme.diff @@ -1,6 +1,6 @@ --- a/tdm/config.def +++ b/tdm/config.def -@@ -2614,18 +2614,18 @@ +@@ -2654,18 +2654,18 @@ Key: UseTheme Type: bool diff --git a/dilos/core/tdebase/debian/patches/disable_starttde_wallpaper.diff b/dilos/core/tdebase/debian/patches/disable_starttde_wallpaper.diff index 598cd7092..a4ced0644 100644 --- a/dilos/core/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/dilos/core/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,6 +1,6 @@ --- a/starttde +++ b/starttde -@@ -288,17 +288,17 @@ +@@ -414,17 +414,17 @@ . "$tdehome/share/config/startupconfig" fi @@ -27,5 +27,5 @@ +# fi +#fi - # XCursor mouse theme needs to be applied here to work even for kded or ksmserver. + # An XCursor mouse theme is needed to work with kded or ksmserver. if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then diff --git a/dilos/core/tdebase/debian/rules b/dilos/core/tdebase/debian/rules index ebe24bc5c..59b703f85 100755 --- a/dilos/core/tdebase/debian/rules +++ b/dilos/core/tdebase/debian/rules @@ -10,8 +10,7 @@ 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 +-include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes @@ -44,6 +43,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="OFF" \ -DWITH_LDAP="ON" \ -DWITH_SAMBA="ON" \ + -DWITH_SFTP="ON" \ -DWITH_LIBUSB="ON" \ -DWITH_LIBRAW1394="OFF" \ -DWITH_OPENEXR="ON" \ @@ -62,7 +62,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_UPOWER="ON" \ -DWITH_LIBART="ON" \ -DWITH_LIBCONFIG="ON" \ - -DWITH_PCRE="ON" \ + -DWITH_PCRE2="ON" \ -DWITH_KRB5="ON" \ -DCMAKE_C_COMPILER=gcc \ -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" @@ -91,6 +91,9 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg \ -Xtdm -Xtdm_config -Xtdm_greet -Xtdmctl -Xtwin -Xtwin_killer_helper \ -Xtwin_resumer_helper -Xtwin_rules_dialog +DEB_DH_INSTALLINIT_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade +DEB_DH_SYSTEMD_START_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade + DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ @@ -131,9 +134,9 @@ binary-install/tdm-trinity:: install -p -D -m644 debian/tdm-trinity.needrestart debian/tdm-trinity/etc/needrestart/conf.d/tdm-trinity.conf binary-install/kcontrol-trinity:: -# mkdir -p debian/kcontrol/etc/udev/rules.d +# mkdir -p debian/$(cdbs_curpkg)/etc/udev/rules.d # chmod +x debian/usermap.pl -# debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/kcontrol/etc/udev/logitechmouse.rules +# debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/$(cdbs_curpkg)/etc/udev/logitechmouse.rules install/klipper-trinity:: sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc diff --git a/dilos/core/tdebase/debian/tdebase-data-trinity.install b/dilos/core/tdebase/debian/tdebase-data-trinity.install index 2ff6aeb6e..132ab8fe8 100644 --- a/dilos/core/tdebase/debian/tdebase-data-trinity.install +++ b/dilos/core/tdebase/debian/tdebase-data-trinity.install @@ -17,6 +17,10 @@ debian/tmp/usr/share/apps/kcmcss/template.css debian/tmp/usr/share/apps/kcminput/cursor_large_black.pcf.gz debian/tmp/usr/share/apps/kcminput/cursor_large_white.pcf.gz debian/tmp/usr/share/apps/kcminput/cursor_small_white.pcf.gz +debian/tmp/usr/share/apps/kcminput/pics/mouse0.png +debian/tmp/usr/share/apps/kcminput/pics/mouse1.png +debian/tmp/usr/share/apps/kcminput/pics/mouse2.png +debian/tmp/usr/share/apps/kcminput/pics/mouse3.png debian/tmp/usr/share/apps/kcminput/pics/mouse_lh.png debian/tmp/usr/share/apps/kcminput/pics/mouse_rh.png debian/tmp/usr/share/apps/kcminput/pics/doubleclick_1.png @@ -79,34 +83,7 @@ debian/tmp/usr/share/apps/tdedisplay/app-defaults/XOsview.ad debian/tmp/usr/share/apps/tdedisplay/app-defaults/Xpdf.ad debian/tmp/usr/share/apps/tdedisplay/app-defaults/XTerm.ad debian/tmp/usr/share/apps/tdedisplay/app-defaults/XV.ad -debian/tmp/usr/share/apps/tdedisplay/color-schemes/AtlasGreen.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/BeOS.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/BlackOnWhite.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/BlueSlate.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/CDE.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/DarkBlue.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/DesertRed.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/DigitalCDE.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/EveX.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/KDEOne.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/KDETwo.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/KeramikEmerald.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/Keramik.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/KeramikWhite.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/MediaPeach.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/Next.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/PaleGray.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/Plastik.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/PointReyesGreen.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/Pumpkin.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/SolarisCDE.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/Storm.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/System.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/WhiteOnBlack.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/Windows2000.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/Windows95.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/WindowsXP.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/YellowOnBlue.kcsrc +debian/tmp/usr/share/apps/tdedisplay/color-schemes/*.kcsrc debian/tmp/usr/share/apps/tdefontview/tdefontviewpart.rc debian/tmp/usr/share/apps/tdefontview/tdefontviewui.rc debian/tmp/usr/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png @@ -338,6 +315,9 @@ debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/tderesources/common debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/tderesources/index.cache.bz2 debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/tderesources/index.docbook +debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/touchpad/common +debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/touchpad/index.cache.bz2 +debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/touchpad/index.docbook debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/twindecoration/common debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2 debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook @@ -514,94 +494,9 @@ debian/tmp/usr/share/icons/crystalsvg/*/categories/preferences-desktop-periphera debian/tmp/usr/share/icons/crystalsvg/*/categories/preferences-desktop-personal.png debian/tmp/usr/share/icons/crystalsvg/*/categories/preferences-desktop.png debian/tmp/usr/share/icons/crystalsvg/*/categories/preferences-system.png +debian/tmp/usr/share/icons/crystalsvg/*/devices/input-touchpad.png debian/tmp/usr/share/icons/crystalsvg/*/devices/laptop.png -debian/tmp/usr/share/services/searchproviders/acronym.desktop -debian/tmp/usr/share/services/searchproviders/alexa.desktop -debian/tmp/usr/share/services/searchproviders/alexa_url.desktop -debian/tmp/usr/share/services/searchproviders/alltheweb.desktop -debian/tmp/usr/share/services/searchproviders/altavista.desktop -debian/tmp/usr/share/services/searchproviders/amg.desktop -debian/tmp/usr/share/services/searchproviders/appsy.desktop -debian/tmp/usr/share/services/searchproviders/austronaut.desktop -debian/tmp/usr/share/services/searchproviders/backports.desktop -debian/tmp/usr/share/services/searchproviders/bugft.desktop -debian/tmp/usr/share/services/searchproviders/bugno.desktop -debian/tmp/usr/share/services/searchproviders/call.desktop -debian/tmp/usr/share/services/searchproviders/cia.desktop -debian/tmp/usr/share/services/searchproviders/citeseer.desktop -debian/tmp/usr/share/services/searchproviders/cpan.desktop -debian/tmp/usr/share/services/searchproviders/ctan_cat.desktop -debian/tmp/usr/share/services/searchproviders/ctan.desktop -debian/tmp/usr/share/services/searchproviders/dbug.desktop -debian/tmp/usr/share/services/searchproviders/de2en.desktop -debian/tmp/usr/share/services/searchproviders/de2fr.desktop -debian/tmp/usr/share/services/searchproviders/deb.desktop -debian/tmp/usr/share/services/searchproviders/dmoz.desktop -debian/tmp/usr/share/services/searchproviders/docbook.desktop -debian/tmp/usr/share/services/searchproviders/doi.desktop -debian/tmp/usr/share/services/searchproviders/en2de.desktop -debian/tmp/usr/share/services/searchproviders/en2es.desktop -debian/tmp/usr/share/services/searchproviders/en2fr.desktop -debian/tmp/usr/share/services/searchproviders/en2it.desktop -debian/tmp/usr/share/services/searchproviders/es2en.desktop -debian/tmp/usr/share/services/searchproviders/excite.desktop -debian/tmp/usr/share/services/searchproviders/feedster.desktop -debian/tmp/usr/share/services/searchproviders/foldoc.desktop -debian/tmp/usr/share/services/searchproviders/fr2de.desktop -debian/tmp/usr/share/services/searchproviders/fr2en.desktop -debian/tmp/usr/share/services/searchproviders/freedb.desktop -debian/tmp/usr/share/services/searchproviders/freshmeat.desktop -debian/tmp/usr/share/services/searchproviders/froogle.desktop -debian/tmp/usr/share/services/searchproviders/fsd.desktop -debian/tmp/usr/share/services/searchproviders/google_advanced.desktop -debian/tmp/usr/share/services/searchproviders/google.desktop -debian/tmp/usr/share/services/searchproviders/google_groups.desktop -debian/tmp/usr/share/services/searchproviders/google_images.desktop -debian/tmp/usr/share/services/searchproviders/google_lucky.desktop -debian/tmp/usr/share/services/searchproviders/google_movie.desktop -debian/tmp/usr/share/services/searchproviders/google_news.desktop -debian/tmp/usr/share/services/searchproviders/gracenote.desktop -debian/tmp/usr/share/services/searchproviders/grec.desktop -debian/tmp/usr/share/services/searchproviders/hotbot.desktop -debian/tmp/usr/share/services/searchproviders/hyperdictionary.desktop -debian/tmp/usr/share/services/searchproviders/hyperdictionary_thesaurus.desktop -debian/tmp/usr/share/services/searchproviders/imdb.desktop -debian/tmp/usr/share/services/searchproviders/it2en.desktop -debian/tmp/usr/share/services/searchproviders/jeeves.desktop -debian/tmp/usr/share/services/searchproviders/katatudo.desktop -debian/tmp/usr/share/services/searchproviders/kde.desktop -debian/tmp/usr/share/services/searchproviders/kde_websvn.desktop -debian/tmp/usr/share/services/searchproviders/leo.desktop -debian/tmp/usr/share/services/searchproviders/lycos.desktop -debian/tmp/usr/share/services/searchproviders/mamma.desktop -debian/tmp/usr/share/services/searchproviders/metacrawler.desktop -debian/tmp/usr/share/services/searchproviders/msdn.desktop -debian/tmp/usr/share/services/searchproviders/netcraft.desktop -debian/tmp/usr/share/services/searchproviders/nl-telephone.desktop -debian/tmp/usr/share/services/searchproviders/nl-teletekst.desktop -debian/tmp/usr/share/services/searchproviders/pgpkeys.desktop -debian/tmp/usr/share/services/searchproviders/php.desktop -debian/tmp/usr/share/services/searchproviders/python.desktop -debian/tmp/usr/share/services/searchproviders/qt3.desktop -debian/tmp/usr/share/services/searchproviders/qt.desktop -debian/tmp/usr/share/services/searchproviders/rae.desktop -debian/tmp/usr/share/services/searchproviders/rfc.desktop -debian/tmp/usr/share/services/searchproviders/rpmfind.desktop -debian/tmp/usr/share/services/searchproviders/ruby_application_archive.desktop -debian/tmp/usr/share/services/searchproviders/seek.desktop -debian/tmp/usr/share/services/searchproviders/sourceforge.desktop -debian/tmp/usr/share/services/searchproviders/technorati.desktop -debian/tmp/usr/share/services/searchproviders/technoratitags.desktop -debian/tmp/usr/share/services/searchproviders/thesaurus.desktop -debian/tmp/usr/share/services/searchproviders/tvtome.desktop -debian/tmp/usr/share/services/searchproviders/uspto.desktop -debian/tmp/usr/share/services/searchproviders/vivisimo.desktop -debian/tmp/usr/share/services/searchproviders/voila.desktop -debian/tmp/usr/share/services/searchproviders/webster.desktop -debian/tmp/usr/share/services/searchproviders/whatis.desktop -debian/tmp/usr/share/services/searchproviders/wikipedia.desktop -debian/tmp/usr/share/services/searchproviders/wiktionary.desktop -debian/tmp/usr/share/services/searchproviders/wordref.desktop +debian/tmp/usr/share/services/searchproviders/*.desktop debian/tmp/usr/share/services/useragentstrings/*.desktop debian/tmp/usr/share/servicetypes/searchprovider.desktop debian/tmp/usr/share/servicetypes/uasprovider.desktop diff --git a/dilos/core/tdebase/debian/tdebase-trinity-bin.install b/dilos/core/tdebase/debian/tdebase-trinity-bin.install index 8fe01a835..663130ba3 100644 --- a/dilos/core/tdebase/debian/tdebase-trinity-bin.install +++ b/dilos/core/tdebase/debian/tdebase-trinity-bin.install @@ -1,6 +1,8 @@ debian/tmp/usr/bin/migratekde3 debian/tmp/usr/bin/r14-xdg-update debian/tmp/usr/bin/tde_release_notes +debian/tmp/usr/bin/tde_license_info +debian/tmp/usr/bin/tde_show_license_info debian/tmp/usr/bin/krootbacking debian/tmp/usr/bin/tdeinit_phase1 debian/tmp/usr/bin/tdeinit_displayconfig @@ -34,8 +36,6 @@ debian/tmp/usr/lib/*/trinity/kcminit_startup.la debian/tmp/usr/lib/*/trinity/kcminit_startup.so debian/tmp/usr/lib/*/trinity/kcm_keyboard.la debian/tmp/usr/lib/*/trinity/kcm_keyboard.so -debian/tmp/usr/lib/*/trinity/kcm_khotkeys_init.la -debian/tmp/usr/lib/*/trinity/kcm_khotkeys_init.so debian/tmp/usr/lib/*/trinity/kcm_khotkeys.la debian/tmp/usr/lib/*/trinity/kcm_khotkeys.so debian/tmp/usr/lib/*/trinity/kded_khotkeys.la @@ -75,7 +75,9 @@ debian/tmp/usr/share/apps/kdcop/kdcopui.rc debian/tmp/usr/share/apps/khotkeys/trinity2b1.khotkeys debian/tmp/usr/share/apps/khotkeys/konqueror_gestures_trinity21.khotkeys debian/tmp/usr/share/apps/khotkeys/printscreen.khotkeys +debian/tmp/usr/share/apps/kxkb/eventsrc debian/tmp/usr/share/autostart/tde_release_notes.desktop +debian/tmp/usr/share/autostart/tde_license_info.desktop debian/tmp/usr/share/doc/tde/HTML/en/kdcop/common debian/tmp/usr/share/doc/tde/HTML/en/kdcop/index.cache.bz2 debian/tmp/usr/share/doc/tde/HTML/en/kdcop/index.docbook @@ -100,6 +102,7 @@ debian/tmp/usr/share/doc/tde/HTML/en/kxkb/layout.png debian/tmp/usr/share/doc/tde/HTML/en/kxkb/switching.png debian/tmp/usr/share/doc/tde/HTML/en/kxkb/xkb.png debian/tmp/usr/share/services/kxkb.desktop +debian/tmp/usr/share/services/kded/khotkeys.desktop debian/tmp/usr/share/man/man1/drkonqi.1 debian/tmp/usr/share/man/man1/kblankscrn.kss.1 debian/tmp/usr/share/man/man1/kcheckpass.1 @@ -115,5 +118,4 @@ debian/tmp/usr/share/man/man1/ksystraycmd.1 debian/tmp/usr/share/man/man1/kwriteconfig.1 debian/tmp/usr/share/man/man1/kxkb.1 debian/tmp/usr/share/man/man1/tdedebugdialog.1 -debian/tmp/usr/share/man/man1/tdeio_system_documenthelper.1 debian/tmp/usr/share/man/man1/tdesu.1 diff --git a/dilos/core/tdebase/debian/tdebase-trinity-bin.lintian b/dilos/core/tdebase/debian/tdebase-trinity-bin.lintian index f24713727..24f59f525 100644 --- a/dilos/core/tdebase/debian/tdebase-trinity-bin.lintian +++ b/dilos/core/tdebase/debian/tdebase-trinity-bin.lintian @@ -5,5 +5,3 @@ tdebase-bin-trinity: setuid-binary usr/bin/tdmtsak 4711 root/root tdebase-bin-trinity: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so tdebase-bin-trinity: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so tdebase-bin-trinity: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so -tdebase-bin-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so -tdebase-bin-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so diff --git a/dilos/core/tdebase/debian/tdeprint-trinity.lintian b/dilos/core/tdebase/debian/tdeprint-trinity.lintian index 79ef87ff2..99109cc72 100644 --- a/dilos/core/tdebase/debian/tdeprint-trinity.lintian +++ b/dilos/core/tdebase/debian/tdeprint-trinity.lintian @@ -1,4 +1,2 @@ tdeprint-trinity: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so tdeprint-trinity: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so -tdeprint-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so -tdeprint-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so diff --git a/dilos/core/tdebase/debian/tdeprint-trinity.postinst b/dilos/core/tdebase/debian/tdeprint-trinity.postinst deleted file mode 100644 index a2fa0876f..000000000 --- a/dilos/core/tdebase/debian/tdeprint-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for tdeprint-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/tdm-trinity.postrm b/dilos/core/tdebase/debian/tdm-trinity.postrm index 2454461f4..881d73298 100644 --- a/dilos/core/tdebase/debian/tdm-trinity.postrm +++ b/dilos/core/tdebase/debian/tdm-trinity.postrm @@ -42,9 +42,6 @@ fi # update-rc.d tdm remove >/dev/null || true # fi #fi -#if [ -d /run/systemd/system ] ; then -# systemctl --system daemon-reload >/dev/null || true -#fi #DEBHELPER# diff --git a/dilos/core/tdebase/debian/tdm-trinity.prerm b/dilos/core/tdebase/debian/tdm-trinity.prerm index 0c1ee9e5d..a5c530e08 100644 --- a/dilos/core/tdebase/debian/tdm-trinity.prerm +++ b/dilos/core/tdebase/debian/tdm-trinity.prerm @@ -184,4 +184,6 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then fi fi +#DEBHELPER# + exit 0 diff --git a/dilos/core/tdebase/debian/twin-trinity.install b/dilos/core/tdebase/debian/twin-trinity.install index 92755cb44..a307d00af 100644 --- a/dilos/core/tdebase/debian/twin-trinity.install +++ b/dilos/core/tdebase/debian/twin-trinity.install @@ -11,24 +11,24 @@ debian/tmp/usr/lib/*/trinity/kcm_twinoptions.la debian/tmp/usr/lib/*/trinity/kcm_twinoptions.so debian/tmp/usr/lib/*/trinity/kcm_twinrules.la debian/tmp/usr/lib/*/trinity/kcm_twinrules.so -debian/tmp/usr/lib/*/trinity/twin3_b2.la -debian/tmp/usr/lib/*/trinity/twin3_b2.so -debian/tmp/usr/lib/*/trinity/twin3_default.la -debian/tmp/usr/lib/*/trinity/twin3_default.so -debian/tmp/usr/lib/*/trinity/twin3_keramik.la -debian/tmp/usr/lib/*/trinity/twin3_keramik.so -debian/tmp/usr/lib/*/trinity/twin3_laptop.la -debian/tmp/usr/lib/*/trinity/twin3_laptop.so -debian/tmp/usr/lib/*/trinity/twin3_modernsys.la -debian/tmp/usr/lib/*/trinity/twin3_modernsys.so -debian/tmp/usr/lib/*/trinity/twin3_plastik.la -debian/tmp/usr/lib/*/trinity/twin3_plastik.so -debian/tmp/usr/lib/*/trinity/twin3_quartz.la -debian/tmp/usr/lib/*/trinity/twin3_quartz.so -debian/tmp/usr/lib/*/trinity/twin3_redmond.la -debian/tmp/usr/lib/*/trinity/twin3_redmond.so -debian/tmp/usr/lib/*/trinity/twin3_web.la -debian/tmp/usr/lib/*/trinity/twin3_web.so +debian/tmp/usr/lib/*/trinity/twin_b2.la +debian/tmp/usr/lib/*/trinity/twin_b2.so +debian/tmp/usr/lib/*/trinity/twin_default.la +debian/tmp/usr/lib/*/trinity/twin_default.so +debian/tmp/usr/lib/*/trinity/twin_keramik.la +debian/tmp/usr/lib/*/trinity/twin_keramik.so +debian/tmp/usr/lib/*/trinity/twin_laptop.la +debian/tmp/usr/lib/*/trinity/twin_laptop.so +debian/tmp/usr/lib/*/trinity/twin_modernsys.la +debian/tmp/usr/lib/*/trinity/twin_modernsys.so +debian/tmp/usr/lib/*/trinity/twin_plastik.la +debian/tmp/usr/lib/*/trinity/twin_plastik.so +debian/tmp/usr/lib/*/trinity/twin_quartz.la +debian/tmp/usr/lib/*/trinity/twin_quartz.so +debian/tmp/usr/lib/*/trinity/twin_redmond.la +debian/tmp/usr/lib/*/trinity/twin_redmond.so +debian/tmp/usr/lib/*/trinity/twin_web.la +debian/tmp/usr/lib/*/trinity/twin_web.so debian/tmp/usr/lib/*/trinity/twin_b2_config.la debian/tmp/usr/lib/*/trinity/twin_b2_config.so debian/tmp/usr/lib/*/trinity/twin_default_config.la @@ -54,12 +54,11 @@ debian/tmp/usr/share/applications/tde/twindecoration.desktop debian/tmp/usr/share/applications/tde/twinoptions.desktop debian/tmp/usr/share/applications/tde/twinrules.desktop debian/tmp/usr/share/applnk/.hidden/twinactions.desktop +debian/tmp/usr/share/applnk/.hidden/twinactiveborders.desktop debian/tmp/usr/share/applnk/.hidden/twinadvanced.desktop debian/tmp/usr/share/applnk/.hidden/twinfocus.desktop debian/tmp/usr/share/applnk/.hidden/twinmoving.desktop debian/tmp/usr/share/applnk/.hidden/twintranslucency.desktop -debian/tmp/usr/share/apps/tdeconf_update/twin3_plugin.pl -debian/tmp/usr/share/apps/tdeconf_update/twin3_plugin.upd debian/tmp/usr/share/apps/tdeconf_update/twin_focus1.sh debian/tmp/usr/share/apps/tdeconf_update/twin_focus1.upd debian/tmp/usr/share/apps/tdeconf_update/twin_focus2.sh @@ -75,19 +74,7 @@ debian/tmp/usr/share/apps/twin/eventsrc debian/tmp/usr/share/apps/twin/keramik.desktop debian/tmp/usr/share/apps/twin/laptop.desktop debian/tmp/usr/share/apps/twin/modernsystem.desktop -debian/tmp/usr/share/apps/twin/pics/bluesun.png -debian/tmp/usr/share/apps/twin/pics/close.png -debian/tmp/usr/share/apps/twin/pics/fog-grey.png -debian/tmp/usr/share/apps/twin/pics/fog.png -debian/tmp/usr/share/apps/twin/pics/greenie.dim.png -debian/tmp/usr/share/apps/twin/pics/greenie.light.png -debian/tmp/usr/share/apps/twin/pics/iconify.png -debian/tmp/usr/share/apps/twin/pics/maximizedown.png -debian/tmp/usr/share/apps/twin/pics/maximize.png -debian/tmp/usr/share/apps/twin/pics/menu.png -debian/tmp/usr/share/apps/twin/pics/pindown.png -debian/tmp/usr/share/apps/twin/pics/pinup.png -debian/tmp/usr/share/apps/twin/pics/unknown.png +debian/tmp/usr/share/apps/twin/pics/* debian/tmp/usr/share/apps/twin/plastik.desktop debian/tmp/usr/share/apps/twin/quartz.desktop debian/tmp/usr/share/apps/twin/redmond.desktop diff --git a/dilos/core/tdebase/debian/usermap.pl b/dilos/core/tdebase/debian/usermap.pl index 9c8c61f26..bd87e2d72 100644 --- a/dilos/core/tdebase/debian/usermap.pl +++ b/dilos/core/tdebase/debian/usermap.pl @@ -34,7 +34,7 @@ sub parse_usermap_line { my @rule; while (my ($key, $flag) = each(%flags)) { - hex($match{match_flags}) & $flag and push @rule, qq(SYSFS{$key}=="$match{$key}",); + hex($match{match_flags}) & $flag and push @rule, qq(ATTRS{$key}=="$match{$key}",); } push @rule, ( @@ -47,9 +47,9 @@ sub parse_usermap_line { print join(' ', @rule) . "\n"; } -print "BUS!=\"usb\", GOTO=\"kcontrol_rules_end\"\n"; +print "DRIVERS!=\"usb\", GOTO=\"kcontrol_rules_end\"\n"; print "ACTION!=\"add\"\, GOTO=\"kcontrol_rules_end\"\n"; -print "SUBSYSTEM!=\"usb_device\"\, GOTO=\"kcontrol_rules_end\"\n\n"; +print "SUBSYSTEMS!=\"usb\"\, GOTO=\"kcontrol_rules_end\"\n\n"; foreach my $usermap (@ARGV) { open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap"; diff --git a/dilos/core/tdebindings/debian/cdbs/debian-tde.mk b/dilos/core/tdebindings/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdebindings/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/tdebindings/debian/cdbs/versions.pl b/dilos/core/tdebindings/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdebindings/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/tdebindings/debian/compat b/dilos/core/tdebindings/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdebindings/debian/compat +++ b/dilos/core/tdebindings/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdebindings/debian/control b/dilos/core/tdebindings/debian/control index c9b846391..5fb5eaff9 100644 --- a/dilos/core/tdebindings/debian/control +++ b/dilos/core/tdebindings/debian/control @@ -1,8 +1,8 @@ Source: tdebindings-trinity -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~), - python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk, +Build-Depends: tde-cdbs (>= 0.4.43), debhelper (>= 10~), + python3-all-dev, dh-python, python3-setuptools, quilt, gawk, default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc], - tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5), + tdelibs14-trinity-dev, ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev, graphviz [solaris-any], libgtk2.0-dev [solaris-any], oracle-java8-jdk [solaris-any] Section: devel @@ -17,7 +17,7 @@ Architecture: all Section: tde Replaces: kdebindings-trinity (<< 4:14.0.0~) Breaks: kdebindings-trinity (<< 4:14.0.0~) -Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version}) +Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python3-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version}) Description: TDE bindings metapackage TDE (the Trinity Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -66,7 +66,7 @@ Description: DCOP bindings for Java [Trinity] This package is part of the official TDE bindings module. Package: libdcop3-jni-trinity -Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc solaris-any +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc solaris-any Section: libs Replaces: libdcop3-jni-trinity (<< 4:14.0.0~) Breaks: libdcop3-jni-trinity (<< 4:14.0.0~) @@ -80,7 +80,7 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity] This package is part of the official TDE bindings module. Package: libdcop3-java-trinity-dev -Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc solaris-any +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc solaris-any Section: libdevel Replaces: libdcop3-java-trinity-dev (<< 4:14.0.0~) Breaks: libdcop3-java-trinity-dev (<< 4:14.0.0~) @@ -111,7 +111,7 @@ Description: Java bindings for Qt [Trinity] This package is part of the official TDE bindings module. Package: libqt3-jni-trinity -Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc solaris-any +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc solaris-any Section: libs Replaces: libqt3-jni-trinity (<< 4:14.0.0~) Breaks: libqt3-jni-trinity (<< 4:14.0.0~) @@ -140,7 +140,7 @@ Description: tdelibs bindings for Java [Trinity] This package is part of the official TDE bindings module. Package: libtrinity-jni-trinity -Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc solaris-any +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc solaris-any Section: libs Replaces: libtrinity-jni-trinity (<< 4:14.0.0~) Breaks: libtrinity-jni-trinity (<< 4:14.0.0~) @@ -212,13 +212,11 @@ Description: SMOKE Binding Library to TDE - Development Files . This package is part of the official TDE bindings module. -Package: python-dcop-trinity +Package: python3-dcop-trinity Architecture: any Section: python -Replaces: python-dcop-trinity (<< 4:14.0.0~) -Breaks: python-dcop-trinity (<< 4:14.0.0~) -Depends: ${python:Depends}, ${shlibs:Depends} -Provides: ${python:Provides} +Depends: ${python3:Depends}, ${shlibs:Depends} +Provides: ${python3:Provides} Description: DCOP bindings for Python This package contains the shared libraries necessary to run and develop Python programs using the Python DCOP bindings diff --git a/dilos/core/tdebindings/debian/python-dcop-trinity.install b/dilos/core/tdebindings/debian/python-dcop-trinity.install deleted file mode 100644 index 86d1a899e..000000000 --- a/dilos/core/tdebindings/debian/python-dcop-trinity.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/python2.*/site-packages diff --git a/dilos/core/tdebindings/debian/python-dcop-trinity.docs b/dilos/core/tdebindings/debian/python3-dcop-trinity.docs index 957d3af3e..957d3af3e 100644 --- a/dilos/core/tdebindings/debian/python-dcop-trinity.docs +++ b/dilos/core/tdebindings/debian/python3-dcop-trinity.docs diff --git a/dilos/core/tdebindings/debian/python-dcop-trinity.examples b/dilos/core/tdebindings/debian/python3-dcop-trinity.examples index 4100d465b..4100d465b 100644 --- a/dilos/core/tdebindings/debian/python-dcop-trinity.examples +++ b/dilos/core/tdebindings/debian/python3-dcop-trinity.examples diff --git a/dilos/core/tdebindings/debian/python3-dcop-trinity.install b/dilos/core/tdebindings/debian/python3-dcop-trinity.install new file mode 100644 index 000000000..0cb9ab6cb --- /dev/null +++ b/dilos/core/tdebindings/debian/python3-dcop-trinity.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/python3/dist-packages diff --git a/dilos/core/tdebindings/debian/rules b/dilos/core/tdebindings/debian/rules index 97aacdcc5..61562d894 100755 --- a/dilos/core/tdebindings/debian/rules +++ b/dilos/core/tdebindings/debian/rules @@ -3,13 +3,9 @@ DEB_QUILT_PATCHDIR_LINK := export QUILT_PATCHES=debian/patches -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) - - include /usr/share/cdbs/1/rules/debhelper.mk override DEB_BUILDDIR := $(DEB_SRCDIR) -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_BUILDDIR := $(DEB_SRCDIR) DEB_CONFIGURE_INCLUDEDIR := /usr/include/tde @@ -39,7 +35,7 @@ DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/usr \ --with-extra-includes=/usr/include/tqt \ DO_NOT_COMPILE='dcopc dcopperl kalyptus qtsharp xparts python' -DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk +DEB_COMPRESS_EXCLUDE_ALL += .java .ui .js .rb .map .wav .bmp .cpp .sk # These are not all the packages with libraries, but only those that # need to be in DEB_SHLIBDEPS_INCLUDE... @@ -117,8 +113,8 @@ common-install-arch:: stamp-install-dcopjava ### -binary-install/python-dcop-trinity:: - ${DH_PYTHON2} -p$(cdbs_curpkg) +binary-install/python3-dcop-trinity:: + dh_python3 -p$(cdbs_curpkg) ### diff --git a/dilos/core/tdeedu/debian/cdbs/debian-tde.mk b/dilos/core/tdeedu/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdeedu/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/tdeedu/debian/cdbs/versions.pl b/dilos/core/tdeedu/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdeedu/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/tdeedu/debian/compat b/dilos/core/tdeedu/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdeedu/debian/compat +++ b/dilos/core/tdeedu/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdeedu/debian/control b/dilos/core/tdeedu/debian/control index c5e32fe45..cf6a353ac 100644 --- a/dilos/core/tdeedu/debian/control +++ b/dilos/core/tdeedu/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: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libzarith-ocaml-dev, libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript Standards-Version: 3.8.4 Package: tdeedu-trinity diff --git a/dilos/core/tdeedu/debian/rules b/dilos/core/tdeedu/debian/rules index 81cc9531c..9bddcdd32 100755 --- a/dilos/core/tdeedu/debian/rules +++ b/dilos/core/tdeedu/debian/rules @@ -1,8 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_INSTALL_DOCS_ALL := diff --git a/dilos/core/tdegames/debian/cdbs/debian-tde.mk b/dilos/core/tdegames/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdegames/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/tdegames/debian/cdbs/versions.pl b/dilos/core/tdegames/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdegames/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/tdegames/debian/compat b/dilos/core/tdegames/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdegames/debian/compat +++ b/dilos/core/tdegames/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdegames/debian/control b/dilos/core/tdegames/debian/control index b7990761a..a6dc385cb 100644 --- a/dilos/core/tdegames/debian/control +++ b/dilos/core/tdegames/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, bzip2, libogg-dev -Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, bzip2, libogg-dev +Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, tdelibs14-trinity-doc Standards-Version: 3.8.4 Package: tdegames-trinity @@ -89,7 +89,7 @@ Architecture: all Section: doc Replaces: libkdegames-trinity-doc (<< 4:14.0.0~) Breaks: libkdegames-trinity-doc (<< 4:14.0.0~) -Recommends: tdelibs14-trinity-doc, libtqtinterface-doc +Recommends: tdelibs14-trinity-doc Suggests: konqueror-trinity | www-browser, libtdegames-trinity-dev Description: API documentation for the Trinity games library This package contains the developers' documentation for libtdegames. diff --git a/dilos/core/tdegames/debian/rules b/dilos/core/tdegames/debian/rules index 3a310cdd3..5829f1efa 100755 --- a/dilos/core/tdegames/debian/rules +++ b/dilos/core/tdegames/debian/rules @@ -1,8 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk export kde_bindir = /usr/games diff --git a/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk b/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdegraphics/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/tdegraphics/debian/cdbs/versions.pl b/dilos/core/tdegraphics/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdegraphics/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/tdegraphics/debian/compat b/dilos/core/tdegraphics/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdegraphics/debian/compat +++ b/dilos/core/tdegraphics/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdegraphics/debian/control b/dilos/core/tdegraphics/debian/control index fa7773eef..c28829149 100644 --- a/dilos/core/tdegraphics/debian/control +++ b/dilos/core/tdegraphics/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: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev Standards-Version: 3.8.4 Package: tdegraphics-trinity diff --git a/dilos/core/tdegraphics/debian/kfaxview-trinity.lintian b/dilos/core/tdegraphics/debian/kfaxview-trinity.lintian index 5bcc6c252..37dda0ca2 100644 --- a/dilos/core/tdegraphics/debian/kfaxview-trinity.lintian +++ b/dilos/core/tdegraphics/debian/kfaxview-trinity.lintian @@ -1,4 +1,2 @@ kfaxview-trinity: no-shlibs-control-file usr/lib/libkfaximage.so -kfaxview-trinity: postinst-must-call-ldconfig usr/lib/libkfaximage.so -kfaxview-trinity: postrm-should-call-ldconfig usr/lib/libkfaximage.so kfaxview-trinity: package-name-doesnt-match-sonames libkfaximage diff --git a/dilos/core/tdegraphics/debian/kuickshow-trinity.lintian b/dilos/core/tdegraphics/debian/kuickshow-trinity.lintian index 1d80f308d..a1f267411 100644 --- a/dilos/core/tdegraphics/debian/kuickshow-trinity.lintian +++ b/dilos/core/tdegraphics/debian/kuickshow-trinity.lintian @@ -1,4 +1,2 @@ kuickshow-trinity: no-shlibs-control-file usr/lib/libtdeinit_kuickshow.so -kuickshow-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kuickshow.so -kuickshow-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kuickshow.so kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow diff --git a/dilos/core/tdegraphics/debian/rules b/dilos/core/tdegraphics/debian/rules index 39c6437f1..afc8eb239 100755 --- a/dilos/core/tdegraphics/debian/rules +++ b/dilos/core/tdegraphics/debian/rules @@ -10,8 +10,7 @@ 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 +-include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ -DLIB_SUFFIX="" \ 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 1144a1dbe..c67017892 100644 --- a/dilos/core/tdelibs/debian/tdelibs-data-trinity.install +++ b/dilos/core/tdelibs/debian/tdelibs-data-trinity.install @@ -1748,6 +1748,7 @@ 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 @@ -1943,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 2c8ee9899..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 diff --git a/dilos/core/tdemultimedia/debian/cdbs/debian-tde.mk b/dilos/core/tdemultimedia/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdemultimedia/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/tdemultimedia/debian/cdbs/versions.pl b/dilos/core/tdemultimedia/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdemultimedia/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/tdemultimedia/debian/compat b/dilos/core/tdemultimedia/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdemultimedia/debian/compat +++ b/dilos/core/tdemultimedia/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdemultimedia/debian/control b/dilos/core/tdemultimedia/debian/control index f865895b1..1eb5b071f 100644 --- a/dilos/core/tdemultimedia/debian/control +++ b/dilos/core/tdemultimedia/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: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev Standards-Version: 3.8.4 Package: tdemultimedia-trinity diff --git a/dilos/core/tdemultimedia/debian/kmix-trinity.install b/dilos/core/tdemultimedia/debian/kmix-trinity.install index a35228747..1c0a60e84 100644 --- a/dilos/core/tdemultimedia/debian/kmix-trinity.install +++ b/dilos/core/tdemultimedia/debian/kmix-trinity.install @@ -12,29 +12,10 @@ debian/tmp/usr/share/applications/tde/kmix.desktop debian/tmp/usr/share/apps/kicker/applets/kmixapplet.desktop debian/tmp/usr/share/apps/kmix/kmixui.rc debian/tmp/usr/share/apps/kmix/pics/Listener.png -debian/tmp/usr/share/apps/kmix/pics/SpeakerFrontLeft.png -debian/tmp/usr/share/apps/kmix/pics/SpeakerFrontRight.png -debian/tmp/usr/share/apps/kmix/pics/SpeakerRearLeft.png -debian/tmp/usr/share/apps/kmix/pics/SpeakerRearRight.png -debian/tmp/usr/share/apps/kmix/pics/kmixdocked.png -debian/tmp/usr/share/apps/kmix/pics/kmixdocked_error.png -debian/tmp/usr/share/apps/kmix/pics/kmixdocked_mute.png -debian/tmp/usr/share/apps/kmix/pics/mix_ac97.png -debian/tmp/usr/share/apps/kmix/pics/mix_audio.png -debian/tmp/usr/share/apps/kmix/pics/mix_bass.png -debian/tmp/usr/share/apps/kmix/pics/mix_cd.png -debian/tmp/usr/share/apps/kmix/pics/mix_digital.png -debian/tmp/usr/share/apps/kmix/pics/mix_ext.png -debian/tmp/usr/share/apps/kmix/pics/mix_headphone.png -debian/tmp/usr/share/apps/kmix/pics/mix_microphone.png -debian/tmp/usr/share/apps/kmix/pics/mix_midi.png -debian/tmp/usr/share/apps/kmix/pics/mix_recmon.png -debian/tmp/usr/share/apps/kmix/pics/mix_record.png -debian/tmp/usr/share/apps/kmix/pics/mix_surround.png -debian/tmp/usr/share/apps/kmix/pics/mix_treble.png -debian/tmp/usr/share/apps/kmix/pics/mix_unknown.png -debian/tmp/usr/share/apps/kmix/pics/mix_video.png -debian/tmp/usr/share/apps/kmix/pics/mix_volume.png +debian/tmp/usr/share/apps/kmix/pics/Speaker*.png +debian/tmp/usr/share/apps/kmix/pics/mix*.png +debian/tmp/usr/share/apps/kmix/pics/crystal/*.png +debian/tmp/usr/share/apps/kmix/pics/oldcrystal/*.png debian/tmp/usr/share/autostart/restore_kmix_volumes.desktop debian/tmp/usr/share/autostart/kmix.desktop debian/tmp/usr/share/doc/tde/HTML/en/kmix/common diff --git a/dilos/core/tdemultimedia/debian/kmix-trinity.lintian b/dilos/core/tdemultimedia/debian/kmix-trinity.lintian index fa69f2d18..42b01cd6a 100644 --- a/dilos/core/tdemultimedia/debian/kmix-trinity.lintian +++ b/dilos/core/tdemultimedia/debian/kmix-trinity.lintian @@ -1,4 +1,2 @@ kmix-trinity: no-shlibs-control-file usr/lib/*/libtdeinit_kmixctrl.so kmix-trinity: no-shlibs-control-file usr/lib/*/libtdeinit_kmix.so -kmix-trinity: postinst-must-call-ldconfig usr/lib/*/libtdeinit_kmixctrl.so -kmix-trinity: postrm-should-call-ldconfig usr/lib/*/libtdeinit_kmixctrl.so diff --git a/dilos/core/tdemultimedia/debian/krec-trinity.lintian b/dilos/core/tdemultimedia/debian/krec-trinity.lintian index fdb934927..81041e36d 100644 --- a/dilos/core/tdemultimedia/debian/krec-trinity.lintian +++ b/dilos/core/tdemultimedia/debian/krec-trinity.lintian @@ -1,3 +1 @@ krec-trinity: no-shlibs-control-file usr/lib/*/libtdeinit_krec.so -krec-trinity: postinst-must-call-ldconfig usr/lib/*/libtdeinit_krec.so -krec-trinity: postrm-should-call-ldconfig usr/lib/*/libtdeinit_krec.so diff --git a/dilos/core/tdemultimedia/debian/rules b/dilos/core/tdemultimedia/debian/rules index 8268b72fe..66175015c 100755 --- a/dilos/core/tdemultimedia/debian/rules +++ b/dilos/core/tdemultimedia/debian/rules @@ -1,8 +1,7 @@ #! /usr/bin/make -f -include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include DEB_CONFIGURE_MANDIR := /usr/share/man diff --git a/dilos/core/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install b/dilos/core/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install index d2888e40f..e80f9c85e 100644 --- a/dilos/core/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install +++ b/dilos/core/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install @@ -8,6 +8,8 @@ debian/tmp/usr/lib/*/trinity/tdefile_m3u.la debian/tmp/usr/lib/*/trinity/tdefile_m3u.so debian/tmp/usr/lib/*/trinity/tdefile_mp3.la debian/tmp/usr/lib/*/trinity/tdefile_mp3.so +debian/tmp/usr/lib/*/trinity/tdefile_mp4.la +debian/tmp/usr/lib/*/trinity/tdefile_mp4.so debian/tmp/usr/lib/*/trinity/tdefile_mpc.la debian/tmp/usr/lib/*/trinity/tdefile_mpc.so debian/tmp/usr/lib/*/trinity/tdefile_mpeg.la @@ -25,6 +27,7 @@ debian/tmp/usr/share/services/tdefile_avi.desktop debian/tmp/usr/share/services/tdefile_flac.desktop debian/tmp/usr/share/services/tdefile_m3u.desktop debian/tmp/usr/share/services/tdefile_mp3.desktop +debian/tmp/usr/share/services/tdefile_mp4.desktop debian/tmp/usr/share/services/tdefile_mpc.desktop debian/tmp/usr/share/services/tdefile_mpeg.desktop debian/tmp/usr/share/services/tdefile_ogg.desktop diff --git a/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk b/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdenetwork/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/tdenetwork/debian/cdbs/versions.pl b/dilos/core/tdenetwork/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdenetwork/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/tdenetwork/debian/compat b/dilos/core/tdenetwork/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdenetwork/debian/compat +++ b/dilos/core/tdenetwork/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdenetwork/debian/control b/dilos/core/tdenetwork/debian/control index 5d3183ee3..360afafcf 100644 --- a/dilos/core/tdenetwork/debian/control +++ b/dilos/core/tdenetwork/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: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8) [!solaris-any], libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64 !solaris-any], libxxf86vm-dev, libv4l-dev [!solaris-any], libssl-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8) [!solaris-any], libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, valgrind [!armel !mips !mipsel !riscv64 !solaris-any], libxxf86vm-dev, libv4l-dev [!solaris-any], libssl-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity diff --git a/dilos/core/tdenetwork/debian/kdict-trinity.install b/dilos/core/tdenetwork/debian/kdict-trinity.install index c3ac57162..982ec3754 100644 --- a/dilos/core/tdenetwork/debian/kdict-trinity.install +++ b/dilos/core/tdenetwork/debian/kdict-trinity.install @@ -24,6 +24,7 @@ debian/tmp/usr/share/icons/hicolor/32x32/apps/kdict.png debian/tmp/usr/share/icons/hicolor/48x48/apps/kdict.png debian/tmp/usr/share/icons/hicolor/64x64/apps/kdict.png debian/tmp/usr/share/icons/hicolor/scalable/apps/kdict.svgz +debian/tmp/usr/share/man/man1/kdict.1 debian/icons/kdict-16.xpm /usr/share/pixmaps debian/icons/kdict.xpm /usr/share/pixmaps diff --git a/dilos/core/tdenetwork/debian/kdict-trinity.manpages b/dilos/core/tdenetwork/debian/kdict-trinity.manpages deleted file mode 100644 index 3128a0e9a..000000000 --- a/dilos/core/tdenetwork/debian/kdict-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/kdict-trinity.1 diff --git a/dilos/core/tdenetwork/debian/kdict-trinity.postinst b/dilos/core/tdenetwork/debian/kdict-trinity.postinst deleted file mode 100644 index 055be2e09..000000000 --- a/dilos/core/tdenetwork/debian/kdict-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kdict-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdenetwork/debian/kget-trinity.install b/dilos/core/tdenetwork/debian/kget-trinity.install index 618f2163f..dc488268e 100644 --- a/dilos/core/tdenetwork/debian/kget-trinity.install +++ b/dilos/core/tdenetwork/debian/kget-trinity.install @@ -73,6 +73,7 @@ debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kget.png debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kget_list.png debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kget.png debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kget_list.png +debian/tmp/usr/share/man/man1/kget.1 debian/tmp/usr/share/mimelnk/application/x-kgetlist.desktop debian/tmp/usr/share/sounds/KGet_Added.ogg debian/tmp/usr/share/sounds/KGet_Finished.ogg diff --git a/dilos/core/tdenetwork/debian/kget-trinity.manpages b/dilos/core/tdenetwork/debian/kget-trinity.manpages deleted file mode 100644 index 585b03129..000000000 --- a/dilos/core/tdenetwork/debian/kget-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/kget-trinity.1 diff --git a/dilos/core/tdenetwork/debian/kopete-trinity.install b/dilos/core/tdenetwork/debian/kopete-trinity.install index 2245d6527..28ab451bb 100644 --- a/dilos/core/tdenetwork/debian/kopete-trinity.install +++ b/dilos/core/tdenetwork/debian/kopete-trinity.install @@ -474,6 +474,7 @@ debian/tmp/usr/share/icons/hicolor/48x48/apps/jabber_protocol.png debian/tmp/usr/share/icons/hicolor/48x48/apps/kopete.png debian/tmp/usr/share/icons/hicolor/64x64/apps/kopete.png debian/tmp/usr/share/icons/hicolor/scalable/apps/kopete2.svgz +debian/tmp/usr/share/man/man1/kopete.1 debian/tmp/usr/share/mimelnk/application/x-icq.desktop debian/tmp/usr/share/mimelnk/application/x-kopete-emoticons.desktop debian/tmp/usr/share/services/aim.protocol diff --git a/dilos/core/tdenetwork/debian/kopete-trinity.manpages b/dilos/core/tdenetwork/debian/kopete-trinity.manpages deleted file mode 100644 index 214a24d2e..000000000 --- a/dilos/core/tdenetwork/debian/kopete-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/out/kopete-trinity.1 diff --git a/dilos/core/tdenetwork/debian/krdc-trinity.install b/dilos/core/tdenetwork/debian/krdc-trinity.install index f183b577c..b5406d66f 100644 --- a/dilos/core/tdenetwork/debian/krdc-trinity.install +++ b/dilos/core/tdenetwork/debian/krdc-trinity.install @@ -5,8 +5,6 @@ debian/tmp/usr/share/apps/krdc/pics/close.png debian/tmp/usr/share/apps/krdc/pics/iconify.png debian/tmp/usr/share/apps/krdc/pics/pindown.png debian/tmp/usr/share/apps/krdc/pics/pinup.png -debian/tmp/usr/share/apps/krdc/pics/pointcursor.png -debian/tmp/usr/share/apps/krdc/pics/pointcursormask.png debian/tmp/usr/share/doc/tde/HTML/en/krdc/authentication.png debian/tmp/usr/share/doc/tde/HTML/en/krdc/close.png debian/tmp/usr/share/doc/tde/HTML/en/krdc/common diff --git a/dilos/core/tdenetwork/debian/ksirc-trinity.lintian b/dilos/core/tdenetwork/debian/ksirc-trinity.lintian index 58fe394fa..3014f3461 100644 --- a/dilos/core/tdenetwork/debian/ksirc-trinity.lintian +++ b/dilos/core/tdenetwork/debian/ksirc-trinity.lintian @@ -1,3 +1 @@ ksirc-trinity: no-shlibs-control-file usr/lib/libtdeinit_ksirc.so -ksirc-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_ksirc.so -ksirc-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_ksirc.so diff --git a/dilos/core/tdenetwork/debian/ksirc-trinity.postinst b/dilos/core/tdenetwork/debian/ksirc-trinity.postinst deleted file mode 100644 index 2c76ed8a9..000000000 --- a/dilos/core/tdenetwork/debian/ksirc-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for ksirc-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdenetwork/debian/kwifimanager-trinity.install b/dilos/core/tdenetwork/debian/kwifimanager-trinity.install index 2b13c9206..47ddce17e 100644 --- a/dilos/core/tdenetwork/debian/kwifimanager-trinity.install +++ b/dilos/core/tdenetwork/debian/kwifimanager-trinity.install @@ -29,6 +29,7 @@ debian/tmp/usr/share/icons/hicolor/32x32/apps/kwifimanager.png debian/tmp/usr/share/icons/hicolor/48x48/apps/kwifimanager.png debian/tmp/usr/share/icons/hicolor/64x64/apps/kwifimanager.png debian/tmp/usr/share/icons/hicolor/scalable/apps/kwifimanager.svgz +debian/tmp/usr/share/man/man1/kwifimanager.1 debian/icons/kwifimanager-16.xpm /usr/share/pixmaps debian/icons/kwifimanager.xpm /usr/share/pixmaps diff --git a/dilos/core/tdenetwork/debian/kwifimanager-trinity.lintian b/dilos/core/tdenetwork/debian/kwifimanager-trinity.lintian index 7f5348940..0e6408ff4 100644 --- a/dilos/core/tdenetwork/debian/kwifimanager-trinity.lintian +++ b/dilos/core/tdenetwork/debian/kwifimanager-trinity.lintian @@ -1,3 +1 @@ kwifimanager-trinity: no-shlibs-control-file usr/lib/libkwireless.so -kwifimanager-trinity: postinst-must-call-ldconfig usr/lib/libkwireless.so -kwifimanager-trinity: postrm-should-call-ldconfig usr/lib/libkwireless.so diff --git a/dilos/core/tdenetwork/debian/kwifimanager-trinity.manpages b/dilos/core/tdenetwork/debian/kwifimanager-trinity.manpages deleted file mode 100644 index 4f390510b..000000000 --- a/dilos/core/tdenetwork/debian/kwifimanager-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/kwifimanager-trinity.1 diff --git a/dilos/core/tdenetwork/debian/lisa-trinity.install b/dilos/core/tdenetwork/debian/lisa-trinity.install index 1e64a3ed2..cab76e2c2 100644 --- a/dilos/core/tdenetwork/debian/lisa-trinity.install +++ b/dilos/core/tdenetwork/debian/lisa-trinity.install @@ -15,6 +15,8 @@ debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/lanbrowser/index.docbook debian/tmp/usr/share/doc/tde/HTML/en/lisa/common debian/tmp/usr/share/doc/tde/HTML/en/lisa/index.cache.bz2 debian/tmp/usr/share/doc/tde/HTML/en/lisa/index.docbook +debian/tmp/usr/share/man/man8/lisa.8 +debian/tmp/usr/share/man/man8/reslisa.8 debian/tmp/usr/share/services/lan.protocol debian/tmp/usr/share/services/rlan.protocol diff --git a/dilos/core/tdenetwork/debian/lisa-trinity.manpages b/dilos/core/tdenetwork/debian/lisa-trinity.manpages deleted file mode 100644 index 306f0c52e..000000000 --- a/dilos/core/tdenetwork/debian/lisa-trinity.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/man/lisa-trinity.8 -debian/man/reslisa-trinity.8 diff --git a/dilos/core/tdenetwork/debian/man/kdict-trinity.1 b/dilos/core/tdenetwork/debian/man/kdict-trinity.1 deleted file mode 100644 index aff5138c4..000000000 --- a/dilos/core/tdenetwork/debian/man/kdict-trinity.1 +++ /dev/null @@ -1,180 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDICT 1 "June 2006" "Trinity Desktop Environment" "TDE Dictionary Client" -.SH NAME -kdict -\- The TDE Dictionary Client -.SH SYNOPSIS -\fBkdict\fP [Qt\-options] [TDE\-options] [options] [word/phrase] -.SH DESCRIPTION -\fBKDict\fP is a graphical client for the \fBDICT Protocol\fP. It enables you to search through dictionary databases for a word or phrase, then displays suitable definitions. \fBKDict\fP tries to ease basic as well as advanced queries. A separate list offers a convenient way to deal with the enormous number of matching words that a advanced query can return. -.sp 1 -The remainder of \fBKDict\fP's user interface resembles a web browser. For instance, you can jump to the definition of a synonym by simply clicking on the highlighted word. The back/forward functionality is also implemented, enabling you to quickly go back to the result of previous queries. -.sp 1 -\fBKDict\fP is able to process the content of the clipboard, so it's easy to combine \fBKDict\fP with your web browser or text editor. -.sp 1 -If your machine is behind a firewall, has no permanent internet connection or the server of dict.org is too slow for you, you can set up your own local server, all you need is available at \fBwww.dict.org\fP. The advantages of a local server are optimal performance and the ability to install additional databases of your choice. -.SH OPTIONS -.SS -.SS Arguments: -word/phrase Lookup the given word/phrase -.SS Options: -.TP -.B \-c, \-\-clipboard -Define X11-clipboard content (selected text) -.SS -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X-server display 'displayname' -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId' -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override -.TP -.B \-\-sync -switches to synchronous mode for debugging -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated) -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color -.TP -.B \-\-btn, \-\-button <color> -sets the default button color -.TP -.B \-\-name <name> -sets the application name -.TP -.B \-\-title <title> -sets the application title (caption) -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root -.TP -.B \-\-im <XIM server> -set XIM server -.TP -.B \-\-noxim -disable XIM -.TP -.B \-\-reverse -mirrors the whole layout of widgets -.SS -.SS TDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar -.TP -.B \-\-config <filename> -Use alternative configuration file -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server' -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager -.TP -.B \-\-style <style> -sets the application GUI style -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget - see man X for the argument format -.TP -.B \-\-nofork -Don't run in the background. -.SS -.SH FILES -.I ~/.trinity/share/config/kdictrc -.br -.I ~/.trinity/share/config/kdict_panelappletrc -.RS -\fBkdict\fP configuration files -.SH SEE ALSO -.TP -\fBwww.dict.org\fP -DICT Development Group home page -.RE -.sp 1 -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/kdict/ -directly into konqueror or you can run -.BR "khelpcenter help:/kdict/" -from the command\-line. -.br -.SH AUTHORS -.nf -Christian Gebauer <gebauer@kde.org> -.br -Matthias Hoelzer <hoelzer@kde.org> -.br - -.br -.fi -Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly. -.PP -This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/dilos/core/tdenetwork/debian/man/kget-trinity.1 b/dilos/core/tdenetwork/debian/man/kget-trinity.1 deleted file mode 100644 index 72b2d3305..000000000 --- a/dilos/core/tdenetwork/debian/man/kget-trinity.1 +++ /dev/null @@ -1,168 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KGET 1 "June 2006" "Trinity Desktop Environment" "download manager" -.SH NAME -kget -\- An advanced download manager for TDE -.SH SYNOPSIS -\fBkget\fP [Qt\-options] [TDE\-options] [options] [URL(s)] -.SH DESCRIPTION -\fBKGet\fP is an advanced download manager for TDE. It allows you to group downloads. In some cases, \fBKGet\fP can resume these downloads even if you shutdown your computer before the downloads have completed. -.sp 1 -To download a document or package, drag and drop the URL on to \fBKGet\fP. -.SH OPTIONS -.SS -.SS Arguments: -URL(s) URL(s) to download -.SS Options: -.TP -.B \-\-showDropTarget -Start KGet with drop target -.SS -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X\-server display 'displayname' -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId' -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override -.TP -.B \-\-sync -switches to synchronous mode for debugging -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated) -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color -.TP -.B \-\-btn, \-\-button <color> -sets the default button color -.TP -.B \-\-name <name> -sets the application name -.TP -.B \-\-title <title> -sets the application title (caption) -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root -.TP -.B \-\-im <XIM server> -set XIM server -.TP -.B \-\-noxim -disable XIM -.TP -.B \-\-reverse -mirrors the whole layout of widgets -.SS -.SS TDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar -.TP -.B \-\-config <filename> -Use alternative configuration file -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server' -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager -.TP -.B \-\-style <style> -sets the application GUI style -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget - see man X for the argument format -.TP -.B \-\-nofork -Don't run in the background. -.SS - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/kget/ -directly into konqueror or you can run -.BR "khelpcenter help:/kget/" -from the command\-line. -.br -.SH AUTHORS -.nf -Matej Moss -.br -Patrick Charbonnier <pch@freeshell.org> -.br -Carsten Pfeiffer <pfeiffer@kde.org> -.br - -.br -.fi -Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly. -.PP -This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/dilos/core/tdenetwork/debian/man/kopete-trinity.sgml b/dilos/core/tdenetwork/debian/man/kopete-trinity.sgml deleted file mode 100644 index 87922999d..000000000 --- a/dilos/core/tdenetwork/debian/man/kopete-trinity.sgml +++ /dev/null @@ -1,334 +0,0 @@ -<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ - -<!-- Process this file with docbook-to-man to generate an nroff manual - page: `docbook-to-man manpage.sgml > manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - --> - - <!ENTITY dhfirstname "<firstname>Daniel</firstname>"> - <!ENTITY dhsurname "<surname>Stone</surname>"> - <!ENTITY dhdate "<date>April 20, 2002</date>"> - <!ENTITY dhsection "<manvolnum>1</manvolnum>"> - <!ENTITY dhemail "<email>dstone@kde.org</email>"> - <!ENTITY dhusername "Daniel Stone"> - <!ENTITY dhucpackage "<refentrytitle>KOPETE</refentrytitle>"> - <!ENTITY dhpackage "kopete"> - - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY gnu "<acronym>GNU</acronym>"> -]> - -<refentry> - <refentryinfo> - <address> - &dhemail; - </address> - <author> - &dhfirstname; - &dhsurname; - </author> - <copyright> - <year>2001</year> - <holder>&dhusername;</holder> - </copyright> - &dhdate; - </refentryinfo> - <refmeta> - &dhucpackage; - - &dhsection; - </refmeta> - <refnamediv> - <refname>&dhpackage;</refname> - - <refpurpose>A TDE-based Instant Messaging client.</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>&dhpackage;</command> - - <arg><option>--help<replaceable></replaceable></option></arg> - <arg><option>--help-tde<replaceable></replaceable></option></arg> - <arg><option>--help-qt<replaceable></replaceable></option></arg> - <arg><option>--version<replaceable> -v</replaceable></option></arg> - <arg><option>--license<replaceable></replaceable</option></arg> - <arg><option>--author<replaceable></replaceable></option></arg> - <arg><option>--caption <caption><replaceable></replaceable></option></arg> - <arg><option>--icon <icon><replaceable></replaceable></option></arg> - <arg><option>--miniicon <icon><replaceable></replaceable></option></arg> - <arg><option>--dcopserver <server><replaceable></replaceable></option></arg> - <arg><option>--nocrashhandler<replaceable></replaceable></option></arg> - <arg><option>--waitforwm<replaceable></replaceable></option></arg> - <arg><option>--style <style><replaceable></replaceable></option></arg> - <arg><option>--geometry <geometry><replaceable></replaceable></option></arg> - <arg><option>--display <display><replaceable></replaceable></option></arg> - <arg><option>--session <sessionid><replaceable></replaceable></option></arg> - <arg><option>--cmap<replaceable></replaceable></option></arg> - <arg><option>--ncols <columns><replaceable></replaceable></option></arg> - <arg><option>--nograb<replaceable></replaceable></option></arg> - <arg><option>--dograb<replaceable></replaceable></option></arg> - <arg><option>--sync<replaceable></replaceable></option></arg> - <arg><option>--font<replaceable> --fn <fontname></replaceable></option></arg> - <arg><option>--background<replaceable> --bg <colour></replaceable></option></arg> - <arg><option>--button<replaceable> --btn <colour></replaceable></option></arg> - <arg><option>--name<replaceable> <name></replaceable></option></arg> - <arg><option>--title<replaceable> <title></replaceable></option></arg> - <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg> - <arg><option>--inputstyle<replaceable> <style></replaceable></option></arg> - <arg><option>--im<replaceable> <server></replaceable></option></arg> - <arg><option>--noxim<replaceable></replaceable></option></arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - - <para>This manual page documents briefly the - <command>&dhpackage;</command> command.</para> - - <para><command>&dhpackage;</command> is a TDE-based multi-protocol Instant - Messaging client. Currently, it supports AIM, ICQ, MSN, IRC and Jabber. - </para> - - </refsect1> - <refsect1> - <title>OPTIONS</title> - - <para>These programs follow the usual GNU command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. However, the ordering is very strict - - --help/-h must come before hostname.</para> - <variablelist> - <varlistentry> - <term><option>-v</option> - <option>--version</option> - </term> - <listitem> - <para>Show version information.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--author</option> - </term> - <listitem> - <para>Show information about the author.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--license</option> - </term> - <listitem> - <para>Show license information.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--caption <caption></option> - </term> - <listitem> - <para>Specify the caption of the window.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--icon <icon></option> - </term> - <listitem> - <para>Specify the icon of the window.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--miniicon <icon></option> - </term> - <listitem> - <para>Specify the mini-icon of the window.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--dcopserver <server></option> - </term> - <listitem> - <para>Specify the DCOP server to use.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--nocrashhandler</option> - </term> - <listitem> - <para>Disable TDE crash handler (enables core dumps).</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--waitforwm</option> - </term> - <listitem> - <para>Waits for a compatible window manager to start.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--style <style></option> - </term> - <listitem> - <para>Sets the application's GUI style (overrides TDE).</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--geometry <geometry></option> - </term> - <listitem> - <para>Sets the geometry of the window.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--display <display></option> - </term> - <listitem> - <para>Specifies the X display to use.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--session <sessionid></option> - </term> - <listitem> - <para>Restores the application for the given session ID.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--cmap</option> - </term> - <listitem> - <para>Forces use of an internal colour map on an 8-bit display.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--ncols <count></option> - </term> - <listitem> - <para>Limits the number of colours allowed in an 8-bit display.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--nograb</option> - </term> - <listitem> - <para>Forces Qt to never grab the mouse or keyboard.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--dograb</option> - </term> - <listitem> - <para>Overrides --nograb, which may be implicitly set.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--sync</option> - </term> - <listitem> - <para>Forces synchronous mode (for debugging).</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--font <font></option> - <option>--fn <font></option></term> - <listitem> - <para>Sets the default application font.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--background <colour></option> - <option>--bg <colour></option></term> - <listitem> - <para>Sets the default background colour and application - pallette.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--foreground <colour></option> - <option>--fg <colour></option></term> - <listitem> - <para>Sets the default foreground colour.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--button <colour></option> - <option>--btn <colour></option></term> - <listitem> - <para>Sets the default button colour.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--name <name></option> - </term> - <listitem> - <para>Sets the application name.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--title <name></option> - </term> - <listitem> - <para>Sets the application title.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--visual TrueColor</option> - </term> - <listitem> - <para>Forces the application to use a True Colour visual on 8-bit - displays.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--inputstyle <style></option> - </term> - <listitem> - <para>Sets X Input Method (XIM) input style. Possible values are: - onthespot, overthespot, offthespot, and root.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--im <server></option> - </term> - <listitem> - <para>Sets X Input Method (XIM) server.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--noxim</option> - </term> - <listitem> - <para>Disables X Input Method (XIM) support.</para> - </listitem> - </varlistentry> - </variablelist> - </refsect1> - <refsect1> - <title>AUTHOR</title> - - <para>This manual page was written by &dhusername; <&dhemail;> for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the <acronym>GNU</acronym> General Public License - version 2 or any later version published by the Free Software Foundation.</para> - - </refsect1> -</refentry> - -<!-- Keep this comment at the end of the file -Local variables: -mode: sgml -sgml-omittag:t -sgml-shorttag:t -sgml-minimize-attributes:nil -sgml-always-quote-attributes:t -sgml-indent-step:2 -sgml-indent-data:t -sgml-parent-document:nil -sgml-default-dtd-file:nil -sgml-exposed-tags:nil -sgml-local-catalogs:nil -sgml-local-ecat-files:nil -End: ---> diff --git a/dilos/core/tdenetwork/debian/man/kwifimanager-trinity.1 b/dilos/core/tdenetwork/debian/man/kwifimanager-trinity.1 deleted file mode 100644 index 5f12be561..000000000 --- a/dilos/core/tdenetwork/debian/man/kwifimanager-trinity.1 +++ /dev/null @@ -1,121 +0,0 @@ -.TH KWIFIMANAGER "1" "October 2006" "kwifimanager" "User Commands" -.SH NAME -kwifimanager \- manual page for kwifimanager -.SH SYNOPSIS -.B kwifimanager -[\fIOPTIONS\fR] -.SH DESCRIPTION -\fBkwifimanager\fR is a TDE wireless management program. -.SH GENERIC OPTIONS: -.TP -\fB\-\-help\fR -Show help about options -.TP -\fB\-\-help\-qt\fR -Show QT specific options -.TP -\fB\-\-help\-tde\fR -Show TDE specific options -.TP -\fB\-\-help\-all\fR -Show all options -.TP -\fB\-\-author\fR -Show author information -.TP -\fB\-v\fR, \fB\-\-version\fR -Show version information -.TP -\fB\-\-license\fR -Show license information -.SH QT OPTIONS: -.TP -\fB\-\-display <displayname>\fR -Use the X-server display 'displayname' -.TP -\fB\-\-session <sessionId>\fR -Restore the application for the given 'sessionId' -.TP -\fB\-\-cmap\fR -Causes the application to install a private color map on an 8-bit display -.TP -\fB\-\-ncols <count>\fR -Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification -.TP -\fB\-\-nograb\fR -Tells Qt to never grab the mouse or the keyboard -.TP -\fB\-\-dograb\fR -Running under a debugger can cause an implicit -nograb, use -dograb to override -.TP -\fB\-\-sync\fR -Switches to synchronous mode for debugging -.TP -\fB\-\-fn, \-\-font <fontname>\fR -Defines the application font -.TP -\fB\-\-bg, \-\-background <color>\fR -Sets the default background color and an application palette (light and dark shades are calculated) -.TP -\fB\-\-fg, \-\-foreground <color>\fR -Sets the default foreground color -.TP -\fB\-\-btn, \-\-button <color>\fR -Sets the default button color -.TP -\fB\-\-name <name>\fR -Sets the application name -.TP -\fB\-\-title <title>\fR -Sets the application title (caption) -.TP -\fB\-\-visual TrueColor\fR -Forces the application to use a TrueColor visual on an 8-bit display -.TP -\fB\-\-inputstyle <inputstyle>\fR -Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root -.TP -\fB\-\-im <XIM server>\fR -Set XIM server -.TP -\fB\-\-noxim\fR -Disable XIM -.TP -\fB\-\-reverse\fR -Mirrors the whole layout of widgets -.SH TDE OPTIONS: -.TP -\fB\-\-caption <caption>\fR -Use 'caption' as name in the titlebar -.TP -\fB\-\-icon <icon>\fR -Use 'icon' as the application icon -.TP -\fB\-\-miniicon <icon>\fR -Use 'icon' as the icon in the titlebar -.TP -\fB\-\-config <filename>\fR -Use alternative configuration file -.TP -\fB\-\-dcopserver <server>\fR -Use the DCOP Server specified by 'server' -.TP -\fB\-\-nocrashhandler\fR -Disable crash handler, to get core dumps -.TP -\fB\-\-waitforwm\fR -Waits for a WM_NET compatible windowmanager -.TP -\fB\-\-style <style>\fR -Sets the application GUI style -.TP -\fB\-\-geometry <geometry>\fR -Sets the client geometry of the main widget - see man X for the argument format -.SH AUTHOR -This manual page was written for the Debian GNU/Linux distribution -because the original program does not have a manual page. -.PP -This manual page was written by Chris Bier <chris.bier@cymor.com>. -Based on the xchat man page written by Davide Puricelli <evo@debian.org>, -and the kwifimanager help options. It was written for the Debian GNU/Linux -system (but may be used by others). diff --git a/dilos/core/tdenetwork/debian/man/lisa-trinity.8 b/dilos/core/tdenetwork/debian/man/lisa-trinity.8 deleted file mode 100644 index 7015757c5..000000000 --- a/dilos/core/tdenetwork/debian/man/lisa-trinity.8 +++ /dev/null @@ -1,77 +0,0 @@ -.TH "lisa" "8" "December 2005" - -.SH "NAME" -lisa \- LAN Information Server - -.SH "SYNOPSIS" -.PP -.B lisa -[options] - -.SH "DESCRIPTION" -.PP -This manual page documents briefly the -.B lisa -command. -.PP -.B lisa -is intended to provide a kind of "network neighbourhood" but only relaying on -the TCP/IP protocol stack, no smb or whatever. The list of running hosts is -provided via TCP port 7741. - -.SH "OPTIONS" -.TP -.B \-c, \-\-config=\fIFILE\fR -Read -.I FILE -instead of $(HOME)/.lisarc and /etc/lisarc. -.TP -.BI "\-p, \-\-port" " PORTNR" -Start the server on the portnumber -.IR PORTNR . -If you use this, LISa won't be able to -cooperate with other LISa's in the network. -.TP -.B \-q, \-\-quiet -Start quiet without the greeting message. -.TP -.B \-u, \-\-unix -Deprecated. -.TP -.B \-k, \-\-kde1 -Deprecated. -.TP -.B \-K, \-\-kde2 -Deprecated. -.TP -.B \-h, \-\-help -Show usage. -.TP -.B \-v, \-\-version -Print out a short version info. - -.SH SIGNALS -.PP -If you send the Hangup-Signal to \fBlisa\fR, it will reread its -configuration file (killall -HUP lisa). -.PP -If you send the User1-Signal to \fBlisa\fR, it will print some status -information to the standard output (killall -USR1 lisa). You won't see -anything if the console from which \fBlisa\fR was started has terminated. - -.SH "SEE ALSO" -.TP -.BR reslisa (8) -.TP -.I /usr/share/doc/lisa/README.gz - -.SH "AUTHOR" -.PP -.B LISa -is Copyright (c) 2000-2003 by Alexander Neundorf <neundorf@kde.org>. -.PP -This manual page was written by Francois Wendling <frwendling@free.fr>. 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 of the -License, or (at your option) any later version. - diff --git a/dilos/core/tdenetwork/debian/man/reslisa-trinity.8 b/dilos/core/tdenetwork/debian/man/reslisa-trinity.8 deleted file mode 100644 index 159b5b7b8..000000000 --- a/dilos/core/tdenetwork/debian/man/reslisa-trinity.8 +++ /dev/null @@ -1,72 +0,0 @@ -.TH "reslisa" "8" "December 2005" - -.SH "NAME" -reslisa \- Restricted LAN Information Server - -.SH "SYNOPSIS" -.PP -.B reslisa -[options] - -.SH "DESCRIPTION" -.PP -This manual page documents briefly the -.B reslisa -command. -.PP -If you have very strict security rules in your network or you don't want to -have another port open or whatever, you can use -.B resLISa -instead of -.BR lisa (1). - -.SH "OPTIONS" -.TP -.B \-c, \-\-config=\fIFILE\fR -Read -.I FILE -instead of $(HOME)/.reslisarc and /etc/reslisarc. -.TP -.B \-q, \-\-quiet -Start quiet without the greeting message. -.TP -.B \-u, \-\-unix -Deprecated. -.TP -.B \-k, \-\-kde1 -Deprecated. -.TP -.B \-K, \-\-kde2 -Deprecated. -.TP -.B \-h, \-\-help -Show usage. -.TP -.B \-v, \-\-version -Print out a short version info. - -.SH SIGNALS -.PP -If you send the Hangup-Signal to \fBreslisa\fR, it will reread its -configuration file (killall -HUP reslisa). -.PP -If you send the User1-Signal to \fBreslisa\fR, it will print some status -information to the standard output (killall -USR1 reslisa). You won't see -anything if the console from which \fBreslisa\fR was started has terminated. - -.SH "SEE ALSO" -.TP -.BR lisa (8) -.TP -.I /usr/share/doc/lisa/README.gz - -.SH "AUTHOR" -.PP -.B LISa -is Copyright (c) 2000-2003 by Alexander Neundorf <neundorf@kde.org>. -.PP -This manual page was written by Francois Wendling <frwendling@free.fr>. 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 of the -License, or (at your option) any later version. - diff --git a/dilos/core/tdenetwork/debian/rules b/dilos/core/tdenetwork/debian/rules index 6e3781f63..1faa8a422 100755 --- a/dilos/core/tdenetwork/debian/rules +++ b/dilos/core/tdenetwork/debian/rules @@ -12,8 +12,7 @@ endif export DH_OPTIONS include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include DEB_CONFIGURE_MANDIR := /usr/share/man diff --git a/dilos/core/tdenetwork/debian/tdednssd-trinity.install b/dilos/core/tdenetwork/debian/tdednssd-trinity.install index 6811c2701..e25b0c1d9 100644 --- a/dilos/core/tdenetwork/debian/tdednssd-trinity.install +++ b/dilos/core/tdenetwork/debian/tdednssd-trinity.install @@ -2,13 +2,14 @@ debian/tmp/usr/share/services/zeroconf.protocol debian/tmp/usr/share/services/invitation.protocol debian/tmp/usr/share/services/kded/dnssdwatcher.desktop debian/tmp/usr/share/apps/remoteview/zeroconf.desktop -debian/tmp/usr/share/apps/zeroconf/_http._tcp debian/tmp/usr/share/apps/zeroconf/_ftp._tcp +debian/tmp/usr/share/apps/zeroconf/_http._tcp debian/tmp/usr/share/apps/zeroconf/_ldap._tcp -debian/tmp/usr/share/apps/zeroconf/_webdav._tcp debian/tmp/usr/share/apps/zeroconf/_nfs._tcp -debian/tmp/usr/share/apps/zeroconf/_ssh._tcp debian/tmp/usr/share/apps/zeroconf/_rfb._tcp +debian/tmp/usr/share/apps/zeroconf/_ssh._tcp +debian/tmp/usr/share/apps/zeroconf/_sftp-ssh._tcp +debian/tmp/usr/share/apps/zeroconf/_webdav._tcp debian/tmp/usr/lib/*/trinity/tdeio_zeroconf.so debian/tmp/usr/lib/*/trinity/tdeio_zeroconf.la debian/tmp/usr/lib/*/trinity/kded_dnssdwatcher.so diff --git a/dilos/core/tdepim/debian/cdbs/debian-tde.mk b/dilos/core/tdepim/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdepim/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/tdepim/debian/cdbs/versions.pl b/dilos/core/tdepim/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdepim/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/tdepim/debian/compat b/dilos/core/tdepim/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdepim/debian/compat +++ b/dilos/core/tdepim/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdepim/debian/control b/dilos/core/tdepim/debian/control index 5e2457136..a0426798d 100644 --- a/dilos/core/tdepim/debian/control +++ b/dilos/core/tdepim/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: Ana Beatriz Guerrero Lopez <ana@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, bison, byacc, bzip2, flex, groff-base, libogg-dev, libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~), @@ -12,7 +12,7 @@ Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libxpm-dev, libxss-dev, texinfo, dpkg-dev (>= 1.14.4), libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev, libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev -Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc +Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, tdelibs14-trinity-doc Build-Conflicts: libkleopatra0-trinity-dev Standards-Version: 3.8.4 @@ -21,7 +21,7 @@ Section: tde Architecture: all Replaces: kdepim-trinity (<< 4:14.0.0~) Breaks: kdepim-trinity (<< 4:14.0.0~) -Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version}) +Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}) | libkleopatra1t64-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version}) | libmimelib1t64-trinity (>= ${source:Version}) Suggests: tdepim-trinity-doc-html Description: Personal Information Management apps from the official Trinity release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical diff --git a/dilos/core/tdepim/debian/libkleopatra1-trinity.install b/dilos/core/tdepim/debian/libkleopatra1-trinity.install index 3046fa20f..9ea72ca5e 100644 --- a/dilos/core/tdepim/debian/libkleopatra1-trinity.install +++ b/dilos/core/tdepim/debian/libkleopatra1-trinity.install @@ -1,12 +1,8 @@ /etc/trinity/libkleopatrarc -/usr/lib/*/libgpgme++.so.0 -/usr/lib/*/libgpgme++.so.0.4.0 -/usr/lib/*/libkleopatra.so.1 -/usr/lib/*/libkleopatra.so.1.0.0 -/usr/lib/*/libkpgp.so.2 -/usr/lib/*/libkpgp.so.2.2.0 -/usr/lib/*/libqgpgme.so.0 -/usr/lib/*/libqgpgme.so.0.0.0 +/usr/lib/*/libgpgme++.so.* +/usr/lib/*/libkleopatra.so.* +/usr/lib/*/libkpgp.so.* +/usr/lib/*/libqgpgme.so.* /usr/share/apps/tdeconf_update/kpgp-3.1-upgrade-address-data.pl /usr/share/apps/tdeconf_update/kpgp.upd /usr/share/apps/libkleopatra diff --git a/dilos/core/tdepim/debian/rules b/dilos/core/tdepim/debian/rules index 06c6e701d..7013201a1 100755 --- a/dilos/core/tdepim/debian/rules +++ b/dilos/core/tdepim/debian/rules @@ -10,8 +10,14 @@ 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 +-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 @@ -92,3 +98,65 @@ NEWDEB_SOURCEDIR := $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) DEB_DH_STRIP_ARGS := -Xlibindex.so.0.0.0 -Xlibgpgme++.so.0.4.0 \ -Xlibmimelib.so.1.0.1 + +post-patches:: + dh_testdir +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libmimelib1c2a" | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libmimelib1$(DEB_TIME64_SUFFIX)$${a##*c2a} && mv $$a $$a.t64); \ + done + ls -d debian/* | \ + grep -E "/libkleopatra1-" | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libkleopatra1$(DEB_TIME64_SUFFIX)-$${a##*-} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libmimelib1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libmimelib1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \ + -e "s/\\(libmimelib1\\)c2a-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + \ + -e "s/^\\(Package: libkleopatra1\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libkleopatra1\\)-trinity\\( \|$$\)/\\1:\\2\\3-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \ + -e "s/\\(libkleopatra1\\)-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 "/libmimelib1$(DEB_TIME64_SUFFIX)-" | \ + xargs -r rm + ls -d debian/* | \ + grep -E "/libkleopatra1$(DEB_TIME64_SUFFIX)-" | \ + xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libmimelib1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libmimelib1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \ + -e "s/\\(libmimelib1\\)c2a-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + \ + -e "s/^\\(Package: libkleopatra1\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libkleopatra1\\)-trinity\\( \|$$\)/\\1:\\2\\3-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \ + -e "s/\\(libkleopatra1\\)-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/tdesdk/debian/cdbs/debian-tde.mk b/dilos/core/tdesdk/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdesdk/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/tdesdk/debian/cdbs/versions.pl b/dilos/core/tdesdk/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdesdk/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/tdesdk/debian/cervisia-trinity.lintian b/dilos/core/tdesdk/debian/cervisia-trinity.lintian index ff16fcf9e..76268d1ab 100644 --- a/dilos/core/tdesdk/debian/cervisia-trinity.lintian +++ b/dilos/core/tdesdk/debian/cervisia-trinity.lintian @@ -4,6 +4,4 @@ cervisia-trinity: script-not-executable ./usr/share/apps/tdeconf_update/move_rep # This is from tdeinit black magic. cervisia-trinity: no-shlibs-control-file usr/lib/libtdeinit_cervisia.so -cervisia-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_cervisia.so -cervisia-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_cervisia.so cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia diff --git a/dilos/core/tdesdk/debian/cervisia-trinity.postinst b/dilos/core/tdesdk/debian/cervisia-trinity.postinst deleted file mode 100644 index 4728b399c..000000000 --- a/dilos/core/tdesdk/debian/cervisia-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for cervisia-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then -# # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdesdk/debian/compat b/dilos/core/tdesdk/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdesdk/debian/compat +++ b/dilos/core/tdesdk/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdesdk/debian/control b/dilos/core/tdesdk/debian/control index fe1f5ae72..99fac9e25 100644 --- a/dilos/core/tdesdk/debian/control +++ b/dilos/core/tdesdk/debian/control @@ -4,11 +4,11 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, tdelibs14-trinity-dev, binutils-dev [!solaris-any], bison, flex, libfl-dev | flex (<< 2.5.39), tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev, libktnef1-trinity-dev, libsvn-dev, libdb-dev, - libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~), + libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~), dh-python, libiconv-dev [solaris-any] Standards-Version: 3.8.4 @@ -166,7 +166,7 @@ Architecture: all Section: devel Replaces: kcachegrind-converters-trinity (<< 4:14.0.0~) Breaks: kcachegrind-converters-trinity (<< 4:14.0.0~) -Depends: ${perl:Depends}, php-cli | php5-cli, python-all +Depends: ${perl:Depends}, ${python3:Depends}, php-cli | php5-cli Recommends: tdecachegrind-trinity Description: format converters for TDECachegrind profiling visualisation tool This is a collection of scripts for converting the output from @@ -220,7 +220,7 @@ Architecture: all Section: devel Replaces: kdesdk-scripts-trinity (<< 4:14.0.0~) Breaks: kdesdk-scripts-trinity (<< 4:14.0.0~) -Depends: ${perl:Depends}, python-all +Depends: ${perl:Depends}, ${python3:Depends} Recommends: automake1.9 | automaken, cvs, gawk Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html, dmalloc, gdb, tdelibs14-trinity-doc, tqt3-doc, valgrind, devscripts Enhances: kate-trinity @@ -361,7 +361,7 @@ Architecture: any Section: devel Replaces: umbrello-trinity (<< 4:14.0.0~) Breaks: umbrello-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${python3:Depends} Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html Description: UML modelling tool and code generator Umbrello UML Modeller is a Unified Modelling Language editor for TDE. diff --git a/dilos/core/tdesdk/debian/rules b/dilos/core/tdesdk/debian/rules index 2321e5f11..20bdef999 100755 --- a/dilos/core/tdesdk/debian/rules +++ b/dilos/core/tdesdk/debian/rules @@ -1,8 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include DEB_CONFIGURE_MANDIR := /usr/share/man @@ -43,28 +42,35 @@ DEB_INSTALL_CHANGELOGS_kompare-trinity := kompare/ChangeLog DEB_INSTALL_CHANGELOGS_umbrello-trinity := umbrello/ChangeLog binary-install/tdesdk-scripts-trinity:: -# mv -f debian/tdesdk-scripts-trinity/usr/bin/svn-clean \ -# debian/tdesdk-scripts-trinity/usr/bin/svn-clean-kde -# mv -f debian/tdesdk-scripts-trinity/usr/bin/svnversions \ -# debian/tdesdk-scripts-trinity/usr/bin/svnversion-kde +# mv -f debian/$(cdbs_curpkg)/usr/bin/svn-clean \ +# debian/$(cdbs_curpkg)/usr/bin/svn-clean-kde +# mv -f debian/$(cdbs_curpkg)/usr/bin/svnversions \ +# debian/$(cdbs_curpkg)/usr/bin/svnversion-kde install -p -D -m644 scripts/kde-buildrc \ - debian/tdesdk-scripts-trinity/usr/share/doc/tdesdk-scripts-trinity/kde-buildrc.example + debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-scripts-trinity/kde-buildrc.example + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/bin binary-install/tdesdk-misc-trinity:: install -p -D -m644 kdeaccounts-plugin/README \ - debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/README.kdeaccounts-plugin + debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/README.kdeaccounts-plugin install -p -D -m644 tdeioslave/svn/AUTHORS \ - debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn + debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn install -p -D -m644 tdeioslave/svn/README \ - debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/README.tdeioslave-svn + debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/README.tdeioslave-svn install -p -D -m644 kprofilemethod/README \ - debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/README.kprofilemethod + debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/README.kprofilemethod install -p -D -m644 scheck/README \ - debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/README.scheck + debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/README.scheck binary-install/kapptemplate-trinity:: - rm -f debian/kapptemplate-trinity/usr/share/apps/kapptemplate/admin/*.cdbs-orig + rm -f debian/$(cdbs_curpkg)/usr/share/apps/kapptemplate/admin/*.cdbs-orig for admindirfile in compile config.guess config.sub debianrules depcomp detect-autoconf.pl \ Doxyfile.global install-sh missing mkinstalldirs nmcheck ylwrap; do \ - chmod 755 debian/kapptemplate-trinity/usr/share/apps/kapptemplate/admin/$$admindirfile; \ + chmod 755 debian/$(cdbs_curpkg)/usr/share/apps/kapptemplate/admin/$$admindirfile; \ done + +binary-install/tdecachegrind-converters-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/bin + +binary-install/umbrello-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/share/apps/umbrello/headings diff --git a/dilos/core/tdetoys/debian/cdbs/debian-tde.mk b/dilos/core/tdetoys/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdetoys/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/tdetoys/debian/cdbs/versions.pl b/dilos/core/tdetoys/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdetoys/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/tdetoys/debian/compat b/dilos/core/tdetoys/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdetoys/debian/compat +++ b/dilos/core/tdetoys/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdetoys/debian/control b/dilos/core/tdetoys/debian/control index 296f05ede..27ea09d22 100644 --- a/dilos/core/tdetoys/debian/control +++ b/dilos/core/tdetoys/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: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev Standards-Version: 3.8.4 Package: tdetoys-trinity diff --git a/dilos/core/tdetoys/debian/kweather-trinity.postinst b/dilos/core/tdetoys/debian/kweather-trinity.postinst deleted file mode 100644 index bf30c75a9..000000000 --- a/dilos/core/tdetoys/debian/kweather-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kweather-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdetoys/debian/rules b/dilos/core/tdetoys/debian/rules index 9218ed39b..73ad35457 100755 --- a/dilos/core/tdetoys/debian/rules +++ b/dilos/core/tdetoys/debian/rules @@ -1,8 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include DEB_CONFIGURE_MANDIR := /usr/share/man diff --git a/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian b/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian index b104d2e5d..914337ec6 100644 --- a/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian +++ b/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian @@ -1,3 +1 @@ ark-trinity: no-shlibs-control-file usr/lib/libtdeinit_ark.so -ark-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_ark.so -ark-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_ark.so diff --git a/dilos/core/tdeutils/debian/ark-trinity.postinst b/dilos/core/tdeutils/debian/ark-trinity.postinst deleted file mode 100644 index d314f31e7..000000000 --- a/dilos/core/tdeutils/debian/ark-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for ark-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdeutils/debian/cdbs/debian-tde.mk b/dilos/core/tdeutils/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdeutils/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/tdeutils/debian/cdbs/versions.pl b/dilos/core/tdeutils/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdeutils/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/tdeutils/debian/compat b/dilos/core/tdeutils/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdeutils/debian/compat +++ b/dilos/core/tdeutils/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdeutils/debian/control b/dilos/core/tdeutils/debian/control index ae733a3e9..b3ca42264 100644 --- a/dilos/core/tdeutils/debian/control +++ b/dilos/core/tdeutils/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-all-dev, libxtst-dev, xutils -Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python3-all-dev, libxtst-dev, xutils +Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, tdelibs14-trinity-doc Standards-Version: 3.8.4 Package: tdeutils-trinity diff --git a/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian b/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian index b08559540..c84b29ee9 100644 --- a/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian +++ b/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian @@ -1,3 +1 @@ kcalc-trinity: no-shlibs-control-file usr/lib/libtdeinit_kcalc.so -kcalc-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kcalc.so -kcalc-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kcalc.so diff --git a/dilos/core/tdeutils/debian/kcalc-trinity.postinst b/dilos/core/tdeutils/debian/kcalc-trinity.postinst deleted file mode 100644 index e1935e9a5..000000000 --- a/dilos/core/tdeutils/debian/kcalc-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kcalc-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdeutils/debian/kedit-trinity.lintian b/dilos/core/tdeutils/debian/kedit-trinity.lintian index da3ee87da..32491dbbb 100644 --- a/dilos/core/tdeutils/debian/kedit-trinity.lintian +++ b/dilos/core/tdeutils/debian/kedit-trinity.lintian @@ -1,3 +1 @@ kedit-trinity: no-shlibs-control-file usr/lib/libtdeinit_kedit.so -kedit-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kedit.so -kedit-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kedit.so diff --git a/dilos/core/tdeutils/debian/kedit-trinity.postinst b/dilos/core/tdeutils/debian/kedit-trinity.postinst deleted file mode 100644 index b939c5451..000000000 --- a/dilos/core/tdeutils/debian/kedit-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kedit-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdeutils/debian/rules b/dilos/core/tdeutils/debian/rules index 1743d5d67..0d85e5f3c 100755 --- a/dilos/core/tdeutils/debian/rules +++ b/dilos/core/tdeutils/debian/rules @@ -1,8 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include DEB_CONFIGURE_MANDIR := /usr/share/man @@ -45,9 +44,3 @@ DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trini DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity - -#shlibs_ver = 4:3.5.0-1 -#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) - -binary-install/superkaramba-trinity:: - rm -f debian/superkaramba/usr/share/doc/superkaramba/examples/globalMouse/xcursor.so diff --git a/dilos/core/tdeutils/debian/superkaramba-trinity.examples b/dilos/core/tdeutils/debian/superkaramba-trinity.examples deleted file mode 100644 index c02a032d2..000000000 --- a/dilos/core/tdeutils/debian/superkaramba-trinity.examples +++ /dev/null @@ -1,12 +0,0 @@ -superkaramba/examples/API -superkaramba/examples/autoHide -superkaramba/examples/globalMouse -superkaramba/examples/input_api -superkaramba/examples/input_example -superkaramba/examples/mouseDrag -superkaramba/examples/popupMenu -superkaramba/examples/README -superkaramba/examples/richtext -superkaramba/examples/taskBar -superkaramba/examples/template.py -superkaramba/examples/unicode diff --git a/dilos/core/tdeutils/debian/superkaramba-trinity.install b/dilos/core/tdeutils/debian/superkaramba-trinity.install index 3dd8dbdad..ae0ab4802 100644 --- a/dilos/core/tdeutils/debian/superkaramba-trinity.install +++ b/dilos/core/tdeutils/debian/superkaramba-trinity.install @@ -1,6 +1,7 @@ debian/tmp/usr/bin/superkaramba debian/tmp/usr/share/applications/tde/superkaramba.desktop debian/tmp/usr/share/apps/superkaramba/superkarambaui.rc +debian/tmp/usr/share/apps/superkaramba/examples debian/tmp/usr/share/doc/tde/HTML/en/superkaramba/common debian/tmp/usr/share/doc/tde/HTML/en/superkaramba/index.cache.bz2 debian/tmp/usr/share/doc/tde/HTML/en/superkaramba/index.docbook diff --git a/dilos/core/tdeutils/debian/tdelirc-trinity.lintian b/dilos/core/tdeutils/debian/tdelirc-trinity.lintian index 00770eec1..3458103f8 100644 --- a/dilos/core/tdeutils/debian/tdelirc-trinity.lintian +++ b/dilos/core/tdeutils/debian/tdelirc-trinity.lintian @@ -1,3 +1 @@ tdelirc-trinity: no-shlibs-control-file usr/lib/libtdeinit_irkick.so -tdelirc-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_irkick.so -tdelirc-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_irkick.so diff --git a/dilos/core/tdeutils/debian/tdelirc-trinity.postinst b/dilos/core/tdeutils/debian/tdelirc-trinity.postinst deleted file mode 100644 index 423d9e98c..000000000 --- a/dilos/core/tdeutils/debian/tdelirc-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for tdelirc-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdevelop/debian/cdbs/debian-tde.mk b/dilos/core/tdevelop/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/core/tdevelop/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/tdevelop/debian/cdbs/versions.pl b/dilos/core/tdevelop/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/core/tdevelop/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/tdevelop/debian/compat b/dilos/core/tdevelop/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdevelop/debian/compat +++ b/dilos/core/tdevelop/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdevelop/debian/control b/dilos/core/tdevelop/debian/control index 257910234..0ddf3e4c6 100644 --- a/dilos/core/tdevelop/debian/control +++ b/dilos/core/tdevelop/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdelibs14-trinity-doc, tqt3-apps-dev, flex, python3-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev Standards-Version: 3.8.4 Package: tdevelop-trinity @@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas Replaces: kdevelop-trinity (<< 4:14.0.0~) Breaks: kdevelop-trinity (<< 4:14.0.0~) Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4) -Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake-trinity, ruby, python-all, g++, kdevdesigner-trinity +Suggests: tqt3-apps-dev, tdelibs14-trinity-dev, sgmltools-lite, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, konsole-trinity, tde-cmake, ruby, python3-all, g++, kdevdesigner-trinity Description: An IDE for Unix/X11 TDevelop is an easy to use Integrated Development Environment for developing C/C++ applications under X11. It features diff --git a/dilos/core/tdevelop/debian/rules b/dilos/core/tdevelop/debian/rules index 962168f89..eee4441ca 100755 --- a/dilos/core/tdevelop/debian/rules +++ b/dilos/core/tdevelop/debian/rules @@ -10,8 +10,7 @@ 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 +-include /usr/share/cdbs/1/class/tde.mk DEB_DH_STRIP_ARGS := --dbg-package=tdevelop-trinity-dbg \ -Xlibkdevcppparser.so.0.0.0 diff --git a/dilos/core/tdevelop/debian/watch b/dilos/core/tdevelop/debian/watch deleted file mode 100644 index 18344a41a..000000000 --- a/dilos/core/tdevelop/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -ftp://ftp.kde.org/pub/kde/stable/latest/src/tdevelop-(.*)\.tar\.bz2 diff --git a/dilos/dependencies/arts/debian/cdbs/debian-tde.mk b/dilos/dependencies/arts/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/dependencies/arts/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/dependencies/arts/debian/cdbs/versions.pl b/dilos/dependencies/arts/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/dependencies/arts/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/dependencies/arts/debian/compat b/dilos/dependencies/arts/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/arts/debian/compat +++ b/dilos/dependencies/arts/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/arts/debian/control b/dilos/dependencies/arts/debian/control index 980e2a77e..26d70fbf0 100644 --- a/dilos/dependencies/arts/debian/control +++ b/dilos/dependencies/arts/debian/control @@ -4,11 +4,11 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/TDE Maintainers <debian-qt-tde@lists.debian.org> Priority: optional Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, docbook-to-man, texinfo, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libaudio-dev, libaudiofile-dev, libglib2.0-dev, libmad0-dev, - libogg-dev, libtqtinterface-dev, + libogg-dev, libtqt3-mt-dev, libvorbis-dev, libltdl-dev Build-Conflicts: libmas-dev Standards-Version: 3.8.4 @@ -18,7 +18,7 @@ Architecture: all Section: sound Replaces: arts-trinity (<< 4:14.0.0~) Breaks: arts-trinity (<< 4:14.0.0~) -Depends: libartsc0-trinity (>= ${source:Version}), libarts1c2a-trinity (>= ${source:Version}) +Depends: libartsc0-trinity (>= ${source:Version}), libarts1c2a-trinity (>= ${source:Version}) | libarts1t64-trinity (>= ${source:Version}) Description: sound system from the official TDE release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -58,7 +58,7 @@ Architecture: any Section: libdevel Replaces: libarts1-trinity-dev (<< 4:14.0.0~) Breaks: libarts1-trinity-dev (<< 4:14.0.0~) -Depends: libarts1c2a-trinity (= ${binary:Version}), libartsc0-trinity-dev (= ${binary:Version}), ${libasound2-dev}, libaudio-dev, libaudiofile-dev, libglib2.0-dev, libogg-dev, libvorbis-dev, libmad0-dev, libtqtinterface-dev +Depends: libarts1c2a-trinity (= ${binary:Version}), libartsc0-trinity-dev (= ${binary:Version}), ${libasound2-dev}, libaudio-dev, libaudiofile-dev, libglib2.0-dev, libogg-dev, libvorbis-dev, libmad0-dev, libtqt3-mt-dev Description: development files for the aRts sound system core components This package contains the header files needed to build applications that use the aRts sound system. diff --git a/dilos/dependencies/arts/debian/rules b/dilos/dependencies/arts/debian/rules index a81635c90..3de069b50 100755 --- a/dilos/dependencies/arts/debian/rules +++ b/dilos/dependencies/arts/debian/rules @@ -9,8 +9,15 @@ #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 +-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 = c2a +endif + DEB_CMAKE_EXTRA_FLAGS := \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ @@ -37,13 +44,13 @@ DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg \ -Xlibmcop.so.1.0.0 -Xlibqtmcop.so.1.0.0 -Xartsplay -Xartsd -Xartscat \ -Xartsshell -Xartsrec -Xmcopidl -PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity +PACKAGES_WITH_LIBS := libarts1$(DEB_TIME64_SUFFIX)-trinity libartsc0-trinity DEB_DH_MAKESHLIBS_ARGS_ALL := -V DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$(DEB_HOST_MULTIARCH)) -DEB_DH_MAKESHLIBS_ARGS_libarts1c2a-trinity := -V'libarts1c2a-trinity (>= 1.5.9)' -DEB_DH_MAKESHLIBS_ARGS_libartsc0-trinity := -V'libartsc0-trinity (>= 1.5.9)' +DEB_DH_MAKESHLIBS_ARGS_libarts1$(DEB_TIME64_SUFFIX)-trinity := -V'libarts1$(DEB_TIME64_SUFFIX)-trinity (>= 1.5.9)' +DEB_DH_MAKESHLIBS_ARGS_libartsc0-trinity := -V'libartsc0-trinity (>= 1.5.9)' #shlibs_ver = 1.5.0-1 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) @@ -54,3 +61,47 @@ binary-predeb/libarts1-trinity-dev:: ifeq (linux,$(DEB_HOST_ARCH_OS)) echo "libasound2-dev=libasound2-dev" >> debian/libarts1-trinity-dev.substvars endif + +post-patches:: + dh_testdir +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libarts1c2a" | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libarts1$(DEB_TIME64_SUFFIX)$${a##*c2a} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libarts1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libarts1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \ + -e "s/\\(libarts1\\)c2a-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 "/libarts1$(DEB_TIME64_SUFFIX)-" | \ + xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libarts1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libarts1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \ + -e "s/\\(libarts1\\)c2a-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + debian/control +else + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif diff --git a/dilos/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk b/dilos/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk deleted file mode 100644 index f36e3527c..000000000 --- a/dilos/dependencies/avahi-tqt/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_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)/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/dilos/dependencies/avahi-tqt/debian/cdbs/versions.pl b/dilos/dependencies/avahi-tqt/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/dependencies/avahi-tqt/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/dependencies/avahi-tqt/debian/compat b/dilos/dependencies/avahi-tqt/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/avahi-tqt/debian/compat +++ b/dilos/dependencies/avahi-tqt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/avahi-tqt/debian/control b/dilos/dependencies/avahi-tqt/debian/control index 171d4678e..86d9bb86f 100644 --- a/dilos/dependencies/avahi-tqt/debian/control +++ b/dilos/dependencies/avahi-tqt/debian/control @@ -3,11 +3,11 @@ Section: net Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, - cmake-trinity, ninja-build, +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, + tde-cmake, ninja-build, gcc, pkg-config, - libtqtinterface-dev, + libtqt3-mt-dev, libavahi-common-dev, libavahi-client-dev Standards-Version: 3.9.1 @@ -38,7 +38,7 @@ Replaces: libavahi-tqt-dev (<< 4:14.0.0~) Breaks: libavahi-tqt-dev (<< 4:14.0.0~) Depends: libavahi-tqt-1 (= ${binary:Version}), ${misc:Depends}, - libtqtinterface-dev, + libtqt3-mt-dev, libavahi-common-dev Description: Development headers for the Avahi TQt integration library Avahi is a fully LGPL framework for Multicast DNS Service Discovery. diff --git a/dilos/dependencies/avahi-tqt/debian/rules b/dilos/dependencies/avahi-tqt/debian/rules index 7ef42f747..0f226c7b6 100755 --- a/dilos/dependencies/avahi-tqt/debian/rules +++ b/dilos/dependencies/avahi-tqt/debian/rules @@ -1,8 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk # Ensure at build time that the library has no dependencies on undefined # symbols, and speed up loading. diff --git a/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk b/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/dependencies/dbus-1-tqt/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/dependencies/dbus-1-tqt/debian/cdbs/versions.pl b/dilos/dependencies/dbus-1-tqt/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/dependencies/dbus-1-tqt/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/dependencies/dbus-1-tqt/debian/compat b/dilos/dependencies/dbus-1-tqt/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/dbus-1-tqt/debian/compat +++ b/dilos/dependencies/dbus-1-tqt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/dbus-1-tqt/debian/control b/dilos/dependencies/dbus-1-tqt/debian/control index 451be956d..6bda799a7 100644 --- a/dilos/dependencies/dbus-1-tqt/debian/control +++ b/dilos/dependencies/dbus-1-tqt/debian/control @@ -2,7 +2,7 @@ Source: dbus-1-tqt Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, libdbus-1-dev (>= 0.90) Build-Depends-Indep: doxygen, graphviz Standards-Version: 3.8.3 @@ -11,7 +11,7 @@ Section: libdevel Architecture: any Replaces: libdbus-1-tqt-dev (<< 4:14.0.0~) Breaks: libdbus-1-tqt-dev (<< 4:14.0.0~) -Depends: libdbus-1-tqt (= ${binary:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev +Depends: libdbus-1-tqt (= ${binary:Version}), libdbus-1-dev (>= 0.90), libtqt3-mt-dev Description: dbus bindings for the Trinity TQt interface D-BUS is a message bus, used for sending messages between applications. Conceptually, it fits somewhere in between raw sockets and CORBA in diff --git a/dilos/dependencies/dbus-1-tqt/debian/rules b/dilos/dependencies/dbus-1-tqt/debian/rules index 9e8e1bb3e..728eddf1b 100755 --- a/dilos/dependencies/dbus-1-tqt/debian/rules +++ b/dilos/dependencies/dbus-1-tqt/debian/rules @@ -1,8 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/dilos/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk b/dilos/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk deleted file mode 100644 index f36e3527c..000000000 --- a/dilos/dependencies/dbus-tqt/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_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)/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/dilos/dependencies/dbus-tqt/debian/cdbs/versions.pl b/dilos/dependencies/dbus-tqt/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/dependencies/dbus-tqt/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/dependencies/dbus-tqt/debian/changelog b/dilos/dependencies/dbus-tqt/debian/changelog deleted file mode 100644 index 91871211a..000000000 --- a/dilos/dependencies/dbus-tqt/debian/changelog +++ /dev/null @@ -1,6 +0,0 @@ -dbus-tqt (0.63.svn.0ubuntu0) maverick; urgency=low - - * Migrate to Trinity Qt [TQt] Interface - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 23 Mar 2011 17:11:00 -0600 - diff --git a/dilos/dependencies/dbus-tqt/debian/compat b/dilos/dependencies/dbus-tqt/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/dilos/dependencies/dbus-tqt/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/dilos/dependencies/dbus-tqt/debian/control b/dilos/dependencies/dbus-tqt/debian/control deleted file mode 100644 index 68eab2d63..000000000 --- a/dilos/dependencies/dbus-tqt/debian/control +++ /dev/null @@ -1,40 +0,0 @@ -Source: dbus-tqt -Section: devel -Priority: optional -Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Drge <slomo@ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) -Standards-Version: 3.8.3 - -Package: libdbus-tqt-1-1c2 -Section: libs -Architecture: any -Replaces: libdbus-tqt-1-1c2 (<< 4:14.0.0~) -Breaks: libdbus-tqt-1-1c2 (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Conflicts: dbus-tqt-1, dbus-tqt-1c2, libdbus-tqt-1-1 -Description: simple interprocess messaging system (TQt-based shared library) - D-BUS is a message bus, used for sending messages between applications. - Conceptually, it fits somewhere in between raw sockets and CORBA in - terms of complexity. - . - This package provides the TQt-based shared library for applications using the - Qt interface to D-BUS. - . - See the dbus description for more information about D-BUS in general. - -Package: libdbus-tqt-1-dev -Section: libdevel -Architecture: any -Replaces: libdbus-tqt-1-dev (<< 4:14.0.0~) -Breaks: libdbus-tqt-1-dev (<< 4:14.0.0~) -Depends: libdbus-tqt-1-1c2 (= ${source:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev -Conflicts: dbus-tqt-1-dev -Description: simple interprocess messaging system (TQt interface) - D-BUS is a message bus, used for sending messages between applications. - Conceptually, it fits somewhere in between raw sockets and CORBA in - terms of complexity. - . - This package provides a TQt-style interface to D-BUS. - . - See the dbus description for more information about D-BUS in general. diff --git a/dilos/dependencies/dbus-tqt/debian/copyright b/dilos/dependencies/dbus-tqt/debian/copyright deleted file mode 100644 index 9541c0a8f..000000000 --- a/dilos/dependencies/dbus-tqt/debian/copyright +++ /dev/null @@ -1,214 +0,0 @@ -This package was debianized by Colin Walters <walters@debian.org> on -Thu, 6 Mar 2003 18:01:37 -0500 - -The source tarball was created by splitting out the qt3 bindings part from the -dbus-qt3 git repository: http://gitweb.freedesktop.org/?p=dbus/dbus-qt3.git - -This package is dual-licensed under the Academic Free License, and the -GPL. For a description of the GPL, see /usr/share/common-licenses/GPL -on your Debian system. - -Portions of the package are only licensed under the GPL (notably -tools/dbus-cleanup-sockets.c and test/decode-gcov.c ). - -The Academic Free License follows: - - The Academic Free License - v. 2.0 - -This Academic Free License (the "License") applies to any original -work of authorship (the "Original Work") whose owner (the "Licensor") -has placed the following notice immediately following the copyright -notice for the Original Work: - -Licensed under the Academic Free License version 2.0 - -1) Grant of Copyright License. Licensor hereby grants You a -world-wide, royalty-free, non-exclusive, perpetual, sublicenseable -license to do the following: - -a) to reproduce the Original Work in copies; - -b) to prepare derivative works ("Derivative Works") based upon the Original Work; - -c) to distribute copies of the Original Work and Derivative Works to the public; - -d) to perform the Original Work publicly; and - -e) to display the Original Work publicly. - -2) Grant of Patent License. Licensor hereby grants You a world-wide, -royalty-free, non-exclusive, perpetual, sublicenseable license, under -patent claims owned or controlled by the Licensor that are embodied in -the Original Work as furnished by the Licensor, to make, use, sell and -offer for sale the Original Work and Derivative Works. - -3) Grant of Source Code License. The term "Source Code" means the -preferred form of the Original Work for making modifications to it and -all available documentation describing how to modify the Original -Work. Licensor hereby agrees to provide a machine-readable copy of -the Source Code of the Original Work along with each copy of the -Original Work that Licensor distributes. Licensor reserves the right -to satisfy this obligation by placing a machine-readable copy of the -Source Code in an information repository reasonably calculated to -permit inexpensive and convenient access by You for as long as -Licensor continues to distribute the Original Work, and by publishing -the address of that information repository in a notice immediately -following the copyright notice that applies to the Original Work. - -4) Exclusions From License Grant. Neither the names of Licensor, nor -the names of any contributors to the Original Work, nor any of their -trademarks or service marks, may be used to endorse or promote -products derived from this Original Work without express prior written -permission of the Licensor. Nothing in this License shall be deemed -to grant any rights to trademarks, copyrights, patents, trade secrets -or any other intellectual property of Licensor except as expressly -stated herein. No patent license is granted to make, use, sell or -offer to sell embodiments of any patent claims other than the licensed -claims defined in Section 2. No right is granted to the trademarks of -Licensor even if such marks are included in the Original Work. -Nothing in this License shall be interpreted to prohibit Licensor from -licensing under different terms from this License any Original Work -that Licensor otherwise would have a right to license. - -5) This section intentionally omitted. - -6) Attribution Rights. You must retain, in the Source Code of any -Derivative Works that You create, all copyright, patent or trademark -notices from the Source Code of the Original Work, as well as any -notices of licensing and any descriptive text identified therein as an -"Attribution Notice." You must cause the Source Code for any -Derivative Works that You create to carry a prominent Attribution -Notice reasonably calculated to inform recipients that You have -modified the Original Work. - -7) Warranty of Provenance and Disclaimer of Warranty. Licensor -warrants that the copyright in and to the Original Work and the patent -rights granted herein by Licensor are owned by the Licensor or are -sublicensed to You under the terms of this License with the permission -of the contributor(s) of those copyrights and patent rights. Except -as expressly stated in the immediately proceeding sentence, the -Original Work is provided under this License on an "AS IS" BASIS and -WITHOUT WARRANTY, either express or implied, including, without -limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY -OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY -constitutes an essential part of this License. No license to Original -Work is granted hereunder except under this disclaimer. - -8) Limitation of Liability. Under no circumstances and under no legal -theory, whether in tort (including negligence), contract, or -otherwise, shall the Licensor be liable to any person for any direct, -indirect, special, incidental, or consequential damages of any -character arising as a result of this License or the use of the -Original Work including, without limitation, damages for loss of -goodwill, work stoppage, computer failure or malfunction, or any and -all other commercial damages or losses. This limitation of liability -shall not apply to liability for death or personal injury resulting -from Licensor's negligence to the extent applicable law prohibits such -limitation. Some jurisdictions do not allow the exclusion or -limitation of incidental or consequential damages, so this exclusion -and limitation may not apply to You. - -9) Acceptance and Termination. If You distribute copies of the -Original Work or a Derivative Work, You must make a reasonable effort -under the circumstances to obtain the express assent of recipients to -the terms of this License. Nothing else but this License (or another -written agreement between Licensor and You) grants You permission to -create Derivative Works based upon the Original Work or to exercise -any of the rights granted in Section 1 herein, and any attempt to do -so except under the terms of this License (or another written -agreement between Licensor and You) is expressly prohibited by -U.S. copyright law, the equivalent laws of other countries, and by -international treaty. Therefore, by exercising any of the rights -granted to You in Section 1 herein, You indicate Your acceptance of -this License and all of its terms and conditions. - -10) Termination for Patent Action. This License shall terminate -automatically and You may no longer exercise any of the rights granted -to You by this License as of the date You commence an action, -including a cross-claim or counterclaim, for patent infringement (i) -against Licensor with respect to a patent applicable to software or -(ii) against any entity with respect to a patent applicable to the -Original Work (but excluding combinations of the Original Work with -other software or hardware). - -11) Jurisdiction, Venue and Governing Law. Any action or suit relating -to this License may be brought only in the courts of a jurisdiction -wherein the Licensor resides or in which Licensor conducts its primary -business, and under the laws of that jurisdiction excluding its -conflict-of-law provisions. The application of the United Nations -Convention on Contracts for the International Sale of Goods is -expressly excluded. Any use of the Original Work outside the scope of -this License or after its termination shall be subject to the -requirements and penalties of the U.S. Copyright Act, 17 U.S.C. \u00a4 -101 et seq., the equivalent laws of other countries, and international -treaty. This section shall survive the termination of this License. - -12) Attorneys Fees. In any action to enforce the terms of this License -or seeking damages relating thereto, the prevailing party shall be -entitled to recover its costs and expenses, including, without -limitation, reasonable attorneys' fees and costs incurred in -connection with such action, including any appeal of such action. -This section shall survive the termination of this License. - -13) Miscellaneous. This License represents the complete agreement -concerning the subject matter hereof. If any provision of this -License is held to be unenforceable, such provision shall be reformed -only to the extent necessary to make it enforceable. - -14) Definition of "You" in This License. "You" throughout this -License, whether in upper or lower case, means an individual or a -legal entity exercising rights under, and complying with all of the -terms of, this License. For legal entities, "You" includes any entity -that controls, is controlled by, or is under common control with you. -For purposes of this definition, "control" means (i) the power, direct -or indirect, to cause the direction or management of such entity, -whether by contract or otherwise, or (ii) ownership of fifty percent -(50%) or more of the outstanding shares, or (iii) beneficial ownership -of such entity. - -15) Right to Use. You may use the Original Work in all ways not -otherwise restricted or conditioned by this License or by law, and -Licensor promises not to interfere with or be responsible for such -uses by You. - -This license is Copyright (C) 2003 Lawrence E. Rosen. All rights -reserved. Permission is hereby granted to copy and distribute this -license without modification. This license may not be modified -without the express written permission of its copyright owner. - --- -END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential -differences between the Academic Free License (AFL) version 1.0 and other -open source licenses: - -The Academic Free License is similar to the BSD, MIT, UoI/NCSA and Apache -licenses in many respects but it is intended to solve a few problems with -those licenses. - -* The AFL is written so as to make it clear what software is being -licensed (by the inclusion of a statement following the copyright notice -in the software). This way, the license functions better than a template -license. The BSD, MIT and UoI/NCSA licenses apply to unidentified software. - -* The AFL tqcontains a complete copyright grant to the software. The BSD -and Apache licenses are vague and incomplete in that respect. - -* The AFL tqcontains a complete patent grant to the software. The BSD, MIT, -UoI/NCSA and Apache licenses rely on an implied patent license and contain -no explicit patent grant. - -* The AFL makes it clear that no trademark rights are granted to the -licensor's trademarks. The Apache license tqcontains such a provision, but the -BSD, MIT and UoI/NCSA licenses do not. - -* The AFL includes the warranty by the licensor that it either owns the -copyright or that it is distributing the software under a license. None of -the other licenses contain that warranty. All other warranties are disclaimed, -as is the case for the other licenses. - -* The AFL is itself copyrighted (with the right granted to copy and distribute -without modification). This ensures that the owner of the copyright to the -license will control changes. The Apache license tqcontains a copyright notice, -but the BSD, MIT and UoI/NCSA licenses do not. diff --git a/dilos/dependencies/dbus-tqt/debian/docs b/dilos/dependencies/dbus-tqt/debian/docs deleted file mode 100644 index 6f83607c1..000000000 --- a/dilos/dependencies/dbus-tqt/debian/docs +++ /dev/null @@ -1,3 +0,0 @@ -AUTHORS -NEWS -README diff --git a/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install b/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install deleted file mode 100644 index 56fcdf6ac..000000000 --- a/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/*/libdbus-tqt-*.so.* diff --git a/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install b/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install deleted file mode 100644 index 12d5cd477..000000000 --- a/dilos/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install +++ /dev/null @@ -1,6 +0,0 @@ -debian/tmp/usr/include/dbus*/dbus/dbus-qt.h -debian/tmp/usr/include/dbus*/dbus/connection.h -debian/tmp/usr/include/dbus*/dbus/server.h -debian/tmp/usr/include/dbus*/dbus/message.h -debian/tmp/usr/lib/*/libdbus-tqt-*.so -debian/tmp/usr/lib/*/pkgconfig/*.pc diff --git a/dilos/dependencies/dbus-tqt/debian/patches/series b/dilos/dependencies/dbus-tqt/debian/patches/series deleted file mode 100644 index e69de29bb..000000000 --- a/dilos/dependencies/dbus-tqt/debian/patches/series +++ /dev/null diff --git a/dilos/dependencies/dbus-tqt/debian/rules b/dilos/dependencies/dbus-tqt/debian/rules deleted file mode 100755 index 570be2358..000000000 --- a/dilos/dependencies/dbus-tqt/debian/rules +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/make -f -# Copyright © 2002,2003 Colin Walters <walters@verbum.org> -# Copyright © 2003 Daniel Stone <daniels@debian.org> -# Copyright © 2006 Sjoerd Simons <sjoerd@debian.org> - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk - -# Strict library versioning -DEB_DH_MAKESHLIBS_ARGS_ALL := -V - -# Build options -DEB_CMAKE_EXTRA_FLAGS := \ - -DCMAKE_C_COMPILER=gcc \ - -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \ - -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ - -DCMAKE_SKIP_RPATH="OFF" \ - -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_APIDOX_HTML_DIRECTORY="usr/share/doc/libdbus-1-tqt/HTML" \ - -DWITH_ALL_OPTIONS="ON" diff --git a/dilos/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk b/dilos/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk deleted file mode 100644 index f36e3527c..000000000 --- a/dilos/dependencies/libart-lgpl/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_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)/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/dilos/dependencies/libart-lgpl/debian/cdbs/versions.pl b/dilos/dependencies/libart-lgpl/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/dependencies/libart-lgpl/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/dependencies/libart-lgpl/debian/compat b/dilos/dependencies/libart-lgpl/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/libart-lgpl/debian/compat +++ b/dilos/dependencies/libart-lgpl/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/libart-lgpl/debian/control b/dilos/dependencies/libart-lgpl/debian/control index 85484ca75..889ef88a2 100644 --- a/dilos/dependencies/libart-lgpl/debian/control +++ b/dilos/dependencies/libart-lgpl/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build Standards-Version: 3.8.4 Package: libart-2.0-2 diff --git a/dilos/dependencies/libart-lgpl/debian/rules b/dilos/dependencies/libart-lgpl/debian/rules index 449353fe1..8988dc726 100755 --- a/dilos/dependencies/libart-lgpl/debian/rules +++ b/dilos/dependencies/libart-lgpl/debian/rules @@ -1,8 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control) diff --git a/dilos/dependencies/python-tqt/debian/README.Debian b/dilos/dependencies/python-tqt/debian/README.Debian deleted file mode 100644 index 33603ec40..000000000 --- a/dilos/dependencies/python-tqt/debian/README.Debian +++ /dev/null @@ -1,4 +0,0 @@ -DOCUMENTATION -------------- -You can find doc and examples about PyTQt in the package python-tqt-doc - diff --git a/dilos/dependencies/python-tqt/debian/compat b/dilos/dependencies/python-tqt/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/dilos/dependencies/python-tqt/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/dilos/dependencies/python-tqt/debian/control b/dilos/dependencies/python-tqt/debian/control deleted file mode 100644 index 7af5607d6..000000000 --- a/dilos/dependencies/python-tqt/debian/control +++ /dev/null @@ -1,200 +0,0 @@ -Source: python-tqt -Section: python -Priority: optional -Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> -Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> -Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg [!solaris-any], python3-all-dev, python3-all-dbg [!solaris-any], libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, python-sip-tqt-dev, python-sip-tqt-dbg [!solaris-any], libtqscintilla-dev, python-support (>= 0.7.1) | dh-python -Standards-Version: 3.8.4 -XS-Python-Version: >= 2.3 -X-Python3-Version: >= 3.0 - -Package: python-tqt -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, ${sip:Depends}, ${misc:Depends} -Replaces: python-tqt (<< 4:14.0.0~) -Breaks: python-tqt (<< 4:14.0.0~) -Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql -Provides: ${python:Provides} -Description: TQt bindings for Python - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - At this moment PyTQt offers a vast subset of TQt API. There are - some minor issues related to the differences between C++ and Python - (types, etc), but usually you'll be able to write code pretty much the - same way in both languages (with syntax differences, of course) - -Package: python-tqt-dbg -Architecture: linux-any -Priority: extra -Replaces: python-tqt-dbg (<< 4:14.0.0~) -Breaks: python-tqt-dbg (<< 4:14.0.0~) -Section: debug -Depends: ${shlibs:Depends}, python-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends} -Description: TQt bindings for Python (debug extension) - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - -Package: python3-tqt -Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip3-tqt:Depends}, ${misc:Depends} -Suggests: python3-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql -Provides: ${python3:Provides} -Description: TQt bindings for Python 3 - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - At this moment PyTQt offers a vast subset of TQt API. There are - some minor issues related to the differences between C++ and Python - (types, etc), but usually you'll be able to write code pretty much the - same way in both languages (with syntax differences, of course) - -Package: python3-tqt-dbg -Architecture: any -Priority: extra -Section: debug -Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends} -Description: TQt bindings for Python 3 (debug extension) - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - -Package: python-tqt-gl -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends} -Replaces: python-tqt-gl (<< 4:14.0.0~) -Breaks: python-tqt-gl (<< 4:14.0.0~) -Suggests: python-tqt-doc -Provides: ${python:Provides} -Description: TQt OpenGL bindings for Python - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - -Package: python-tqt-gl-dbg -Priority: extra -Section: debug -Replaces: python-tqt-gl-dbg (<< 4:14.0.0~) -Breaks: python-tqt-gl-dbg (<< 4:14.0.0~) -Architecture: linux-any -Depends: ${shlibs:Depends}, python-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt OpenGL bindings for Python (debug extension) - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - -Package: python3-tqt-gl -Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), python3-opengl, ${misc:Depends} -Suggests: python-tqt-doc -Provides: ${python3:Provides} -Description: TQt OpenGL bindings for Python 3 - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - -Package: python3-tqt-gl-dbg -Priority: extra -Section: debug -Architecture: any -Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt-gl (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt OpenGL bindings for Python 3 (debug extension) - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - -Package: python-tqtext -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends} -Replaces: python-tqtext (<< 4:14.0.0~) -Breaks: python-tqtext (<< 4:14.0.0~) -Provides: ${python:Provides} -Description: TQt extensions for PyTQt - PyTQt Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - -Package: python-tqtext-dbg -Priority: extra -Section: debug -Replaces: python-tqtext-dbg (<< 4:14.0.0~) -Breaks: python-tqtext-dbg (<< 4:14.0.0~) -Architecture: linux-any -Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt debug extensions for PyTQt - PyTQt debug Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - -Package: python3-tqtext -Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), ${misc:Depends} -Provides: ${python3:Provides} -Description: TQt extensions for PyTQt - PyTQt Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - -Package: python3-tqtext-dbg -Priority: extra -Section: debug -Architecture: any -Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqtext (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt debug extensions for PyTQt - PyTQt debug Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - -Package: pytqt-tools -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: pytqt-tools (<< 4:14.0.0~) -Breaks: pytqt-tools (<< 4:14.0.0~) -Description: pyuic and pylupdate for TQt - pyuic is the PyTQt counterpart for TQt's uic. It takes an XML - user interface file and generates Python code. - . - pylupdate is the counterpart for TQt's lupdate. It updates TQt - Linguist translation files from Python code. - -Package: python-tqt-dev -Depends: python3-tqt (= ${binary:Version}) | python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends} -Suggests: python3-sip-tqt-dev | python-sip-tqt-dev -Replaces: python-tqt-dev (<< 4:14.0.0~) -Breaks: python-tqt-dev (<< 4:14.0.0~) -Architecture: all -Description: TQt bindings for Python - Development files - Development .sip files with definitions of PyTQt classes. They - are needed to build PyTQt, but also as building blocks of other - packages based on them, like PyTDE. - -Package: python-tqt-doc -Section: doc -Architecture: all -Replaces: python-tqt-doc (<< 4:14.0.0~) -Breaks: python-tqt-doc (<< 4:14.0.0~) -Depends: ${misc:Depends} -Suggests: python-tqt -Description: TQt bindings for Python - Documentation and examples - Documentation and examples for the PyTQt (bindings that allow - the use of TQt library from within a Python script). diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-dev.dirs b/dilos/dependencies/python-tqt/debian/python-tqt-dev.dirs deleted file mode 100644 index ae635cbcd..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-dev.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/sip/tqt diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-dev.install b/dilos/dependencies/python-tqt/debian/python-tqt-dev.install deleted file mode 100644 index 7b6aca191..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -sip/* usr/share/sip/tqt - diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/dilos/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides deleted file mode 100644 index 36e6c1349..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides +++ /dev/null @@ -1,15 +0,0 @@ -# lintian test overriden as the files tripping this error are put into the source -# of the generated package. This is a false-positive - -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qt/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtaxcontainer/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtcanvas/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtext/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtgl/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtnetwork/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtpe/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtsql/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qttable/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtui/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtxml/copying.sip - diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-doc.dirs b/dilos/dependencies/python-tqt/debian/python-tqt-doc.dirs deleted file mode 100644 index 43a4fa9fa..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-doc.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/doc/python-tqt-doc/html -usr/share/doc/python-tqt-doc/examples diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-doc.install b/dilos/dependencies/python-tqt/debian/python-tqt-doc.install deleted file mode 100644 index 65f82036b..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-doc.install +++ /dev/null @@ -1 +0,0 @@ -doc/PyQt.html usr/share/doc/python-tqt-doc/html diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-gl.install b/dilos/dependencies/python-tqt/debian/python-tqt-gl.install deleted file mode 100644 index d58e26ab5..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-gl.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.*/*-packages/python_tqt/qtgl.so diff --git a/dilos/dependencies/python-tqt/debian/python-tqt.install b/dilos/dependencies/python-tqt/debian/python-tqt.install deleted file mode 100644 index 4ec8f4d19..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/python2.*/*-packages/python_tqt/qtcanvas.so -usr/lib/python2.*/*-packages/python_tqt/qtnetwork.so -usr/lib/python2.*/*-packages/python_tqt/qtsql.so -usr/lib/python2.*/*-packages/python_tqt/qttable.so -usr/lib/python2.*/*-packages/python_tqt/qtui.so -usr/lib/python2.*/*-packages/python_tqt/qtxml.so -usr/lib/python2.*/*-packages/python_tqt/qt.so diff --git a/dilos/dependencies/python-tqt/debian/python-tqtext.install b/dilos/dependencies/python-tqt/debian/python-tqtext.install deleted file mode 100644 index 00345e2e7..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqtext.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.*/*-packages/python_tqt/qtext.so diff --git a/dilos/dependencies/python-tqt/debian/python3-tqt-gl.install b/dilos/dependencies/python-tqt/debian/python3-tqt-gl.install deleted file mode 100644 index ead3920cf..000000000 --- a/dilos/dependencies/python-tqt/debian/python3-tqt-gl.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python3*/*-packages/python_tqt/qtgl.so diff --git a/dilos/dependencies/python-tqt/debian/python3-tqt.install b/dilos/dependencies/python-tqt/debian/python3-tqt.install deleted file mode 100644 index 4ceda8c75..000000000 --- a/dilos/dependencies/python-tqt/debian/python3-tqt.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/python3*/*-packages/python_tqt/qtcanvas.so -usr/lib/python3*/*-packages/python_tqt/qtnetwork.so -usr/lib/python3*/*-packages/python_tqt/qtsql.so -usr/lib/python3*/*-packages/python_tqt/qttable.so -usr/lib/python3*/*-packages/python_tqt/qtui.so -usr/lib/python3*/*-packages/python_tqt/qtxml.so -usr/lib/python3*/*-packages/python_tqt/qt.so diff --git a/dilos/dependencies/python-tqt/debian/python3-tqtext.install b/dilos/dependencies/python-tqt/debian/python3-tqtext.install deleted file mode 100644 index 4d58d8a28..000000000 --- a/dilos/dependencies/python-tqt/debian/python3-tqtext.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python3*/*-packages/python_tqt/qtext.so diff --git a/dilos/dependencies/python-tqt/debian/pytqt-tools.manpages b/dilos/dependencies/python-tqt/debian/pytqt-tools.manpages deleted file mode 100644 index 7d27d0034..000000000 --- a/dilos/dependencies/python-tqt/debian/pytqt-tools.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/manpages/pylupdate.1 -debian/manpages/pyuic.1 diff --git a/dilos/dependencies/python-tqt/debian/watch b/dilos/dependencies/python-tqt/debian/watch deleted file mode 100644 index 506321d38..000000000 --- a/dilos/dependencies/python-tqt/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.riverbankcomputing.com/software/pyqt/download3 \ - /static/Downloads/PyQt3/PyQt-x11-gpl-([.\d]*)\.tar\.gz diff --git a/dilos/dependencies/pytqt/debian/README.Debian b/dilos/dependencies/pytqt/debian/README.Debian new file mode 100644 index 000000000..201336f3a --- /dev/null +++ b/dilos/dependencies/pytqt/debian/README.Debian @@ -0,0 +1,3 @@ +DOCUMENTATION +------------- +You can find doc and examples about PyTQt in the package pytqt-doc diff --git a/dilos/dependencies/python-tqt/debian/changelog b/dilos/dependencies/pytqt/debian/changelog index 95e2f0cce..e834a6ca8 100644 --- a/dilos/dependencies/python-tqt/debian/changelog +++ b/dilos/dependencies/pytqt/debian/changelog @@ -1,4 +1,4 @@ -python-tqt (3.18.1-4ubuntu0) lucid; urgency=low +pytqt (3.18.1-4ubuntu0) lucid; urgency=low * Initial build diff --git a/dilos/dependencies/pytqt/debian/compat b/dilos/dependencies/pytqt/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/compat @@ -0,0 +1 @@ +10 diff --git a/dilos/dependencies/pytqt/debian/control b/dilos/dependencies/pytqt/debian/control new file mode 100644 index 000000000..ab7e52e22 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/control @@ -0,0 +1,128 @@ +Source: pytqt +Section: python +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> +Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> +Build-Depends: debhelper (>= 10~), python3-all-dev, python3-all-dbg [!solaris-any], libtqt3-mt-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg [!solaris-any], libtqscintilla-dev, dh-python +Standards-Version: 3.8.4 +XS-Python-Version: >= 2.3 +X-Python3-Version: >= 3.0 + +Package: python3-pytqt +Architecture: any +Depends: ${shlibs:Depends}, ${python3:Depends}, ${py3sip-tqt:Depends}, ${misc:Depends} +Suggests: python3-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql +Provides: ${python3:Provides} +Replaces: python3-tqt +Breaks: python3-tqt +Description: TQt bindings for Python 3 + Python binding module that allows use of TQt X Window toolkit v3. + You can use it to create portable graphics-capable scripts (there + are PyTQt versions for Linux, Windows and MacOS X). + . + At this moment PyTQt offers a vast subset of TQt API. There are + some minor issues related to the differences between C++ and Python + (types, etc), but usually you'll be able to write code pretty much the + same way in both languages (with syntax differences, of course) + +Package: python3-pytqt-dbg +Architecture: any +Priority: extra +Section: debug +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends} +Replaces: python3-tqt-dbg +Breaks: python3-tqt-dbg +Description: TQt bindings for Python 3 (debug extension) + Python binding module that allows use of TQt X Window toolkit v3. + You can use it to create portable graphics-capable scripts (there + are PyTQt versions for Linux, Windows and MacOS X). + . + This package contains the extension built for the Python debug interpreter. + +Package: python3-pytqt-gl +Architecture: any +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), python3-opengl, ${misc:Depends} +Suggests: pytqt-doc +Provides: ${python3:Provides} +Replaces: python3-tqt-gl +Breaks: python3-tqt-gl +Description: TQt OpenGL bindings for Python 3 + Python binding module that allows use of the OpenGL facilities + offered by the TQt X Window toolkit v3. You can use it to create + portable graphics-capable scripts (there are PyTQt versions for + Linux, Windows and MacOS X). + +Package: python3-pytqt-gl-dbg +Priority: extra +Section: debug +Architecture: any +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt-gl (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends} +Replaces: python3-tqt-gl-dbg +Breaks: python3-tqt-gl-dbg +Description: TQt OpenGL bindings for Python 3 (debug extension) + Python binding module that allows use of the OpenGL facilities + offered by the TQt X Window toolkit v3. You can use it to create + portable graphics-capable scripts (there are PyTQt versions for + Linux, Windows and MacOS X). + . + This package contains the extension built for the Python debug interpreter. + +Package: python3-pytqtext +Architecture: any +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), ${misc:Depends} +Provides: ${python3:Provides} +Replaces: python3-tqtext +Breaks: python3-tqtext +Description: TQt extensions for PyTQt + PyTQt Extensions. Contains: + . + * TQScintilla: a featureful TQt source code editing component based + on Scintilla. + +Package: python3-pytqtext-dbg +Priority: extra +Section: debug +Architecture: any +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqtext (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends} +Replaces: python3-tqtext-dbg +Breaks: python3-tqtext-dbg +Description: TQt debug extensions for PyTQt + PyTQt debug Extensions. Contains: + . + * TQScintilla: a featureful TQt source code editing component based + on Scintilla. + +Package: pytqt-tools +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: pytqt-tools (<< 4:14.0.0~) +Breaks: pytqt-tools (<< 4:14.0.0~) +Description: pyuic and pylupdate for TQt + pyuic is the PyTQt counterpart for TQt's uic. It takes an XML + user interface file and generates Python code. + . + pylupdate is the counterpart for TQt's lupdate. It updates TQt + Linguist translation files from Python code. + +Package: pytqt-dev +Depends: python3-pytqt (= ${binary:Version}), ${misc:Depends} +Suggests: python3-sip-tqt-dev, sip-tqt-dev +Replaces: python-tqt-dev +Breaks: python-tqt-dev +Architecture: all +Description: TQt bindings for Python - Development files + Development .sip files with definitions of PyTQt classes. They + are needed to build PyTQt, but also as building blocks of other + packages based on them, like PyTDE. + +Package: pytqt-doc +Section: doc +Architecture: all +Replaces: python-tqt-doc +Breaks: python-tqt-doc +Depends: ${misc:Depends} +Suggests: python3-pytqt +Description: TQt bindings for Python - Documentation and examples + Documentation and examples for the PyTQt (bindings that allow + the use of TQt library from within a Python script). diff --git a/dilos/dependencies/python-tqt/debian/copyright b/dilos/dependencies/pytqt/debian/copyright index 715a83f24..715a83f24 100644 --- a/dilos/dependencies/python-tqt/debian/copyright +++ b/dilos/dependencies/pytqt/debian/copyright diff --git a/dilos/dependencies/python-tqt/debian/docs b/dilos/dependencies/pytqt/debian/docs index 50bd824bb..50bd824bb 100644 --- a/dilos/dependencies/python-tqt/debian/docs +++ b/dilos/dependencies/pytqt/debian/docs diff --git a/dilos/dependencies/python-tqt/debian/manpages/pylupdate.1 b/dilos/dependencies/pytqt/debian/manpages/pytqlupdate.1 index 4d2c8919a..9e68e9605 100644 --- a/dilos/dependencies/python-tqt/debian/manpages/pylupdate.1 +++ b/dilos/dependencies/pytqt/debian/manpages/pytqlupdate.1 @@ -1,4 +1,4 @@ -.TH pylupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*- +.TH pytqlupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*- .\" .\" Copyright 2001 Trolltech AS. All rights reserved. .\" Copyright 2004 Ricardo Cardenes. All rights reserved. @@ -14,20 +14,20 @@ .\" See http://www.trolltech.com/gpl/ for GPL licensing information. .\" .SH NAME -pylupdate \- update Qt Linguist translation files from Python sources +pytqlupdate \- update TQt Linguist translation files from Python sources .SH SYNOPSIS -.B pylupdate +.B pytqlupdate .RI "[ " options " ] " project-file... .SH DESCRIPTION This page documents the -.B Qt Linguist Update -tool for the Qt GUI toolkit, for Python source files. -.B PyLupdate -reads a qmake project file (.pro file), finds the translatable +.B TQt Linguist Update +tool for the TQt GUI toolkit, for Python source files. +.B PyTQLupdate +reads a tqmake project file (.pro file), finds the translatable strings in the specified source, header and interface files, and updates the translation files (.ts files) specified in it. The translation files are given to the translator who uses -.B Qt Linguist +.B TQt Linguist to read the files and insert the translations. .PP The .ts file format is a simple human-readable XML format that can be @@ -66,15 +66,15 @@ TRANSLATIONS = gnomovision_dk.ts \\ .in -4 .PP When running -.B pylupdate +.B pytqlupdate on this project file, the translatable strings in all the files listed in the SOURCES and FORMS entries will be put in the translation files listed in the TRANSLATIONS entry. Previous translations will be reused as far as possible, and translated strings that have vanished from the source files are marked obsolete. .SH "SEE ALSO" -.BR lupdate (1), -.BR lrelease (1) +.BR tqlupdate (1), +.BR tqlrelease (1) and .BR http://doc.trolltech.com/i18n.html .SH AUTHOR diff --git a/dilos/dependencies/python-tqt/debian/manpages/pyuic.1 b/dilos/dependencies/pytqt/debian/manpages/pytquic.1 index f1ffa41ff..e456074a2 100644 --- a/dilos/dependencies/python-tqt/debian/manpages/pyuic.1 +++ b/dilos/dependencies/pytqt/debian/manpages/pytquic.1 @@ -1,26 +1,26 @@ -.TH pyuic 1 "25 June 2001" \" -*- nroff -*- +.TH pytquic 1 "25 June 2001" \" -*- nroff -*- .SH NAME -pyuic \- Qt user interface compiler for Python +pytquic \- TQt user interface compiler for Python .SH SYNOPSIS -.B pyuic +.B pytquic [options] <uifile> .SH DESCRIPTION This page documents the .B Python User Interface Compiler -for the Qt GUI application framework. The -.B pyuic -reads a user interface definition file (.ui) in XML as generated by Qt +for the TQt GUI application framework. The +.B pytquic +reads a user interface definition file (.ui) in XML as generated by TQt Designer and creates corresponding Python module. .PP .PP Generate implementation: .br -.I "\fB pyuic [options] \fI<uifile>" +.I "\fB pytquic [options] \fI<uifile>" .br .PP Generate image collection: .br -.I "\fB pyuic [options] -embed \fI<project> <image1> <image2> <image3>\fP ..." +.I "\fB pytquic [options] -embed \fI<project> <image1> <image2> <image3>\fP ..." .br \fI<project>\fP: project name \fI<image[1..n]>\fP: image files @@ -28,7 +28,7 @@ Generate image collection: .PP Generate subclass implementation: .br -.I "\fB pyuic [options] -subimpl <classname> \fI<uifile>" +.I "\fB pytquic [options] -subimpl <classname> \fI<uifile>" .br \fI<classname>\fP: name of the subclass to generate .PP @@ -57,13 +57,13 @@ Generate extra code to test the class Generate extra code to test but not display the class .TP .I -version -Display version of pyuic +Display version of pytquic .TP .I -help Display this information .SH "SEE ALSO" -.BR uic (1) +.BR tquic (1) .BR http://www.trolltech.com/ diff --git a/dilos/dependencies/python-tqt/debian/patches/debian_configure_changes.diff b/dilos/dependencies/pytqt/debian/patches/debian_configure_changes.diff index 131e9dbdc..131e9dbdc 100644 --- a/dilos/dependencies/python-tqt/debian/patches/debian_configure_changes.diff +++ b/dilos/dependencies/pytqt/debian/patches/debian_configure_changes.diff diff --git a/dilos/dependencies/python-tqt/debian/patches/series b/dilos/dependencies/pytqt/debian/patches/series index 573069d8d..573069d8d 100644 --- a/dilos/dependencies/python-tqt/debian/patches/series +++ b/dilos/dependencies/pytqt/debian/patches/series diff --git a/dilos/dependencies/pytqt/debian/python3-pytqt-gl.install b/dilos/dependencies/pytqt/debian/python3-pytqt-gl.install new file mode 100644 index 000000000..dd7cab0c0 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/python3-pytqt-gl.install @@ -0,0 +1 @@ +usr/lib/python3*/*-packages/PyTQt/tqtgl.so diff --git a/dilos/dependencies/pytqt/debian/python3-pytqt.install b/dilos/dependencies/pytqt/debian/python3-pytqt.install new file mode 100644 index 000000000..f18aeefd0 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/python3-pytqt.install @@ -0,0 +1,7 @@ +usr/lib/python3*/*-packages/PyTQt/tqtcanvas.so +usr/lib/python3*/*-packages/PyTQt/tqtnetwork.so +usr/lib/python3*/*-packages/PyTQt/tqtsql.so +usr/lib/python3*/*-packages/PyTQt/tqttable.so +usr/lib/python3*/*-packages/PyTQt/tqtui.so +usr/lib/python3*/*-packages/PyTQt/tqtxml.so +usr/lib/python3*/*-packages/PyTQt/tqt.so diff --git a/dilos/dependencies/pytqt/debian/python3-pytqtext.install b/dilos/dependencies/pytqt/debian/python3-pytqtext.install new file mode 100644 index 000000000..511c1c0c4 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/python3-pytqtext.install @@ -0,0 +1 @@ +usr/lib/python3*/*-packages/PyTQt/tqtext.so diff --git a/dilos/dependencies/pytqt/debian/pytqt-dev.dirs b/dilos/dependencies/pytqt/debian/pytqt-dev.dirs new file mode 100644 index 000000000..735874a93 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-dev.dirs @@ -0,0 +1 @@ +usr/share/sip-tqt/tqt diff --git a/dilos/dependencies/pytqt/debian/pytqt-dev.install b/dilos/dependencies/pytqt/debian/pytqt-dev.install new file mode 100644 index 000000000..de146d1b0 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-dev.install @@ -0,0 +1,2 @@ +sip/* usr/share/sip-tqt/tqt + diff --git a/dilos/dependencies/pytqt/debian/pytqt-dev.lintian-overrides b/dilos/dependencies/pytqt/debian/pytqt-dev.lintian-overrides new file mode 100644 index 000000000..1a3799d59 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-dev.lintian-overrides @@ -0,0 +1,14 @@ +# lintian test overriden as the files tripping this error are put into the source +# of the generated package. This is a false-positive + +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqt/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtaxcontainer/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtcanvas/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtext/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtgl/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtnetwork/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtpe/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtsql/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqttable/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtui/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtxml/copying.sip diff --git a/dilos/dependencies/pytqt/debian/pytqt-doc.dirs b/dilos/dependencies/pytqt/debian/pytqt-doc.dirs new file mode 100644 index 000000000..8067955f9 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-doc.dirs @@ -0,0 +1,2 @@ +usr/share/doc/pytqt-doc/html +usr/share/doc/pytqt-doc/examples diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-doc.examples b/dilos/dependencies/pytqt/debian/pytqt-doc.examples index c48447a3e..c48447a3e 100644 --- a/dilos/dependencies/python-tqt/debian/python-tqt-doc.examples +++ b/dilos/dependencies/pytqt/debian/pytqt-doc.examples diff --git a/dilos/dependencies/pytqt/debian/pytqt-doc.install b/dilos/dependencies/pytqt/debian/pytqt-doc.install new file mode 100644 index 000000000..273120f41 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-doc.install @@ -0,0 +1 @@ +doc/PyTQt.html usr/share/doc/pytqt-doc/html diff --git a/dilos/dependencies/python-tqt/debian/pytqt-tools.install b/dilos/dependencies/pytqt/debian/pytqt-tools.install index 1df36c612..1df36c612 100644 --- a/dilos/dependencies/python-tqt/debian/pytqt-tools.install +++ b/dilos/dependencies/pytqt/debian/pytqt-tools.install diff --git a/dilos/dependencies/pytqt/debian/pytqt-tools.manpages b/dilos/dependencies/pytqt/debian/pytqt-tools.manpages new file mode 100644 index 000000000..a8224067a --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-tools.manpages @@ -0,0 +1,2 @@ +debian/manpages/pytqlupdate.1 +debian/manpages/pytquic.1 diff --git a/dilos/dependencies/pytqt/debian/pytqtconfig_py3.py b/dilos/dependencies/pytqt/debian/pytqtconfig_py3.py new file mode 100644 index 000000000..c25f1f56e --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqtconfig_py3.py @@ -0,0 +1,17 @@ +# import the pytqtconfig.py for the normal or the debug build + +import os +import sys +import sysconfig + +sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages', 'PyTQt')) + +if 'd' in sys.abiflags: + try: + from pytqtconfig_d import * + from pytqtconfig_d import _pkg_config, _default_macros + except ImportError as msg: + raise ImportError('No module named pytqtconfig; package python3-pytqt-dbg not installed') +else: + from pytqtconfig_nd import * + from pytqtconfig_nd import _pkg_config, _default_macros diff --git a/dilos/dependencies/python-tqt/debian/rules b/dilos/dependencies/pytqt/debian/rules index 85cc0b06d..d0f0a6a28 100755 --- a/dilos/dependencies/python-tqt/debian/rules +++ b/dilos/dependencies/pytqt/debian/rules @@ -3,8 +3,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - # 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| .*||" | \ @@ -15,9 +13,13 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + export DH_OPTIONS --include /usr/share/python/python.mk +-include /usr/share/python3/python.mk ifeq (,$(py_sitename)) py_sitename = site-packages py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages @@ -26,7 +28,7 @@ py_libdir_sh = $(py_libdir) endif -DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc +DOC=$(CURDIR)/debian/pytqt-doc/usr/share/doc/pytqt-doc INSTDIR=$(CURDIR)/debian export TQTDIR=/usr/share/tqt3 @@ -37,12 +39,9 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) else CXXFLAGS += -O1 endif -CXXFLAGS += "-I/usr/include/tqt" - -PYTHONS := $(shell pyversions -vr debian/control) $(shell py3versions -vd) +CXXFLAGS += "-I/usr/include/tqt" "-I/usr/include/tqt3" -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) +PYTHONS := $(shell py3versions -vr) DEB_PARALLEL_JOBS ?= 40 @@ -59,9 +58,9 @@ build-%/configure-stamp: -c -n /usr/include/tqt3 \ -e python$* \ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \ - -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ + -d /usr/lib/python$*/$(call py_sitename,$*)/PyTQt \ -l /usr/include/python$* \ - -v /usr/share/sip/tqt \ + -v /usr/share/sip-tqt/tqt \ -m /usr/lib/python$*/config \ -z \ CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP="" @@ -74,9 +73,9 @@ dbg-build-%/configure-stamp: | python$*-dbg ../configure.py \ -c -n /usr/include/tqt3 \ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \ - -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ + -d /usr/lib/python$*/$(call py_sitename,$*)/PyTQt \ -l /usr/include/python$*_d \ - -v /usr/share/sip/tqt \ + -v /usr/share/sip-tqt/tqt \ -m /usr/lib/python$*/config_d \ -z \ CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP="" @@ -101,12 +100,15 @@ install-indep: configure dh_testroot dh_clean -k -i dh_installdirs -i - for version in ${PYTHONS}; do\ - pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())')/python_tqt;\ - mkdir -p debian/python-tqt-dev/$$pylib;\ - install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\ + for version in ${PYTHONS}; do \ + pylibdev=debian/pytqt-dev/$$(python$$version -c "import sysconfig; print(sysconfig.get_path('platstdlib'))")/dist-packages/PyTQt;\ + mkdir -p $$pylibdev;\ + install -m 644 -o root -g root build-$$version/pytqtconfig.py $$pylibdev/pytqtconfig_nd.py; \ + install -m 644 -o root -g root dbg-build-$$version/pytqtconfig.py $$pylibdev/pytqtconfig_d.py; \ done dh_install -i + mkdir -p debian/pytqt-dev/usr/lib/python3/dist-packages/PyTQt + install -m 644 -o root -g root debian/pytqtconfig_py3.py debian/pytqt-dev/usr/lib/python3/dist-packages/PyTQt/pytqtconfig.py install-arch: build dh_testdir @@ -114,7 +116,7 @@ install-arch: build dh_clean -k -a dh_installdirs -a - for p in $(PYTHONS) ; do \ + for p in ${PYTHONS} ; do \ $(MAKE) -f debian/rules install-arch-$$p;\ done @@ -130,29 +132,16 @@ install-arch: build install-arch-3.%: $(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp -# $(MAKE) -C dbg-build-3.* install DESTDIR=$(CURDIR)/debian/python3-tqt-dbg - mkdir -p debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt - cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py \ - debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py -# mkdir -p debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt -# mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \ -# debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/ -# mkdir -p debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt -# mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtext.so \ -# debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/ - -install-arch-%: - $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp -# $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-tqt-dbg - mkdir -p debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt - cp -a debian/tmp/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py \ - debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py -# mkdir -p debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt -# mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \ -# debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/ -# mkdir -p debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt -# mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtext.so \ -# debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/ +# $(MAKE) -C dbg-build-3.$* install DESTDIR=$(CURDIR)/debian/python3-pytqt-dbg + mkdir -p debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt + cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py \ + debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py +# mkdir -p debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt +# mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/tqtgl.so \ +# debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ +# mkdir -p debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt +# mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/tqtext.so \ +# debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ clean: dh_testdir @@ -175,14 +164,8 @@ binary-common: # dh_strip dh_compress -X.py -X.bmp -X.ui -X.sql dh_fixperms -ifneq (dh_pysupport,${DH_PYTHON2}) - ${DH_PYTHON2} --no-dbg-cleaning -else - ${DH_PYTHON2} -endif dh_python3 --no-dbg-cleaning - dh_sip_tqt - dh_sip3_tqt + dh_py3sip_tqt dh_lintian dh_installdeb dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info diff --git a/dilos/common/cmake/debian/source/format b/dilos/dependencies/pytqt/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/dilos/common/cmake/debian/source/format +++ b/dilos/dependencies/pytqt/debian/source/format diff --git a/dilos/common/cmake/debian/source/options b/dilos/dependencies/pytqt/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/dilos/common/cmake/debian/source/options +++ b/dilos/dependencies/pytqt/debian/source/options diff --git a/dilos/dependencies/sip4-tqt/debian/compat b/dilos/dependencies/sip4-tqt/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/sip4-tqt/debian/compat +++ b/dilos/dependencies/sip4-tqt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/sip4-tqt/debian/control b/dilos/dependencies/sip4-tqt/debian/control index 08cddf311..18f8cb9d2 100644 --- a/dilos/dependencies/sip4-tqt/debian/control +++ b/dilos/dependencies/sip4-tqt/debian/control @@ -4,49 +4,27 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> -Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg [!solaris-any], python3-all-dev, python3-all-dbg [!solaris-any], python-support (>= 0.7.1) | dh-python, libtqtinterface-dev, bison, flex +Build-Depends: debhelper (>= 10~), python3-all-dev, python3-all-dbg, python3-setuptools, dh-python, libtqt3-mt-dev, bison, flex Standards-Version: 3.8.4 XS-Python-Version: all X-Python3-Version: >= 3.0 -Package: python-sip-tqt +Package: python3-sip-tqt Architecture: any Section: python -Replaces: python-sip-tqt (<< 4:14.0.0~) -Breaks: python-sip-tqt (<< 4:14.0.0~) -Provides: ${python:Provides} -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Conflicts: python-sip4 (<< 4.10) -Description: Python/C++ bindings generator runtime library - SIP-TQt is a tool for generating bindings for C++ classes with some ideas - borrowed from SWIG, but capable of tighter bindings because of its - specificity towards C++ and Python. - -Package: python-sip-tqt-dbg -Priority: extra -Architecture: linux-any -Replaces: python-sip-tqt-dbg (<< 4:14.0.0~) -Breaks: python-sip-tqt-dbg (<< 4:14.0.0~) -Section: debug -Provides: ${python:Provides} -Depends: python-sip-tqt (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends} -Conflicts: python-sip4-dbg (<< 4.10) -Description: Python/C++ bindings generator runtime library (debug extension) +Provides: ${python3:Provides} +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} +Description: Python 3/C++ bindings generator runtime library SIP-TQt is a tool for generating bindings for C++ classes with some ideas borrowed from SWIG, but capable of tighter bindings because of its specificity towards C++ and Python. . - This package contains the extension built for the Python debug interpreter. + This package provides the SIP-TQt module for Python 3 -Package: python-sip-tqt-dev +Package: python3-sip-tqt-dev Architecture: any Section: python -Replaces: python-sip-tqt-dev (<< 4:14.0.0~) -Breaks: python-sip-tqt-dev (<< 4:14.0.0~) -Depends: ${python:Depends}, python-sip-tqt (= ${binary:Version}), python-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends} -Recommends: python-sip-tqt (>= ${source:Version}) -Provides: python-sip-dev, python-sip4-dev, sip4 -Conflicts: python-sip-dev, python-sip4-dev (<< 4.10), sip4 (<< 4.10) +Depends: ${python3:Depends}, python3-sip-tqt (= ${binary:Version}), sip-tqt-dev, python3-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends} Description: Python/C++ bindings generator development files SIP-TQt is a tool for generating bindings for C++ classes with some ideas borrowed from SWIG, but capable of tighter bindings because of its @@ -67,25 +45,26 @@ Description: Python/C++ bindings generator development files - static member functions. . This package contains the code generator tool and the development headers - needed to develop Python bindings with sip-tqt. + needed to develop Python 3 bindings with sip-tqt. -Package: python3-sip-tqt +Package: python3-sip-tqt-dbg Architecture: any -Section: python -Provides: ${python3:Provides} -Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} +Section: debug +Priority: extra +Depends: python3-sip-tqt (= ${binary:Version}), python3-all-dbg, ${shlibs:Depends}, ${misc:Depends} Description: Python 3/C++ bindings generator runtime library SIP-TQt is a tool for generating bindings for C++ classes with some ideas borrowed from SWIG, but capable of tighter bindings because of its specificity towards C++ and Python. . - This package provides SIP-TQt with support for Python 3 + This package provides the SIP-TQt module for the debug build of the Python 3. -Package: python3-sip-tqt-dev +Package: sip-tqt-dev Architecture: any Section: python -Depends: ${python:Depends}, python3-sip-tqt (= ${binary:Version}), python-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends} -Recommends: python3-sip-tqt (>= ${source:Version}) +Depends: ${python3:Depends}, ${shlibs:Depends} +Breaks: python-sip-tqt-dev (<< 4:14.1.0~) +Recommends: python3-sip-tqt-dev Description: Python/C++ bindings generator development files SIP-TQt is a tool for generating bindings for C++ classes with some ideas borrowed from SWIG, but capable of tighter bindings because of its @@ -105,17 +84,4 @@ Description: Python/C++ bindings generator development files - global class instances - static member functions. . - This package contains the code generator tool and the development headers - needed to develop Python 3 bindings with sip-tqt. - -Package: python3-sip-tqt-dbg -Architecture: any -Section: debug -Priority: extra -Depends: python3-sip-tqt (= ${binary:Version}), python3-all-dbg, ${shlibs:Depends}, ${misc:Depends} -Description: Python 3/C++ bindings generator runtime library - SIP-TQt is a tool for generating bindings for C++ classes with some ideas - borrowed from SWIG, but capable of tighter bindings because of its - specificity towards C++ and Python. - . - This package contains debugging symbols for python3-sip-tqt + This package contains the code generator tool needed to develop Python 3 bindings with sip-tqt. diff --git a/dilos/dependencies/sip4-tqt/debian/dh_py3sip_tqt b/dilos/dependencies/sip4-tqt/debian/dh_py3sip_tqt new file mode 100644 index 000000000..a59025f15 --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/dh_py3sip_tqt @@ -0,0 +1,49 @@ +#!/usr/bin/perl -w + +=head1 NAME + +dh_py3sip_tqt - set the correct dependencies for Python 3 packages using sip + +=cut + +use strict; +use Debian::Debhelper::Dh_Lib; + +=head1 SYNOPSIS + +B<dh_py3sip_tqt> + +=head1 DESCRIPTION + +dh_py3sip_tqt creates the ${py3sip-tqt:Depends} substitution variable which must be +used by Python 3 extensions built with sip-tqt in order to depend on a version of +python3-sip-tqt that exports the correct public API. + +=cut + +init(); + +my $sip_tqt_provides = `dpkg -s python3-sip-tqt`; +$sip_tqt_provides =~ /^Provides:\s*(.+)$/m; + +my @sip_tqt_apis = sort(grep(/sip\-tqt\-py3api/, split(/,\s*/, $1))); + +my $sip_tqt_api_version=$sip_tqt_apis[-1]; + +foreach my $package (@{$dh{DOPACKAGES}}) { + addsubstvar($package, "py3sip-tqt:Depends", $sip_tqt_api_version); +} + +=head1 SEE ALSO + +L<debhelper(7)> + +This program is a part of python3-sip-tqt-dev but is made to work with debhelper. + +=head1 AUTHORS + +Torsten Marek <shlomme@debian.org> +Adapted for Python3 by +Slávek Banko <slavek.banko@axis.cz> + +=cut diff --git a/dilos/dependencies/sip4-tqt/debian/dh_sip3_tqt b/dilos/dependencies/sip4-tqt/debian/dh_sip3_tqt deleted file mode 100644 index 9b6387689..000000000 --- a/dilos/dependencies/sip4-tqt/debian/dh_sip3_tqt +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/perl -w - -=head1 NAME - -dh_sip3_tqt - set the correct dependencies for Python 3 packages using sip - -=cut - -use strict; -use Debian::Debhelper::Dh_Lib; - -=head1 SYNOPSIS - -B<dh_sip3_tqt> - -=head1 DESCRIPTION - -dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be -used by Python 3 extensions built with sip3-tqt in order to depend on a version of -python3-sip-tqt that exports the correct public API. - -=cut - -init(); - -my $sip3_tqt_provides = `dpkg -s python3-sip-tqt`; -$sip3_tqt_provides =~ /^Provides:\s*(.+)$/m; - -my @sip3_tqt_apis = sort(grep(/sip\-tqt\-py3api/, split(/,\s*/, $1))); - -my $sip3_tqt_api_version=$sip3_tqt_apis[-1]; - -foreach my $package (@{$dh{DOPACKAGES}}) { - addsubstvar($package, "sip3-tqt:Depends", $sip3_tqt_api_version); -} - -=head1 SEE ALSO - -L<debhelper(7)> - -This program is a part of python3-sip-tqt-dev but is made to work with debhelper. - -=head1 AUTHORS - -Torsten Marek <shlomme@debian.org> -Adapted for Python3 by -Slávek Banko <slavek.banko@axis.cz> - -=cut diff --git a/dilos/dependencies/sip4-tqt/debian/dh_sip_tqt b/dilos/dependencies/sip4-tqt/debian/dh_sip_tqt deleted file mode 100644 index c92f23529..000000000 --- a/dilos/dependencies/sip4-tqt/debian/dh_sip_tqt +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/perl -w - -=head1 NAME - -dh_sip_tqt - set the correct dependencies for Python packages using sip-tqt - -=cut - -use strict; -use Debian::Debhelper::Dh_Lib; - -=head1 SYNOPSIS - -B<dh_sip_tqt> - -=head1 DESCRIPTION - -dh_sip_tqt creates the ${sip-tqt:Depends} substitution variable which must be -used by Python extensions built with sip-tqt in order to depend on a version of -python-sip-tqt that exports the correct public API. - -=cut - -init(); - -my $sip_tqt_provides = `dpkg -s python-sip-tqt`; -$sip_tqt_provides =~ /^Provides:\s*(.+)$/m; - -my @sip_tqt_apis = sort(grep(/sip\-tqt\-api/, split(/,\s*/, $1))); - -my $sip_tqt_api_version=$sip_tqt_apis[-1]; - -foreach my $package (@{$dh{DOPACKAGES}}) { - addsubstvar($package, "sip-tqt:Depends", $sip_tqt_api_version); -} - -=head1 SEE ALSO - -L<debhelper(7)> - -This program is a part of python-sip-tqt-dev but is made to work with debhelper. - -=head1 AUTHORS - -Torsten Marek <shlomme@debian.org> - -=cut diff --git a/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1 b/dilos/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1 index a4284326a..8539600cf 100644 --- a/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1 +++ b/dilos/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1 @@ -123,20 +123,20 @@ .rm #[ #] #H #V #F C .\" ======================================================================== .\" -.IX Title "DH_SIP3_TQT 1" -.TH DH_SIP3_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation" +.IX Title "DH_PY3SIP_TQT 1" +.TH DH_PY3SIP_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l .nh .SH "NAME" -dh_sip3_tqt \- set the correct dependencies for Python 3 packages using sip-tqt +dh_py3sip_tqt \- set the correct dependencies for Python 3 packages using sip-tqt .SH "SYNOPSIS" .IX Header "SYNOPSIS" -\&\fBdh_sip3_tqt\fR +\&\fBdh_py3sip_tqt\fR .SH "DESCRIPTION" .IX Header "DESCRIPTION" -dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be used by +dh_py3sip_tqt creates the ${py3sip-tqt:Depends} substitution variable which must be used by Python 3 extensions built with sip-tqt in order to depend on a version of python3-sip-tqt that exports the correct public \s-1API\s0. .SH "SEE ALSO" diff --git a/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 b/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 deleted file mode 100644 index 6f0edd8f1..000000000 --- a/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 +++ /dev/null @@ -1,149 +0,0 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "DH_SIP_TQT 1" -.TH DH_SIP_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "NAME" -dh_sip_tqt \- set the correct dependencies for Python packages using sip-tqt -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -\&\fBdh_sip_tqt\fR -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -dh_sip_tqt creates the ${sip-tqt:Depends} substitution variable which must be used by -Python extensions built with sip-tqt in order to depend on a version of python-sip-tqt -that exports the correct public \s-1API\s0. -.SH "SEE ALSO" -.IX Header "SEE ALSO" -\&\fIdebhelper\fR\|(7) -.PP -This program is a part of python-sip-tqt-dev but is made to work with debhelper. -.SH "AUTHORS" -.IX Header "AUTHORS" -Torsten Marek <shlomme@debian.org> diff --git a/dilos/dependencies/sip4-tqt/debian/patches/series b/dilos/dependencies/sip4-tqt/debian/patches/series index 0b31a69ff..e69de29bb 100644 --- a/dilos/dependencies/sip4-tqt/debian/patches/series +++ b/dilos/dependencies/sip4-tqt/debian/patches/series @@ -1,2 +0,0 @@ -# siputils_debian_changes.diff -# siputils_objdir_module_fix.diff diff --git a/dilos/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff b/dilos/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff deleted file mode 100644 index 2640f57c2..000000000 --- a/dilos/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_siputils.dpatch by Torsten Marek <shlomme@debian.org> -Index: sip4-qt3-4.10/siputils.py -=================================================================== ---- sip4-qt3-4.10.orig/siputils.py 2010-01-14 15:52:09.000000000 +0100 -+++ sip4-qt3-4.10/siputils.py 2010-01-26 21:09:49.172700039 +0100 -@@ -718,7 +718,8 @@ - - libs.extend(self.optional_list("LIBS_WINDOWS")) - -- lflags.extend(self._platform_rpaths(rpaths.as_list())) -+ # Don't append any rpaths -+ #lflags.extend(self._platform_rpaths(rpaths.as_list())) - - # Save the transformed values. - self.CFLAGS.set(cflags) -@@ -843,6 +844,15 @@ - clib is the library name in cannonical form. - framework is set of the library is implemented as a MacOS framework. - """ -+ ################################################################## -+ # Generally, the linker is intelligent enough not to need this # -+ # additional information! # -+ # And Qt4's pkg-config and prl files are broken # -+ # Changed for Debian packaging, Torsten Marek <shlomme@gmx.net> # -+ ################################################################## -+ -+ return [] -+ - prl_libs = [] - - if self.generator in ("MSVC", "MSVC.NET", "BMAKE"): diff --git a/dilos/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff b/dilos/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff deleted file mode 100644 index 3c4570b21..000000000 --- a/dilos/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff +++ /dev/null @@ -1,18 +0,0 @@ -Index: b/siputils.py -=================================================================== ---- a/siputils.py -+++ b/siputils.py -@@ -1547,9 +1547,12 @@ - mfile.write("\n$(OFILES): $(HFILES)\n") - - for mf in self._build["tqmoc_headers"].split(): -- root, discard = os.path.splitext(mf) -+ root, _ = os.path.splitext(mf) - cpp = "tqmoc_" + root + ".cpp" - -+ if self._src_dir != self.dir: -+ mf = os.path.join(self._src_dir, mf) -+ - mfile.write("\n%s: %s\n" % (cpp, mf)) - mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf)) - diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install deleted file mode 100644 index 8b1c81fa9..000000000 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/* -../../debian/dh_sip_tqt /usr/bin/ diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links deleted file mode 100644 index fdd5af4cc..000000000 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-tqt-dev/html/_static/jquery.js diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages deleted file mode 100644 index b3b0eafea..000000000 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/manpages/sip-tqt.1 -debian/manpages/dh_sip_tqt.1 diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install deleted file mode 100644 index e9db89432..000000000 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.*/*-packages/sip_tqt.so diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs index 416a453aa..416a453aa 100644 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs +++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install index 43fbfa385..8c6fee21f 100644 --- a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install +++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install @@ -1 +1 @@ -../../debian/dh_sip3_tqt /usr/bin/ +../dh_py3sip_tqt /usr/bin/ diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links new file mode 100644 index 000000000..47086f7df --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links @@ -0,0 +1 @@ +usr/share/javascript/jquery/jquery.js usr/share/doc/python3-sip-tqt-dev/html/_static/jquery.js diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages index db0d5945a..42f51bda1 100644 --- a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages +++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages @@ -1 +1 @@ -debian/manpages/dh_sip3_tqt.1 +debian/manpages/dh_py3sip_tqt.1 diff --git a/dilos/dependencies/sip4-tqt/debian/pyversions b/dilos/dependencies/sip4-tqt/debian/pyversions deleted file mode 100644 index 57a7586e4..000000000 --- a/dilos/dependencies/sip4-tqt/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.3- diff --git a/dilos/dependencies/sip4-tqt/debian/rules b/dilos/dependencies/sip4-tqt/debian/rules index 2786cf6f6..cb02fe737 100755 --- a/dilos/dependencies/sip4-tqt/debian/rules +++ b/dilos/dependencies/sip4-tqt/debian/rules @@ -12,9 +12,12 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + export DH_OPTIONS -PY2_PROVIDES=sip-tqt-api-7.0, sip-tqt-api-7.1 PY3_PROVIDES=sip-tqt-py3api-7.0, sip-tqt-py3api-7.1 PYDIST=sip $(shell python -c "a=[i.strip() for i in '$(PY3_PROVIDES)'.split(',')]; print sorted(a, reverse=True)[0]") @@ -28,12 +31,9 @@ else CFLAGS += -O2 -g endif -PYTHONS := $(shell pyversions -vr) $(shell py3versions -vd) - -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) +PYTHONS := $(shell py3versions -vr) --include /usr/share/python/python.mk +-include /usr/share/python3/python.mk ifeq (,$(py_sitename)) py_sitename = site-packages py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages @@ -92,7 +92,6 @@ install-arch: build dh_testdir dh_testroot dh_prep -a - echo "python:Provides=$(PY2_PROVIDES)" >> debian/python-sip-tqt.substvars echo "python3:Provides=$(PY3_PROVIDES)" >> debian/python3-sip-tqt.substvars dh_installdirs -a # This is needed to enforce that the install-arch-% rules are @@ -104,16 +103,10 @@ install-arch: build $(MAKE) -f debian/rules install-arch-$$p;\ done -# for i in $$(find debian/python-sip-tqt-dbg -name '*.so'); do \ -# b=$$(basename $$i .so); \ -# mv $$i $$(dirname $$i)/$${b}_d.so; \ -# done # for i in $$(find debian/python3-sip-tqt-dbg -name '*.so'); do \ # b=$$(basename $$i .so); \ # mv $$i $$(dirname $$i)/$${b}_d.so; \ # done -# find debian/python-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f -# find debian/python-sip-tqt-dbg -depth -empty -exec rmdir {} \; # find debian/python3-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f # find debian/python3-sip-tqt-dbg -depth -empty -exec rmdir {} \; @@ -126,29 +119,14 @@ install-arch-3.%: install -m 644 -o root -g root debian/sip_tqt_config_py3.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config.py install -m 644 -o root -g root build-3.$*/sip_tqt_config.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config_nd.py # install -m 644 -o root -g root dbg-build-3.$*/sip_tqt_config.py debian/python3-sip-tqt-dbg/usr/lib/python3.$*/dist-packages/sip_tqt_config_d.py - mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())') - install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/ -# mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())') -# ln -s ../$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip-tqt.h \ -# debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip-tqt.h + mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))') + install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')/ +# mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))') +# ln -s ../$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))' | xargs basename)/sip-tqt.h \ +# debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')/sip-tqt.h mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages install -m 644 -o root -g root sip_tqt_distutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages -install-arch-%: - $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp -# $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip-tqt-dbg - mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/ - install -m 644 -o root -g root debian/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config.py - install -m 644 -o root -g root build-$*/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_nd.py -# install -m 644 -o root -g root dbg-build-$*/sip_tqt_config.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_d.py - mkdir -p debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())') - install -m 644 -o root -g root siplib/sip-tqt.h debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/ -# mkdir -p debian/python-sip-tqt-dev$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())') -# ln -s ../$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip-tqt.h \ -# debian/python-sip-tqt-dev/$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip-tqt.h - mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*) - install -m 644 -o root -g root sip_tqt_distutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*) - # Must not depend on anything. This is to be called by # binary-arch/binary-indep @@ -163,24 +141,14 @@ binary-common: dh_link # don't call strip twice, it's in binary-common ifneq (,$(findstring -a, $(DH_OPTIONS))) - DH_OPTIONS= dh_strip -ppython-sip-tqt-dev - DH_OPTIONS= dh_strip -ppython-sip-tqt -Npython-sip-tqt-dev --dbg-package=python-sip-tqt-dbg DH_OPTIONS= dh_strip -ppython3-sip-tqt-dev DH_OPTIONS= dh_strip -ppython3-sip-tqt -Npython3-sip-tqt-dev --dbg-package=python3-sip-tqt-dbg - rm -rf debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg -# mkdir -p debian/python-sip-tqt-dbg/usr/share/doc -# ln -s python-sip-tqt debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg rm -rf debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg # mkdir -p debian/python3-sip-tqt-dbg/usr/share/doc # ln -s python3-sip-tqt debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg endif dh_compress -X.inv dh_fixperms -ifneq (dh_pysupport,${DH_PYTHON2}) - ${DH_PYTHON2} --no-dbg-cleaning -else - ${DH_PYTHON2} -endif dh_python3 --no-dbg-cleaning dh_installdeb dh_shlibdeps @@ -197,4 +165,4 @@ binary-arch: install-arch $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary configure +.PHONY: build build-arch clean binary-indep binary-arch binary configure diff --git a/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.install b/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.install new file mode 100644 index 000000000..07438bc04 --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.install @@ -0,0 +1 @@ +usr/bin/sip-tqt diff --git a/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages b/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages new file mode 100644 index 000000000..1570b539a --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages @@ -0,0 +1 @@ +debian/manpages/sip-tqt.1 diff --git a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py deleted file mode 100644 index 33ebcb65b..000000000 --- a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py +++ /dev/null @@ -1,13 +0,0 @@ -# import the sip_tqt_config.py for the normal or the debug build - -import sys - -if getattr(sys, "pydebug", False): - try: - from sip_tqt_config_d import * - from sip_tqt_config_d import _pkg_config, _default_macros - except ImportError, msg: - raise ImportError, 'No module named sip_config; package python-sip-tqt-dbg not installed' -else: - from sip_tqt_config_nd import * - from sip_tqt_config_nd import _pkg_config, _default_macros diff --git a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py index fb27b6475..a937df69a 100644 --- a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py +++ b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py @@ -1,8 +1,12 @@ # import the sip_tqt_config.py for the normal or the debug build +import os import sys +import sysconfig -if getattr(sys, "pydebug", False): +sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages')) + +if 'd' in sys.abiflags: try: from sip_tqt_config_d import * from sip_tqt_config_d import _pkg_config, _default_macros diff --git a/dilos/common/cmake/debian/cdbs/cmake-versions.pl b/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl index 6bbbec325..ded0cfa99 100644 --- a/dilos/common/cmake/debian/cdbs/cmake-versions.pl +++ b/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl @@ -3,17 +3,21 @@ use strict; use warnings; +# Get real cmake version and package version prefix my $version = `cmake --version | awk '/^cmake version/ {print \$3}' | tr -d '\n'`; +my $packageversion = `dpkg-query -W -f='\${Version}' cmake`; +my ($prefix); my ($version3, $version3_next); my ($version2, $version2_next); +($prefix = $packageversion) =~ s/$version.*//; ($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 "CMake-Version3=$version3\n"; -print "CMake-Version2=$version2\n"; -print "CMake-Next-Version3=$version3_next\n"; -print "CMake-Next-Version2=$version2_next\n"; +print "CMake-Version3=$prefix$version3\n"; +print "CMake-Version2=$prefix$version2\n"; +print "CMake-Next-Version3=$prefix$version3_next\n"; +print "CMake-Next-Version2=$prefix$version2_next\n"; diff --git a/dilos/common/cmake/debian/changelog b/dilos/dependencies/tde-cmake/debian/changelog index a5303f852..368e8ed98 100644 --- a/dilos/common/cmake/debian/changelog +++ b/dilos/dependencies/tde-cmake/debian/changelog @@ -1,3 +1,9 @@ +tde-cmake (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low + + * Move from common submodule to dependencies. + + -- Slávek Banko <slavek.banko@axis.cz> Fri, 13 Jan 2023 15:36:28 +0100 + cmake-trinity (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low * Initial release as a standalone package. diff --git a/dilos/dependencies/tde-cmake/debian/compat b/dilos/dependencies/tde-cmake/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/dilos/dependencies/tde-cmake/debian/compat @@ -0,0 +1 @@ +10 diff --git a/dilos/common/cmake/debian/control b/dilos/dependencies/tde-cmake/debian/control index 50ea830ef..89e639c24 100644 --- a/dilos/common/cmake/debian/control +++ b/dilos/dependencies/tde-cmake/debian/control @@ -1,13 +1,16 @@ -Source: cmake-trinity +Source: tde-cmake Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~) +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, cmake (>= 3.10~) Standards-Version: 3.8.4 -Package: cmake-trinity +Package: tde-cmake Architecture: all Depends: cmake (>= ${CMake-Version2}~), cmake (<< ${CMake-Next-Version2}~), perl-base, libxml-parser-perl +Replaces: cmake-trinity (<< 4:14.1.0~) +Breaks: cmake-trinity (<< 4:14.1.0~) +Provides: cmake-trinity Description: TDE CMake modules TDE uses its own set of modules and macros to simplify CMake rules. . diff --git a/dilos/common/cmake/debian/copyright b/dilos/dependencies/tde-cmake/debian/copyright index 82d825030..82d825030 100644 --- a/dilos/common/cmake/debian/copyright +++ b/dilos/dependencies/tde-cmake/debian/copyright diff --git a/dilos/common/cmake/debian/patches/series b/dilos/dependencies/tde-cmake/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/dilos/common/cmake/debian/patches/series +++ b/dilos/dependencies/tde-cmake/debian/patches/series diff --git a/dilos/common/cmake/debian/rules b/dilos/dependencies/tde-cmake/debian/rules index 95a42b3f7..615a177d0 100755 --- a/dilos/common/cmake/debian/rules +++ b/dilos/dependencies/tde-cmake/debian/rules @@ -1,8 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ diff --git a/dilos/dependencies/dbus-tqt/debian/source/format b/dilos/dependencies/tde-cmake/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/dilos/dependencies/dbus-tqt/debian/source/format +++ b/dilos/dependencies/tde-cmake/debian/source/format diff --git a/dilos/dependencies/dbus-tqt/debian/source/options b/dilos/dependencies/tde-cmake/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/dilos/dependencies/dbus-tqt/debian/source/options +++ b/dilos/dependencies/tde-cmake/debian/source/options diff --git a/dilos/dependencies/tqca/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqca/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/dependencies/tqca/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/dependencies/tqca/debian/cdbs/versions.pl b/dilos/dependencies/tqca/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/dependencies/tqca/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/dependencies/tqca/debian/compat b/dilos/dependencies/tqca/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/tqca/debian/compat +++ b/dilos/dependencies/tqca/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/tqca/debian/control b/dilos/dependencies/tqca/debian/control index 7da73e73c..2afcbac0d 100644 --- a/dilos/dependencies/tqca/debian/control +++ b/dilos/dependencies/tqca/debian/control @@ -2,7 +2,7 @@ Source: tqca Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libssl-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, libssl-dev Standards-Version: 3.8.3 Package: libtqca @@ -17,7 +17,7 @@ Package: libtqca-dev Architecture: any Multi-Arch: foreign Section: libdevel -Depends: libtqca (= ${binary:Version}), libtqtinterface-dev +Depends: libtqca (= ${binary:Version}), libtqt3-mt-dev Description: libtqca provides TQt interface for security plugins . diff --git a/dilos/dependencies/tqca/debian/rules b/dilos/dependencies/tqca/debian/rules index bcf875516..63b656615 100755 --- a/dilos/dependencies/tqca/debian/rules +++ b/dilos/dependencies/tqca/debian/rules @@ -1,8 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk ifdef DEB_HOST_MULTIARCH CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) diff --git a/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk deleted file mode 100644 index f36e3527c..000000000 --- a/dilos/dependencies/tqscintilla/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_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)/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/dilos/dependencies/tqscintilla/debian/cdbs/versions.pl b/dilos/dependencies/tqscintilla/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/dependencies/tqscintilla/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/dependencies/tqscintilla/debian/compat b/dilos/dependencies/tqscintilla/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/tqscintilla/debian/compat +++ b/dilos/dependencies/tqscintilla/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/tqscintilla/debian/control b/dilos/dependencies/tqscintilla/debian/control index 9d4458b48..c6a33c3c5 100644 --- a/dilos/dependencies/tqscintilla/debian/control +++ b/dilos/dependencies/tqscintilla/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Torsten Marek <shlomme@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, tqt3-dev-tools, libtqt3-mt-dev Standards-Version: 3.8.4 Package: libtqscintilla7 diff --git a/dilos/dependencies/tqscintilla/debian/rules b/dilos/dependencies/tqscintilla/debian/rules index bcf875516..63b656615 100755 --- a/dilos/dependencies/tqscintilla/debian/rules +++ b/dilos/dependencies/tqscintilla/debian/rules @@ -1,8 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk ifdef DEB_HOST_MULTIARCH CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) diff --git a/dilos/dependencies/tqt3/debian/README.Debian b/dilos/dependencies/tqt/debian/README.Debian index e48fe37ea..86b633251 100644 --- a/dilos/dependencies/tqt3/debian/README.Debian +++ b/dilos/dependencies/tqt/debian/README.Debian @@ -5,92 +5,92 @@ Qt for Debian README This README is intended to give developers and users exact information about how the qt-x11-free package provided by TrollTech AS has been packaged -for Debian in case you either want to faciliate it for development -of applications and libraries or plugins using the Qt class library. With -qt-x11-3.1.1, the Debian packages have been massively restructured to get -the most out of theoriginal Qt package and spit the contents up into -several packages so that they make the most sensefor several groups of -users; developers, application users, translators of Qt-based -applications and Debian packagers who are packaging applications developed -with Qt.2. +for Debian in case you either want to faciliate it for development +of applications and libraries or plugins using the Qt class library. With +qt-x11-3.1.1, the Debian packages have been massively restructured to get +the most out of theoriginal Qt package and spit the contents up into +several packages so that they make the most sensefor several groups of +users; developers, application users, translators of Qt-based +applications and Debian packagers who are packaging applications developed +with Qt.2. 2. General Overview -As Qt is a huge package that contains a complete environment for -developers, it needs to be split up into several packages that make it -easier for everyone else to handle it and not to retquire -unnecessary disk space for end-users. Additionally, Qt can be configured -in several ways - and therefore also used in several ways. Qt development -usually retquires the environment variable QTDIR. As Debian is placing -libraries and header files in a tquite specific filesystem order, this -usually breaks setting a single environment variable to meet the -retquirements of packages. Therefore, symlinks are used to set up the system -to meet both, the Debian filesystem standard and the QTDIR variable. All of -Qt (so the QTDIR path) is available in /usr/share/tqt3. If you need to set +As Qt is a huge package that contains a complete environment for +developers, it needs to be split up into several packages that make it +easier for everyone else to handle it and not to retquire +unnecessary disk space for end-users. Additionally, Qt can be configured +in several ways - and therefore also used in several ways. Qt development +usually retquires the environment variable QTDIR. As Debian is placing +libraries and header files in a tquite specific filesystem order, this +usually breaks setting a single environment variable to meet the +retquirements of packages. Therefore, symlinks are used to set up the system +to meet both, the Debian filesystem standard and the QTDIR variable. All of +Qt (so the QTDIR path) is available in /usr/share/tqt3. If you need to set QTDIR, do export QTDIR=/usr/share/tqt3 -As far as the common build configuration goes, we note explicitely that the -Debian package of Qt will in very rare cases break the compilation (most -likely the linking) of applications on Debian which use Qt, in particular -utilizing styles in an incorrect way by deriving from one of the styles -that ship with Qt. In case you are a Debian packager and encounter +As far as the common build configuration goes, we note explicitely that the +Debian package of Qt will in very rare cases break the compilation (most +likely the linking) of applications on Debian which use Qt, in particular +utilizing styles in an incorrect way by deriving from one of the styles +that ship with Qt. In case you are a Debian packager and encounter problems, contact Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org). -We will tell you why things don't work and what you should communicate on -with the programmers of your application that you are packaging. The build -configuration generally is intended to provide a Qt version that is as -small as possible in terms of the memory size it retquires. Therefore, -everything inside Qt that can be compiled as plugins has been compiled that -way. This includes: - -- imageformats: jpeg and mng - codecs (for languages like arab, japanese - etc provided with Qt) +We will tell you why things don't work and what you should communicate on +with the programmers of your application that you are packaging. The build +configuration generally is intended to provide a Qt version that is as +small as possible in terms of the memory size it retquires. Therefore, +everything inside Qt that can be compiled as plugins has been compiled that +way. This includes: + +- imageformats: jpeg and mng - codecs (for languages like arab, japanese + etc provided with Qt) - sql drivers for databases (MySQL, ODBC and PostgreSQL) -The only exception is the imageformat png which has been compiled built-in -due to the fact that there is literally no program that uses no icons at -all and icons are to be used preferrably in png format. The plugins are all +The only exception is the imageformat png which has been compiled built-in +due to the fact that there is literally no program that uses no icons at +all and icons are to be used preferrably in png format. The plugins are all located under /usr/lib/tqt3/plugins. This is also the install location you -should choose as a package maintainer for -qt-plugins so the user doesn't have to customize his library path for -loading Qt plugins. The only exception is that KDE delivers a set of Qt -plugins as well (mainly styles and designer plugins); those are placed in -/usr/lib/trinity/plugins. - -QMotif Extension: As this code is only available in commercial environments -(and produces a static library libqmotif.a anyway that those commercial -applications have to be linked against in addition to Qt), we left out all -header files of the libtqt3-headers package that are belonging to this +should choose as a package maintainer for +qt-plugins so the user doesn't have to customize his library path for +loading Qt plugins. The only exception is that KDE delivers a set of Qt +plugins as well (mainly styles and designer plugins); those are placed in +/usr/lib/trinity/plugins. + +QMotif Extension: As this code is only available in commercial environments +(and produces a static library libqmotif.a anyway that those commercial +applications have to be linked against in addition to Qt), we left out all +header files of the libtqt3-headers package that are belonging to this QMotif extension. -Oracle Database driver, Sybase & Microsoft SQL Server driver: Those drivers -are only available in a commercial version of Qt due to license -incompatibilities with the GPL. If you need to faciliate those drivers, -please visit http://www.trolltech.com and have a read at +Oracle Database driver, Sybase & Microsoft SQL Server driver: Those drivers +are only available in a commercial version of Qt due to license +incompatibilities with the GPL. If you need to faciliate those drivers, +please visit http://www.trolltech.com and have a read at http://doc.trolltech.com/3.0/sql-driver.html. - -3. Packages (End-User) -The Qt built has been split up into several packages that allow for easy -installation for all types of users. The End-user usually only retquires to -have the following packages installed to run an application that links +3. Packages (End-User) + +The Qt built has been split up into several packages that allow for easy +installation for all types of users. The End-user usually only retquires to +have the following packages installed to run an application that links against Qt: -Threaded version:libtqt3-mt (the library libtqt-mt.so.* and libtqui.so.* for +Threaded version:libtqt3-mt (the library libtqt-mt.so.* and libtqui.so.* for loading designer-made user interfaces at runtime). Optionally depending on the program's retquirements: libtqt3-mt-odbc libtqt3-mt-mysql -libtqt3-mt-psql +libtqt3-mt-psql -In addition to the libraries, it may make sense to install the program -qtconfig to customize the look and behaviorof Qt programs. If you have KDE -installed, the KDE control center will take this task automatically in most +In addition to the libraries, it may make sense to install the program +qtconfig to customize the look and behaviorof Qt programs. If you have KDE +installed, the KDE control center will take this task automatically in most cases. qtconfig is available in the package tqt3-qtconfig. -Also, Qt programs can make use of the online-help tool that ships with Qt, -the Qt Assistant. The Assistant can be installed with the package +Also, Qt programs can make use of the online-help tool that ships with Qt, +the Qt Assistant. The Assistant can be installed with the package qt3-assistant. Qt Configuration files @@ -104,82 +104,80 @@ assistant as well as qtconfig. 4. Packages (Package maintainers) -In addition to the library, a package maintainer will retquire an additional -set of packages to compile a package that retquires Qt. Depending on the -version of the qt library, you will retquire a different set of packages; -the most common option should be to make your application link against the -multi-threaded version (-mt).Packages necessary for compiling Qt +In addition to the library, a package maintainer will retquire an additional +set of packages to compile a package that retquires Qt. Depending on the +version of the qt library, you will retquire a different set of packages; +the most common option should be to make your application link against the +multi-threaded version (-mt).Packages necessary for compiling Qt applications from source: -libtqt3-mt-dev (use libtqt3-dev for linking against -lqt, this package only +libtqt3-mt-dev (use libtqt3-dev for linking against -ltqt, this package only contains the .so files and the header file for libtqui.so) -libtqt3-headers (header files for libqt and libtqt-mt) - -qt3-dev-tools (this package contains the tools uic and moc as well as -qmake, retquired for building Qt applications) +libtqt3-headers (header files for libtqt and libtqt-mt) + +tqt3-dev-tools (this package contains the tools tquic and tqmoc as well as +tqmake, required for building TQt applications) -If, however, you encounter an older program not to compile with this set +If, however, you encounter an older program not to compile with this set read the FAQ at the end of this document. 5. Packages (Developers) -In addition to the packages that packagers retquire, a developer usually -will retquire the Qt API documentationas well as tools like the assistant, -linguist or designer. However, you should be fine with installing the API -documentation that you can browse with a webbrowser, optionally with the +In addition to the packages that packagers retquire, a developer usually +will retquire the Qt API documentationas well as tools like the assistant, +linguist or designer. However, you should be fine with installing the API +documentation that you can browse with a webbrowser, optionally with the assistant. They are available in /usr/share/doc/tqt3-doc/html. For a regular development environment, install tqt3-designer and tqt3-doc. -For faciliating Qt's extended environment to write plugins for the Qt -Designer or extend the Designer as well as utilizing the Qt Assistant by +For faciliating Qt's extended environment to write plugins for the Qt +Designer or extend the Designer as well as utilizing the Qt Assistant by calling it from within your program, install tqt3-apps-dev, which contains the static libraries and header files retquired for this functionality. -For Embedded Developers, the program tqvfb (Qt Virtual Frambuffer) and -maketqpf (embedded fonts tool)have been packaged into -qt3-dev-tools-embedded. For developers that work on migrating their program -from any Qt version prior to Qt 3.x to the Qt 3.x platform you will find +For developers that work on migrating their program +from any Qt version prior to Qt 3.x to the Qt 3.x platform you will find additional tools in the tqt3-dev-tools-compat. -For using the QTranslator class and where to find the qm-file for qt as +For using the QTranslator class and where to find the qm-file for qt as well as where to place your translations,see the next section. -If your program doesn't compile with those settings in case you have -started your project with Qt 1.x or 2.x, please read the FAQ section at the +If your program doesn't compile with those settings in case you have +started your project with Qt 1.x or 2.x, please read the FAQ section at the end of this document. 5. Packages (Translators) -In order to translate a Qt program into any other language, the Qt 3 way to -do this is to let the developer create a ts-file containing the strings -that the program exposes on the user interface. The tools to create the -ts-file and to create the final qm (Q-message binary) file, lupdate and -lrelease, are included in tqt3-dev-tools.The single translator that only -gets provided the ts file and has to return a translated ts file, it -is absolutely enough to install tqt3-linguist; the package tqt3-assistant can +In order to translate a Qt program into any other language, the Qt 3 way to +do this is to let the developer create a ts-file containing the strings +that the program exposes on the user interface. The tools to create the +ts-file and to create the final qm (Q-message binary) file, lupdate and +lrelease, are included in tqt3-dev-tools.The single translator that only +gets provided the ts file and has to return a translated ts file, it +is absolutely enough to install tqt3-linguist; the package tqt3-assistant can be installed to access the online-help for the Qt Linguist itself. -In case you're converting an application using Qt prior to Qt 3, you may -want to uitilize the tqt3-dev-tools-compat which include the necessary tools +In case you're converting an application using Qt prior to Qt 3, you may +want to uitilize the tqt3-dev-tools-compat which include the necessary tools to convert older qm files to the new ts file standard. -Locations of message translations: +Locations of message translations: -Qt ships with a set of translations for the strings used inside Qt. Those -translations will be installed into /usr/share/tqt3/translations (qm files -only), which equals $QTDIR/translations respectively -qInstallPath() + QString( "/translations" ). +Qt ships with a set of translations for the strings used inside Qt. Those +translations will be installed into /usr/share/tqt3/translations (qm files +only), which equals $QTDIR/translations respectively +qInstallPath() + QString( "/translations" ). The configure option --translationdir has been set to /usr/share/tqt3/translations -accordingly since it was introduced in Qt 3.2. +accordingly since it was introduced in Qt 3.2. -To correctly enable your program to display the translations to the Qt -library and to load the translation of the program itself, we currently -suggest to either install your translations along with any other data files -into/usr/share/<appname>/, translation files into the subdirectory -translations (that is /usr/share/<appname>/translations) The code that your -application should use to load the Qt translation will have to look like -the following: +To correctly enable your program to display the translations to the Qt +library and to load the translation of the program itself, we currently +suggest to either install your translations along with any other data files +into/usr/share/<appname>/, translation files into the subdirectory +translations (that is /usr/share/<appname>/translations) The code that your +application should use to load the Qt translation will have to look like +the following: int main( int argc, char **argv ) { @@ -187,89 +185,69 @@ int main( int argc, char **argv ) // translation file for Qt QTranslator qt( 0 ); - qt.load( QString( "qt_" ) + QTextCodec::locale(), qInstallPath() + + qt.load( QString( "qt_" ) + QTextCodec::locale(), qInstallPath() + QString( "/translations" ); app.installTranslator( &qt ); // translation file for application strings QTranslator myapp( 0 ); - myapp.load( QString( "myapp_" ) + QTextCodec::locale(), "." ); - // use a substitue for $prefix/share/appname/translations here + myapp.load( QString( "myapp_" ) + QTextCodec::locale(), "." ); + // use a substitue for $prefix/share/appname/translations here app.installTranslator( &myapp ); 6. Frequently Asked Questions -Using Qt for Debian as a developer or packager +Using Qt for Debian as a developer or packager ---------------------------------------------- -Q: I want to compile a source package that utilizes qmake to build the +Q: I want to compile a source package that utilizes qmake to build the Makefiles. What do I need to do to makeit work ? -A: qmake retquires two environment variables to be set, QTDIR and QMAKESPEC. +A: qmake retquires two environment variables to be set, QTDIR and QMAKESPEC. To make it work, do export QTDIR=/usr/share/tqt3 export QMAKESPEC=linux-g++ Then run qmake -o Makefile <projectfile>.pro -After that, the Makefile is correctly created to build your application on -Debian. As a packager, export thosetwo variables in the rules file before +After that, the Makefile is correctly created to build your application on +Debian. As a packager, export thosetwo variables in the rules file before calling qmake. -Q: I have an application that when linking gives me symbol referencing +Q: I have an application that when linking gives me symbol referencing errors to Q*Style. Why does my applicationnot link correctly ? -A: The author of the program is using the styles that ship with Qt directly -instead of using the QStylePlugin interface.If you are the author of the -program, change your program to use QStylePlugin. If you are a packager, -write to theauthor of the program that he is assuming that the styles -shipped with Qt are built-in to the library which is not the case on Debian +A: The author of the program is using the styles that ship with Qt directly +instead of using the QStylePlugin interface.If you are the author of the +program, change your program to use QStylePlugin. If you are a packager, +write to theauthor of the program that he is assuming that the styles +shipped with Qt are built-in to the library which is not the case on Debian and that he please should fix this and use QStylePlugin. Q: Where are all the examples and tutorials ? And how do I build them ? -A: Qt ships with examples and tutorials; so does the Linguist and Designer. -The tutorials and examples are compressed tarballs which you can unpack with +A: Qt ships with examples and tutorials; so does the Linguist and Designer. +The tutorials and examples are compressed tarballs which you can unpack with tar -zxvf into your home directory. Change into the tqt3-examples directory and run the provided ./build-examples script. All Qt examples and tutorials, including those for designer and the linguist, will be compiled. You will notice however, that those examples that inherit from style classes which are not built-in into Qt but configured as a plugin will not compile due -to the fact that they can't link to the Qt library. +to the fact that they can't link to the Qt library. -Q: I'm writing a pure Qt application and I want to ship it with a default -configuration file. Where does that global configuration file go if I make -use of the QSettings class ? +Q: I'm writing a pure Qt application and I want to ship it with a default +configuration file. Where does that global configuration file go if I make +use of the QSettings class ? A: With qt-3.2.0, Trolltech has introduced a configure option to Qt called --sysconfdir which we intentionally set to /etc/tqt3 similar to /etc/trinity for KDE programs. Install your application's system wide configuration file -to /etc/tqt3. - -Q: I'm compiling a program and I have a compile error due to a missing -include. Why isn't that include not present in the Debian packages anymore -? It compiled with older versions of Debian packages of Qt ! - -A: This may be due to two reasons: either the package still uses the old -includes from Qt 1.x or 2.x that got basically renamed by Trolltech due to -the naming convention. The filenames are now all following the scheme - -ClassName -> classname.h. - -Therefore, if you are the developer of the affected program, change your -sources according to this scheme. Qt ships with tqtrename140, a tool to -help developers migrate their API to the Qt 3 version, -which can help you in the transition upgrade to Qt 3. - -If you are affected by this as a packager, notify upstream to fix those -problems and in the meanwhile use libtqt3-compat-headers as a build -dependency which includes the compatibility headers that just include the -right files from the new API again. +to /etc/tqt3. -Q: I have a question not covered by this FAQ and README file. Who should I +Q: I have a question not covered by this FAQ and README file. Who should I turn to ? -A: Please turn to Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org) +A: Please turn to Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org) for any questions regarding Qt on Debian. -- Ralf Nolden <nolden@kde.org> Sun, 26 Jan 2003 20:39:19 +0100 diff --git a/dilos/dependencies/tqt3/debian/changelog b/dilos/dependencies/tqt/debian/changelog index 3e813531e..4d5a96f19 100644 --- a/dilos/dependencies/tqt3/debian/changelog +++ b/dilos/dependencies/tqt/debian/changelog @@ -1,4 +1,4 @@ -tqt-x11-free (3:3.3.8-d-0ubuntu0) maverick; urgency=low +tqt (3:3.3.8-d-0ubuntu0) maverick; urgency=low * Upload of 3.3.8d (working revision) from GIT diff --git a/dilos/dependencies/tqt/debian/compat b/dilos/dependencies/tqt/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/dilos/dependencies/tqt/debian/compat @@ -0,0 +1 @@ +10 diff --git a/dilos/dependencies/tqt3/debian/control b/dilos/dependencies/tqt/debian/control index cbf9bae09..c654f2946 100644 --- a/dilos/dependencies/tqt3/debian/control +++ b/dilos/dependencies/tqt/debian/control @@ -1,8 +1,8 @@ -Source: tqt-x11-free +Source: tqt Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4), +Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libnsl-dev | libc6-dev (<<2.32~), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, @@ -125,7 +125,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libxft-dev, libaudio-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libc6-dev [!solaris-any], libtqt3-mt (= ${binary:Version}), libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version}) -Recommends: libtqt3-compat-headers, libcups2-dev +Recommends: libcups2-dev Suggests: libtqt3-i18n, tqt3-doc Description: TQt development files (Threaded) TQt is a C++ class library optimized for graphical user interface @@ -133,13 +133,6 @@ Description: TQt development files (Threaded) for building threaded TQt applications as well as the libtqui.so symlink and the necessary header files for libtqui.so. (See README.Debian and the TQt Documentation for instructions on libtqui.so) - . - WARNING: If you plan to build some older TQt3 applications, you will - most probably have to install the libtqt3-compat-headers package. It - contains all the headers which are not part of the official TQt3 API - anymore but which are still used by some programs. So if you encounter - problems with missing header files, please install this package first - before you send a bugreport. Package: libtqt3-headers Architecture: all @@ -153,23 +146,6 @@ Description: TQt3 header files with TQt3. If you want to compile or develop programs which use TQt3, you have to install this package. -Package: libtqt3-compat-headers -Architecture: all -Multi-Arch: foreign -Section: devel -Replaces: libtqt3-compat-headers (<< 4:14.0.0~) -Breaks: libtqt3-compat-headers (<< 4:14.0.0~) -Depends: libtqt3-headers (= ${binary:Version}) -Recommends: libtqt3-mt-dev -Description: TQt 1.x and 2.x compatibility includes - This package contains header files that are intended for build - compatibility for applications that build with TQt3 but still use - deprecated includes. It is meant as an intermediate solution and - these header files are not part of the official TQt3 API. - All sourcecode that is still using the headers of this package is - subject to be changed to use the new header files which are in - libtqt3-headers. - Package: tqt3-dev-tools Architecture: any Multi-Arch: foreign @@ -180,7 +156,7 @@ Depends: ${shlibs:Depends} Recommends: libtqt3-mt-dev Description: TQt3 development tools This package contains all tools that are necessary to build programs - that are written using TQt3. These are: qmake, uic and moc. + that are written using TQt3. These are: tqmake, tquic and tqmoc. For TQt3 development, you most likely want to install this package. Package: tqt3-designer @@ -198,7 +174,7 @@ Description: TQt3 Designer create whole project and works together with the database drivers provided by TQt to create applications with easy database access through TQt. The resulting user interface files can then be converted to - C++ classes using the uic commandline utility which is usually done + C++ classes using the tquic commandline utility which is usually done automatically for the developer with a project management with qmake or automake. @@ -211,17 +187,27 @@ Depends: ${shlibs:Depends} Description: TQt3 Designer plugins This package contains plugins for TQt3 Designer +Package: libtqt3-apps-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Conflicts: tqt3-apps-dev (<< 4:14.1.0~) +Depends: ${shlibs:Depends}, libtqt3-mt (= ${binary:Version}) +Description: TQt3 Developer applications development libraries + This package contains additional libraries that ship with the applications + included with TQt - the TQt Designer and the TQt Assistant. + Package: tqt3-apps-dev Architecture: any Multi-Arch: no Section: devel Replaces: tqt3-apps-dev (<< 4:14.0.0~) Breaks: tqt3-apps-dev (<< 4:14.0.0~) -Depends: libtqt3-mt-dev +Depends: libtqt3-mt-dev, libtqt3-apps-dev Description: TQt3 Developer applications development files This package is intended for developers who want to develop applications - using the additional static libraries that ship with the applications - included with TQt; the TQt Designer and the TQt Assistant. + using the additional libraries that ship with the applications + included with TQt - the TQt Designer and the TQt Assistant. It allows integrating additional enhancements into the TQt Designer respectively faciliate the TQt Assistant from within your TQt application to interactively call the Assistant for displaying online help that the @@ -276,21 +262,6 @@ Description: The TQt3 Configuration Application CJK-fonts or other non-latin scripts, you will most likely want to install this package. -Package: tqt3-dev-tools-embedded -Architecture: any -Multi-Arch: foreign -Section: devel -Replaces: tqt3-dev-tools-embedded (<< 4:14.0.0~) -Breaks: tqt3-dev-tools-embedded (<< 4:14.0.0~) -Recommends: libtqt3-mt-dev -Depends: ${shlibs:Depends} -Description: Tools to develop embedded TQt applications - This package contains applications only suitable for developing - applications with TQt Embedded and/or Qtopia. It provides the QVFB - program for simulating an embedded device desktop as well as maketqpf - for converting fonts to embedded fonts suitable for being utilized - by TQt Embedded applications. - Package: tqt3-dev-tools-compat Architecture: any Multi-Arch: foreign @@ -300,7 +271,7 @@ Breaks: tqt3-dev-tools-compat (<< 4:14.0.0~) Recommends: libtqt3-mt-dev Depends: ${shlibs:Depends} Description: Conversion utilities for TQt3 development - This package contains some older TQt tools (namely tqtrename140, + This package contains some older TQt tools (namely tqm2ts, tqtmergetr, tqtfindtr and msg2tqm). These tools are needed only by application developers who need to migrate any TQt application written for TQt 1.x or 2.x over to TQt 3.x. The purpose of the tools are to @@ -314,7 +285,7 @@ Multi-Arch: foreign Section: libs Replaces: libtqt3-i18n (<< 4:14.0.0~) Breaks: libtqt3-i18n (<< 4:14.0.0~) -Recommends: libtqt3-mt +Recommends: libtqt3-mt | libtqt3-mt-t64 Description: i18n files for TQt3 library This package contains the internationalization files for the TQt library. TQt applications that are internationalized will need to depend on this package diff --git a/dilos/dependencies/tqt3/debian/copyright b/dilos/dependencies/tqt/debian/copyright index 3482b8b3a..3482b8b3a 100644 --- a/dilos/dependencies/tqt3/debian/copyright +++ b/dilos/dependencies/tqt/debian/copyright diff --git a/dilos/dependencies/tqt/debian/libtqt3-apps-dev.install b/dilos/dependencies/tqt/debian/libtqt3-apps-dev.install new file mode 100644 index 000000000..eea094136 --- /dev/null +++ b/dilos/dependencies/tqt/debian/libtqt3-apps-dev.install @@ -0,0 +1,3 @@ +usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so.* diff --git a/dilos/dependencies/tqt/debian/libtqt3-headers.install b/dilos/dependencies/tqt/debian/libtqt3-headers.install new file mode 100644 index 000000000..6a11ea7b5 --- /dev/null +++ b/dilos/dependencies/tqt/debian/libtqt3-headers.install @@ -0,0 +1,267 @@ +usr/include/tqt3/private/* +usr/include/tqt3/tqaccel.h +usr/include/tqt3/tqaccessible.h +usr/include/tqt3/tqaction.h +usr/include/tqt3/tqapplication.h +usr/include/tqt3/tqasciicache.h +usr/include/tqt3/tqasciidict.h +usr/include/tqt3/tqasyncimageio.h +usr/include/tqt3/tqasyncio.h +usr/include/tqt3/tqbig5codec.h +usr/include/tqt3/tqbitarray.h +usr/include/tqt3/tqbitmap.h +usr/include/tqt3/tqbrush.h +usr/include/tqt3/tqbuffer.h +usr/include/tqt3/tqbutton.h +usr/include/tqt3/tqbuttongroup.h +usr/include/tqt3/tqcache.h +usr/include/tqt3/tqcanvas.h +usr/include/tqt3/tqcdestyle.h +usr/include/tqt3/tqchar.h +usr/include/tqt3/tqcheckbox.h +usr/include/tqt3/tqcleanuphandler.h +usr/include/tqt3/tqclipboard.h +usr/include/tqt3/tqcolor.h +usr/include/tqt3/tqcolordialog.h +usr/include/tqt3/tqcombobox.h +usr/include/tqt3/tqcommonstyle.h +usr/include/tqt3/tqcompactstyle.h +usr/include/tqt3/tqconnection.h +usr/include/tqt3/tqcstring.h +usr/include/tqt3/tqcursor.h +usr/include/tqt3/tqdatabrowser.h +usr/include/tqt3/tqdatastream.h +usr/include/tqt3/tqdatatable.h +usr/include/tqt3/tqdataview.h +usr/include/tqt3/tqdatetime.h +usr/include/tqt3/tqdatetimeedit.h +usr/include/tqt3/tqdeepcopy.h +usr/include/tqt3/tqdesktopwidget.h +usr/include/tqt3/tqdial.h +usr/include/tqt3/tqdialog.h +usr/include/tqt3/tqdict.h +usr/include/tqt3/tqdir.h +usr/include/tqt3/tqdns.h +usr/include/tqt3/tqdockarea.h +usr/include/tqt3/tqdockwindow.h +usr/include/tqt3/tqdom.h +usr/include/tqt3/tqdragobject.h +usr/include/tqt3/tqdrawutil.h +usr/include/tqt3/tqdropsite.h +usr/include/tqt3/tqeditorfactory.h +usr/include/tqt3/tqerrormessage.h +usr/include/tqt3/tqeucjpcodec.h +usr/include/tqt3/tqeuckrcodec.h +usr/include/tqt3/tqevent.h +usr/include/tqt3/tqeventloop.h +usr/include/tqt3/tqfeatures.h +usr/include/tqt3/tqfile.h +usr/include/tqt3/tqfiledialog.h +usr/include/tqt3/tqfileinfo.h +usr/include/tqt3/tqfocusdata.h +usr/include/tqt3/tqfont.h +usr/include/tqt3/tqfontdatabase.h +usr/include/tqt3/tqfontdialog.h +usr/include/tqt3/tqfontinfo.h +usr/include/tqt3/tqfontmetrics.h +usr/include/tqt3/tqframe.h +usr/include/tqt3/tqftp.h +usr/include/tqt3/tqgarray.h +usr/include/tqt3/tqgb18030codec.h +usr/include/tqt3/tqgbkcodec.h +usr/include/tqt3/tqgcache.h +usr/include/tqt3/tqgdict.h +usr/include/tqt3/tqgif.h +usr/include/tqt3/tqglist.h +usr/include/tqt3/tqglobal.h +usr/include/tqt3/tqgplugin.h +usr/include/tqt3/tqgrid.h +usr/include/tqt3/tqgridview.h +usr/include/tqt3/tqgroupbox.h +usr/include/tqt3/tqguardedptr.h +usr/include/tqt3/tqgvector.h +usr/include/tqt3/tqhbox.h +usr/include/tqt3/tqhbuttongroup.h +usr/include/tqt3/tqheader.h +usr/include/tqt3/tqhebrewcodec.h +usr/include/tqt3/tqhgroupbox.h +usr/include/tqt3/tqhostaddress.h +usr/include/tqt3/tqhttp.h +usr/include/tqt3/tqiconset.h +usr/include/tqt3/tqiconview.h +usr/include/tqt3/tqimage.h +usr/include/tqt3/tqimageformatplugin.h +usr/include/tqt3/tqinputcontext.h +usr/include/tqt3/tqinputcontextfactory.h +usr/include/tqt3/tqinputcontextplugin.h +usr/include/tqt3/tqinputdialog.h +usr/include/tqt3/tqintcache.h +usr/include/tqt3/tqintdict.h +usr/include/tqt3/tqinterlacestyle.h +usr/include/tqt3/tqiodevice.h +usr/include/tqt3/tqjiscodec.h +usr/include/tqt3/tqjpegio.h +usr/include/tqt3/tqjpunicode.h +usr/include/tqt3/tqkeycode.h +usr/include/tqt3/tqkeysequence.h +usr/include/tqt3/tqlabel.h +usr/include/tqt3/tqlayout.h +usr/include/tqt3/tqlcdnumber.h +usr/include/tqt3/tqlibrary.h +usr/include/tqt3/tqlineedit.h +usr/include/tqt3/tqlistbox.h +usr/include/tqt3/tqlistview.h +usr/include/tqt3/tqlocale.h +usr/include/tqt3/tqlocalfs.h +usr/include/tqt3/tqmainwindow.h +usr/include/tqt3/tqmap.h +usr/include/tqt3/tqmemarray.h +usr/include/tqt3/tqmenubar.h +usr/include/tqt3/tqmenudata.h +usr/include/tqt3/tqmessagebox.h +usr/include/tqt3/tqmetaobject.h +usr/include/tqt3/tqmime.h +usr/include/tqt3/tqmngio.h +usr/include/tqt3/tqmotifstyle.h +usr/include/tqt3/tqmotifplusstyle.h +usr/include/tqt3/tqmovie.h +usr/include/tqt3/tqmultilineedit.h +usr/include/tqt3/tqmutex.h +usr/include/tqt3/tqnamespace.h +usr/include/tqt3/tqnetwork.h +usr/include/tqt3/tqnetworkprotocol.h +usr/include/tqt3/tqobject.h +usr/include/tqt3/tqobjectcleanuphandler.h +usr/include/tqt3/tqobjectdefs.h +usr/include/tqt3/tqobjectdict.h +usr/include/tqt3/tqobjectlist.h +usr/include/tqt3/tqpaintdevice.h +usr/include/tqt3/tqpaintdevicemetrics.h +usr/include/tqt3/tqpainter.h +usr/include/tqt3/tqpair.h +usr/include/tqt3/tqpalette.h +usr/include/tqt3/tqpen.h +usr/include/tqt3/tqpicture.h +usr/include/tqt3/tqpixmap.h +usr/include/tqt3/tqpixmapcache.h +usr/include/tqt3/tqplatinumstyle.h +usr/include/tqt3/tqpngio.h +usr/include/tqt3/tqpoint.h +usr/include/tqt3/tqpointarray.h +usr/include/tqt3/tqpolygonscanner.h +usr/include/tqt3/tqpopupmenu.h +usr/include/tqt3/tqprintdialog.h +usr/include/tqt3/tqprinter.h +usr/include/tqt3/tqprocess.h +usr/include/tqt3/tqprogressbar.h +usr/include/tqt3/tqprogressdialog.h +usr/include/tqt3/tqptrcollection.h +usr/include/tqt3/tqptrdict.h +usr/include/tqt3/tqptrlist.h +usr/include/tqt3/tqptrqueue.h +usr/include/tqt3/tqptrstack.h +usr/include/tqt3/tqptrvector.h +usr/include/tqt3/tqpushbutton.h +usr/include/tqt3/tqradiobutton.h +usr/include/tqt3/tqrangecontrol.h +usr/include/tqt3/tqrect.h +usr/include/tqt3/tqregexp.h +usr/include/tqt3/tqregion.h +usr/include/tqt3/tqscrollbar.h +usr/include/tqt3/tqscrollview.h +usr/include/tqt3/tqsemaphore.h +usr/include/tqt3/tqserversocket.h +usr/include/tqt3/tqsessionmanager.h +usr/include/tqt3/tqsettings.h +usr/include/tqt3/tqsgistyle.h +usr/include/tqt3/tqshared.h +usr/include/tqt3/tqsignal.h +usr/include/tqt3/tqsignalmapper.h +usr/include/tqt3/tqsignalslotimp.h +usr/include/tqt3/tqsimplerichtext.h +usr/include/tqt3/tqsize.h +usr/include/tqt3/tqsizegrip.h +usr/include/tqt3/tqsizepolicy.h +usr/include/tqt3/tqsjiscodec.h +usr/include/tqt3/tqslider.h +usr/include/tqt3/tqsocket.h +usr/include/tqt3/tqsocketdevice.h +usr/include/tqt3/tqsocketnotifier.h +usr/include/tqt3/tqsound.h +usr/include/tqt3/tqspinbox.h +usr/include/tqt3/tqsplashscreen.h +usr/include/tqt3/tqsplitter.h +usr/include/tqt3/tqsql.h +usr/include/tqt3/tqsqlcursor.h +usr/include/tqt3/tqsqldatabase.h +usr/include/tqt3/tqsqldriver.h +usr/include/tqt3/tqsqldriverplugin.h +usr/include/tqt3/tqsqleditorfactory.h +usr/include/tqt3/tqsqlerror.h +usr/include/tqt3/tqsqlfield.h +usr/include/tqt3/tqsqlform.h +usr/include/tqt3/tqsqlindex.h +usr/include/tqt3/tqsqlpropertymap.h +usr/include/tqt3/tqsqlquery.h +usr/include/tqt3/tqsqlrecord.h +usr/include/tqt3/tqsqlresult.h +usr/include/tqt3/tqsqlselectcursor.h +usr/include/tqt3/tqstatusbar.h +usr/include/tqt3/tqstring.h +usr/include/tqt3/tqstringlist.h +usr/include/tqt3/tqstrlist.h +usr/include/tqt3/tqstrvec.h +usr/include/tqt3/tqstyle.h +usr/include/tqt3/tqstylefactory.h +usr/include/tqt3/tqstyleplugin.h +usr/include/tqt3/tqstylesheet.h +usr/include/tqt3/tqsyntaxhighlighter.h +usr/include/tqt3/tqt.h +usr/include/tqt3/tqtabbar.h +usr/include/tqt3/tqtabdialog.h +usr/include/tqt3/tqtable.h +usr/include/tqt3/tqtabwidget.h +usr/include/tqt3/tqtextbrowser.h +usr/include/tqt3/tqtextcodec.h +usr/include/tqt3/tqtextcodecfactory.h +usr/include/tqt3/tqtextcodecplugin.h +usr/include/tqt3/tqtextedit.h +usr/include/tqt3/tqtextstream.h +usr/include/tqt3/tqtextview.h +usr/include/tqt3/tqthread.h +usr/include/tqt3/tqthreadstorage.h +usr/include/tqt3/tqtimer.h +usr/include/tqt3/tqtl.h +usr/include/tqt3/tqtoolbar.h +usr/include/tqt3/tqtoolbox.h +usr/include/tqt3/tqtoolbutton.h +usr/include/tqt3/tqtooltip.h +usr/include/tqt3/tqtranslator.h +usr/include/tqt3/tqtsciicodec.h +usr/include/tqt3/tqurl.h +usr/include/tqt3/tqurlinfo.h +usr/include/tqt3/tqurloperator.h +usr/include/tqt3/tqutfcodec.h +usr/include/tqt3/tquuid.h +usr/include/tqt3/tqvalidator.h +usr/include/tqt3/tqvaluelist.h +usr/include/tqt3/tqvaluestack.h +usr/include/tqt3/tqvaluevector.h +usr/include/tqt3/tqvariant.h +usr/include/tqt3/tqvbox.h +usr/include/tqt3/tqvbuttongroup.h +usr/include/tqt3/tqvgroupbox.h +usr/include/tqt3/tqwaitcondition.h +usr/include/tqt3/tqwhatsthis.h +usr/include/tqt3/tqwidget.h +usr/include/tqt3/tqwidgetintdict.h +usr/include/tqt3/tqwidgetlist.h +usr/include/tqt3/tqwidgetplugin.h +usr/include/tqt3/tqwidgetstack.h +usr/include/tqt3/tqwindowdefs.h +usr/include/tqt3/tqwindowsstyle.h +usr/include/tqt3/tqwinexport.h +usr/include/tqt3/tqwizard.h +usr/include/tqt3/tqwmatrix.h +usr/include/tqt3/tqworkspace.h +usr/include/tqt3/tqxml.h diff --git a/dilos/dependencies/tqt/debian/libtqt3-i18n.install b/dilos/dependencies/tqt/debian/libtqt3-i18n.install new file mode 100644 index 000000000..249feb9ef --- /dev/null +++ b/dilos/dependencies/tqt/debian/libtqt3-i18n.install @@ -0,0 +1,18 @@ +usr/share/tqt3/translations/qt_ar.qm +usr/share/tqt3/translations/qt_ca.qm +usr/share/tqt3/translations/qt_cs.qm +usr/share/tqt3/translations/qt_de.qm +usr/share/tqt3/translations/qt_es.qm +usr/share/tqt3/translations/qt_es_AR.qm +usr/share/tqt3/translations/qt_fr.qm +usr/share/tqt3/translations/qt_he.qm +usr/share/tqt3/translations/qt_it.qm +usr/share/tqt3/translations/qt_ja.qm +usr/share/tqt3/translations/qt_nb.qm +usr/share/tqt3/translations/qt_pt-br.qm +usr/share/tqt3/translations/qt_pt.qm +usr/share/tqt3/translations/qt_ru.qm +usr/share/tqt3/translations/qt_sk.qm +usr/share/tqt3/translations/qt_tr.qm +usr/share/tqt3/translations/qt_zh-cn.qm +usr/share/tqt3/translations/qt_zh-tw.qm diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt-data.install b/dilos/dependencies/tqt/debian/libtqt3-mt-data.install index b9308b1b4..b9308b1b4 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt-data.install +++ b/dilos/dependencies/tqt/debian/libtqt3-mt-data.install diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.docs b/dilos/dependencies/tqt/debian/libtqt3-mt-dev.docs index dbd9a5d19..59a51ee13 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.docs +++ b/dilos/dependencies/tqt/debian/libtqt3-mt-dev.docs @@ -1,4 +1,5 @@ -README +README.md README.immodule +README.Qt3 README-QT.TXT PLATFORMS diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.install b/dilos/dependencies/tqt/debian/libtqt3-mt-dev.install index a022db2cc..d2904e511 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.install +++ b/dilos/dependencies/tqt/debian/libtqt3-mt-dev.install @@ -4,6 +4,8 @@ usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tqt-mt.pc -usr/include/tqt3/ntqgl.h -usr/include/tqt3/ntqglcolormap.h -usr/include/tqt3/ntqwidgetfactory.h +usr/include/tqt3/tqconfig.h +usr/include/tqt3/tqgl.h +usr/include/tqt3/tqglcolormap.h +usr/include/tqt3/tqmodules.h +usr/include/tqt3/tqwidgetfactory.h diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.links b/dilos/dependencies/tqt/debian/libtqt3-mt-dev.links index 9da3a5e25..9da3a5e25 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.links +++ b/dilos/dependencies/tqt/debian/libtqt3-mt-dev.links diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt-ibase.install b/dilos/dependencies/tqt/debian/libtqt3-mt-ibase.install index 1cdae4fe4..1cdae4fe4 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt-ibase.install +++ b/dilos/dependencies/tqt/debian/libtqt3-mt-ibase.install diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt-mysql.install b/dilos/dependencies/tqt/debian/libtqt3-mt-mysql.install index 8f5572965..8f5572965 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt-mysql.install +++ b/dilos/dependencies/tqt/debian/libtqt3-mt-mysql.install diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt-odbc.install b/dilos/dependencies/tqt/debian/libtqt3-mt-odbc.install index d51b3fd7f..d51b3fd7f 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt-odbc.install +++ b/dilos/dependencies/tqt/debian/libtqt3-mt-odbc.install diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt-psql.install b/dilos/dependencies/tqt/debian/libtqt3-mt-psql.install index a5e2b70cd..a5e2b70cd 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt-psql.install +++ b/dilos/dependencies/tqt/debian/libtqt3-mt-psql.install diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt-sqlite.install b/dilos/dependencies/tqt/debian/libtqt3-mt-sqlite.install index d637b096b..d637b096b 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt-sqlite.install +++ b/dilos/dependencies/tqt/debian/libtqt3-mt-sqlite.install diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install b/dilos/dependencies/tqt/debian/libtqt3-mt-sqlite3.install index 3f3392374..3f3392374 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install +++ b/dilos/dependencies/tqt/debian/libtqt3-mt-sqlite3.install diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt.docs b/dilos/dependencies/tqt/debian/libtqt3-mt.docs index dbd9a5d19..59a51ee13 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt.docs +++ b/dilos/dependencies/tqt/debian/libtqt3-mt.docs @@ -1,4 +1,5 @@ -README +README.md README.immodule +README.Qt3 README-QT.TXT PLATFORMS diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt.install b/dilos/dependencies/tqt/debian/libtqt3-mt.install index 33303e90c..023c39399 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt.install +++ b/dilos/dependencies/tqt/debian/libtqt3-mt.install @@ -1,4 +1,4 @@ usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.* usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.* -usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/imageformats/libqmng.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/imageformats/libtqmng.so usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/inputmethods/*.so diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt.links b/dilos/dependencies/tqt/debian/libtqt3-mt.links index 8c8f30e38..8c8f30e38 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt.links +++ b/dilos/dependencies/tqt/debian/libtqt3-mt.links diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt.postrm b/dilos/dependencies/tqt/debian/libtqt3-mt.postrm index 6556affdc..6556affdc 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt.postrm +++ b/dilos/dependencies/tqt/debian/libtqt3-mt.postrm diff --git a/dilos/dependencies/tqt3/debian/maintain/build-examples.sh b/dilos/dependencies/tqt/debian/maintain/build-examples.sh index f62d83b85..ed29d712b 100644 --- a/dilos/dependencies/tqt3/debian/maintain/build-examples.sh +++ b/dilos/dependencies/tqt/debian/maintain/build-examples.sh @@ -7,7 +7,7 @@ export QTDIR=/usr/share/tqt3 cp /usr/share/tqt3/.qmake.cache ./.qmake.cache # Now compile the examples. The themes example -# won't work since ntqconfig.h is not really correct with the +# won't work since tqconfig.h is not really correct with the # ifdef's for the TQT_NO_xyz_STYLE, so we use make -k to continue cd examples; qmake -o Makefile examples.pro; make -k diff --git a/dilos/dependencies/tqt3/debian/patches/06_disable_rpath.diff b/dilos/dependencies/tqt/debian/patches/06_disable_rpath.diff index a3d74ffce..a3d74ffce 100644 --- a/dilos/dependencies/tqt3/debian/patches/06_disable_rpath.diff +++ b/dilos/dependencies/tqt/debian/patches/06_disable_rpath.diff diff --git a/dilos/dependencies/tqt3/debian/patches/09_amd64_lib64.diff b/dilos/dependencies/tqt/debian/patches/09_amd64_lib64.diff index de42482fc..de42482fc 100644 --- a/dilos/dependencies/tqt3/debian/patches/09_amd64_lib64.diff +++ b/dilos/dependencies/tqt/debian/patches/09_amd64_lib64.diff diff --git a/dilos/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff b/dilos/dependencies/tqt/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff index b4e71d35b..b4e71d35b 100644 --- a/dilos/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff +++ b/dilos/dependencies/tqt/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff diff --git a/dilos/dependencies/tqt3/debian/patches/series b/dilos/dependencies/tqt/debian/patches/series index e6bdb92af..e6bdb92af 100644 --- a/dilos/dependencies/tqt3/debian/patches/series +++ b/dilos/dependencies/tqt/debian/patches/series diff --git a/dilos/dependencies/tqt3/debian/qt_plugins_3.3rc b/dilos/dependencies/tqt/debian/qt_plugins_3.3rc index e193b495c..6a411f315 100644 --- a/dilos/dependencies/tqt3/debian/qt_plugins_3.3rc +++ b/dilos/dependencies/tqt/debian/qt_plugins_3.3rc @@ -1,4 +1,4 @@ [usr] lib/trinity/plugins/styles/plastik.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-09-29T20:06:31^e -lib/tqt3/plugins/imageformats/libqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e +lib/tqt3/plugins/imageformats/libtqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e diff --git a/dilos/dependencies/tqt3/debian/qtrc b/dilos/dependencies/tqt/debian/qtrc index 4f44006ae..4f44006ae 100644 --- a/dilos/dependencies/tqt3/debian/qtrc +++ b/dilos/dependencies/tqt/debian/qtrc diff --git a/dilos/dependencies/tqt3/debian/rules b/dilos/dependencies/tqt/debian/rules index 9b6c34f78..4960cd195 100755 --- a/dilos/dependencies/tqt3/debian/rules +++ b/dilos/dependencies/tqt/debian/rules @@ -25,6 +25,13 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +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 + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL ?= true @@ -36,7 +43,7 @@ PLATFORM_ARG = dilos-g++ # build variables (directorys) DEBIAN = $(shell pwd)/debian -P_LIBS = $(DEBIAN)/libtqt3-mt +P_LIBS = $(DEBIAN)/libtqt3-mt$(DEB_TIME64_SUFFIX) P_DOC = $(DEBIAN)/tqt3-doc P_APPSDEV = $(DEBIAN)/tqt3-apps-dev P_HEADERS = $(DEBIAN)/libtqt3-headers @@ -131,6 +138,22 @@ endif post-patches:: dh_testdir +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libtqt3-mt\." | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libtqt3-mt$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libtqt3-mt\\)$$/\\1$(DEB_TIME64_SUFFIX)/" \ + -e "s/^\\(Replaces\\|Breaks\\): \\(libtqt3-mt\\)\\( \|$$\)/\\1: \\2, \\2$(DEB_TIME64_SUFFIX)\\3/" \ + -e "s/\\(libtqt3-mt\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +endif build build-arch: libqt-thread-stamp build-indep: @@ -145,11 +168,6 @@ libqt-thread-stamp: post-patches echo yes | ./configure $(CONFIGURE_OPTS) - rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h - ln -s ../src/kernel/ntqinputcontext.h include/ntqinputcontext.h - ln -s ../src/inputmethod/ntqinputcontextfactory.h include/ntqinputcontextfactory.h - ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h - # proceed $(MAKE) sub-src sub-plugins sub-tools $(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target @@ -159,29 +177,16 @@ libqt-thread-stamp: post-patches # archives get accidentally stripped by make install. Copy over unstripped ones for now. -cp lib/lib*.a $(TMP_INSTALL)/usr/lib/ - cp bin/tqtrename140 $(TMP_INSTALL)/usr/bin/ cp bin/tqtfindtr $(TMP_INSTALL)/usr/bin/ # build tqtconv2ui cd tools/designer/tools/tqtconv2ui && $(MAKE) cp bin/tqtconv2ui $(TMP_INSTALL)/usr/bin/tqtconv2ui - # build tqvfb - cd tools/tqvfb/ && $(MAKE) - cp tools/tqvfb/tqvfb $(TMP_INSTALL)/usr/bin/tqvfb - # install qmake.cache file install -d $(P_QTMTDEV)/usr/share/tqt3/ cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache - # install ntqconfig.h for the mt - install -m 644 -D include/ntqconfig.h $(P_QTMTDEV)/usr/include/tqt3/ntqconfig.h - install -m 644 -D include/ntqmodules.h $(P_QTMTDEV)/usr/include/tqt3/ntqmodules.h - - install -m 644 -D include/ntqinputcontext.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontext.h - install -m 644 -D include/ntqinputcontextfactory.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontextfactory.h - install -m 644 -D include/ntqinputcontextplugin.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontextplugin.h - touch libqt-thread-stamp clean:: @@ -196,23 +201,22 @@ clean:: if [ -f "src/Makefile" ]; then \ $(MAKE) -C src clean; $(MAKE) -C plugins/src distclean; $(MAKE) -C tools distclean; \ - $(MAKE) -C tools/maketqpf distclean; $(MAKE) -C tools/qconfig distclean; $(MAKE) -C tools/tqvfb distclean; \ + $(MAKE) -C tools/qconfig distclean; \ $(MAKE) -C tools/msg2tqm distclean; $(MAKE) -C tools/tqtmergetr distclean; $(MAKE) -C tools/qembed distclean; \ $(MAKE) -C tools/designer/tools/tqtconv2ui distclean; $(MAKE) -C tools/designer/tools/tqtcreatecw distclean; \ - $(MAKE) -C tools/designer/plugins/glade distclean; $(MAKE) -C tools/designer/plugins/qglwidget distclean; \ + $(MAKE) -C tools/designer/plugins/glade distclean; \ $(MAKE) -C config.tests/unix/largefile distclean; $(MAKE) -C qmake distclean; \ fi -rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \ - config.status bin/moc bin/tqmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ - src/tools/qconfig.cpp include/ntqconfig.h include/ntqmodules.h plugins/accessibleqtwidgets.prl \ + config.status bin/tqmoc bin/tqmake src/tqmoc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ + src/tools/qconfig.cpp plugins/accessibleqtwidgets.prl \ config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \ config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \ config.tests/unix/endian/endiantest lib/tqt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \ extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer rm -f qmake/*o - rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o @@ -231,6 +235,27 @@ clean:: 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 "/libtqt3-mt$(DEB_TIME64_SUFFIX)\." | \ + xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libtqt3-mt\\)$$/\\1$(DEB_TIME64_SUFFIX)/" \ + -e "s/^\\(Replaces\\|Breaks\\): \\(libtqt3-mt\\)\\( \|$$\)/\\1: \\2, \\2$(DEB_TIME64_SUFFIX)\\3/" \ + -e "s/\\(libtqt3-mt\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +else + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif + install: build dh_testdir @@ -373,11 +398,6 @@ binary-arch: build install cp `pwd`/tools/designer/editor/*.h $(P_APPSDEV)/usr/include/tqt3/ rm -rf `pwd`/debian/tqt3-apps-dev/usr/include/tqt3/preferences.ui.h - ## tqvfb package - install -m644 -D `pwd`/tools/tqvfb/pda.skin `pwd`/debian/tqt3-dev-tools-embedded/etc/tqt3/tqvfb/pda.skin - install -m644 -D `pwd`/tools/tqvfb/pda_down.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/tqvfb/pda_down.png - install -m644 -D `pwd`/tools/tqvfb/pda_up.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/tqvfb/pda_up.png - # remove utterly ugle symlink rm -rf `pwd`/debian/tqt3-dev-tools//usr/share/tqt3/mkspecs/linux-g++/linux-g++ @@ -430,7 +450,7 @@ binary-arch: build install dh_link -ptqt3-dev-tools usr/share/tqt3/doc/html usr/share/doc/tqt3-dev-tools/html # copy README.Debian - for a in libtqt3-mt-dev libtqt3-mt tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done + for a in libtqt3-mt-dev libtqt3-mt$(DEB_TIME64_SUFFIX) tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done # install the qmake binary rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake @@ -467,15 +487,12 @@ binary-arch: build install dh_makeshlibs -a $(IBASE) -V dh_installdeb -a $(IBASE) dh_perl -a $(IBASE) - dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt/usr/lib\ + dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt$(DEB_TIME64_SUFFIX)/usr/lib\ --dpkg-shlibdeps-params=--ignore-missing-info # fix shlibdeps madness for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done - # fix conffiles file for tqt3-dev-tools-embedded - echo "/etc/tqt3/tqvfb/pda.skin" > `pwd`/debian/tqt3-dev-tools-embedded/DEBIAN/conffiles - dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) diff --git a/dilos/dependencies/python-tqt/debian/source/format b/dilos/dependencies/tqt/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/dilos/dependencies/python-tqt/debian/source/format +++ b/dilos/dependencies/tqt/debian/source/format diff --git a/dilos/dependencies/python-tqt/debian/source/options b/dilos/dependencies/tqt/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/dilos/dependencies/python-tqt/debian/source/options +++ b/dilos/dependencies/tqt/debian/source/options diff --git a/dilos/dependencies/tqt/debian/tqt3-apps-dev.install b/dilos/dependencies/tqt/debian/tqt3-apps-dev.install new file mode 100644 index 000000000..d3cfad18a --- /dev/null +++ b/dilos/dependencies/tqt/debian/tqt3-apps-dev.install @@ -0,0 +1,4 @@ +usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so +usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so +usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so +usr/include/tqt3/tqassistantclient.h diff --git a/dilos/dependencies/tqt3/debian/tqt3-apps-dev.links b/dilos/dependencies/tqt/debian/tqt3-apps-dev.links index 72bd7093a..60fe91b77 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-apps-dev.links +++ b/dilos/dependencies/tqt/debian/tqt3-apps-dev.links @@ -1,8 +1,8 @@ /usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so /usr/share/tqt3/lib/libtqteditor.so /usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so /usr/share/tqt3/lib/libtqtdesignercore.so /usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so /usr/share/tqt3/lib/libtqassistantclient.so /usr/include/tqt3 /usr/share/tqt3/tools/designer/editor /usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces diff --git a/dilos/dependencies/tqt3/debian/tqt3-assistant.install b/dilos/dependencies/tqt/debian/tqt3-assistant.install index 4cfd10cf1..4cfd10cf1 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-assistant.install +++ b/dilos/dependencies/tqt/debian/tqt3-assistant.install diff --git a/dilos/dependencies/tqt3/debian/tqt3-assistant.links b/dilos/dependencies/tqt/debian/tqt3-assistant.links index 5244653a5..5244653a5 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-assistant.links +++ b/dilos/dependencies/tqt/debian/tqt3-assistant.links diff --git a/dilos/dependencies/tqt3/debian/tqt3-assistant.menu b/dilos/dependencies/tqt/debian/tqt3-assistant.menu index d59f83bd0..d59f83bd0 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-assistant.menu +++ b/dilos/dependencies/tqt/debian/tqt3-assistant.menu diff --git a/dilos/dependencies/tqt3/debian/tqt3-assistant.postinst b/dilos/dependencies/tqt/debian/tqt3-assistant.postinst index 2852229d7..2852229d7 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-assistant.postinst +++ b/dilos/dependencies/tqt/debian/tqt3-assistant.postinst diff --git a/dilos/dependencies/tqt3/debian/tqt3-assistant.prerm b/dilos/dependencies/tqt/debian/tqt3-assistant.prerm index 048730aa0..048730aa0 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-assistant.prerm +++ b/dilos/dependencies/tqt/debian/tqt3-assistant.prerm diff --git a/dilos/dependencies/tqt3/debian/tqt3-designer-plugins.install b/dilos/dependencies/tqt/debian/tqt3-designer-plugins.install index 13fed3016..13fed3016 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-designer-plugins.install +++ b/dilos/dependencies/tqt/debian/tqt3-designer-plugins.install diff --git a/dilos/dependencies/tqt3/debian/tqt3-designer.install b/dilos/dependencies/tqt/debian/tqt3-designer.install index 6cfffd9cd..6cfffd9cd 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-designer.install +++ b/dilos/dependencies/tqt/debian/tqt3-designer.install diff --git a/dilos/dependencies/tqt3/debian/tqt3-designer.links b/dilos/dependencies/tqt/debian/tqt3-designer.links index 19922f299..19922f299 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-designer.links +++ b/dilos/dependencies/tqt/debian/tqt3-designer.links diff --git a/dilos/dependencies/tqt3/debian/tqt3-designer.manpages b/dilos/dependencies/tqt/debian/tqt3-designer.manpages index 5fcb29982..5fcb29982 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-designer.manpages +++ b/dilos/dependencies/tqt/debian/tqt3-designer.manpages diff --git a/dilos/dependencies/tqt3/debian/tqt3-designer.menu b/dilos/dependencies/tqt/debian/tqt3-designer.menu index be078bd49..be078bd49 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-designer.menu +++ b/dilos/dependencies/tqt/debian/tqt3-designer.menu diff --git a/dilos/dependencies/tqt3/debian/tqt3-designer.postinst b/dilos/dependencies/tqt/debian/tqt3-designer.postinst index 4ebd22505..4ebd22505 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-designer.postinst +++ b/dilos/dependencies/tqt/debian/tqt3-designer.postinst diff --git a/dilos/dependencies/tqt3/debian/tqt3-designer.prerm b/dilos/dependencies/tqt/debian/tqt3-designer.prerm index 02cf2ff66..02cf2ff66 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-designer.prerm +++ b/dilos/dependencies/tqt/debian/tqt3-designer.prerm diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-compat.install b/dilos/dependencies/tqt/debian/tqt3-dev-tools-compat.install index 56e0156b5..5975d4bb9 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-compat.install +++ b/dilos/dependencies/tqt/debian/tqt3-dev-tools-compat.install @@ -1,4 +1,3 @@ -usr/bin/tqtrename140 usr/bin/tqm2ts usr/bin/tqtmergetr usr/bin/tqtfindtr diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.install b/dilos/dependencies/tqt/debian/tqt3-dev-tools.install index 3c795661b..3c795661b 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.install +++ b/dilos/dependencies/tqt/debian/tqt3-dev-tools.install diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.links b/dilos/dependencies/tqt/debian/tqt3-dev-tools.links index 073720d2b..073720d2b 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.links +++ b/dilos/dependencies/tqt/debian/tqt3-dev-tools.links diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.manpages b/dilos/dependencies/tqt/debian/tqt3-dev-tools.manpages index 2976f6c84..2976f6c84 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.manpages +++ b/dilos/dependencies/tqt/debian/tqt3-dev-tools.manpages diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.postinst b/dilos/dependencies/tqt/debian/tqt3-dev-tools.postinst index 9af54f964..9af54f964 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.postinst +++ b/dilos/dependencies/tqt/debian/tqt3-dev-tools.postinst diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.prerm b/dilos/dependencies/tqt/debian/tqt3-dev-tools.prerm index 1f8b6a46c..1f8b6a46c 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.prerm +++ b/dilos/dependencies/tqt/debian/tqt3-dev-tools.prerm diff --git a/dilos/dependencies/tqt3/debian/tqt3-doc.doc-base b/dilos/dependencies/tqt/debian/tqt3-doc.doc-base index 08f4fcdc3..08f4fcdc3 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-doc.doc-base +++ b/dilos/dependencies/tqt/debian/tqt3-doc.doc-base diff --git a/dilos/dependencies/tqt3/debian/tqt3-doc.docs b/dilos/dependencies/tqt/debian/tqt3-doc.docs index f08fd0f02..2630a416c 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-doc.docs +++ b/dilos/dependencies/tqt/debian/tqt3-doc.docs @@ -1,2 +1,3 @@ FAQ +README.md README-QT.TXT diff --git a/dilos/dependencies/tqt3/debian/tqt3-doc.links b/dilos/dependencies/tqt/debian/tqt3-doc.links index dfec5318b..dfec5318b 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-doc.links +++ b/dilos/dependencies/tqt/debian/tqt3-doc.links diff --git a/dilos/dependencies/tqt3/debian/tqt3-linguist.install b/dilos/dependencies/tqt/debian/tqt3-linguist.install index c02015323..c02015323 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-linguist.install +++ b/dilos/dependencies/tqt/debian/tqt3-linguist.install diff --git a/dilos/dependencies/tqt3/debian/tqt3-linguist.links b/dilos/dependencies/tqt/debian/tqt3-linguist.links index 4fa700555..4fa700555 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-linguist.links +++ b/dilos/dependencies/tqt/debian/tqt3-linguist.links diff --git a/dilos/dependencies/tqt3/debian/tqt3-linguist.manpages b/dilos/dependencies/tqt/debian/tqt3-linguist.manpages index 14380e5ab..14380e5ab 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-linguist.manpages +++ b/dilos/dependencies/tqt/debian/tqt3-linguist.manpages diff --git a/dilos/dependencies/tqt3/debian/tqt3-linguist.menu b/dilos/dependencies/tqt/debian/tqt3-linguist.menu index 976cb4b3c..976cb4b3c 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-linguist.menu +++ b/dilos/dependencies/tqt/debian/tqt3-linguist.menu diff --git a/dilos/dependencies/tqt3/debian/tqt3-linguist.postinst b/dilos/dependencies/tqt/debian/tqt3-linguist.postinst index fc135a3e1..fc135a3e1 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-linguist.postinst +++ b/dilos/dependencies/tqt/debian/tqt3-linguist.postinst diff --git a/dilos/dependencies/tqt3/debian/tqt3-linguist.prerm b/dilos/dependencies/tqt/debian/tqt3-linguist.prerm index 4037445d0..4037445d0 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-linguist.prerm +++ b/dilos/dependencies/tqt/debian/tqt3-linguist.prerm diff --git a/dilos/dependencies/tqt3/debian/tqt3-qtconfig.install b/dilos/dependencies/tqt/debian/tqt3-qtconfig.install index 6b1f88962..6b1f88962 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-qtconfig.install +++ b/dilos/dependencies/tqt/debian/tqt3-qtconfig.install diff --git a/dilos/dependencies/tqt3/debian/tqt3-qtconfig.links b/dilos/dependencies/tqt/debian/tqt3-qtconfig.links index eb6dd21c0..eb6dd21c0 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-qtconfig.links +++ b/dilos/dependencies/tqt/debian/tqt3-qtconfig.links diff --git a/dilos/dependencies/tqt3/debian/tqt3-qtconfig.manpages b/dilos/dependencies/tqt/debian/tqt3-qtconfig.manpages index 025ff0ad8..025ff0ad8 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-qtconfig.manpages +++ b/dilos/dependencies/tqt/debian/tqt3-qtconfig.manpages diff --git a/dilos/dependencies/tqt3/debian/tqt3-qtconfig.menu b/dilos/dependencies/tqt/debian/tqt3-qtconfig.menu index 79f2ff8e5..79f2ff8e5 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-qtconfig.menu +++ b/dilos/dependencies/tqt/debian/tqt3-qtconfig.menu diff --git a/dilos/dependencies/tqt3/debian/tqt3-qtconfig.postinst b/dilos/dependencies/tqt/debian/tqt3-qtconfig.postinst index 3964f38d3..3964f38d3 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-qtconfig.postinst +++ b/dilos/dependencies/tqt/debian/tqt3-qtconfig.postinst diff --git a/dilos/dependencies/tqt3/debian/tqt3-qtconfig.prerm b/dilos/dependencies/tqt/debian/tqt3-qtconfig.prerm index 5024559d2..5024559d2 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-qtconfig.prerm +++ b/dilos/dependencies/tqt/debian/tqt3-qtconfig.prerm diff --git a/dilos/dependencies/tqt3/debian/compat b/dilos/dependencies/tqt3/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/dilos/dependencies/tqt3/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/dilos/dependencies/tqt3/debian/libtqt3-compat-headers.install b/dilos/dependencies/tqt3/debian/libtqt3-compat-headers.install deleted file mode 100644 index d2bcbd7d6..000000000 --- a/dilos/dependencies/tqt3/debian/libtqt3-compat-headers.install +++ /dev/null @@ -1,48 +0,0 @@ -usr/include/tqt3/ntqapp.h -usr/include/tqt3/ntqarray.h -usr/include/tqt3/ntqbitarry.h -usr/include/tqt3/ntqbttngrp.h -usr/include/tqt3/ntqchkbox.h -usr/include/tqt3/ntqclipbrd.h -usr/include/tqt3/ntqcollect.h -usr/include/tqt3/ntqcollection.h -usr/include/tqt3/ntqcombo.h -usr/include/tqt3/ntqconnect.h -usr/include/tqt3/ntqdatetm.h -usr/include/tqt3/ntqdrawutl.h -usr/include/tqt3/ntqdstream.h -usr/include/tqt3/ntqfiledef.h -usr/include/tqt3/ntqfiledlg.h -usr/include/tqt3/ntqfileinf.h -usr/include/tqt3/ntqfontinf.h -usr/include/tqt3/ntqfontmet.h -usr/include/tqt3/ntqgrpbox.h -usr/include/tqt3/ntqintcach.h -usr/include/tqt3/ntqiodev.h -usr/include/tqt3/ntqlcdnum.h -usr/include/tqt3/ntqlined.h -usr/include/tqt3/ntqmenudta.h -usr/include/tqt3/ntqmetaobj.h -usr/include/tqt3/ntqmlined.h -usr/include/tqt3/ntqmsgbox.h -usr/include/tqt3/ntqmultilinedit.h -usr/include/tqt3/ntqobjcoll.h -usr/include/tqt3/ntqobjdefs.h -usr/include/tqt3/ntqpdevmet.h -usr/include/tqt3/ntqpmcache.h -usr/include/tqt3/ntqpntarry.h -usr/include/tqt3/ntqpopmenu.h -usr/include/tqt3/ntqprndlg.h -usr/include/tqt3/ntqprogbar.h -usr/include/tqt3/ntqprogdlg.h -usr/include/tqt3/ntqpsprn.h -usr/include/tqt3/ntqpushbt.h -usr/include/tqt3/ntqqueue.h -usr/include/tqt3/ntqradiobt.h -usr/include/tqt3/ntqrangect.h -usr/include/tqt3/ntqscrbar.h -usr/include/tqt3/ntqsocknot.h -usr/include/tqt3/ntqtabdlg.h -usr/include/tqt3/ntqtstream.h -usr/include/tqt3/ntqwidcoll.h -usr/include/tqt3/ntqwindefs.h diff --git a/dilos/dependencies/tqt3/debian/libtqt3-headers.install b/dilos/dependencies/tqt3/debian/libtqt3-headers.install deleted file mode 100644 index be1e2d79c..000000000 --- a/dilos/dependencies/tqt3/debian/libtqt3-headers.install +++ /dev/null @@ -1,270 +0,0 @@ -usr/include/tqt3/private/* -usr/include/tqt3/ntqabstractlayout.h -usr/include/tqt3/ntqaccel.h -usr/include/tqt3/ntqaccessible.h -usr/include/tqt3/ntqaction.h -usr/include/tqt3/ntqapplication.h -usr/include/tqt3/ntqasciicache.h -usr/include/tqt3/ntqasciidict.h -usr/include/tqt3/ntqasyncimageio.h -usr/include/tqt3/ntqasyncio.h -usr/include/tqt3/ntqbig5codec.h -usr/include/tqt3/ntqbitarray.h -usr/include/tqt3/ntqbitmap.h -usr/include/tqt3/ntqbrush.h -usr/include/tqt3/ntqbuffer.h -usr/include/tqt3/ntqbutton.h -usr/include/tqt3/ntqbuttongroup.h -usr/include/tqt3/ntqcache.h -usr/include/tqt3/ntqcanvas.h -usr/include/tqt3/ntqcdestyle.h -usr/include/tqt3/ntqcheckbox.h -usr/include/tqt3/ntqcleanuphandler.h -usr/include/tqt3/ntqclipboard.h -usr/include/tqt3/ntqcolor.h -usr/include/tqt3/ntqcolordialog.h -usr/include/tqt3/ntqcombobox.h -usr/include/tqt3/ntqcommonstyle.h -usr/include/tqt3/ntqcompactstyle.h -usr/include/tqt3/ntqconnection.h -usr/include/tqt3/ntqcstring.h -usr/include/tqt3/ntqcursor.h -usr/include/tqt3/ntqdatabrowser.h -usr/include/tqt3/ntqdatastream.h -usr/include/tqt3/ntqdatatable.h -usr/include/tqt3/ntqdataview.h -usr/include/tqt3/ntqdatetime.h -usr/include/tqt3/ntqdatetimeedit.h -usr/include/tqt3/ntqdeepcopy.h -usr/include/tqt3/ntqdesktopwidget.h -usr/include/tqt3/ntqdial.h -usr/include/tqt3/ntqdialog.h -usr/include/tqt3/ntqdict.h -usr/include/tqt3/ntqdir.h -usr/include/tqt3/ntqdns.h -usr/include/tqt3/ntqdockarea.h -usr/include/tqt3/ntqdockwindow.h -usr/include/tqt3/ntqdom.h -usr/include/tqt3/ntqdragobject.h -usr/include/tqt3/ntqdrawutil.h -usr/include/tqt3/ntqdropsite.h -usr/include/tqt3/ntqeditorfactory.h -usr/include/tqt3/ntqerrormessage.h -usr/include/tqt3/ntqeucjpcodec.h -usr/include/tqt3/ntqeuckrcodec.h -usr/include/tqt3/ntqevent.h -usr/include/tqt3/ntqeventloop.h -usr/include/tqt3/ntqfeatures.h -usr/include/tqt3/ntqfile.h -usr/include/tqt3/ntqfiledialog.h -usr/include/tqt3/ntqfileinfo.h -usr/include/tqt3/ntqfocusdata.h -usr/include/tqt3/ntqfont.h -usr/include/tqt3/ntqfontdatabase.h -usr/include/tqt3/ntqfontdialog.h -usr/include/tqt3/ntqfontinfo.h -usr/include/tqt3/ntqfontmetrics.h -usr/include/tqt3/ntqframe.h -usr/include/tqt3/ntqftp.h -usr/include/tqt3/ntqgarray.h -usr/include/tqt3/ntqgb18030codec.h -usr/include/tqt3/ntqgbkcodec.h -usr/include/tqt3/ntqgcache.h -usr/include/tqt3/ntqgdict.h -usr/include/tqt3/ntqgeneric.h -usr/include/tqt3/ntqgif.h -usr/include/tqt3/ntqglist.h -usr/include/tqt3/ntqglobal.h -usr/include/tqt3/ntqgplugin.h -usr/include/tqt3/ntqgrid.h -usr/include/tqt3/ntqgridview.h -usr/include/tqt3/ntqgroupbox.h -usr/include/tqt3/ntqguardedptr.h -usr/include/tqt3/ntqgvector.h -usr/include/tqt3/ntqhbox.h -usr/include/tqt3/ntqhbuttongroup.h -usr/include/tqt3/ntqheader.h -usr/include/tqt3/ntqhgroupbox.h -usr/include/tqt3/ntqhostaddress.h -usr/include/tqt3/ntqhttp.h -usr/include/tqt3/ntqiconset.h -usr/include/tqt3/ntqiconview.h -usr/include/tqt3/ntqimage.h -usr/include/tqt3/ntqimageformatplugin.h -usr/include/tqt3/ntqinputdialog.h -usr/include/tqt3/ntqintcache.h -usr/include/tqt3/ntqintdict.h -usr/include/tqt3/ntqinterlacestyle.h -usr/include/tqt3/ntqiodevice.h -usr/include/tqt3/ntqjiscodec.h -usr/include/tqt3/ntqjpegio.h -usr/include/tqt3/ntqjpunicode.h -usr/include/tqt3/ntqkeycode.h -usr/include/tqt3/ntqkeysequence.h -usr/include/tqt3/ntqlabel.h -usr/include/tqt3/ntqlayout.h -usr/include/tqt3/ntqlcdnumber.h -usr/include/tqt3/ntqlibrary.h -usr/include/tqt3/ntqlineedit.h -usr/include/tqt3/ntqlistbox.h -usr/include/tqt3/ntqlistview.h -usr/include/tqt3/ntqlocale.h -usr/include/tqt3/ntqlocalfs.h -usr/include/tqt3/ntqmainwindow.h -usr/include/tqt3/ntqmap.h -usr/include/tqt3/ntqmemarray.h -usr/include/tqt3/ntqmenubar.h -usr/include/tqt3/ntqmenudata.h -usr/include/tqt3/ntqmessagebox.h -usr/include/tqt3/ntqmetaobject.h -usr/include/tqt3/ntqmime.h -usr/include/tqt3/ntqmngio.h -usr/include/tqt3/ntqmotifstyle.h -usr/include/tqt3/ntqmotifplusstyle.h -usr/include/tqt3/ntqmovie.h -usr/include/tqt3/ntqmultilineedit.h -usr/include/tqt3/ntqmutex.h -usr/include/tqt3/ntqnamespace.h -usr/include/tqt3/ntqnetwork.h -usr/include/tqt3/ntqnetworkprotocol.h -usr/include/tqt3/ntqnp.h -usr/include/tqt3/ntqobject.h -usr/include/tqt3/ntqobjectcleanuphandler.h -usr/include/tqt3/ntqobjectdefs.h -usr/include/tqt3/ntqobjectdict.h -usr/include/tqt3/ntqobjectlist.h -usr/include/tqt3/ntqpaintdevice.h -usr/include/tqt3/ntqpaintdevicemetrics.h -usr/include/tqt3/ntqpainter.h -usr/include/tqt3/ntqpair.h -usr/include/tqt3/ntqpalette.h -usr/include/tqt3/ntqpen.h -usr/include/tqt3/ntqpicture.h -usr/include/tqt3/ntqpixmap.h -usr/include/tqt3/ntqpixmapcache.h -usr/include/tqt3/ntqplatinumstyle.h -usr/include/tqt3/ntqpngio.h -usr/include/tqt3/ntqpoint.h -usr/include/tqt3/ntqpointarray.h -usr/include/tqt3/ntqpolygonscanner.h -usr/include/tqt3/ntqpopupmenu.h -usr/include/tqt3/ntqprintdialog.h -usr/include/tqt3/ntqprinter.h -usr/include/tqt3/ntqprocess.h -usr/include/tqt3/ntqprogressbar.h -usr/include/tqt3/ntqprogressdialog.h -usr/include/tqt3/ntqptrcollection.h -usr/include/tqt3/ntqptrdict.h -usr/include/tqt3/ntqptrlist.h -usr/include/tqt3/ntqptrqueue.h -usr/include/tqt3/ntqptrstack.h -usr/include/tqt3/ntqptrvector.h -usr/include/tqt3/ntqpushbutton.h -usr/include/tqt3/ntqradiobutton.h -usr/include/tqt3/ntqrangecontrol.h -usr/include/tqt3/ntqrect.h -usr/include/tqt3/ntqregexp.h -usr/include/tqt3/ntqregion.h -usr/include/tqt3/ntqrtlcodec.h -usr/include/tqt3/ntqscrollbar.h -usr/include/tqt3/ntqscrollview.h -usr/include/tqt3/ntqsemaphore.h -usr/include/tqt3/ntqsemimodal.h -usr/include/tqt3/ntqserversocket.h -usr/include/tqt3/ntqsession.h -usr/include/tqt3/ntqsessionmanager.h -usr/include/tqt3/ntqsettings.h -usr/include/tqt3/ntqsgistyle.h -usr/include/tqt3/ntqshared.h -usr/include/tqt3/ntqsignal.h -usr/include/tqt3/ntqsignalmapper.h -usr/include/tqt3/ntqsignalslotimp.h -usr/include/tqt3/ntqsimplerichtext.h -usr/include/tqt3/ntqsize.h -usr/include/tqt3/ntqsizegrip.h -usr/include/tqt3/ntqsizepolicy.h -usr/include/tqt3/ntqsjiscodec.h -usr/include/tqt3/ntqslider.h -usr/include/tqt3/ntqsocket.h -usr/include/tqt3/ntqsocketdevice.h -usr/include/tqt3/ntqsocketnotifier.h -usr/include/tqt3/ntqsortedlist.h -usr/include/tqt3/ntqsound.h -usr/include/tqt3/ntqspinbox.h -usr/include/tqt3/ntqsplashscreen.h -usr/include/tqt3/ntqsplitter.h -usr/include/tqt3/ntqsql.h -usr/include/tqt3/ntqsqlcursor.h -usr/include/tqt3/ntqsqldatabase.h -usr/include/tqt3/ntqsqldriver.h -usr/include/tqt3/ntqsqldriverplugin.h -usr/include/tqt3/ntqsqleditorfactory.h -usr/include/tqt3/ntqsqlerror.h -usr/include/tqt3/ntqsqlfield.h -usr/include/tqt3/ntqsqlform.h -usr/include/tqt3/ntqsqlindex.h -usr/include/tqt3/ntqsqlpropertymap.h -usr/include/tqt3/ntqsqlquery.h -usr/include/tqt3/ntqsqlrecord.h -usr/include/tqt3/ntqsqlresult.h -usr/include/tqt3/ntqsqlselectcursor.h -usr/include/tqt3/ntqstatusbar.h -usr/include/tqt3/ntqstring.h -usr/include/tqt3/ntqstringlist.h -usr/include/tqt3/ntqstrlist.h -usr/include/tqt3/ntqstrvec.h -usr/include/tqt3/ntqstyle.h -usr/include/tqt3/ntqstylefactory.h -usr/include/tqt3/ntqstyleplugin.h -usr/include/tqt3/ntqstylesheet.h -usr/include/tqt3/ntqsyntaxhighlighter.h -usr/include/tqt3/ntqt.h -usr/include/tqt3/ntqtabbar.h -usr/include/tqt3/ntqtabdialog.h -usr/include/tqt3/ntqtable.h -usr/include/tqt3/ntqtabwidget.h -usr/include/tqt3/ntqtextbrowser.h -usr/include/tqt3/ntqtextcodec.h -usr/include/tqt3/ntqtextcodecfactory.h -usr/include/tqt3/ntqtextcodecplugin.h -usr/include/tqt3/ntqtextedit.h -usr/include/tqt3/ntqtextstream.h -usr/include/tqt3/ntqtextview.h -usr/include/tqt3/ntqthread.h -usr/include/tqt3/ntqthreadstorage.h -usr/include/tqt3/ntqtimer.h -usr/include/tqt3/ntqtl.h -usr/include/tqt3/ntqtoolbar.h -usr/include/tqt3/ntqtoolbox.h -usr/include/tqt3/ntqtoolbutton.h -usr/include/tqt3/ntqtooltip.h -usr/include/tqt3/ntqtranslator.h -usr/include/tqt3/ntqtsciicodec.h -usr/include/tqt3/ntqurl.h -usr/include/tqt3/ntqurlinfo.h -usr/include/tqt3/ntqurloperator.h -usr/include/tqt3/ntqutfcodec.h -usr/include/tqt3/ntquuid.h -usr/include/tqt3/ntqvalidator.h -usr/include/tqt3/ntqvaluelist.h -usr/include/tqt3/ntqvaluestack.h -usr/include/tqt3/ntqvaluevector.h -usr/include/tqt3/ntqvariant.h -usr/include/tqt3/ntqvbox.h -usr/include/tqt3/ntqvbuttongroup.h -usr/include/tqt3/ntqvfbhdr.h -usr/include/tqt3/ntqvgroupbox.h -usr/include/tqt3/ntqwaitcondition.h -usr/include/tqt3/ntqwhatsthis.h -usr/include/tqt3/ntqwidget.h -usr/include/tqt3/ntqwidgetintdict.h -usr/include/tqt3/ntqwidgetlist.h -usr/include/tqt3/ntqwidgetplugin.h -usr/include/tqt3/ntqwidgetstack.h -usr/include/tqt3/ntqwindowdefs.h -usr/include/tqt3/ntqwindowsstyle.h -usr/include/tqt3/ntqwinexport.h -usr/include/tqt3/ntqwizard.h -usr/include/tqt3/ntqwmatrix.h -usr/include/tqt3/ntqworkspace.h -usr/include/tqt3/ntqxml.h diff --git a/dilos/dependencies/tqt3/debian/libtqt3-i18n.install b/dilos/dependencies/tqt3/debian/libtqt3-i18n.install deleted file mode 100644 index cd272202b..000000000 --- a/dilos/dependencies/tqt3/debian/libtqt3-i18n.install +++ /dev/null @@ -1,8 +0,0 @@ -usr/share/tqt3/translations/qt_ar.qm -usr/share/tqt3/translations/qt_cs.qm -usr/share/tqt3/translations/qt_de.qm -usr/share/tqt3/translations/qt_es.qm -usr/share/tqt3/translations/qt_fr.qm -usr/share/tqt3/translations/qt_he.qm -usr/share/tqt3/translations/qt_ru.qm -usr/share/tqt3/translations/qt_sk.qm diff --git a/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install b/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install deleted file mode 100644 index d60b07fc7..000000000 --- a/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.* -usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.* -usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.* -usr/include/tqt3/ntqassistantclient.h diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install b/dilos/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install deleted file mode 100644 index 38a249f41..000000000 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/maketqpf -usr/bin/tqvfb diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links b/dilos/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links deleted file mode 100644 index 72baff7fd..000000000 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/maketqpf /usr/share/tqt3/bin/maketqpf -/usr/bin/tqvfb /usr/share/tqt3/bin/tqvfb diff --git a/dilos/dependencies/tqtinterface/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqtinterface/debian/cdbs/debian-tde.mk deleted file mode 100644 index f36e3527c..000000000 --- a/dilos/dependencies/tqtinterface/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_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)/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/dilos/dependencies/tqtinterface/debian/cdbs/versions.pl b/dilos/dependencies/tqtinterface/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/dependencies/tqtinterface/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/dependencies/tqtinterface/debian/changelog b/dilos/dependencies/tqtinterface/debian/changelog deleted file mode 100644 index 460ca1061..000000000 --- a/dilos/dependencies/tqtinterface/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -libtqtinterface (4:0.3.0) lucid; urgency=low - - * Initial release of the TQt Interface Library, supporting Qt3 - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 12 Jul 2010 03:13:00 -0600
\ No newline at end of file diff --git a/dilos/dependencies/tqtinterface/debian/compat b/dilos/dependencies/tqtinterface/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/dilos/dependencies/tqtinterface/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/dilos/dependencies/tqtinterface/debian/control b/dilos/dependencies/tqtinterface/debian/control deleted file mode 100644 index 0c20229d6..000000000 --- a/dilos/dependencies/tqtinterface/debian/control +++ /dev/null @@ -1,58 +0,0 @@ -Source: libtqtinterface -Section: tde -Priority: optional -Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-apps-dev -Standards-Version: 3.8.4 - -Package: libtqtinterface -Architecture: any -Multi-Arch: same -Section: libs -Replaces: libtqtinterface (<< 4:14.0.0~) -Breaks: libtqtinterface (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Description: The Trinity Qt Interface Libraries - The Trinity Qt Interface is a library that abstracts Qt from Trinity - This allows the Trinity code to rapidly port from one version of Qt to another. - This is primarily accomplished by defining old functions in terms of new functions, - although some code has been added for useful functions that are no longer part of Qt. - -Package: libtqtinterface-dev -Architecture: all -Multi-Arch: foreign -Section: libs -Replaces: libtqtinterface-dev (<< 4:14.0.0~) -Breaks: libtqtinterface-dev (<< 4:14.0.0~) -Depends: ${shlibs:Depends}, libtqtinterface (>= ${source:Version}), tqt3-apps-dev -Description: The Trinity Qt Interface Libraries (Development Files) - The Trinity Qt Interface is a library that abstracts Qt from Trinity - This allows the Trinity code to rapidly port from one version of Qt to another. - This is primarily accomplished by defining old functions in terms of new functions, - although some code has been added for useful functions that are no longer part of Qt. - -Package: libtqtinterface-doc -Architecture: all -Multi-Arch: foreign -Section: libs -Replaces: libtqtinterface-doc (<< 4:14.0.0~) -Breaks: libtqtinterface-doc (<< 4:14.0.0~) -Depends: ${shlibs:Depends}, libtqtinterface (>= ${source:Version}), tqt3-doc -Description: The Trinity Qt Interface Libraries (Debug Files) - The Trinity Qt Interface is a library that abstracts Qt from Trinity - This allows the Trinity code to rapidly port from one version of Qt to another. - This is primarily accomplished by defining old functions in terms of new functions, - although some code has been added for useful functions that are no longer part of Qt. - -Package: libtqtinterface-dbg -Architecture: linux-any -Multi-Arch: same -Section: libs -Replaces: libtqtinterface-dbg (<< 4:14.0.0~) -Breaks: libtqtinterface-dbg (<< 4:14.0.0~) -Depends: ${shlibs:Depends}, libtqtinterface (>= ${source:Version}), tqt-x11-free-dbg -Description: The Trinity Qt Interface Libraries (Debug Files) - The Trinity Qt Interface is a library that abstracts Qt from Trinity - This allows the Trinity code to rapidly port from one version of Qt to another. - This is primarily accomplished by defining old functions in terms of new functions, - although some code has been added for useful functions that are no longer part of Qt. diff --git a/dilos/dependencies/tqtinterface/debian/copyright b/dilos/dependencies/tqtinterface/debian/copyright deleted file mode 100644 index 978e1bb3e..000000000 --- a/dilos/dependencies/tqtinterface/debian/copyright +++ /dev/null @@ -1,25 +0,0 @@ -This package was debianized by Timothy Pearson <kb9vqf@pearsoncomputing.net> on -Mon, 12 Jul 2010 03:58:00 -0600. - -Upstream Authors: Timothy Pearson <kb9vqf@pearsoncomputing.net> - -Copyright: - - Copyright (c) 2010, Timothy Pearson - - This package 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; version 2 dated June, 1991, or at - your option any later version. - - This package 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 package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/dilos/dependencies/tqtinterface/debian/doc-base b/dilos/dependencies/tqtinterface/debian/doc-base deleted file mode 100644 index e69de29bb..000000000 --- a/dilos/dependencies/tqtinterface/debian/doc-base +++ /dev/null diff --git a/dilos/dependencies/tqtinterface/debian/docs b/dilos/dependencies/tqtinterface/debian/docs deleted file mode 100644 index ca0272abf..000000000 --- a/dilos/dependencies/tqtinterface/debian/docs +++ /dev/null @@ -1,3 +0,0 @@ -AUTHORS -README -TODO diff --git a/dilos/dependencies/tqtinterface/debian/libtqtinterface-dev.install b/dilos/dependencies/tqtinterface/debian/libtqtinterface-dev.install deleted file mode 100644 index 8b19fb624..000000000 --- a/dilos/dependencies/tqtinterface/debian/libtqtinterface-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/include /usr -debian/tmp/usr/bin /usr diff --git a/dilos/dependencies/tqtinterface/debian/libtqtinterface.install b/dilos/dependencies/tqtinterface/debian/libtqtinterface.install deleted file mode 100644 index f9610d9a2..000000000 --- a/dilos/dependencies/tqtinterface/debian/libtqtinterface.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib /usr diff --git a/dilos/dependencies/tqtinterface/debian/links b/dilos/dependencies/tqtinterface/debian/links deleted file mode 100644 index e69de29bb..000000000 --- a/dilos/dependencies/tqtinterface/debian/links +++ /dev/null diff --git a/dilos/dependencies/tqtinterface/debian/patches/series b/dilos/dependencies/tqtinterface/debian/patches/series deleted file mode 100644 index e69de29bb..000000000 --- a/dilos/dependencies/tqtinterface/debian/patches/series +++ /dev/null diff --git a/dilos/dependencies/tqtinterface/debian/rules b/dilos/dependencies/tqtinterface/debian/rules deleted file mode 100755 index b4e01120d..000000000 --- a/dilos/dependencies/tqtinterface/debian/rules +++ /dev/null @@ -1,17 +0,0 @@ -#! /usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk - -version=Debian Package $(DEB_VERSION) -DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) - -DEB_CMAKE_EXTRA_FLAGS := \ - -DPKGCONFIG_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_LIBRARY_PATH="/usr/lib/$(DEB_HOST_MULTIARCH)" \ - -DLIB_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)" \ - -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_C_COMPILER=gcc diff --git a/dilos/dependencies/tqtinterface/debian/source/format b/dilos/dependencies/tqtinterface/debian/source/format deleted file mode 100644 index 163aaf8d8..000000000 --- a/dilos/dependencies/tqtinterface/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/dilos/dependencies/tqtinterface/debian/source/options b/dilos/dependencies/tqtinterface/debian/source/options deleted file mode 100644 index 72f1f5450..000000000 --- a/dilos/dependencies/tqtinterface/debian/source/options +++ /dev/null @@ -1,6 +0,0 @@ -# Use xz instead of gzip -compression = "xz" -compression-level = 9 - -# Don't run differences -diff-ignore = .* diff --git a/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk deleted file mode 100644 index e2b1dc666..000000000 --- a/dilos/libraries/libtdeldap/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/libraries/libtdeldap/debian/cdbs/versions.pl b/dilos/libraries/libtdeldap/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/dilos/libraries/libtdeldap/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/libraries/libtdeldap/debian/compat b/dilos/libraries/libtdeldap/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/libraries/libtdeldap/debian/compat +++ b/dilos/libraries/libtdeldap/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/libraries/libtdeldap/debian/control b/dilos/libraries/libtdeldap/debian/control index 0bedee5d7..74907f0d9 100644 --- a/dilos/libraries/libtdeldap/debian/control +++ b/dilos/libraries/libtdeldap/debian/control @@ -2,7 +2,7 @@ Source: libtdeldap-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, libldap2-dev, heimdal-multidev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev Standards-Version: 3.8.4 Package: libtdeldap-trinity diff --git a/dilos/libraries/libtdeldap/debian/rules b/dilos/libraries/libtdeldap/debian/rules index 967f58705..5d6237e91 100755 --- a/dilos/libraries/libtdeldap/debian/rules +++ b/dilos/libraries/libtdeldap/debian/rules @@ -1,8 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include debian/cdbs/debian-tde.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include DEB_CONFIGURE_MANDIR := /usr/share/man diff --git a/dilos/libraries/python-trinity/debian/NEWS.Debian b/dilos/libraries/pytde/debian/NEWS.Debian index 367c6950d..367c6950d 100644 --- a/dilos/libraries/python-trinity/debian/NEWS.Debian +++ b/dilos/libraries/pytde/debian/NEWS.Debian diff --git a/dilos/libraries/python-trinity/debian/changelog b/dilos/libraries/pytde/debian/changelog index 12485eccd..43df2609a 100644 --- a/dilos/libraries/python-trinity/debian/changelog +++ b/dilos/libraries/pytde/debian/changelog @@ -1,4 +1,4 @@ -python-trinity-trinity (3.16.3-0ubuntu4) karmic; urgency=low +pytde (3.16.3-0ubuntu4) karmic; urgency=low * Karmic rebuild diff --git a/dilos/libraries/pytde/debian/compat b/dilos/libraries/pytde/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/dilos/libraries/pytde/debian/compat @@ -0,0 +1 @@ +10 diff --git a/dilos/libraries/python-trinity/debian/control b/dilos/libraries/pytde/debian/control index 85cb1de20..40dee1a76 100644 --- a/dilos/libraries/python-trinity/debian/control +++ b/dilos/libraries/pytde/debian/control @@ -1,44 +1,40 @@ -Source: python-trinity-trinity +Source: pytde Section: python Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> -Build-Depends: debhelper (>= 9~), libtqtinterface-dev, python-all, python-all-dev, python-all-dbg [!solaris-any], python-sip-tqt, python-sip-tqt-dev, python-sip-tqt-dbg [!solaris-any], python-tqt-dev, python-tqt-dbg [!solaris-any], tdelibs14-trinity-dev, dh-python +Build-Depends: debhelper (>= 10~), libtqt3-mt-dev, dh-python, python3-all-dev, python3-all-dbg [!solaris-any], python3-sip-tqt, python3-sip-tqt-dev, python3-sip-tqt-dbg [!solaris-any], pytqt-dev, python3-pytqt-dbg [!solaris-any], tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php -Package: python-trinity-trinity +Package: python3-pytde Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt -Replaces: python-trinity-trinity (<< 4:14.0.0~) -Breaks: python-trinity-trinity (<< 4:14.0.0~) -Provides: ${python:Provides} -Conflicts: python-trinity-trinity -Description: Trinity bindings for Python [Trinity] +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt +Breaks: python-trinity-trinity (<< 4:14.1.0~) +Provides: ${python3:Provides} +Description: Trinity bindings for Python 3 [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyTDE. Using this, you'll get (for example) classes from kio, kjs, tdehtml and kprint. -Package: python-trinity-trinity-dbg +Package: python3-pytde-dbg Priority: extra Architecture: linux-any -Replaces: python-trinity-trinity-dbg (<< 4:14.0.0~) -Breaks: python-trinity-trinity-dbg (<< 4:14.0.0~) -Depends: python-trinity-trinity (= ${binary:Version}), python-all-dbg, python-tqt-dbg, ${shlibs:Depends} -Description: Trinity bindings for Python (debug extensions) [Trinity] +Depends: python3-pytde (= ${binary:Version}), python3-all-dbg, python3-pytqt-dbg, ${shlibs:Depends} +Description: Trinity bindings for Python 3 (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyTDE. Using this, you'll get (for example) classes from kio, kjs, tdehtml and kprint. . This package contains the extension built for the Python debug interpreter. -Package: python-trinity-trinity-dev +Package: pytde-dev Section: python Architecture: all -Replaces: python-trinity-trinity-dev (<< 4:14.0.0~) -Breaks: python-trinity-trinity-dev (<< 4:14.0.0~) -Depends: pytqt-tools, ${python:Depends} +Replaces: python-trinity-trinity-dev (<< 4:14.1.0~) +Breaks: python-trinity-trinity-dev (<< 4:14.1.0~) +Depends: pytqt-tools, ${python3:Depends} Description: Trinity bindings for Python - Development files and scripts [Trinity] Development .sip files with definitions of PyTDE classes. They are needed to build PyTDE, but also as building blocks of other @@ -46,11 +42,11 @@ Description: Trinity bindings for Python - Development files and scripts [Trinit The package also contains tdepyuic, a wrapper script around PyTQt's user interface compiler. -Package: python-trinity-trinity-doc +Package: pytde-doc Section: doc Architecture: all -Replaces: python-trinity-trinity-doc (<< 4:14.0.0~) -Breaks: python-trinity-trinity-doc (<< 4:14.0.0~) +Replaces: python-trinity-trinity-doc (<< 4:14.1.0~) +Breaks: python-trinity-trinity-doc (<< 4:14.1.0~) Description: Documentation and examples for PyTDE [Trinity] General documentation and examples for PyTDE providing programming tips and working code you can use to learn from. diff --git a/dilos/libraries/python-trinity/debian/copyright b/dilos/libraries/pytde/debian/copyright index eec6b36a5..eec6b36a5 100644 --- a/dilos/libraries/python-trinity/debian/copyright +++ b/dilos/libraries/pytde/debian/copyright diff --git a/dilos/libraries/python-trinity/debian/patches/.gitignore b/dilos/libraries/pytde/debian/patches/.gitignore index e69de29bb..e69de29bb 100644 --- a/dilos/libraries/python-trinity/debian/patches/.gitignore +++ b/dilos/libraries/pytde/debian/patches/.gitignore diff --git a/dilos/libraries/pytde/debian/pytde-dev.dirs b/dilos/libraries/pytde/debian/pytde-dev.dirs new file mode 100644 index 000000000..d4b26d5db --- /dev/null +++ b/dilos/libraries/pytde/debian/pytde-dev.dirs @@ -0,0 +1 @@ +usr/share/sip-tqt/trinity diff --git a/dilos/libraries/pytde/debian/pytde-dev.install b/dilos/libraries/pytde/debian/pytde-dev.install new file mode 100644 index 000000000..224c18bd2 --- /dev/null +++ b/dilos/libraries/pytde/debian/pytde-dev.install @@ -0,0 +1,2 @@ +sip/* usr/share/sip-tqt/trinity +contrib/tdepyuic usr/bin/ diff --git a/dilos/libraries/pytde/debian/pytde-doc.dirs b/dilos/libraries/pytde/debian/pytde-doc.dirs new file mode 100644 index 000000000..190e712a3 --- /dev/null +++ b/dilos/libraries/pytde/debian/pytde-doc.dirs @@ -0,0 +1,3 @@ +usr/share/doc/pytde-doc +usr/share/doc/pytde-doc/examples +usr/share/doc/pytde-doc/html diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/dilos/libraries/pytde/debian/pytde-doc.doc-base index bb9705168..4429e7518 100644 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base +++ b/dilos/libraries/pytde/debian/pytde-doc.doc-base @@ -8,5 +8,5 @@ Abstract: This documentation describes the PyTDE API Section: Programming Format: HTML -Index: /usr/share/doc/python-trinity-trinity-doc/html/index.html -Files: /usr/share/doc/python-trinity-trinity-doc/html/*.html +Index: /usr/share/doc/pytde-doc/html/index.html +Files: /usr/share/doc/pytde-doc/html/*.html diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/dilos/libraries/pytde/debian/pytde-doc.examples index e39721e20..e39721e20 100644 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.examples +++ b/dilos/libraries/pytde/debian/pytde-doc.examples diff --git a/dilos/libraries/pytde/debian/pytde-doc.install b/dilos/libraries/pytde/debian/pytde-doc.install new file mode 100644 index 000000000..484ad91a4 --- /dev/null +++ b/dilos/libraries/pytde/debian/pytde-doc.install @@ -0,0 +1 @@ +doc/* usr/share/doc/pytde-doc/html diff --git a/dilos/libraries/pytde/debian/pytdeconfig.py b/dilos/libraries/pytde/debian/pytdeconfig.py new file mode 100644 index 000000000..c12c20788 --- /dev/null +++ b/dilos/libraries/pytde/debian/pytdeconfig.py @@ -0,0 +1,17 @@ +# import the sipconfig.py for the normal or the debug build + +import os +import sys +import sysconfig + +sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages')) + +if 'd' in sys.abiflags: + try: + from pytdeconfig_d import * + from pytdeconfig_d import _pkg_config, _default_macros + except ImportError as msg: + raise ImportError('No module named pytdeconfig; package python3-pytde-dbg not installed') +else: + from pytdeconfig_nd import * + from pytdeconfig_nd import _pkg_config, _default_macros diff --git a/dilos/libraries/pytde/debian/python3-pytde.install b/dilos/libraries/pytde/debian/python3-pytde.install new file mode 100644 index 000000000..a3546ced0 --- /dev/null +++ b/dilos/libraries/pytde/debian/python3-pytde.install @@ -0,0 +1,2 @@ +usr/lib/python3*/*-packages/*.so +usr/lib/python3*/*-packages/dcop*.py diff --git a/dilos/libraries/python-trinity/debian/rules b/dilos/libraries/pytde/debian/rules index 3bae8384b..40e46f0ad 100755 --- a/dilos/libraries/python-trinity/debian/rules +++ b/dilos/libraries/pytde/debian/rules @@ -1,11 +1,8 @@ #!/usr/bin/make -f -# -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - DEB_CONFIGURE_INCLUDEDIR := /usr/include DEB_CONFIGURE_MANDIR := /usr/share/man DEB_CONFIGURE_PREFIX := /usr @@ -23,10 +20,22 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif -# This has to be exported to make some magic below work. +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + export DH_OPTIONS -export QTDIR=/usr/share/qt3 -export QMAKESPEC=$(QTDIR)/mkspecs/dilos-g++ + +-include /usr/share/python3/python.mk +ifeq (,$(py_sitename)) +py_sitename = site-packages +py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages +py_sitename_sh = $(py_sitename) +py_libdir_sh = $(py_libdir) +endif + +export TQTDIR=/usr/share/tqt3 +export QMAKESPEC=$(TQTDIR)/mkspecs/dilos-g++ CXXFLAGS = -Wall -g @@ -36,10 +45,7 @@ else CXXFLAGS += -O2 endif -PYTHONS := $(shell pyversions -vr debian/control) -#DBG_PYTHONS := $(shell pyversions -vd) - -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) +PYTHONS := $(shell py3versions -vr) GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') ifneq (,$(filter $(GCCVER),4.2 4.3)) @@ -52,15 +58,15 @@ endif # dbg-build-%/configure-stamp configure: $(PYTHONS:%=build-%/configure-stamp) -# $(DBG_PYTHONS:%=dbg-build-%/configure-stamp) +# $(PYTHONS:%=dbg-build-%/configure-stamp) build-%/configure-stamp: dh_testdir mkdir -p build-$* cd build-$* && python$* ../configure.py \ -c -u -k /usr -o /usr/include -n /usr/lib/$(DEB_HOST_MULTIARCH) \ - -e python$* \ - -v /usr/share/sip/trinity -j $(SPLIT) + -d /usr/lib/python$*/$(call py_sitename,$*) \ + -v /usr/share/sip-tqt/trinity -j $(SPLIT) touch $@ dbg-build-%/configure-stamp: @@ -68,12 +74,12 @@ dbg-build-%/configure-stamp: mkdir -p dbg-build-$* cd dbg-build-$* && python$*-dbg ../configure.py \ -c -u -k /usr -o /usr/include -n /usr/lib \ - -e python$* \ - -v /usr/share/sip/trinity -j $(SPLIT) + -d /usr/lib/python$*/$(call py_sitename,$*) \ + -v /usr/share/sip-tqt/trinity -j $(SPLIT) touch $@ build build-arch: $(PYTHONS:%=build-%/build-stamp) -# $(DBG_PYTHONS:%=dbg-build-%/build-stamp) +# $(PYTHONS:%=dbg-build-%/build-stamp) build-indep: build-%/build-stamp: build-%/configure-stamp @@ -90,7 +96,7 @@ clean: dh_testdir dh_testroot rm -f *-stamp - rm -rf $(PYTHONS:%=build-%) $(DBG_PYTHONS:%=dbg-build-%) + rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) # remove autogenerated *mod.sip files and clean up sources for moddir in sip/*;\ @@ -111,14 +117,12 @@ install-indep: dh_install -i -X'\.diff$$' -X'\.in$$' -X'\.html$$' for version in ${PYTHONS};\ do\ - mkdir -p debian/python-trinity-trinity-dev/usr/lib/python-$$version/site-packages;\ - cp debian/pytdeconfig.py debian/python-trinity-trinity-dev/usr/lib/python-$$version/site-packages/;\ - cp build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/usr/lib/python-$$version/site-packages/pytdeconfig_nd.py;\ + pylib=$$(python$$version -c "import sysconfig; print(sysconfig.get_path('platstdlib'))");\ + mkdir -p debian/pytde-dev/$$pylib;\ + install -m 644 -o root -g root debian/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig.py;\ + install -m 644 -o root -g root build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_nd.py;\ done -# for version in ${DBG_PYTHONS};\ -# do\ -# cp dbg-build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/usr/lib/python-$$version/site-packages/pytdeconfig_d.py;\ -# done +# install -m 644 -o root -g root dbg-build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_d.py;\ install-arch: dh_testdir @@ -130,23 +134,19 @@ install-arch: do\ $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\ done - -# set -e; \ -# for version in ${DBG_PYTHONS}; do \ -# $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-trinity-trinity-dbg;\ -# done +# $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python3-pytde-dbg;\ dh_install -a --sourcedir=$(CURDIR)/debian/tmp - mkdir -p $(CURDIR)/debian/python-trinity-trinity/usr/lib/$(DEB_HOST_MULTIARCH) - ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/trinity/libkonsolepart.so $(CURDIR)/debian/python-trinity-trinity/usr/lib/$(DEB_HOST_MULTIARCH) -# for i in $$(find debian/python-*-dbg -name '*.so'); do \ + mkdir -p $(CURDIR)/debian/python3-pytde/usr/lib/$(DEB_HOST_MULTIARCH) + ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/trinity/libkonsolepart.so $(CURDIR)/debian/python3-pytde/usr/lib/$(DEB_HOST_MULTIARCH) +# for i in $$(find debian/python3-*-dbg -name '*.so'); do \ # b=$$(basename $$i .so); \ # mv $$i $$(dirname $$i)/$${b}_d.so; \ # done -# find debian/python-*-dbg ! -type d \ +# find debian/python3-*-dbg ! -type d \ # ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f -# find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \; +# find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \; # Must not depend on anything. This is to be called by @@ -160,11 +160,11 @@ binary-common: dh_installexamples dh_link ifeq (,$(findstring -i, $(DH_OPTIONS))) - DH_OPTIONS= dh_strip -ppython-trinity-trinity #--dbg-package=python-trinity-trinity-dbg + DH_OPTIONS= dh_strip -ppython3-pytde #--dbg-package=python3-pytde-dbg endif dh_compress -X.py -X.ui -X.dtd dh_fixperms - ${DH_PYTHON2} + dh_python3 --no-dbg-cleaning --shebang=/usr/bin/python3 dh_installdeb dh_shlibdeps -l /usr/lib/$(DEB_HOST_MULTIARCH) dh_gencontrol diff --git a/dilos/dependencies/tqt3/debian/source/format b/dilos/libraries/pytde/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/dilos/dependencies/tqt3/debian/source/format +++ b/dilos/libraries/pytde/debian/source/format diff --git a/dilos/dependencies/tqt3/debian/source/options b/dilos/libraries/pytde/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/dilos/dependencies/tqt3/debian/source/options +++ b/dilos/libraries/pytde/debian/source/options diff --git a/dilos/libraries/pytdeextensions/debian/compat b/dilos/libraries/pytdeextensions/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/libraries/pytdeextensions/debian/compat +++ b/dilos/libraries/pytdeextensions/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/libraries/pytdeextensions/debian/control b/dilos/libraries/pytdeextensions/debian/control index 48386f4de..846e02c1a 100644 --- a/dilos/libraries/pytdeextensions/debian/control +++ b/dilos/libraries/pytdeextensions/debian/control @@ -3,18 +3,18 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), chrpath [!solaris-any], quilt, tdelibs14-trinity, libtool-bin | libtool (<< 2.4.2-1.11), libtool, - libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity, - python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6) | dh-python, python-all, python-all-dev +Build-Depends: cdbs, debhelper (>= 10~), chrpath [!solaris-any], quilt, tdelibs-trinity, libtool-bin, libtool, + libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python3-pytde, + pytqt-dev, python3-sip-tqt-dev, dh-python, python3-all, python3-all-dev, python3-setuptools Standards-Version: 3.8.4 Package: pytdeextensions-trinity Architecture: all -Depends: ${python:Depends} +Depends: ${python3:Depends} Replaces: pykdeextensions-trinity (<< 4:14.0.0~) Breaks: pykdeextensions-trinity (<< 4:14.0.0~) Conflicts: pykdeextensions -Provides: ${python:Provides} +Provides: ${python3:Provides} Description: Python packages to support TDE applications (scripts) [Trinity] PyTDE Extensions is a collection of software and Python packages to support the creation and installation of TDE applications. @@ -26,7 +26,7 @@ Architecture: any Section: libdevel Replaces: libpythonize0-trinity-dev (<< 4:14.0.0~) Breaks: libpythonize0-trinity-dev (<< 4:14.0.0~) -Depends: libpythonize0-trinity (= ${binary:Version}), python-all-dev +Depends: libpythonize0-trinity (= ${binary:Version}), python3-all-dev Description: Python packages to support TDE applications (development) [Trinity] PyTDE Extensions is a collection of software and Python packages to support the creation and installation of TDE applications. diff --git a/dilos/libraries/pytdeextensions/debian/python-distutils-jaunty.mk b/dilos/libraries/pytdeextensions/debian/python-distutils-jaunty.mk deleted file mode 100644 index 8b238c772..000000000 --- a/dilos/libraries/pytdeextensions/debian/python-distutils-jaunty.mk +++ /dev/null @@ -1,297 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2003 Colin Walters <walters@debian.org> -# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org> -# -# Description: manage Python public modules build -# This class is designed to work with Python packages using the -# 'distutils' build system and comply to the new policy established -# during summer 2006. Use of the debhelper class to make use of the -# new dh_python is strongly advised. (This is still left as optional -# in line with CDBS' flexible behavior.) -# -# 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., 51 Franklin St, Fifth Floor, Boston, MA -# 02111-1307 USA. -# - -# This class provides rules for old and new Python policy. Leaving -# DEB_PYTHON_SYSTEM unset selects the old behavior. The pysupport and -# pycentral methods are available to comply with new policy. Don't forget -# to update your 'debian/control'. (Build-Depends are correctly generated -# if you are using the auto control generation feature.) - -# Once all old-style packages are removed before etch, some of the old -# can be refactored or removed. - - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_class_python_distutils -_cdbs_class_python_distutils = 1 - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) -include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix) - - -# check python system -cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes) -cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi) -cdbs_pycompat = $(cdbs_selected_pycompat) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE) - ifeq (, $(cdbs_selected_pycompat)) - cdbs_pycompat = 2 - endif # use pycompat - # warning pysupport compatibility mode - ifneq (, $(cdbs_use_xs_field)) - $(warning WARNING: Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.) - endif # use XS field (compat) -else - ifeq (pycentral, $(DEB_PYTHON_SYSTEM)) - ifeq (, $(cdbs_selected_pycompat)) - cdbs_pycompat = 2 - endif # use pycompat - else - ifneq (, $(DEB_PYTHON_SYSTEM)) - $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral)) - else - ifneq (, $(cdbs_use_xs_field)) - $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral") - endif - ifneq (, $(cdbs_selected_pycompat)) - ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes)) - $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral") - endif - endif # use pycompat - endif # unknown method - endif # pycentral -endif # pysupport - - -ifndef DEB_PYTHON_SYSTEM -DEB_PYTHON_COMPILE_VERSION = -DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7 -else -# default package is the first one declared in 'debian/control' -# (override if necessary) -DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES))) -DEB_PYTHON_PRIVATE_MODULES_DIRS = -endif - -# common variables -DEB_PYTHON_SETUP_CMD = setup.py -DEB_PYTHON_CLEAN_ARGS = -a -DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build" -DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0 --prefix=/usr - - -ifndef DEB_PYTHON_SYSTEM -########################### old policy method ########################### - -$(warning =======================================================) -$(warning Your package does not conform to the new Python policy.) -$(warning Please consider updating. Here is some documentation:) -$(warning http://wiki.debian.org/DebianPython/NewPolicy) -$(warning http://wiki.debian.org/DebianPythonFAQ) -$(warning =======================================================) - -# make: *** No rule to make target `voodoo'. Stop. -DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES)))) -# If no versioned python library packages found, grab all simpler ones -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES)))) -endif - -cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg)))) - -common-build-arch common-build-indep:: common-build-impl -common-build-impl:: - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) - - -# See if this package doesn't appear to need to be compiled by multiple -# Python versions. -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -common-install-arch common-install-indep:: common-install-impl -common-install-impl:: - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) - for ddir in $(DEB_DESTDIR)/usr/lib/python?.?/dist-packages; do \ - sdir=$$(dirname $$ddir)/site-packages; \ - mkdir -p $$sdir; \ - tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \ - rm -rf $$ddir; \ - done -else -$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% : - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) - for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \ - sdir=$$(dirname $$ddir)/site-packages; \ - mkdir -p $$sdir; \ - tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \ - rm -rf $$ddir; \ - done -endif - -$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% : - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \ - sdir=$$(dirname $$ddir)/site-packages; \ - mkdir -p $$sdir; \ - tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \ - rm -rf $$ddir; \ - done -endif - -# This class can optionally utilize debhelper's "dh_python" command. Just -# be sure you include debhelper.mk before including this file. -ifdef _cdbs_rules_debhelper - -DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) -endif - - -# Ignore errors from this rule. In a tarball build, the file may not -# exist. -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -clean:: - -python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -else -clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) - -$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% : - -python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -endif - -else -########################## new policy methods ########################### - -# Calculate cdbs_python_build_versions -cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control)) -cdbs_python_current_version := $(shell pyversions -vd) -ifeq (all, $(cdbs_python_module_arch)) - # check if current is in build versions - ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr))) - cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr)))) - cdbs_python_build_versions := $(cdbs_python_compile_version) - else - cdbs_python_build_versions := $(cdbs_python_current_version) - endif -else -cdbs_python_build_versions := $(shell pyversions -vr) -endif # archall - -# check if build is possible -ifeq (, $(cdbs_python_build_versions)) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) -$(error invalid setting in debian/pyversions) -else -$(error invalid setting for XS-Python-Version) -endif # system selected -endif # build versions empty - - -# Declare Build-Deps for packages using this file -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43) -ifeq (all, $(cdbs_python_module_arch)) - ifneq (, $(cdbs_python_compile_version)) - CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11) - else - CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11) - endif -else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11) -endif -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2) -else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6) -endif - - -cdbs_python_current_binary := $(shell pyversions -d) -cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1)) - -# build stage -common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions)) -python-build-stamp-%: -ifeq (all, $(cdbs_python_module_arch)) - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) -else - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) -endif # archall detection - touch $@ - - -# install stage -ifeq (all, $(cdbs_python_module_arch)) -common-install-arch common-install-indep:: python-install-py -python-install-py: - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) -else -common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions)) -python-install-%: - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) -endif # archall detection - - -# This class can optionally use debhelper's commands. Just -# be sure you include debhelper.mk before including this file. -ifdef _cdbs_rules_debhelper - -DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - dh_pysupport -p$(cdbs_curpkg) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) -else - dh_pycentral -p$(cdbs_curpkg) -endif - ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) -endif - - -# clean stage -clean:: $(addprefix python-clean-, $(cdbs_python_build_versions)) -python-clean-%: -ifeq (all, $(cdbs_python_module_arch)) - -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -else - -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -endif # archall detection - -clean:: -ifeq (, $(cdbs_selected_pycompat)) - echo "$(cdbs_pycompat)" >debian/pycompat -endif # use pycompat - rm -f python-build-stamp-* - -endif - - -########################## all policy methods ########################### - -# Calling setup.py clean may create .pyc files, so we need a final cleanup -# pass here. -clean:: - find . -name '*.pyc' -exec rm '{}' ';' - -endif diff --git a/dilos/libraries/pytdeextensions/debian/pyversions b/dilos/libraries/pytdeextensions/debian/pyversions deleted file mode 100644 index 0c043f18c..000000000 --- a/dilos/libraries/pytdeextensions/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.6- diff --git a/dilos/libraries/pytdeextensions/debian/rules b/dilos/libraries/pytdeextensions/debian/rules index 009b362ca..9f24adcf1 100755 --- a/dilos/libraries/pytdeextensions/debian/rules +++ b/dilos/libraries/pytdeextensions/debian/rules @@ -1,17 +1,11 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DEB_PYTHON2_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity +DEB_PYTHON3_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) include /usr/share/cdbs/1/rules/debhelper.mk -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - include debian/python-distutils-jaunty.mk -else - include /usr/share/cdbs/1/class/python-distutils.mk -endif -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/python-distutils.mk include /usr/share/cdbs/1/rules/utils.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include @@ -40,12 +34,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif -post-patches:: - # make sure that python binary exists - # since the existing code is still dependent on python2 - # and cdbs uses python as the default binary name - test -x /usr/bin/python || ln -s python2 /usr/bin/python - install/pytdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" diff --git a/dilos/libraries/python-trinity/debian/compat b/dilos/libraries/python-trinity/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/dilos/libraries/python-trinity/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/dilos/libraries/python-trinity/debian/pytdeconfig.py b/dilos/libraries/python-trinity/debian/pytdeconfig.py deleted file mode 100644 index eac264752..000000000 --- a/dilos/libraries/python-trinity/debian/pytdeconfig.py +++ /dev/null @@ -1,11 +0,0 @@ -# import the sipconfig.py for the normal or the debug build - -import sys - -if getattr(sys, "pydebug", False): - try: - from pytdeconfig_d import * - except ImportError, msg: - raise ImportError, 'No module named pytdeconfig; package python-trinity-dbg not installed' -else: - from pytdeconfig_nd import * diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs deleted file mode 100644 index be8aad160..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/sip/trinity diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.install deleted file mode 100644 index c523f227e..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -sip/* usr/share/sip/trinity -contrib/tdepyuic usr/bin/ diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs deleted file mode 100644 index 96235463f..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/share/doc/python-trinity-trinity-doc -usr/share/doc/python-trinity-trinity-doc/examples -usr/share/doc/python-trinity-trinity-doc/html diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.install deleted file mode 100644 index 20b273acb..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.install +++ /dev/null @@ -1 +0,0 @@ -doc/* usr/share/doc/python-trinity-trinity-doc/html diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity.install b/dilos/libraries/python-trinity/debian/python-trinity-trinity.install deleted file mode 100644 index facee2907..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/python*/*-packages/*.so -usr/lib/python*/*-packages/dcop*.py - diff --git a/dilos/libraries/python-trinity/debian/source/format b/dilos/libraries/python-trinity/debian/source/format deleted file mode 100644 index 163aaf8d8..000000000 --- a/dilos/libraries/python-trinity/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/dilos/libraries/python-trinity/debian/source/options b/dilos/libraries/python-trinity/debian/source/options deleted file mode 100644 index 72f1f5450..000000000 --- a/dilos/libraries/python-trinity/debian/source/options +++ /dev/null @@ -1,6 +0,0 @@ -# Use xz instead of gzip -compression = "xz" -compression-level = 9 - -# Don't run differences -diff-ignore = .* diff --git a/dilos/libraries/python-trinity/debian/watch b/dilos/libraries/python-trinity/debian/watch deleted file mode 100644 index 8b3afcac0..000000000 --- a/dilos/libraries/python-trinity/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 - -http://www.riverbankcomputing.com/Downloads/PyTrinity/PyKDE-(.*)\.tar\.bz2 diff --git a/dilos/metapackages/tde-cdbs b/dilos/metapackages/tde-cdbs new file mode 120000 index 000000000..5d87114ba --- /dev/null +++ b/dilos/metapackages/tde-cdbs @@ -0,0 +1 @@ +../../debian/_base/metapackages/tde-cdbs
\ No newline at end of file |