diff options
66 files changed, 222 insertions, 918 deletions
diff --git a/debian/_base/applications/graphics/digikam/debian/control b/debian/_base/applications/graphics/digikam/debian/control index 9a0ce57b7..dd96d8130 100644 --- a/debian/_base/applications/graphics/digikam/debian/control +++ b/debian/_base/applications/graphics/digikam/debian/control @@ -4,12 +4,11 @@ Priority: optional Maintainer: TDE Debian Team <[email protected]> XSBC-Original-Maintainer: Debian KDE Extras Team <[email protected]> Uploaders: Achim Bohnet <[email protected]>, Mark Purcell <[email protected]>, Fathi Boudra <[email protected]> -Build-Depends: cdbs, debhelper (>= 10~), quilt, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtiff-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev, libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6), libjasper-dev, libpng-dev, libexiv2-dev, - libkdcraw3-trinity-dev (>= 0.1.4), - automake, autoconf, libtool, libltdl-dev + libkdcraw3-trinity-dev (>= 0.1.4) Standards-Version: 3.8.4 Homepage: http://www.digikam.org diff --git a/debian/_base/applications/graphics/digikam/debian/digikam-trinity.install b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.install index 67fe3a3b9..223a24aa6 100644 --- a/debian/_base/applications/graphics/digikam/debian/digikam-trinity.install +++ b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.install @@ -1,5 +1,5 @@ /opt/trinity/bin/digi* -/opt/trinity/include/tde +/opt/trinity/include /opt/trinity/lib /opt/trinity/share/apps/digikam /opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop diff --git a/debian/_base/applications/graphics/digikam/debian/rules b/debian/_base/applications/graphics/digikam/debian/rules index 3b310f8f1..a6797f19a 100755 --- a/debian/_base/applications/graphics/digikam/debian/rules +++ b/debian/_base/applications/graphics/digikam/debian/rules @@ -1,38 +1,17 @@ #!/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 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -TARBALL_EXT=tar.bz2 - -DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3 --prefix=/opt/trinity --disable-static - -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" - -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)/opt/trinity/lib) - -PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:$PKG_CONFIG_PATH - -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 - -binary-install/digikam-trinity-doc:: - # remove empty API-docs dirs tree - rm -rf $(CURDIR)/debian/digikam-trinity-doc/opt/trinity/share/doc/tde/HTML/en/digikam-apidocs +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/debian/_base/applications/multimedia/k3b/debian/rules b/debian/_base/applications/multimedia/k3b/debian/rules index 0cd87b24d..70fead837 100755 --- a/debian/_base/applications/multimedia/k3b/debian/rules +++ b/debian/_base/applications/multimedia/k3b/debian/rules @@ -57,6 +57,13 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/libk3b3$(DEB_TIME64_SUFFIX)-" | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libk3b3\\)-trinity$$/Package: \\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libk3b3-trinity\\)\\( [^,]*\|$$\)/\\1:\\2\\3/" \ + -e "s/\\(libk3b3\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + debian/control +else [ ! -f debian/control.t64 ] || \ mv debian/control.t64 debian/control endif diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk deleted file mode 100644 index aba508624..000000000 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk +++ /dev/null @@ -1,251 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2003 Christopher L Cheney <[email protected]> -# Copyright © 2019 TDE Team -# Description: A class for TDE packages; sets TDE environment variables, etc -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -ifndef _cdbs_bootstrap -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class -endif - -ifndef _cdbs_class_debian-qt-kde -_cdbs_class_debian-qt-kde := 1 - -# for dh_icons -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) - -# Note: This _must_ be included before autotools.mk, or it won't work. -common-configure-arch common-configure-indep:: debian/stamp-cvs-make -debian/stamp-cvs-make: -ifndef _cdbs_class_cmake - cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; -endif - touch debian/stamp-cvs-make - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) - -ifdef _cdbs_tarball_dir -DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) -else -DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) -endif - -ifndef _cdbs_class_cmake -include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) -endif - -ifdef _cdbs_class_cmake -ifneq "$(wildcard /usr/bin/ninja)" "" -MAKE = ninja -v -DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) -DEB_MAKE_INSTALL_TARGET = install -DEB_CMAKE_NORMAL_ARGS += -GNinja -endif -endif - -ifndef _cdbs_rules_patchsys_quilt -DEB_PATCHDIRS := debian/patches/common debian/patches -endif - -export kde_cgidir = \$${libdir}/cgi-bin -export kde_confdir = \$${sysconfdir}/trinity -export kde_htmldir = \$${datadir}/doc/tde/HTML - -DEB_KDE_ENABLE_FINAL := yes -DEB_INSTALL_DOCS_ALL := - -DEB_DH_MAKESHLIBS_ARGS_ALL := -V -DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) - -DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb - ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) - cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) - else - cdbs_kde_enable_final = - endif -endif - -ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) - cdbs_kde_enable_final = - cdbs_kde_enable_debug = --enable-debug=yes -else - cdbs_kde_enable_debug = --disable-debug -endif - -ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) - cdbs_kde_enable_debug = --enable-debug=full -endif - -DEB_BUILD_PARALLEL ?= true - -cdbs_configure_flags += \ - --with-qt-dir=/usr/share/qt3 \ - --disable-rpath \ - --with-xinerama \ - $(cdbs_kde_enable_final) \ - $(cdbs_kde_enable_debug) - - -# This is a convenience target for calling manually. -# It's not part of the build process. -buildprep: clean apply-patches -ifndef _cdbs_class_cmake - $(MAKE) -f admin/Makefile.common dist -endif - debian/rules clean - -.tdepkginfo: - echo "# TDE package information" >.tdepkginfo - dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo - dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo - date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo - -post-patches:: .tdepkginfo - -common-build-arch:: debian/stamp-man-pages -debian/stamp-man-pages: - if ! test -d debian/man/out; then mkdir -p debian/man/out; fi - for f in $$(find debian/man -name '*.sgml'); do \ - docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ - done - for f in $$(find debian/man -name '*.man'); do \ - soelim -I debian/man $$f \ - > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ - done - touch debian/stamp-man-pages - -common-binary-indep:: - ( set -e; \ - tmpf=`mktemp debian/versions.XXXXXX`; \ - perl debian/cdbs/versions.pl >$$tmpf; \ - for p in $(DEB_INDEP_PACKAGES); do \ - cat $$tmpf >>debian/$$p.substvars; \ - done; \ - rm -f $$tmpf ) - -common-binary-arch:: - ( set -e; \ - tmpf=`mktemp debian/versions.XXXXXX`; \ - perl debian/cdbs/versions.pl >$$tmpf; \ - for p in $(DEB_ARCH_PACKAGES); do \ - cat $$tmpf >>debian/$$p.substvars; \ - done; \ - rm -f $$tmpf ) - # update multi-arch path in install files - ls -d debian/* | \ - grep -E "(install|links)$$" | \ - while read a; do \ - [ -d $$a ] || [ -f $$a.arch ] || \ - ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ - sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ - done - -clean:: - rm -rf debian/man/out - -rmdir debian/man - rm -f debian/stamp-man-pages - rm -rf debian/shlibs-check - # revert multi-arch path in install files - ls -d debian/* | \ - grep -E "(install|links)$$" | \ - while read a; do \ - [ ! -f $$a.arch ] || \ - mv $$a.arch $$a; \ - done - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi - if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi - if test -e debian/$(cdbs_curpkg).lintian; then \ - install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ - fi - if test -e debian/$(cdbs_curpkg).presubj; then \ - install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ - fi - if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ - test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ - echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ - echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ - fi - -binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: - set -e; \ - for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ - pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ - echo Building $$pkg HTML docs...; \ - mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ - done - for pkg in $(DOC_HTML_PRUNE) ; do \ - rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - done - -common-build-indep:: debian/stamp-kde-apidox -debian/stamp-kde-apidox: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) - touch $@ - -common-install-indep:: common-install-kde-apidox -common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) - -cleanbuilddir:: - -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) - -clean:: -ifndef _cdbs_class_cmake - if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ - cd $(DEB_SRCDIR); \ - find . -name Makefile.in -print | \ - xargs --no-run-if-empty rm -f; \ - rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ - configure configure.files configure.in stamp-h.in \ - subdirs; \ - fi -endif - rm -f .tdepkginfo - rm -f debian/stamp-kde-apidox - rm -f debian/stamp-cvs-make - -endif diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/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/debian/_base/applications/multimedia/kaffeine-mozilla/debian/changelog b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/changelog deleted file mode 100644 index 7e3c2a0fd..000000000 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/changelog +++ /dev/null @@ -1,27 +0,0 @@ -kaffeine-mozilla-trinity (0.4.3.1.dfsg-0.2) karmic; urgency=low - - * Karmic upload - - -- Timothy Pearson <[email protected]> Mon, 07 Dec 2009 00:26:00 -0600 - -kaffeine-mozilla (0.4.3.1.dfsg-0.1) unstable; urgency=low - - * Non-maintainer upload - * Repackaging source package; removing unclear licensed jri*.h files - (Closes: 322961) - * Removed the sources put in twice - * Found the missing jri*.h files and jni*.h-files in mozilla-dev - and changed the path to prtypes.h to make them usable. - New files introduced in the diff.gz - * Built and tested. - - -- Sune Vuorela <[email protected]> Wed, 14 Jun 2006 02:21:30 +0200 - -kaffeine-mozilla (0.4.3.1-1) unstable; urgency=low - - * This version corresponds to '0.2' upstream. - * kaffeine-mozilla has been split from kaffeine at the source level - upstream. Redid packaging. - - -- Zack Cerza <[email protected]> Thu, 13 May 2004 18:28:05 -0400 - diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat deleted file mode 100644 index f599e28b8..000000000 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control deleted file mode 100644 index f5edfda31..000000000 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control +++ /dev/null @@ -1,16 +0,0 @@ -Source: kaffeine-mozilla-trinity -Section: web -Priority: optional -Maintainer: TDE Debian Team <[email protected]> -Uploaders: Riku Voipio <[email protected]> -Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libxaw7-dev, libnspr4-dev -Standards-Version: 3.8.4 - -Package: kaffeine-mozilla-trinity -Architecture: any -Depends: kaffeine-trinity, ${shlibs:Depends}, ${misc:Depends} -Replaces: kaffeine-mozilla-trinity (<< 4:14.0.0~) -Breaks: kaffeine-mozilla-trinity (<< 4:14.0.0~) -Description: mozilla plugin that lanches kaffeine for supported media types [Trinity] - This mozilla plugin launches kaffeine, the xine-based media player for TDE, - when a page containing a supported media format is loaded. diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/copyright b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/copyright deleted file mode 100644 index d7092f934..000000000 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/copyright +++ /dev/null @@ -1,10 +0,0 @@ -This package was debianized by Zack Cerza <[email protected]> on -Sun, 28 Mar 2004 22:55:09 -0500. - -It was downloaded from http://kaffeine.sourceforge.net - -Upstream Author: Jürgen Kofler - -This software is copyright (c) Jürgen Kofler - -You are free to distribute this software under the terms of the GNU General Public License. On Debian systems, the complete text of the GNU General Public License can be found in the file `/usr/share/common-licenses/GPL'. diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/docs b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/docs deleted file mode 100644 index 0b6e0f321..000000000 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -AUTHORS -README.md diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/patches/series b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/patches/series deleted file mode 100644 index e69de29bb..000000000 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/patches/series +++ /dev/null diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/rules b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/rules deleted file mode 100755 index edb9f2f68..000000000 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/rules +++ /dev/null @@ -1,13 +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 - -DEB_CMAKE_EXTRA_FLAGS := \ - -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DCMAKE_SKIP_RPATH="OFF" \ - -DWITH_ALL_OPTIONS="ON" diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/source/format b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/source/format deleted file mode 100644 index 163aaf8d8..000000000 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/source/options b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/source/options deleted file mode 100644 index 72f1f5450..000000000 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/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/debian/_base/core/tdebase/debian/patches/disable_default_tdm_theme.diff b/debian/_base/core/tdebase/debian/patches/disable_default_tdm_theme.diff index e50536e78..cea1576e4 100644 --- a/debian/_base/core/tdebase/debian/patches/disable_default_tdm_theme.diff +++ b/debian/_base/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/debian/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff index 598cd7092..99db98c6f 100644 --- a/debian/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/debian/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,6 +1,6 @@ --- a/starttde +++ b/starttde -@@ -288,17 +288,17 @@ +@@ -396,17 +396,17 @@ . "$tdehome/share/config/startupconfig" fi diff --git a/debian/_base/core/tdebase/debian/tdebase-data-trinity.install b/debian/_base/core/tdebase/debian/tdebase-data-trinity.install index 2ac5be87f..8131ae5b5 100644 --- a/debian/_base/core/tdebase/debian/tdebase-data-trinity.install +++ b/debian/_base/core/tdebase/debian/tdebase-data-trinity.install @@ -83,40 +83,7 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/XOsview.ad debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/Xpdf.ad debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/XTerm.ad debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/XV.ad -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/AtlasGreen.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/BeOS.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/BlackOnWhite.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/BlueSlate.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/CDE.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DarkBlue.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DesertRed.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DigitalCDE.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/EveX.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Human.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDEOne.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDETwo.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikEmerald.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Keramik.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikWhite.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Last.fm.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Lizard.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/MediaPeach.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Next.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PaleGray.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Plastik.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Platinum.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PointReyesGreen.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Pumpkin.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Sienna.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/SolarisCDE.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Storm.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/System.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WedgieWeb.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WhiteOnBlack.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows2000.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows95.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WindowsXP.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/YellowOnBlue.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/*.kcsrc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewpart.rc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewui.rc debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png diff --git a/debian/_base/core/tdelibs/debian/rules b/debian/_base/core/tdelibs/debian/rules index 5ae26a03c..ace45702f 100755 --- a/debian/_base/core/tdelibs/debian/rules +++ b/debian/_base/core/tdelibs/debian/rules @@ -110,10 +110,10 @@ 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/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real - install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell.real - install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell + install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell.real + install -p -D -m755 debian/tdecmshell debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell post-patches:: dh_testdir @@ -126,6 +126,7 @@ ifeq ($(DEB_TIME64_API),true) [ -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/" \ @@ -148,6 +149,13 @@ ifeq ($(DEB_TIME64_API),true) 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/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install b/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install index 57ab2211a..e819337a0 100644 --- a/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install +++ b/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install @@ -182,7 +182,7 @@ debian/tmp/opt/trinity/include/tdeconfigdialogmanager.h debian/tmp/opt/trinity/include/tdeconfig.h debian/tmp/opt/trinity/include/tdeconfigskeleton.h debian/tmp/opt/trinity/include/kcpuinfo.h -debian/tmp/opt/trinity/include/kcrash.h +debian/tmp/opt/trinity/include/tdecrash.h debian/tmp/opt/trinity/include/kcursor.h debian/tmp/opt/trinity/include/kcustommenueditor.h debian/tmp/opt/trinity/include/kdatagramsocket.h @@ -294,7 +294,7 @@ debian/tmp/opt/trinity/include/tdefontdialog.h debian/tmp/opt/trinity/include/tdefontrequester.h debian/tmp/opt/trinity/include/kgenericfactory.h debian/tmp/opt/trinity/include/kgenericfactory.tcc -debian/tmp/opt/trinity/include/kglobalaccel.h +debian/tmp/opt/trinity/include/tdeglobalaccel.h debian/tmp/opt/trinity/include/tdeglobal.h debian/tmp/opt/trinity/include/tdeglobalsettings.h debian/tmp/opt/trinity/include/kguiitem.h @@ -485,10 +485,9 @@ debian/tmp/opt/trinity/include/tdepopupmenu.h debian/tmp/opt/trinity/include/kpreviewwidgetbase.h debian/tmp/opt/trinity/include/kprintaction.h debian/tmp/opt/trinity/include/kprinter.h -debian/tmp/opt/trinity/include/kprocctrl.h debian/tmp/opt/trinity/include/tdeprocctrl.h debian/tmp/opt/trinity/include/tdeprocess.h -debian/tmp/opt/trinity/include/kprocio.h +debian/tmp/opt/trinity/include/tdeprocio.h debian/tmp/opt/trinity/include/kprogress.h debian/tmp/opt/trinity/include/kprogressbox.h debian/tmp/opt/trinity/include/kpropertiesdialog.h @@ -596,12 +595,12 @@ debian/tmp/opt/trinity/include/ksslutils.h debian/tmp/opt/trinity/include/ksslx509map.h debian/tmp/opt/trinity/include/ksslx509v3.h debian/tmp/opt/trinity/include/kstandarddirs.h +debian/tmp/opt/trinity/include/tdestandarddirs.h debian/tmp/opt/trinity/include/tdestartupinfo.h debian/tmp/opt/trinity/include/kstaticdeleter.h debian/tmp/opt/trinity/include/kstatusbar.h debian/tmp/opt/trinity/include/tdestdaccel.h debian/tmp/opt/trinity/include/kstdaction.h -debian/tmp/opt/trinity/include/kstddirs.h debian/tmp/opt/trinity/include/kstdguiitem.h debian/tmp/opt/trinity/include/kstreamsocket.h debian/tmp/opt/trinity/include/kstringhandler.h diff --git a/debian/_base/core/tdepim/debian/rules b/debian/_base/core/tdepim/debian/rules index 874cc57ac..b88ad0ab0 100755 --- a/debian/_base/core/tdepim/debian/rules +++ b/debian/_base/core/tdepim/debian/rules @@ -141,6 +141,17 @@ ifeq ($(DEB_TIME64_API),true) 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/debian/_base/dependencies/arts/debian/rules b/debian/_base/dependencies/arts/debian/rules index a934b8c5a..5d7285b22 100755 --- a/debian/_base/dependencies/arts/debian/rules +++ b/debian/_base/dependencies/arts/debian/rules @@ -89,6 +89,13 @@ ifeq ($(DEB_TIME64_API),true) 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/debian/_base/dependencies/libcaldav/debian/rules b/debian/_base/dependencies/libcaldav/debian/rules index 9b371a62d..612de3dff 100755 --- a/debian/_base/dependencies/libcaldav/debian/rules +++ b/debian/_base/dependencies/libcaldav/debian/rules @@ -59,6 +59,12 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/libcaldav$(DEB_TIME64_SUFFIX)\." | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libcaldav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \ + -e "s/\\(libcaldav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +else [ ! -f debian/control.t64 ] || \ mv debian/control.t64 debian/control endif diff --git a/debian/_base/dependencies/libcarddav/debian/rules b/debian/_base/dependencies/libcarddav/debian/rules index 22b8c9e32..e9ea50672 100755 --- a/debian/_base/dependencies/libcarddav/debian/rules +++ b/debian/_base/dependencies/libcarddav/debian/rules @@ -59,6 +59,12 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/libcarddav$(DEB_TIME64_SUFFIX)\." | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libcarddav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \ + -e "s/\\(libcarddav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +else [ ! -f debian/control.t64 ] || \ mv debian/control.t64 debian/control endif diff --git a/debian/_base/dependencies/tqt3/debian/rules b/debian/_base/dependencies/tqt3/debian/rules index cb73bd445..fa9b59714 100755 --- a/debian/_base/dependencies/tqt3/debian/rules +++ b/debian/_base/dependencies/tqt3/debian/rules @@ -253,6 +253,13 @@ ifeq ($(DEB_TIME64_API),true) 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 diff --git a/debian/_base/libraries/libkdcraw/debian/control b/debian/_base/libraries/libkdcraw/debian/control index 7c51c5b46..be6f6e763 100644 --- a/debian/_base/libraries/libkdcraw/debian/control +++ b/debian/_base/libraries/libkdcraw/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <[email protected] Uploaders: Mark Purcell <[email protected]>, Achim Bohnet <[email protected]>, Fathi Boudra <[email protected]> Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config, - libomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] | libiomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] + libomp-dev [amd64 arm64 armhf mips64el ppc64el riscv64] Standards-Version: 3.8.4 Homepage: http://www.kipi-plugins.org/ diff --git a/debian/_base/libraries/libkdcraw/debian/rules b/debian/_base/libraries/libkdcraw/debian/rules index f69d1ece9..6a83cc74c 100755 --- a/debian/_base/libraries/libkdcraw/debian/rules +++ b/debian/_base/libraries/libkdcraw/debian/rules @@ -4,6 +4,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk +HAVE_OPENMP= $(if $(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libomp*.so),ON,OFF) + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -14,7 +16,8 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DWITH_ALL_OPTIONS="ON" + -DWITH_ALL_OPTIONS="ON" \ + -DWITH_OPENMP="$(HAVE_OPENMP)" # add installed liblcms*-dev to libkdcraw3-trinity-dev depends common-binary-arch:: 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..99db98c6f 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 @@ +@@ -396,17 +396,17 @@ . "$tdehome/share/config/startupconfig" fi diff --git a/dilos/core/tdebase/debian/tdebase-data-trinity.install b/dilos/core/tdebase/debian/tdebase-data-trinity.install index ab8031781..4ee48f327 100644 --- a/dilos/core/tdebase/debian/tdebase-data-trinity.install +++ b/dilos/core/tdebase/debian/tdebase-data-trinity.install @@ -83,40 +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/Human.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/Last.fm.kcsrc -debian/tmp/usr/share/apps/tdedisplay/color-schemes/Lizard.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/Platinum.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/Sienna.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/WedgieWeb.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 diff --git a/dilos/core/tdelibs/debian/rules b/dilos/core/tdelibs/debian/rules index 320ef61b0..41af33f15 100755 --- a/dilos/core/tdelibs/debian/rules +++ b/dilos/core/tdelibs/debian/rules @@ -183,10 +183,10 @@ 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 @@ -199,6 +199,7 @@ ifeq ($(DEB_TIME64_API),true) [ -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/" \ @@ -221,6 +222,13 @@ ifeq ($(DEB_TIME64_API),true) 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/tdelibs14-trinity-dev.install b/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.install index d05cddf4e..7920cb921 100644 --- a/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.install +++ b/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.install @@ -182,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 @@ -294,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 @@ -485,10 +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/tdeprocctrl.h debian/tmp/usr/include/tdeprocess.h -debian/tmp/usr/include/kprocio.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 @@ -596,12 +595,12 @@ 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 diff --git a/dilos/core/tdepim/debian/rules b/dilos/core/tdepim/debian/rules index afc29ebff..a408cecfa 100755 --- a/dilos/core/tdepim/debian/rules +++ b/dilos/core/tdepim/debian/rules @@ -147,6 +147,17 @@ ifeq ($(DEB_TIME64_API),true) 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/dependencies/arts/debian/rules b/dilos/dependencies/arts/debian/rules index b97d4a1af..b3c6200d5 100755 --- a/dilos/dependencies/arts/debian/rules +++ b/dilos/dependencies/arts/debian/rules @@ -96,6 +96,13 @@ ifeq ($(DEB_TIME64_API),true) 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/tqt3/debian/rules b/dilos/dependencies/tqt3/debian/rules index a6fc3e9d3..4960cd195 100755 --- a/dilos/dependencies/tqt3/debian/rules +++ b/dilos/dependencies/tqt3/debian/rules @@ -245,6 +245,13 @@ ifeq ($(DEB_TIME64_API),true) 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 diff --git a/freebsd/core/tdelibs/pkg-plist b/freebsd/core/tdelibs/pkg-plist index 575b91539..fb1f603b9 100644 --- a/freebsd/core/tdelibs/pkg-plist +++ b/freebsd/core/tdelibs/pkg-plist @@ -307,9 +307,9 @@ include/kpluginselector.h include/kpreviewwidgetbase.h include/kprintaction.h include/kprinter.h -include/kprocctrl.h -include/kprocess.h -include/kprocio.h +include/tdeprocctrl.h +include/tdeprocess.h +include/tdeprocio.h include/kprogress.h include/kprogressbox.h include/kpropertiesdialog.h @@ -409,8 +409,7 @@ include/ktimezonewidget.h include/ktip.h include/ktrader.h include/ktypelist.h -include/kuniqueapp.h -include/kuniqueapplication.h +include/tdeuniqueapplication.h include/kunload.h include/kurifilter.h include/kurl.h diff --git a/freebsd/libraries/libksquirrel/Makefile b/freebsd/libraries/libksquirrel/Makefile index 6d8438d92..8b8771d07 100644 --- a/freebsd/libraries/libksquirrel/Makefile +++ b/freebsd/libraries/libksquirrel/Makefile @@ -32,6 +32,7 @@ LIB_DEPENDS+=\ libgif.so:graphics/giflib \ libiconv.so:converters/libiconv \ libjasper.so:graphics/jasper \ + liblcms.so:graphics/lcms \ libOpenEXR.so:graphics/openexr \ libmng.so:graphics/libmng \ libnetpbm.so:graphics/netpbm \ diff --git a/freebsd/trinity.port.mk b/freebsd/trinity.port.mk index ecf2eb5e5..e5335e685 100644 --- a/freebsd/trinity.port.mk +++ b/freebsd/trinity.port.mk @@ -43,14 +43,14 @@ TDE_DEBUG?= 0 PKG_CONFIG_PATH=${TDE_PREFIX}/libdata/pkgconfig:/usr/local/libdata/pkgconfig:/usr/libdata/pkgconfig EXTRACT_DEPENDS=\ + gfind:misc/findutils \ + gsed:textproc/gsed \ gtar:archivers/gtar \ BUILD_DEPENDS=\ automake:devel/automake \ libtool:devel/libtool \ gettext:devel/gettext \ - gfind:misc/findutils \ - gsed:textproc/gsed \ bash:shells/bash \ USES+= ninja diff --git a/openbsd/tdelibs/pkg/PLIST b/openbsd/tdelibs/pkg/PLIST index f9e9c6e6a..fd8e45acb 100644 --- a/openbsd/tdelibs/pkg/PLIST +++ b/openbsd/tdelibs/pkg/PLIST @@ -322,9 +322,9 @@ include/tde/kpluginselector.h include/tde/kpreviewwidgetbase.h include/tde/kprintaction.h include/tde/kprinter.h -include/tde/kprocctrl.h -include/tde/kprocess.h -include/tde/kprocio.h +include/tde/tdeprocctrl.h +include/tde/tdeprocess.h +include/tde/tdeprocio.h include/tde/kprogress.h include/tde/kprogressbox.h include/tde/kpropertiesdialog.h @@ -425,8 +425,7 @@ include/tde/ktimezonewidget.h include/tde/ktip.h include/tde/ktrader.h include/tde/ktypelist.h -include/tde/kuniqueapp.h -include/tde/kuniqueapplication.h +include/tde/tdeuniqueapplication.h include/tde/kunload.h include/tde/kurifilter.h include/tde/kurl.h diff --git a/ubuntu/_base/applications/graphics/digikam/debian/control b/ubuntu/_base/applications/graphics/digikam/debian/control index f0da4b350..64015de3c 100644 --- a/ubuntu/_base/applications/graphics/digikam/debian/control +++ b/ubuntu/_base/applications/graphics/digikam/debian/control @@ -4,12 +4,11 @@ Priority: optional Maintainer: TDE Debian Team <[email protected]> XSBC-Original-Maintainer: Debian KDE Extras Team <[email protected]> Uploaders: Achim Bohnet <[email protected]>, Mark Purcell <[email protected]>, Fathi Boudra <[email protected]> -Build-Depends: cdbs, debhelper (>= 10~), quilt, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtiff-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev, libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6), libjasper-dev, libpng-dev, libexiv2-dev, - libkdcraw3-trinity-dev (>= 0.1.4), - automake, autoconf, libtool, libltdl-dev + libkdcraw3-trinity-dev (>= 0.1.4) Standards-Version: 3.8.4 Homepage: http://www.digikam.org diff --git a/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install index 67fe3a3b9..223a24aa6 100644 --- a/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install +++ b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install @@ -1,5 +1,5 @@ /opt/trinity/bin/digi* -/opt/trinity/include/tde +/opt/trinity/include /opt/trinity/lib /opt/trinity/share/apps/digikam /opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop diff --git a/ubuntu/_base/applications/graphics/digikam/debian/rules b/ubuntu/_base/applications/graphics/digikam/debian/rules index 3b310f8f1..a6797f19a 100755 --- a/ubuntu/_base/applications/graphics/digikam/debian/rules +++ b/ubuntu/_base/applications/graphics/digikam/debian/rules @@ -1,38 +1,17 @@ #!/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 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -TARBALL_EXT=tar.bz2 - -DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3 --prefix=/opt/trinity --disable-static - -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" - -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)/opt/trinity/lib) - -PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:$PKG_CONFIG_PATH - -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 - -binary-install/digikam-trinity-doc:: - # remove empty API-docs dirs tree - rm -rf $(CURDIR)/debian/digikam-trinity-doc/opt/trinity/share/doc/tde/HTML/en/digikam-apidocs +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/rules b/ubuntu/_base/applications/multimedia/k3b/debian/rules index 0cd87b24d..70fead837 100755 --- a/ubuntu/_base/applications/multimedia/k3b/debian/rules +++ b/ubuntu/_base/applications/multimedia/k3b/debian/rules @@ -57,6 +57,13 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/libk3b3$(DEB_TIME64_SUFFIX)-" | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libk3b3\\)-trinity$$/Package: \\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libk3b3-trinity\\)\\( [^,]*\|$$\)/\\1:\\2\\3/" \ + -e "s/\\(libk3b3\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + debian/control +else [ ! -f debian/control.t64 ] || \ mv debian/control.t64 debian/control endif diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk deleted file mode 100644 index aba508624..000000000 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk +++ /dev/null @@ -1,251 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2003 Christopher L Cheney <[email protected]> -# Copyright © 2019 TDE Team -# Description: A class for TDE packages; sets TDE environment variables, etc -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -ifndef _cdbs_bootstrap -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class -endif - -ifndef _cdbs_class_debian-qt-kde -_cdbs_class_debian-qt-kde := 1 - -# for dh_icons -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) - -# Note: This _must_ be included before autotools.mk, or it won't work. -common-configure-arch common-configure-indep:: debian/stamp-cvs-make -debian/stamp-cvs-make: -ifndef _cdbs_class_cmake - cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; -endif - touch debian/stamp-cvs-make - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) - -ifdef _cdbs_tarball_dir -DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) -else -DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) -endif - -ifndef _cdbs_class_cmake -include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) -endif - -ifdef _cdbs_class_cmake -ifneq "$(wildcard /usr/bin/ninja)" "" -MAKE = ninja -v -DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) -DEB_MAKE_INSTALL_TARGET = install -DEB_CMAKE_NORMAL_ARGS += -GNinja -endif -endif - -ifndef _cdbs_rules_patchsys_quilt -DEB_PATCHDIRS := debian/patches/common debian/patches -endif - -export kde_cgidir = \$${libdir}/cgi-bin -export kde_confdir = \$${sysconfdir}/trinity -export kde_htmldir = \$${datadir}/doc/tde/HTML - -DEB_KDE_ENABLE_FINAL := yes -DEB_INSTALL_DOCS_ALL := - -DEB_DH_MAKESHLIBS_ARGS_ALL := -V -DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) - -DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb - ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) - cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) - else - cdbs_kde_enable_final = - endif -endif - -ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) - cdbs_kde_enable_final = - cdbs_kde_enable_debug = --enable-debug=yes -else - cdbs_kde_enable_debug = --disable-debug -endif - -ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) - cdbs_kde_enable_debug = --enable-debug=full -endif - -DEB_BUILD_PARALLEL ?= true - -cdbs_configure_flags += \ - --with-qt-dir=/usr/share/qt3 \ - --disable-rpath \ - --with-xinerama \ - $(cdbs_kde_enable_final) \ - $(cdbs_kde_enable_debug) - - -# This is a convenience target for calling manually. -# It's not part of the build process. -buildprep: clean apply-patches -ifndef _cdbs_class_cmake - $(MAKE) -f admin/Makefile.common dist -endif - debian/rules clean - -.tdepkginfo: - echo "# TDE package information" >.tdepkginfo - dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo - dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo - date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo - -post-patches:: .tdepkginfo - -common-build-arch:: debian/stamp-man-pages -debian/stamp-man-pages: - if ! test -d debian/man/out; then mkdir -p debian/man/out; fi - for f in $$(find debian/man -name '*.sgml'); do \ - docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ - done - for f in $$(find debian/man -name '*.man'); do \ - soelim -I debian/man $$f \ - > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ - done - touch debian/stamp-man-pages - -common-binary-indep:: - ( set -e; \ - tmpf=`mktemp debian/versions.XXXXXX`; \ - perl debian/cdbs/versions.pl >$$tmpf; \ - for p in $(DEB_INDEP_PACKAGES); do \ - cat $$tmpf >>debian/$$p.substvars; \ - done; \ - rm -f $$tmpf ) - -common-binary-arch:: - ( set -e; \ - tmpf=`mktemp debian/versions.XXXXXX`; \ - perl debian/cdbs/versions.pl >$$tmpf; \ - for p in $(DEB_ARCH_PACKAGES); do \ - cat $$tmpf >>debian/$$p.substvars; \ - done; \ - rm -f $$tmpf ) - # update multi-arch path in install files - ls -d debian/* | \ - grep -E "(install|links)$$" | \ - while read a; do \ - [ -d $$a ] || [ -f $$a.arch ] || \ - ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ - sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ - done - -clean:: - rm -rf debian/man/out - -rmdir debian/man - rm -f debian/stamp-man-pages - rm -rf debian/shlibs-check - # revert multi-arch path in install files - ls -d debian/* | \ - grep -E "(install|links)$$" | \ - while read a; do \ - [ ! -f $$a.arch ] || \ - mv $$a.arch $$a; \ - done - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi - if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi - if test -e debian/$(cdbs_curpkg).lintian; then \ - install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ - fi - if test -e debian/$(cdbs_curpkg).presubj; then \ - install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ - fi - if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ - test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ - echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ - echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ - fi - -binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: - set -e; \ - for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ - pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ - echo Building $$pkg HTML docs...; \ - mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ - done - for pkg in $(DOC_HTML_PRUNE) ; do \ - rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - done - -common-build-indep:: debian/stamp-kde-apidox -debian/stamp-kde-apidox: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) - touch $@ - -common-install-indep:: common-install-kde-apidox -common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) - -cleanbuilddir:: - -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) - -clean:: -ifndef _cdbs_class_cmake - if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ - cd $(DEB_SRCDIR); \ - find . -name Makefile.in -print | \ - xargs --no-run-if-empty rm -f; \ - rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ - configure configure.files configure.in stamp-h.in \ - subdirs; \ - fi -endif - rm -f .tdepkginfo - rm -f debian/stamp-kde-apidox - rm -f debian/stamp-cvs-make - -endif diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/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/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/changelog b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/changelog deleted file mode 100644 index 7e3c2a0fd..000000000 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/changelog +++ /dev/null @@ -1,27 +0,0 @@ -kaffeine-mozilla-trinity (0.4.3.1.dfsg-0.2) karmic; urgency=low - - * Karmic upload - - -- Timothy Pearson <[email protected]> Mon, 07 Dec 2009 00:26:00 -0600 - -kaffeine-mozilla (0.4.3.1.dfsg-0.1) unstable; urgency=low - - * Non-maintainer upload - * Repackaging source package; removing unclear licensed jri*.h files - (Closes: 322961) - * Removed the sources put in twice - * Found the missing jri*.h files and jni*.h-files in mozilla-dev - and changed the path to prtypes.h to make them usable. - New files introduced in the diff.gz - * Built and tested. - - -- Sune Vuorela <[email protected]> Wed, 14 Jun 2006 02:21:30 +0200 - -kaffeine-mozilla (0.4.3.1-1) unstable; urgency=low - - * This version corresponds to '0.2' upstream. - * kaffeine-mozilla has been split from kaffeine at the source level - upstream. Redid packaging. - - -- Zack Cerza <[email protected]> Thu, 13 May 2004 18:28:05 -0400 - diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat deleted file mode 100644 index f599e28b8..000000000 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control deleted file mode 100644 index 3567b8f9e..000000000 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control +++ /dev/null @@ -1,16 +0,0 @@ -Source: kaffeine-mozilla-trinity -Section: web -Priority: optional -Maintainer: TDE Debian Team <[email protected]> -Uploaders: Riku Voipio <[email protected]> -Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libxaw7-dev, libnspr4-dev -Standards-Version: 3.8.4 - -Package: kaffeine-mozilla-trinity -Architecture: any -Depends: kaffeine-trinity, ${shlibs:Depends}, ${misc:Depends} -Replaces: kaffeine-mozilla-kde3 (<< 4:14.0.0~), kaffeine-mozilla-trinity (<< 4:14.0.0~) -Breaks: kaffeine-mozilla-kde3 (<< 4:14.0.0~), kaffeine-mozilla-trinity (<< 4:14.0.0~) -Description: mozilla plugin that lanches kaffeine for supported media types [Trinity] - This mozilla plugin launches kaffeine, the xine-based media player for TDE, - when a page containing a supported media format is loaded. diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/copyright b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/copyright deleted file mode 100644 index d7092f934..000000000 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/copyright +++ /dev/null @@ -1,10 +0,0 @@ -This package was debianized by Zack Cerza <[email protected]> on -Sun, 28 Mar 2004 22:55:09 -0500. - -It was downloaded from http://kaffeine.sourceforge.net - -Upstream Author: Jürgen Kofler - -This software is copyright (c) Jürgen Kofler - -You are free to distribute this software under the terms of the GNU General Public License. On Debian systems, the complete text of the GNU General Public License can be found in the file `/usr/share/common-licenses/GPL'. diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/docs b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/docs deleted file mode 100644 index 0b6e0f321..000000000 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -AUTHORS -README.md diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/patches/series b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/patches/series deleted file mode 100644 index e69de29bb..000000000 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/patches/series +++ /dev/null diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/rules b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/rules deleted file mode 100755 index edb9f2f68..000000000 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/rules +++ /dev/null @@ -1,13 +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 - -DEB_CMAKE_EXTRA_FLAGS := \ - -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DCMAKE_SKIP_RPATH="OFF" \ - -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/format b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/format deleted file mode 100644 index 163aaf8d8..000000000 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/options b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/options deleted file mode 100644 index 72f1f5450..000000000 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/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/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff index 1ee900501..bc9f7dace 100644 --- a/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff +++ b/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff @@ -59,7 +59,7 @@ + TQByteArray buffer; + proc.launch(buffer); + while (!proc.normalExit()) { -+ TDEApplication::kapp->processEvents(); ++ TDEApplication::tdeApp->processEvents(); + } + bool exists = TQFile::exists(url.path()); + return exists; @@ -88,7 +88,7 @@ + TQByteArray buffer; + proc.launch(buffer); + while (!proc.normalExit()) { -+ TDEApplication::kapp->processEvents(); ++ TDEApplication::tdeApp->processEvents(); + } + + TQProcess proc2; @@ -96,7 +96,7 @@ + proc2.addArgument("chmod 0644 " + dest.path()); + proc2.launch(buffer); + while (!proc2.normalExit()) { -+ TDEApplication::kapp->processEvents(); ++ TDEApplication::tdeApp->processEvents(); + } + + bool exists = TQFile::exists(dest.path()); @@ -116,7 +116,7 @@ + TQByteArray buffer; + proc.launch(buffer); + while (!proc.normalExit()) { -+ TDEApplication::kapp->processEvents(); ++ TDEApplication::tdeApp->processEvents(); + } + bool exists = !TQFile::exists(url.path()); + return exists; @@ -135,7 +135,7 @@ + TQByteArray buffer; + proc.launch(buffer); + while (!proc.normalExit()) { -+ TDEApplication::kapp->processEvents(); ++ TDEApplication::tdeApp->processEvents(); + } + + bool exists = TQFile::exists(target.path()); diff --git a/ubuntu/_base/core/tdebase/debian/patches/disable_default_tdm_theme.diff b/ubuntu/_base/core/tdebase/debian/patches/disable_default_tdm_theme.diff index 45798364e..ce438ad29 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/disable_default_tdm_theme.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/disable_default_tdm_theme.diff @@ -1,6 +1,6 @@ --- a/tdm/config.def +++ b/tdm/config.def -@@ -2644,9 +2644,9 @@ +@@ -2654,9 +2654,9 @@ Key: UseTheme Type: bool diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install index 2ac5be87f..8131ae5b5 100644 --- a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install @@ -83,40 +83,7 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/XOsview.ad debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/Xpdf.ad debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/XTerm.ad debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/XV.ad -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/AtlasGreen.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/BeOS.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/BlackOnWhite.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/BlueSlate.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/CDE.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DarkBlue.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DesertRed.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DigitalCDE.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/EveX.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Human.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDEOne.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDETwo.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikEmerald.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Keramik.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikWhite.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Last.fm.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Lizard.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/MediaPeach.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Next.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PaleGray.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Plastik.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Platinum.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PointReyesGreen.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Pumpkin.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Sienna.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/SolarisCDE.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Storm.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/System.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WedgieWeb.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WhiteOnBlack.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows2000.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows95.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WindowsXP.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/YellowOnBlue.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/*.kcsrc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewpart.rc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewui.rc debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png diff --git a/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules index bcbeda4fc..cbf8f05e0 100755 --- a/ubuntu/_base/core/tdelibs/debian/rules +++ b/ubuntu/_base/core/tdelibs/debian/rules @@ -110,10 +110,10 @@ 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/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real - install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell.real - install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell + install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell.real + install -p -D -m755 debian/tdecmshell debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell post-patches:: dh_testdir @@ -126,6 +126,7 @@ ifeq ($(DEB_TIME64_API),true) [ -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/" \ @@ -148,6 +149,13 @@ ifeq ($(DEB_TIME64_API),true) 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/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install index 57ab2211a..e819337a0 100644 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install @@ -182,7 +182,7 @@ debian/tmp/opt/trinity/include/tdeconfigdialogmanager.h debian/tmp/opt/trinity/include/tdeconfig.h debian/tmp/opt/trinity/include/tdeconfigskeleton.h debian/tmp/opt/trinity/include/kcpuinfo.h -debian/tmp/opt/trinity/include/kcrash.h +debian/tmp/opt/trinity/include/tdecrash.h debian/tmp/opt/trinity/include/kcursor.h debian/tmp/opt/trinity/include/kcustommenueditor.h debian/tmp/opt/trinity/include/kdatagramsocket.h @@ -294,7 +294,7 @@ debian/tmp/opt/trinity/include/tdefontdialog.h debian/tmp/opt/trinity/include/tdefontrequester.h debian/tmp/opt/trinity/include/kgenericfactory.h debian/tmp/opt/trinity/include/kgenericfactory.tcc -debian/tmp/opt/trinity/include/kglobalaccel.h +debian/tmp/opt/trinity/include/tdeglobalaccel.h debian/tmp/opt/trinity/include/tdeglobal.h debian/tmp/opt/trinity/include/tdeglobalsettings.h debian/tmp/opt/trinity/include/kguiitem.h @@ -485,10 +485,9 @@ debian/tmp/opt/trinity/include/tdepopupmenu.h debian/tmp/opt/trinity/include/kpreviewwidgetbase.h debian/tmp/opt/trinity/include/kprintaction.h debian/tmp/opt/trinity/include/kprinter.h -debian/tmp/opt/trinity/include/kprocctrl.h debian/tmp/opt/trinity/include/tdeprocctrl.h debian/tmp/opt/trinity/include/tdeprocess.h -debian/tmp/opt/trinity/include/kprocio.h +debian/tmp/opt/trinity/include/tdeprocio.h debian/tmp/opt/trinity/include/kprogress.h debian/tmp/opt/trinity/include/kprogressbox.h debian/tmp/opt/trinity/include/kpropertiesdialog.h @@ -596,12 +595,12 @@ debian/tmp/opt/trinity/include/ksslutils.h debian/tmp/opt/trinity/include/ksslx509map.h debian/tmp/opt/trinity/include/ksslx509v3.h debian/tmp/opt/trinity/include/kstandarddirs.h +debian/tmp/opt/trinity/include/tdestandarddirs.h debian/tmp/opt/trinity/include/tdestartupinfo.h debian/tmp/opt/trinity/include/kstaticdeleter.h debian/tmp/opt/trinity/include/kstatusbar.h debian/tmp/opt/trinity/include/tdestdaccel.h debian/tmp/opt/trinity/include/kstdaction.h -debian/tmp/opt/trinity/include/kstddirs.h debian/tmp/opt/trinity/include/kstdguiitem.h debian/tmp/opt/trinity/include/kstreamsocket.h debian/tmp/opt/trinity/include/kstringhandler.h diff --git a/ubuntu/_base/core/tdepim/debian/rules b/ubuntu/_base/core/tdepim/debian/rules index 874cc57ac..b88ad0ab0 100755 --- a/ubuntu/_base/core/tdepim/debian/rules +++ b/ubuntu/_base/core/tdepim/debian/rules @@ -141,6 +141,17 @@ ifeq ($(DEB_TIME64_API),true) 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/ubuntu/_base/dependencies/arts/debian/rules b/ubuntu/_base/dependencies/arts/debian/rules index a934b8c5a..5d7285b22 100755 --- a/ubuntu/_base/dependencies/arts/debian/rules +++ b/ubuntu/_base/dependencies/arts/debian/rules @@ -89,6 +89,13 @@ ifeq ($(DEB_TIME64_API),true) 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/ubuntu/_base/dependencies/libcaldav/debian/rules b/ubuntu/_base/dependencies/libcaldav/debian/rules index 9b371a62d..612de3dff 100755 --- a/ubuntu/_base/dependencies/libcaldav/debian/rules +++ b/ubuntu/_base/dependencies/libcaldav/debian/rules @@ -59,6 +59,12 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/libcaldav$(DEB_TIME64_SUFFIX)\." | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libcaldav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \ + -e "s/\\(libcaldav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +else [ ! -f debian/control.t64 ] || \ mv debian/control.t64 debian/control endif diff --git a/ubuntu/_base/dependencies/libcarddav/debian/rules b/ubuntu/_base/dependencies/libcarddav/debian/rules index 22b8c9e32..e9ea50672 100755 --- a/ubuntu/_base/dependencies/libcarddav/debian/rules +++ b/ubuntu/_base/dependencies/libcarddav/debian/rules @@ -59,6 +59,12 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/libcarddav$(DEB_TIME64_SUFFIX)\." | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libcarddav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \ + -e "s/\\(libcarddav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +else [ ! -f debian/control.t64 ] || \ mv debian/control.t64 debian/control endif diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules index cb73bd445..fa9b59714 100755 --- a/ubuntu/_base/dependencies/tqt3/debian/rules +++ b/ubuntu/_base/dependencies/tqt3/debian/rules @@ -253,6 +253,13 @@ ifeq ($(DEB_TIME64_API),true) 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 diff --git a/ubuntu/_base/libraries/libkdcraw/debian/control b/ubuntu/_base/libraries/libkdcraw/debian/control index 26cb1d4ef..eafecaec3 100644 --- a/ubuntu/_base/libraries/libkdcraw/debian/control +++ b/ubuntu/_base/libraries/libkdcraw/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <[email protected] Uploaders: Mark Purcell <[email protected]>, Achim Bohnet <[email protected]>, Fathi Boudra <[email protected]> Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config, - libomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] | libiomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] + libomp-dev [amd64 arm64 armhf mips64el ppc64el riscv64] Standards-Version: 3.8.4 Homepage: http://www.kipi-plugins.org/ diff --git a/ubuntu/_base/libraries/libkdcraw/debian/rules b/ubuntu/_base/libraries/libkdcraw/debian/rules index f69d1ece9..6a83cc74c 100755 --- a/ubuntu/_base/libraries/libkdcraw/debian/rules +++ b/ubuntu/_base/libraries/libkdcraw/debian/rules @@ -4,6 +4,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk +HAVE_OPENMP= $(if $(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libomp*.so),ON,OFF) + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -14,7 +16,8 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DWITH_ALL_OPTIONS="ON" + -DWITH_ALL_OPTIONS="ON" \ + -DWITH_OPENMP="$(HAVE_OPENMP)" # add installed liblcms*-dev to libkdcraw3-trinity-dev depends common-binary-arch:: |