summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/_base/applications/desktop-effects-tde/debian/control2
-rw-r--r--debian/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk227
-rw-r--r--debian/_base/applications/kaffeine-mozilla/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/applications/kaffeine-mozilla/debian/control2
-rw-r--r--debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install2
-rw-r--r--debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links2
-rw-r--r--debian/_base/applications/kaffeine-mozilla/debian/patches/series0
-rwxr-xr-xdebian/_base/applications/kaffeine-mozilla/debian/rules199
-rw-r--r--debian/_base/applications/kdpkg/debian/control2
-rw-r--r--debian/_base/applications/keep/debian/control2
-rw-r--r--debian/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff20
-rw-r--r--debian/_base/applications/keep/debian/patches/series1
-rw-r--r--debian/_base/applications/kima/debian/control2
-rw-r--r--debian/_base/applications/kima/debian/docs1
-rw-r--r--debian/_base/applications/ksystemlog/debian/control2
-rw-r--r--debian/_base/applications/ksystemlog/debian/ksystemlog.xml109
-rwxr-xr-xdebian/_base/applications/ksystemlog/debian/rules50
-rw-r--r--debian/_base/applications/ksystemlog/debian/watch2
-rw-r--r--debian/_base/applications/mathemagics/debian/cdbs/debian-tde.mk227
-rw-r--r--debian/_base/applications/mathemagics/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/applications/mathemagics/debian/changelog5
-rw-r--r--debian/_base/applications/mathemagics/debian/compat1
-rw-r--r--debian/_base/applications/mathemagics/debian/control14
-rw-r--r--debian/_base/applications/mathemagics/debian/copyright12
-rw-r--r--debian/_base/applications/mathemagics/debian/docs2
-rw-r--r--debian/_base/applications/mathemagics/debian/patches/series0
-rwxr-xr-xdebian/_base/applications/mathemagics/debian/rules19
-rw-r--r--debian/_base/applications/mathemagics/debian/source/format1
-rw-r--r--debian/_base/applications/mathemagics/debian/source/options6
-rw-r--r--debian/_base/applications/tde-style-baghira/debian/bab-trinity.136
-rw-r--r--debian/_base/applications/tde-style-baghira/debian/control2
-rwxr-xr-xdebian/_base/applications/tde-style-baghira/debian/rules17
-rw-r--r--debian/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.manpages1
-rw-r--r--debian/_base/applications/tde-systemsettings/debian/control2
-rwxr-xr-xdebian/_base/applications/tde-systemsettings/debian/rules57
-rw-r--r--debian/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook123
-rw-r--r--debian/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory13
-rw-r--r--debian/_base/applications/tdepacman/debian/cdbs/debian-tde.mk227
-rw-r--r--debian/_base/applications/tdepacman/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/applications/tdepacman/debian/changelog5
-rw-r--r--debian/_base/applications/tdepacman/debian/compat1
-rw-r--r--debian/_base/applications/tdepacman/debian/control19
-rw-r--r--debian/_base/applications/tdepacman/debian/copyright59
-rw-r--r--debian/_base/applications/tdepacman/debian/docs3
-rw-r--r--debian/_base/applications/tdepacman/debian/patches/series0
-rwxr-xr-xdebian/_base/applications/tdepacman/debian/rules19
-rw-r--r--debian/_base/applications/tdepacman/debian/source/format1
-rw-r--r--debian/_base/applications/tdepacman/debian/source/options6
-rw-r--r--debian/_base/applications/tdepacman/debian/tdepacman-trinity.menu8
-rwxr-xr-xdebian/_base/dependencies/tqt3/debian/rules4
-rw-r--r--debian/_base/libraries/python-trinity/debian/control2
-rw-r--r--debian/_base/tdeaddons/debian/control2
-rw-r--r--debian/_base/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--debian/_base/tdeaddons/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--debian/_base/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--debian/_base/tdeaddons/debian/patches/series3
-rw-r--r--debian/_base/tdebase/debian/control2
-rw-r--r--debian/_base/tdegames/debian/control2
-rw-r--r--debian/_base/tdegames/debian/libtdegames-trinity-dev.install1
-rw-r--r--debian/_base/tdegames/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--debian/_base/tdegames/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--debian/_base/tdegames/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--debian/_base/tdegames/debian/patches/series3
-rw-r--r--debian/_base/tdelibs/debian/control2
-rw-r--r--debian/_base/tdelibs/debian/tdelibs-data-trinity.install11
-rw-r--r--debian/_base/tdenetwork/debian/control2
-rw-r--r--debian/_base/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--debian/_base/tdenetwork/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--debian/_base/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--debian/_base/tdenetwork/debian/patches/series4
-rw-r--r--debian/_base/tdepim/debian/control7
-rw-r--r--debian/_base/tdesdk/debian/control5
-rw-r--r--debian/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--debian/_base/tdesdk/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--debian/_base/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--debian/_base/tdesdk/debian/patches/series3
-rw-r--r--debian/_base/tdevelop/debian/control2
-rw-r--r--debian/_base/tdevelop/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--debian/_base/tdevelop/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--debian/_base/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--debian/_base/tdevelop/debian/patches/series3
-rw-r--r--debian/_base/tdewebdev/debian/klinkstatus-trinity.install1
-rwxr-xr-xdebian/_buildscripts/local/00_extradeps.sh21
-rwxr-xr-xdebian/_buildscripts/local/04_applications_01.sh1
-rwxr-xr-xdebian/_buildscripts/local/09_applications_06.sh1
-rwxr-xr-xdebian/_buildscripts/local/10_others_01.sh1
-rwxr-xr-xdebian/_buildscripts/local/11_others_02.sh14
-rw-r--r--debian/_buildscripts/local/README.txt124
-rwxr-xr-xdebian/_buildscripts/local/build_module.sh315
-rwxr-xr-xdebian/_buildscripts/local/generate_tags.sh24
-rwxr-xr-xdebian/_buildscripts/local/internals/_build_common.sh5
-rwxr-xr-xdebian/_buildscripts/local/update_repositories.sh343
-rwxr-xr-xdilos/dependencies/tqt3/debian/rules4
-rw-r--r--dilos/tdeaddons/debian/control2
-rw-r--r--dilos/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--dilos/tdeaddons/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--dilos/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--dilos/tdeaddons/debian/patches/series3
-rw-r--r--dilos/tdebase/debian/control2
-rw-r--r--dilos/tdegames/debian/control2
-rw-r--r--dilos/tdegames/debian/libtdegames-trinity-dev.install1
-rw-r--r--dilos/tdegames/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--dilos/tdegames/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--dilos/tdegames/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--dilos/tdegames/debian/patches/series3
-rw-r--r--dilos/tdelibs/debian/control2
-rw-r--r--dilos/tdelibs/debian/tdelibs-data-trinity.install11
-rw-r--r--dilos/tdenetwork/debian/control2
-rw-r--r--dilos/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--dilos/tdenetwork/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--dilos/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--dilos/tdenetwork/debian/patches/series3
-rw-r--r--dilos/tdepim/debian/control7
-rw-r--r--dilos/tdesdk/debian/control4
-rw-r--r--dilos/tdesdk/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--dilos/tdesdk/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--dilos/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--dilos/tdesdk/debian/patches/series3
-rw-r--r--dilos/tdevelop/debian/control2
-rw-r--r--dilos/tdevelop/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--dilos/tdevelop/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--dilos/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--dilos/tdevelop/debian/patches/series3
-rw-r--r--ubuntu/_base/applications/desktop-effects-tde/debian/control2
-rw-r--r--ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk227
-rw-r--r--ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/kaffeine-mozilla/debian/control2
-rw-r--r--ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install2
-rw-r--r--ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links2
-rw-r--r--ubuntu/_base/applications/kaffeine-mozilla/debian/patches/series0
-rwxr-xr-xubuntu/_base/applications/kaffeine-mozilla/debian/rules199
-rw-r--r--ubuntu/_base/applications/kdpkg/debian/control2
-rw-r--r--ubuntu/_base/applications/keep/debian/control2
-rw-r--r--ubuntu/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff20
-rw-r--r--ubuntu/_base/applications/keep/debian/patches/series1
-rw-r--r--ubuntu/_base/applications/kima/debian/control2
-rw-r--r--ubuntu/_base/applications/kima/debian/docs1
-rw-r--r--ubuntu/_base/applications/ksystemlog/debian/control2
-rw-r--r--ubuntu/_base/applications/ksystemlog/debian/ksystemlog.xml109
-rwxr-xr-xubuntu/_base/applications/ksystemlog/debian/rules50
-rw-r--r--ubuntu/_base/applications/ksystemlog/debian/watch2
-rw-r--r--ubuntu/_base/applications/mathemagics/debian/cdbs/debian-tde.mk227
-rw-r--r--ubuntu/_base/applications/mathemagics/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/mathemagics/debian/changelog5
-rw-r--r--ubuntu/_base/applications/mathemagics/debian/compat1
-rw-r--r--ubuntu/_base/applications/mathemagics/debian/control14
-rw-r--r--ubuntu/_base/applications/mathemagics/debian/copyright12
-rw-r--r--ubuntu/_base/applications/mathemagics/debian/docs2
-rw-r--r--ubuntu/_base/applications/mathemagics/debian/patches/series0
-rwxr-xr-xubuntu/_base/applications/mathemagics/debian/rules19
-rw-r--r--ubuntu/_base/applications/mathemagics/debian/source/format1
-rw-r--r--ubuntu/_base/applications/mathemagics/debian/source/options6
-rw-r--r--ubuntu/_base/applications/tde-style-baghira/debian/bab-trinity.136
-rw-r--r--ubuntu/_base/applications/tde-style-baghira/debian/control2
-rwxr-xr-xubuntu/_base/applications/tde-style-baghira/debian/rules17
-rw-r--r--ubuntu/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.manpages1
-rw-r--r--ubuntu/_base/applications/tde-systemsettings/debian/control2
-rwxr-xr-xubuntu/_base/applications/tde-systemsettings/debian/rules57
-rw-r--r--ubuntu/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook123
-rw-r--r--ubuntu/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory13
-rw-r--r--ubuntu/_base/applications/tdepacman/debian/cdbs/debian-tde.mk227
-rw-r--r--ubuntu/_base/applications/tdepacman/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/tdepacman/debian/changelog5
-rw-r--r--ubuntu/_base/applications/tdepacman/debian/compat1
-rw-r--r--ubuntu/_base/applications/tdepacman/debian/control19
-rw-r--r--ubuntu/_base/applications/tdepacman/debian/copyright59
-rw-r--r--ubuntu/_base/applications/tdepacman/debian/docs3
-rw-r--r--ubuntu/_base/applications/tdepacman/debian/patches/series0
-rwxr-xr-xubuntu/_base/applications/tdepacman/debian/rules19
-rw-r--r--ubuntu/_base/applications/tdepacman/debian/source/format1
-rw-r--r--ubuntu/_base/applications/tdepacman/debian/source/options6
-rw-r--r--ubuntu/_base/applications/tdepacman/debian/tdepacman-trinity.menu8
-rwxr-xr-xubuntu/_base/dependencies/tqt3/debian/rules4
-rw-r--r--ubuntu/_base/libraries/python-trinity/debian/control2
-rw-r--r--ubuntu/_base/tdeaddons/debian/control2
-rw-r--r--ubuntu/_base/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--ubuntu/_base/tdeaddons/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--ubuntu/_base/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--ubuntu/_base/tdeaddons/debian/patches/series3
-rw-r--r--ubuntu/_base/tdebase/debian/control2
-rw-r--r--ubuntu/_base/tdegames/debian/control2
-rw-r--r--ubuntu/_base/tdegames/debian/libtdegames-trinity-dev.install1
-rw-r--r--ubuntu/_base/tdegames/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--ubuntu/_base/tdegames/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--ubuntu/_base/tdegames/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--ubuntu/_base/tdegames/debian/patches/series3
-rw-r--r--ubuntu/_base/tdelibs/debian/control2
-rw-r--r--ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.install11
-rw-r--r--ubuntu/_base/tdenetwork/debian/control2
-rw-r--r--ubuntu/_base/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--ubuntu/_base/tdenetwork/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--ubuntu/_base/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--ubuntu/_base/tdenetwork/debian/patches/series4
-rw-r--r--ubuntu/_base/tdepim/debian/control7
-rw-r--r--ubuntu/_base/tdesdk/debian/control5
-rw-r--r--ubuntu/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--ubuntu/_base/tdesdk/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--ubuntu/_base/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--ubuntu/_base/tdesdk/debian/patches/series3
-rw-r--r--ubuntu/_base/tdevelop/debian/control2
-rw-r--r--ubuntu/_base/tdevelop/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--ubuntu/_base/tdevelop/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--ubuntu/_base/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--ubuntu/_base/tdevelop/debian/patches/series3
-rw-r--r--ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.install1
205 files changed, 2432 insertions, 2550 deletions
diff --git a/debian/_base/applications/desktop-effects-tde/debian/control b/debian/_base/applications/desktop-effects-tde/debian/control
index 004eeb342..f36516872 100644
--- a/debian/_base/applications/desktop-effects-tde/debian/control
+++ b/debian/_base/applications/desktop-effects-tde/debian/control
@@ -2,7 +2,7 @@ Source: desktop-effects-tde-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 9~), python-support (>= 0.6) | python-all-dev
+Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 9~), python-support (>= 0.6) | dh-python, python-all-dev
Standards-Version: 3.8.4
XS-Python-Version: all
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/debian/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..24191b2cd
--- /dev/null
+++ b/debian/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk
@@ -0,0 +1,227 @@
+# -*- 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
+
+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
+
+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" -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),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+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/kaffeine-mozilla/debian/cdbs/versions.pl b/debian/_base/applications/kaffeine-mozilla/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/kaffeine-mozilla/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/control b/debian/_base/applications/kaffeine-mozilla/debian/control
index ee9ef4a14..359f6c225 100644
--- a/debian/_base/applications/kaffeine-mozilla/debian/control
+++ b/debian/_base/applications/kaffeine-mozilla/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Riku Voipio <riku.voipio@iki.fi>
-Build-Depends: debhelper (>= 9~), pkg-config, libxaw7-dev, libnspr4-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, pkg-config, libxaw7-dev, libnspr4-dev
Standards-Version: 3.8.4
Package: kaffeine-mozilla-trinity
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install b/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install
deleted file mode 100644
index 30f14a91f..000000000
--- a/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kaffeine-mozilla/usr/lib/mozilla/plugins/kaffeineplugin.la
-debian/kaffeine-mozilla/usr/lib/mozilla/plugins/kaffeineplugin.so
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links b/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links
deleted file mode 100644
index 372fe38d5..000000000
--- a/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/mozilla/plugins/kaffeineplugin.so /usr/lib/mozilla-firefox/plugins/kaffeineplugin.so
-/usr/lib/mozilla/plugins/kaffeineplugin.so /usr/lib/mozilla-snapshot/plugins/kaffeineplugin.so
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/patches/series b/debian/_base/applications/kaffeine-mozilla/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/applications/kaffeine-mozilla/debian/patches/series
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/rules b/debian/_base/applications/kaffeine-mozilla/debian/rules
index 228818f36..1e2d330b9 100755
--- a/debian/_base/applications/kaffeine-mozilla/debian/rules
+++ b/debian/_base/applications/kaffeine-mozilla/debian/rules
@@ -1,196 +1,15 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-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)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-config.status:
- dh_testdir
-
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh ltmain.sh
-endif
-
- aclocal
- autoconf
- automake --add-missing
-
- # Apply Debian specific patches
- if test -d $(CURDIR)/debian/patches ;\
- then \
- for i in $(CURDIR)/debian/patches/*.diff.uu ;\
- do \
- cd $(CURDIR)/debian/patches ;\
- uudecode "$$i" ;\
- cd $(CURDIR) ;\
- done ;\
- patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort);\
- fi ;\
- if test ! -f patch-stamp; then \
- for patch in $$patches ;\
- do \
- echo APPLYING PATCH\: "$${patch##*/}" ;\
- patch -p1 < "$$patch" ;\
- done ;\
- touch patch-stamp ;\
- fi
-
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- #/usr/bin/docbook-to-man debian/kaffeine-mozilla.sgml > kaffeine-mozilla.1
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
-
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh ltmain.sh
-endif
-
- aclocal
- automake --add-missing
-
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
-
- # Remove Debian specific patches
- if test -d $(CURDIR)/debian/patches ;\
- then \
- patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort -r);\
- fi ;\
- if test -f patch-stamp; then \
- for patch in $$patches ;\
- do \
- echo REMOVING PATCH\: "$${patch##*/}" ;\
- patch -p1 -R < "$$patch" ;\
- done ;\
- for i in $(CURDIR)/debian/patches/*.diff.uu ;\
- do \
- rm -f "$${i%%.uu}" ;\
- done ;\
- rm -f patch-stamp ;\
- fi
-
- -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/kaffeine-mozilla.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kaffeine-mozilla-trinity
-
- mkdir -p debian/kaffeine-mozilla-trinity/opt/trinity/lib/mozilla/ && \
- mv -f debian/kaffeine-mozilla-trinity/opt/trinity/plugins/ \
- debian/kaffeine-mozilla-trinity/opt/trinity/lib/mozilla/
- mkdir -p debian/kaffeine-mozilla-trinity/usr/lib/mozilla/plugins/
- mv debian/kaffeine-mozilla-trinity/opt/trinity/lib/mozilla/plugins/kaffeineplugin.so debian/kaffeine-mozilla-trinity/usr/lib/mozilla/plugins/kaffeineplugin-trinity.so
- mv debian/kaffeine-mozilla-trinity/opt/trinity/lib/mozilla/plugins/kaffeineplugin.la debian/kaffeine-mozilla-trinity/usr/lib/mozilla/plugins/kaffeineplugin-trinity.la
- mv debian/kaffeine-mozilla-trinity/opt/trinity/lib/mozilla/plugins/kaffeineplugin.a debian/kaffeine-mozilla-trinity/usr/lib/mozilla/plugins/kaffeineplugin-trinity.a
- rm -rf debian/kaffeine-mozilla-trinity/opt
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs -V
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+DEB_CMAKE_EXTRA_FLAGS := \
+ -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/kdpkg/debian/control b/debian/_base/applications/kdpkg/debian/control
index 9e7624df0..15adf6eef 100644
--- a/debian/_base/applications/kdpkg/debian/control
+++ b/debian/_base/applications/kdpkg/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Alexander Kopf <kopf-alexander@gmx.de>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: kdpkg-trinity
diff --git a/debian/_base/applications/keep/debian/control b/debian/_base/applications/keep/debian/control
index c681087ef..5ee3bfbf5 100644
--- a/debian/_base/applications/keep/debian/control
+++ b/debian/_base/applications/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: keep-trinity
diff --git a/debian/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff
deleted file mode 100644
index 696f9093c..000000000
--- a/debian/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh
---- keep-0.4.0/admin/cvs.sh 2006-09-23 01:51:35.000000000 +0200
-+++ keep-0.4.0.new/admin/cvs.sh 2006-12-05 16:29:23.000000000 +0100
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/usr/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,7 +556,6 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi
diff --git a/debian/_base/applications/keep/debian/patches/series b/debian/_base/applications/keep/debian/patches/series
index 9ccf4a125..e69de29bb 100644
--- a/debian/_base/applications/keep/debian/patches/series
+++ b/debian/_base/applications/keep/debian/patches/series
@@ -1 +0,0 @@
-kubuntu_01_kdepot.diff
diff --git a/debian/_base/applications/kima/debian/control b/debian/_base/applications/kima/debian/control
index 75e170f95..296e78263 100644
--- a/debian/_base/applications/kima/debian/control
+++ b/debian/_base/applications/kima/debian/control
@@ -2,7 +2,7 @@ Source: kima-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev,
libxnvctrl-dev [amd64 i386] | nvidia-settings [amd64 i386]
Standards-Version: 3.8.4
diff --git a/debian/_base/applications/kima/debian/docs b/debian/_base/applications/kima/debian/docs
index ca0272abf..1a4f0317f 100644
--- a/debian/_base/applications/kima/debian/docs
+++ b/debian/_base/applications/kima/debian/docs
@@ -1,3 +1,4 @@
AUTHORS
+FAQ
README
TODO
diff --git a/debian/_base/applications/ksystemlog/debian/control b/debian/_base/applications/ksystemlog/debian/control
index e17c1ed51..c078d1565 100644
--- a/debian/_base/applications/ksystemlog/debian/control
+++ b/debian/_base/applications/ksystemlog/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: ksystemlog-trinity
diff --git a/debian/_base/applications/ksystemlog/debian/ksystemlog.xml b/debian/_base/applications/ksystemlog/debian/ksystemlog.xml
deleted file mode 100644
index 3261e6bf7..000000000
--- a/debian/_base/applications/ksystemlog/debian/ksystemlog.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
- <refentryinfo>
- <author>
- <firstname>Riddell</firstname>
- <surname>Jonathan</surname>
- <email>jriddell@ubuntu.com</email>
- </author>
- <copyright>
- <year>2005</year>
- <holder>Jonathan Riddell</holder>
- </copyright>
- <!-- XXX IMPORTANT XXX -->
- <!-- Keep this date up to date: -->
- <date>2005-07-28</date>
- <!-- ^^^^^^^^^^ -->
- </refentryinfo>
- <refmeta>
- <refentrytitle>ksystemlog</refentrytitle>
- <manvolnum>1</manvolnum>
- </refmeta>
- <refnamediv>
- <refname>ksystemlog</refname>
- <refpurpose>A System Log Viewer</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>ksystemlog</command>
- <arg choice="opt">
- <option><replaceable>Qt-options</replaceable></option>
- </arg>
- <arg choice="opt">
- <option><replaceable>TDE-options</replaceable></option>
- </arg>
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- KSystemLog is an application to view system logs.
- </para>
- </refsect1>
- <refsect1>
- <title>OPTIONS</title>
- <para>
- All <productname>TDE</productname> and <productname>Qt</productname>
- programs accept a some common command-line options. KSystemLog has no
- application-specific options.
- </para>
- <para>
- <variablelist>
- <title>Generic options:</title>
- <varlistentry>
- <term> <option>--help</option> </term>
- <listitem> <para>Show help about options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-qt</option> </term>
- <listitem> <para>Show Qt specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-tde</option> </term>
- <listitem> <para>Show TDE specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-all</option> </term>
- <listitem> <para>Show all options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--author</option> </term>
- <listitem> <para>Show author information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>-v</option>, <option>--version</option> </term>
- <listitem> <para>Show version information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--license</option> </term>
- <listitem> <para>Show license information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--</option> </term>
- <listitem> <para>Indicates end of options</para> </listitem>
- </varlistentry>
- </variablelist>
- <!-- TODO * add all the rest of the options, but maybe find an automated
- way to keep it up to date -->
- </para>
- </refsect1>
- <refsect1>
- <title>COPYRIGHT</title>
- <para>
- This manual page was written by Jonathan Riddell
- <email>jriddell@ubuntu.com</email> for the
- <productname>Ubuntu</productname> 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>
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in
- <filename>/usr/share/common-licenses/GPL</filename>.
- </para>
- </refsect1>
-</refentry>
diff --git a/debian/_base/applications/ksystemlog/debian/rules b/debian/_base/applications/ksystemlog/debian/rules
index 4f6505558..18aa16b96 100755
--- a/debian/_base/applications/ksystemlog/debian/rules
+++ b/debian/_base/applications/ksystemlog/debian/rules
@@ -1,47 +1,19 @@
#!/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)
-
-DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
-
-build/ksystemlog-trinity::
- /usr/bin/docbook2x-man debian/ksystemlog.xml
-
-binary-install/ksystemlog-trinity::
- mv debian/ksystemlog-trinity/usr/share/man debian/ksystemlog-trinity/opt/trinity/share/
-
-binary-post-install/ksystemlog-trinity::
- rm -rf debian/ksystemlog/opt/trinity/share/applnk/
-
-clean::
- rm -f ksystemlog.1
+DEB_CMAKE_EXTRA_FLAGS := \
+ -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/ksystemlog/debian/watch b/debian/_base/applications/ksystemlog/debian/watch
deleted file mode 100644
index b15cf467b..000000000
--- a/debian/_base/applications/ksystemlog/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://ksystemlog.forum-software.org/archives/src/ksystemlog-(.*)\.tar\.bz2 debian svn-upgrade
diff --git a/debian/_base/applications/mathemagics/debian/cdbs/debian-tde.mk b/debian/_base/applications/mathemagics/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..24191b2cd
--- /dev/null
+++ b/debian/_base/applications/mathemagics/debian/cdbs/debian-tde.mk
@@ -0,0 +1,227 @@
+# -*- 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
+
+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
+
+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" -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),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+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/mathemagics/debian/cdbs/versions.pl b/debian/_base/applications/mathemagics/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/mathemagics/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/applications/mathemagics/debian/changelog b/debian/_base/applications/mathemagics/debian/changelog
new file mode 100644
index 000000000..590a849e0
--- /dev/null
+++ b/debian/_base/applications/mathemagics/debian/changelog
@@ -0,0 +1,5 @@
+mathemagics-trinity (1.1-0) buster; urgency=low
+
+ * Initial Release for TDE.
+
+ -- Slávek Banko <slavek.banko@axis.cz> Sun, 10 Aug 2020 23:32:23 +0200
diff --git a/debian/_base/applications/mathemagics/debian/compat b/debian/_base/applications/mathemagics/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/debian/_base/applications/mathemagics/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/_base/applications/mathemagics/debian/control b/debian/_base/applications/mathemagics/debian/control
new file mode 100644
index 000000000..671e69dad
--- /dev/null
+++ b/debian/_base/applications/mathemagics/debian/control
@@ -0,0 +1,14 @@
+Source: mathemagics-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
+
+Package: mathemagics-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A RPN scientific calculator for TDE
+ Mathemagics makes use of the Reverse Polish Notation or RPN.
+ Mathemagics can store and use user-defined functions and variables,
+ It comes with large number of built-in functions as well.
diff --git a/debian/_base/applications/mathemagics/debian/copyright b/debian/_base/applications/mathemagics/debian/copyright
new file mode 100644
index 000000000..b04d202a4
--- /dev/null
+++ b/debian/_base/applications/mathemagics/debian/copyright
@@ -0,0 +1,12 @@
+This package was debianized by Slávek Banko <slavek.banko@axis.cz> on
+Sun, 10 Aug 2020 23:32:23 +0200.
+
+Upstream Author: Jason Katz-Brown <jason@katzbrown.com>
+
+mathemagics 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 of the License, or
+(at your option) any later version.
+
+On Debian systems, the full text of GNU's GPL can be found in
+/usr/share/common-licenses/GPL-2
diff --git a/debian/_base/applications/mathemagics/debian/docs b/debian/_base/applications/mathemagics/debian/docs
new file mode 100644
index 000000000..6f12db508
--- /dev/null
+++ b/debian/_base/applications/mathemagics/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/debian/_base/applications/mathemagics/debian/patches/series b/debian/_base/applications/mathemagics/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/applications/mathemagics/debian/patches/series
diff --git a/debian/_base/applications/mathemagics/debian/rules b/debian/_base/applications/mathemagics/debian/rules
new file mode 100755
index 000000000..18aa16b96
--- /dev/null
+++ b/debian/_base/applications/mathemagics/debian/rules
@@ -0,0 +1,19 @@
+#!/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_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -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/mathemagics/debian/source/format b/debian/_base/applications/mathemagics/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/_base/applications/mathemagics/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/_base/applications/mathemagics/debian/source/options b/debian/_base/applications/mathemagics/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/debian/_base/applications/mathemagics/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/debian/_base/applications/tde-style-baghira/debian/bab-trinity.1 b/debian/_base/applications/tde-style-baghira/debian/bab-trinity.1
deleted file mode 100644
index c88691405..000000000
--- a/debian/_base/applications/tde-style-baghira/debian/bab-trinity.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\" Author: Jose Luis Tallon <jltallon@adv-solutions.net>
-.\"
-.\" This is free software; you may 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 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 the Debian GNU/Linux system; if not, write to the Free
-.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-.\" 02111-1307 USA
-.TH bab "1" "October 2004"
-.SH NAME
-bab \- Baghira's config tray applet
-.SH SYNOPSIS
-bab
-.SH DESCRIPTION
-.B bab
-is a simple systray application, which enables you to dinamically
-change some aspects of Baghira's configuration without accesing
-Trinity Control Center
-.PP
-Complete documentation can be found in docbook format in
-/opt/trinity/share/doc/kde/HTML/<lang>/baghira/ on this system.
-.SH AUTHOR
- Thomas L\[:u]bking <baghira-style@users.sourceforge.net>
-.PP
-This manual page was written by Jose Luis Tallon
-.nh
-<jltallon@adv\-solutions.net>
-for the \fBDebian\fP system (but may be used by others).
diff --git a/debian/_base/applications/tde-style-baghira/debian/control b/debian/_base/applications/tde-style-baghira/debian/control
index 46f2a54ef..ad7abf025 100644
--- a/debian/_base/applications/tde-style-baghira/debian/control
+++ b/debian/_base/applications/tde-style-baghira/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, automake, libtool, tdebase-trinity-dev, libxtst-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdebase-trinity-dev, libxtst-dev
Standards-Version: 3.8.0
Package: tde-style-baghira-trinity
diff --git a/debian/_base/applications/tde-style-baghira/debian/rules b/debian/_base/applications/tde-style-baghira/debian/rules
index 2aebaac7b..18aa16b96 100755
--- a/debian/_base/applications/tde-style-baghira/debian/rules
+++ b/debian/_base/applications/tde-style-baghira/debian/rules
@@ -1,12 +1,19 @@
#!/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
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -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/tde-style-baghira/debian/tde-style-baghira-trinity.manpages b/debian/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.manpages
deleted file mode 100644
index c462e2d47..000000000
--- a/debian/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/bab-trinity.1
diff --git a/debian/_base/applications/tde-systemsettings/debian/control b/debian/_base/applications/tde-systemsettings/debian/control
index c715064d4..363e24bb1 100644
--- a/debian/_base/applications/tde-systemsettings/debian/control
+++ b/debian/_base/applications/tde-systemsettings/debian/control
@@ -2,7 +2,7 @@ Source: tde-systemsettings-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 9~), quilt, patchutils (>= 0.2.25), tdelibs14-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tde-systemsettings-trinity
diff --git a/debian/_base/applications/tde-systemsettings/debian/rules b/debian/_base/applications/tde-systemsettings/debian/rules
index 14f491a3e..18aa16b96 100755
--- a/debian/_base/applications/tde-systemsettings/debian/rules
+++ b/debian/_base/applications/tde-systemsettings/debian/rules
@@ -1,54 +1,19 @@
#!/usr/bin/make -f
-cdbs_kde_enable_debug = --disable-debug
-
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)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
-
-cleanbuilddir/tde-systemsettings-trinity::
- rm -f systemsettings.1
-
-build/tde-systemsettings-trinity::
- docbook2x-man debian/systemsettings.1.docbook
-
-install/tde-systemsettings-trinity::
- # Don't clash files, just Use the ones from kcontrol
- rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/tde-settings-power.directory
- rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/tde-settings-system.directory
- rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/tde/kcmfontinst.desktop
- rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/tde/laptop.desktop
- cp debian/tde-settings-laptops.directory debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/
-
-DEB_INSTALL_MANPAGES_tde-systemsettings-trinity = systemsettings.1
-
-binary-install/tde-systemsettings-trinity::
- mv debian/tde-systemsettings-trinity/usr/share/man debian/tde-systemsettings-trinity/opt/trinity/share/
+DEB_CMAKE_EXTRA_FLAGS := \
+ -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/tde-systemsettings/debian/systemsettings.1.docbook b/debian/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook
deleted file mode 100644
index 33a640918..000000000
--- a/debian/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
- <refentryinfo>
- <author>
- <firstname>Jonathan</firstname>
- <surname>Riddell</surname>
- <email>jriddell@ubuntu.com</email>
- </author>
- <copyright>
- <year>2005</year>
- <holder>Jonathan Riddell</holder>
- </copyright>
- <!-- XXX IMPORTANT XXX -->
- <!-- Keep this date up to date: -->
- <date>2005-06-09</date>
- <!-- ^^^^^^^^^^ -->
- </refentryinfo>
- <refmeta>
- <refentrytitle>systemsettings</refentrytitle>
- <manvolnum>1</manvolnum>
- </refmeta>
- <refnamediv>
- <refname>systemsettings</refname>
- <refpurpose>TDE System Settings.</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>systemsettings</command>
- <arg choice="opt">
- <option><replaceable>Qt-options</replaceable></option>
- </arg>
- <arg choice="opt">
- <option><replaceable>TDE-options</replaceable></option>
- </arg>
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- System Settings is a user friendly control centre for TDE.
- </para>
- </refsect1>
- <refsect1>
- <title>OPTIONS</title>
- <para>
- All <productname>TDE</productname> and <productname>Qt</productname>
- programs accept a some common command-line options.
- </para>
- <para>
- <variablelist>
- <title>Options:</title>
- <varlistentry>
- <term> <option>-e, --noembed</option> </term>
- <listitem> <para>Do not embed windows</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--menu &gt;argument&lt;</option> </term>
- <listitem> <para>XDG menu to use (default is systemsettings)</para> </listitem>
- </varlistentry>
- </variablelist>
- </para>
- <para>
- <variablelist>
- <title>Generic options:</title>
- <varlistentry>
- <term> <option>--help</option> </term>
- <listitem> <para>Show help about options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-qt</option> </term>
- <listitem> <para>Show Qt specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-tde</option> </term>
- <listitem> <para>Show TDE specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-all</option> </term>
- <listitem> <para>Show all options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--author</option> </term>
- <listitem> <para>Show author information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>-v</option>, <option>--version</option> </term>
- <listitem> <para>Show version information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--license</option> </term>
- <listitem> <para>Show license information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--</option> </term>
- <listitem> <para>Indicates end of options</para> </listitem>
- </varlistentry>
- </variablelist>
- <!-- TODO * add all the rest of the options, but maybe find an automated
- way to keep it up to date -->
- </para>
- </refsect1>
- <refsect1>
- <title>COPYRIGHT</title>
- <para>
- This manual page was written by Jonathan Riddell
- <email>jriddell@ubuntu.com</email> for
- <productname>Debian</productname> (but may be used by others).
- Permission is granted to copy, distribute and/or modify this document
- under either the terms of the <acronym>GNU</acronym> General Public License,
- Version 2 or any later version published by the Free Software Foundation or
- the <acronym>GNU</acronym> Free Documentation License 1.2 or any later version
- published by the Free Software Foundation.
- </para>
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in
- <filename>/usr/share/common-licenses/GPL</filename>.
- </para>
- </refsect1>
-</refentry>
diff --git a/debian/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory b/debian/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory
deleted file mode 100644
index 687a493c4..000000000
--- a/debian/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Laptops & Power
-Name[br]=Gremm
-Name[el]=Ισχύς
-Name[it]=Energia
-Name[mt]=Elettriku
-Name[nl]=Energie
-Name[pa]=ਊਰਜਾ(power)
-Name[pt_BR]=Energia
-Name[ru]=Управление питанием
-Name[sv]=Effekt
-Icon=energy
diff --git a/debian/_base/applications/tdepacman/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdepacman/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..24191b2cd
--- /dev/null
+++ b/debian/_base/applications/tdepacman/debian/cdbs/debian-tde.mk
@@ -0,0 +1,227 @@
+# -*- 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
+
+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
+
+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" -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),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+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/tdepacman/debian/cdbs/versions.pl b/debian/_base/applications/tdepacman/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/tdepacman/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/applications/tdepacman/debian/changelog b/debian/_base/applications/tdepacman/debian/changelog
new file mode 100644
index 000000000..341323bf7
--- /dev/null
+++ b/debian/_base/applications/tdepacman/debian/changelog
@@ -0,0 +1,5 @@
+tdepacman-trinity (0.3.2-0debian) testing; urgency=low
+
+ * Initial import in TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it> Sat, 05 Sep 2020 20:56:00 +0900
diff --git a/debian/_base/applications/tdepacman/debian/compat b/debian/_base/applications/tdepacman/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/debian/_base/applications/tdepacman/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/_base/applications/tdepacman/debian/control b/debian/_base/applications/tdepacman/debian/control
new file mode 100644
index 000000000..71bb44912
--- /dev/null
+++ b/debian/_base/applications/tdepacman/debian/control
@@ -0,0 +1,19 @@
+Source: tdepacman-trinity
+Section: games
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: J.rg Th.nnissen <joe@dsite.de>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev, libtdegames-trinity-dev
+Standards-Version: 0.3.2
+
+Package: tdepacman-trinity
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Replaces: tdepacman-trinity (<< 4:14.0.0~)
+Breaks: tdepacman-trinity (<< 4:14.0.0~)
+Description: A pacman clone game for TDE.
+ TDEPacman is a classic arcade game.
+ .
+ Pac-Man was designed by Toru Iwatani, Namco first released the game in
+ Japan in May 1980.
diff --git a/debian/_base/applications/tdepacman/debian/copyright b/debian/_base/applications/tdepacman/debian/copyright
new file mode 100644
index 000000000..7cac470a4
--- /dev/null
+++ b/debian/_base/applications/tdepacman/debian/copyright
@@ -0,0 +1,59 @@
+This package was debianized by Fabian Wuertz <xadras@sidux.com> on
+Fri, 3 Sep 2007 19:52:51 +0100.
+
+It was downloaded from http://www.wuertz.org/downloads
+
+Upstream Author: Fabian Wuertz <xadras@sidux.com>
+
+Copyright:
+ (C) 2008 Fabian Wuertz <xadras@sidux.com>
+
+ The following file are from knxcc
+ (C) 2006 Andreas Loibl <andreas@andreas-loibl.de>
+ process.cpp klamp/process.cpp
+ klamp-install/process.cpp
+ process.h klamp/process.h
+ klamp-install/process.h
+
+ --- icons ---
+
+ The following icons are from kde-icons-nuovext
+ (C) 2005 Alexandre Moore <alexandre.moore@gmail.com>
+ cancel.png in klamp/tdepacmandialog.ui
+ in klamp-install/installdialog.ui
+ info.png in klamp/tdepacmandialog.ui
+
+ The following icons are from tdelibs-data
+ (c) 2002 Kalle Dalheimer <kalle@kde.org> and many others
+ wizard.png in klamp/tdepacmandialog.ui
+ in klamp-install/installdialog.ui
+ messagebox_warning.png in klamp-install/installdialog.ui
+
+ The following icon is from kde-icons-crystalproject
+ (C) 2005 Everaldo Coelho <everaldo@everaldo.com>
+ help.png in klamp/tdepacmandialog.ui
+ in klamp-install/installdialog.ui
+ package.png in klamp/tdepacmandialog.ui
+ in klamp-install/installdialog.ui
+
+License:
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ 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
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2008, Alexander Kopf <kopf-alexander@gmx.de> and
+is licensed under the GPL, see above.
diff --git a/debian/_base/applications/tdepacman/debian/docs b/debian/_base/applications/tdepacman/debian/docs
new file mode 100644
index 000000000..ca0272abf
--- /dev/null
+++ b/debian/_base/applications/tdepacman/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README
+TODO
diff --git a/debian/_base/applications/tdepacman/debian/patches/series b/debian/_base/applications/tdepacman/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/applications/tdepacman/debian/patches/series
diff --git a/debian/_base/applications/tdepacman/debian/rules b/debian/_base/applications/tdepacman/debian/rules
new file mode 100755
index 000000000..cee2a3058
--- /dev/null
+++ b/debian/_base/applications/tdepacman/debian/rules
@@ -0,0 +1,19 @@
+#!/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_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -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/tdepacman/debian/source/format b/debian/_base/applications/tdepacman/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/_base/applications/tdepacman/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/_base/applications/tdepacman/debian/source/options b/debian/_base/applications/tdepacman/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/debian/_base/applications/tdepacman/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/debian/_base/applications/tdepacman/debian/tdepacman-trinity.menu b/debian/_base/applications/tdepacman/debian/tdepacman-trinity.menu
new file mode 100644
index 000000000..0c6870760
--- /dev/null
+++ b/debian/_base/applications/tdepacman/debian/tdepacman-trinity.menu
@@ -0,0 +1,8 @@
+?package(tdepacman-trinity):\
+ needs="x11"\
+ section="Games/Arcade"\
+ hints="TDE"\
+ title="TDEPacMan"\
+ icon32x32="/opt/trinity/share/icons/hicolor/32x32/apps/tdepacman.png"\
+ command="/opt/trinity/bin/tdepacman"
+
diff --git a/debian/_base/dependencies/tqt3/debian/rules b/debian/_base/dependencies/tqt3/debian/rules
index b83a3da10..070591030 100755
--- a/debian/_base/dependencies/tqt3/debian/rules
+++ b/debian/_base/dependencies/tqt3/debian/rules
@@ -43,6 +43,8 @@ P_APPSDEV = $(DEBIAN)/tqt3-apps-dev
P_HEADERS = $(DEBIAN)/libtqt3-headers
P_QTMTDEV = $(DEBIAN)/libtqt3-mt-dev
+RPC_INCLUDES = $(if $(wildcard /usr/include/tirpc),-I/usr/include/tirpc,)
+
TMP_INSTALL = $(DEBIAN)/tmp-install
CONFIGURE_OPTS = \
@@ -102,6 +104,8 @@ CONFIGURE_OPTS = \
-I/usr/include/freetype2 \
-I`pg_config --includedir` \
-I`pg_config --includedir-server` \
+ $(RPC_INCLUDES) \
+ \
-L/usr/lib/$(DEB_HOST_MULTIARCH)\
\
-lfontconfig \
diff --git a/debian/_base/libraries/python-trinity/debian/control b/debian/_base/libraries/python-trinity/debian/control
index 666c792de..e987fa4ac 100644
--- a/debian/_base/libraries/python-trinity/debian/control
+++ b/debian/_base/libraries/python-trinity/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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, python-sip-tqt, python-sip-tqt-dev, python-sip-tqt-dbg, python-tqt-dev, python-tqt-dbg, tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), libtqtinterface-dev, python-support (>= 0.7.1) | dh-python, python-all, python-all-dev, python-all-dbg, python-sip-tqt, python-sip-tqt-dev, python-sip-tqt-dbg, python-tqt-dev, python-tqt-dbg, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
diff --git a/debian/_base/tdeaddons/debian/control b/debian/_base/tdeaddons/debian/control
index 8aab49cea..ea4e4f524 100644
--- a/debian/_base/tdeaddons/debian/control
+++ b/debian/_base/tdeaddons/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, autotools-dev, gawk, 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, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, gawk, 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
Standards-Version: 3.8.4
Package: tdeaddons-trinity
diff --git a/debian/_base/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/debian/_base/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/debian/_base/tdeaddons/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/tdeaddons/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/debian/_base/tdeaddons/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/debian/_base/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 39dd7745e..000000000
--- a/debian/_base/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/opt/trinity/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/debian/_base/tdeaddons/debian/patches/series b/debian/_base/tdeaddons/debian/patches/series
index 6b3ddc8ec..e69de29bb 100644
--- a/debian/_base/tdeaddons/debian/patches/series
+++ b/debian/_base/tdeaddons/debian/patches/series
@@ -1,3 +0,0 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
diff --git a/debian/_base/tdebase/debian/control b/debian/_base/tdebase/debian/control
index 9a99e9042..f8f962ba3 100644
--- a/debian/_base/tdebase/debian/control
+++ b/debian/_base/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, autotools-dev, gawk, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, libssl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, gawk, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, sharutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.8.4
diff --git a/debian/_base/tdegames/debian/control b/debian/_base/tdegames/debian/control
index 584e621f6..28a19f373 100644
--- a/debian/_base/tdegames/debian/control
+++ b/debian/_base/tdegames/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, autotools-dev, gawk, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, gawk, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, sharutils, bzip2, sharutils, libogg-dev
Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc
Standards-Version: 3.8.4
diff --git a/debian/_base/tdegames/debian/libtdegames-trinity-dev.install b/debian/_base/tdegames/debian/libtdegames-trinity-dev.install
index 9640a4bc8..fe44b3d68 100644
--- a/debian/_base/tdegames/debian/libtdegames-trinity-dev.install
+++ b/debian/_base/tdegames/debian/libtdegames-trinity-dev.install
@@ -2,3 +2,4 @@
/opt/trinity/include/kgame
/opt/trinity/lib/libtdegames.so
/opt/trinity/lib/libtdegames.la
+/opt/trinity/lib/pkgconfig/libtdegames.pc
diff --git a/debian/_base/tdegames/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/tdegames/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/debian/_base/tdegames/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/debian/_base/tdegames/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/tdegames/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/debian/_base/tdegames/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/debian/_base/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 39dd7745e..000000000
--- a/debian/_base/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/opt/trinity/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/debian/_base/tdegames/debian/patches/series b/debian/_base/tdegames/debian/patches/series
index 6b3ddc8ec..e69de29bb 100644
--- a/debian/_base/tdegames/debian/patches/series
+++ b/debian/_base/tdegames/debian/patches/series
@@ -1,3 +0,0 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
diff --git a/debian/_base/tdelibs/debian/control b/debian/_base/tdelibs/debian/control
index 5d5476221..bf178fcaa 100644
--- a/debian/_base/tdelibs/debian/control
+++ b/debian/_base/tdelibs/debian/control
@@ -44,7 +44,7 @@ Section: libs
Architecture: all
Replaces: kdelibs-data-trinity (<< 4:14.0.0~)
Breaks: kdelibs-data-trinity (<< 4:14.0.0~)
-Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~), klinkstatus-trinity (<< 4:14.0.9~)
Depends: hicolor-icon-theme
Provides: tdelibs-data
Description: core shared data for all TDE applications
diff --git a/debian/_base/tdelibs/debian/tdelibs-data-trinity.install b/debian/_base/tdelibs/debian/tdelibs-data-trinity.install
index 74f6b8d3f..92a201781 100644
--- a/debian/_base/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/_base/tdelibs/debian/tdelibs-data-trinity.install
@@ -224,16 +224,6 @@ debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kurlrequester.png
debian/tmp/opt/trinity/share/apps/tdehtml/css/html4.css
debian/tmp/opt/trinity/share/apps/tdehtml/css/quirks.css
debian/tmp/opt/trinity/share/apps/tdehtml/domain_info
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/128x128/actions/bug.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/bug.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/images_display.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/wallet_open.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/bug.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/images_display.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/bug.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/images_display.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/48x48/actions/bug.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/64x64/actions/bug.png
debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_browser.rc
debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_popupmenu.rc
debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml.rc
@@ -1907,7 +1897,6 @@ debian/tmp/opt/trinity/share/services/tderesources/tdeabc/file.desktop
debian/tmp/opt/trinity/share/services/tderesources/tdeabc/net.desktop
debian/tmp/opt/trinity/share/services/tderesources/tdeabc/ldaptdeio.desktop
debian/tmp/opt/trinity/share/services/tderesources/tdeabc_manager.desktop
-
debian/tmp/opt/trinity/share/services/tdespell_aspell.desktop
debian/tmp/opt/trinity/share/services/tdespell_hspell.desktop
debian/tmp/opt/trinity/share/services/tdespell_ispell.desktop
diff --git a/debian/_base/tdenetwork/debian/control b/debian/_base/tdenetwork/debian/control
index 86aa9019b..5125e53a8 100644
--- a/debian/_base/tdenetwork/debian/control
+++ b/debian/_base/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev, libssl-dev, libtqca-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, docbook-to-man, doxygen, gawk, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev
Standards-Version: 3.8.4
Package: tdenetwork-trinity
diff --git a/debian/_base/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/debian/_base/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/debian/_base/tdenetwork/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/tdenetwork/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/debian/_base/tdenetwork/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/debian/_base/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 39dd7745e..000000000
--- a/debian/_base/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/opt/trinity/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/debian/_base/tdenetwork/debian/patches/series b/debian/_base/tdenetwork/debian/patches/series
index 6b3ddc8ec..8b1378917 100644
--- a/debian/_base/tdenetwork/debian/patches/series
+++ b/debian/_base/tdenetwork/debian/patches/series
@@ -1,3 +1 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
+
diff --git a/debian/_base/tdepim/debian/control b/debian/_base/tdepim/debian/control
index 8d5a734b0..603e4610b 100644
--- a/debian/_base/tdepim/debian/control
+++ b/debian/_base/tdepim/debian/control
@@ -4,15 +4,14 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt,
- cdparanoia, gawk, tdelibs14-trinity-dev, bison, byacc, bzip2,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool,
+ gawk, tdelibs14-trinity-dev, bison, byacc, bzip2,
flex, groff-base, libogg-dev,
libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~),
libreadline-dev | libreadline6-dev | libreadline5-dev, libsasl2-dev, libssl-dev,
libxpm-dev, libxss-dev, sharutils, 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,
- cmake, libtool, libltdl-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-Conflicts: libkleopatra0-trinity-dev
Standards-Version: 3.8.4
diff --git a/debian/_base/tdesdk/debian/control b/debian/_base/tdesdk/debian/control
index 886a0320f..d9b09acfc 100644
--- a/debian/_base/tdesdk/debian/control
+++ b/debian/_base/tdesdk/debian/control
@@ -4,12 +4,11 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, autotools-dev, gawk,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, gawk,
pkg-config, tdelibs14-trinity-dev, binutils-dev, 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~),
- automake, autoconf, libtool, libltdl-dev
+ libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~)
Standards-Version: 3.8.4
Package: tdesdk-trinity
diff --git a/debian/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/debian/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/debian/_base/tdesdk/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/tdesdk/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/debian/_base/tdesdk/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/debian/_base/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 39dd7745e..000000000
--- a/debian/_base/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/opt/trinity/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/debian/_base/tdesdk/debian/patches/series b/debian/_base/tdesdk/debian/patches/series
index 6b3ddc8ec..e69de29bb 100644
--- a/debian/_base/tdesdk/debian/patches/series
+++ b/debian/_base/tdesdk/debian/patches/series
@@ -1,3 +0,0 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
diff --git a/debian/_base/tdevelop/debian/control b/debian/_base/tdevelop/debian/control
index 13398e188..6b94f64c0 100644
--- a/debian/_base/tdevelop/debian/control
+++ b/debian/_base/tdevelop/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev
Standards-Version: 3.8.4
Package: tdevelop-trinity
diff --git a/debian/_base/tdevelop/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/tdevelop/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/debian/_base/tdevelop/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/debian/_base/tdevelop/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/tdevelop/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/debian/_base/tdevelop/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/debian/_base/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 39dd7745e..000000000
--- a/debian/_base/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/opt/trinity/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/debian/_base/tdevelop/debian/patches/series b/debian/_base/tdevelop/debian/patches/series
index 6b3ddc8ec..e69de29bb 100644
--- a/debian/_base/tdevelop/debian/patches/series
+++ b/debian/_base/tdevelop/debian/patches/series
@@ -1,3 +0,0 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
diff --git a/debian/_base/tdewebdev/debian/klinkstatus-trinity.install b/debian/_base/tdewebdev/debian/klinkstatus-trinity.install
index 9c6c7048d..78d214bfb 100644
--- a/debian/_base/tdewebdev/debian/klinkstatus-trinity.install
+++ b/debian/_base/tdewebdev/debian/klinkstatus-trinity.install
@@ -11,7 +11,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/*.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/*.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/*.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/bug.png
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/klinkstatus.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/klinkstatus.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/klinkstatus.png
diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh
index f8bbf4a7b..3f0f0891d 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_extradeps.sh
@@ -7,17 +7,18 @@ set_log_start
if [[ "$USE_PREBUILD_EXTRA_DEPS" = "y" ]]; then
echo -e "${CBrown}#### Use of pre-built extra dependency packages is currently configured. Nothing to do. ####\n${CNone}"
- echo "Use of pre-built extra dependency packages is currently configured. Nothing to do." >>"$LOG_BUILD_RESULT_FILENAME"
+ echo "Use of pre-built extra dependency packages is currently configured. Nothing to do." >>"$LOG_BUILD_RESULT_FILENAME"
else
- build_module "edeps/fireflies"
- build_module "edeps/imlib"
-# build_module "edeps/opensync" # deprecated - no longer required in R14.1 series. To remove in R14.2.0
- build_module "edeps/pcsc-lite-nodbus"
- build_module "edeps/lcms"
- build_module "edeps/wv2"
- build_module "edeps/jasper"
- build_module "edeps/openslp-dfsg"
- build_module "edeps/mp4v2"
+ build_module "$CFG_EXTRA_DEPS_DIR/fireflies"
+ build_module "$CFG_EXTRA_DEPS_DIR/imlib"
+# build_module "$CFG_EXTRA_DEPS_DIR/opensync" # deprecated - no longer required in R14.1 series. To remove in R14.2.0
+ build_module "$CFG_EXTRA_DEPS_DIR/pcsc-lite-nodbus"
+ build_module "$CFG_EXTRA_DEPS_DIR/lcms"
+ build_module "$CFG_EXTRA_DEPS_DIR/wv2"
+ build_module "$CFG_EXTRA_DEPS_DIR/jasper"
+ build_module "$CFG_EXTRA_DEPS_DIR/openslp-dfsg"
+ build_module "$CFG_EXTRA_DEPS_DIR/mp4v2"
+ build_module "$CFG_EXTRA_DEPS_DIR/transcode"
fi
set_log_end
diff --git a/debian/_buildscripts/local/04_applications_01.sh b/debian/_buildscripts/local/04_applications_01.sh
index 4901f3d9e..b9e97d1e0 100755
--- a/debian/_buildscripts/local/04_applications_01.sh
+++ b/debian/_buildscripts/local/04_applications_01.sh
@@ -12,6 +12,7 @@ build_module "libraries/kipi-plugins"
build_module "applications/abakus"
build_module "applications/amarok"
build_module "applications/basket"
+build_module "applications/codeine"
build_module "applications/digikam"
build_module "applications/dolphin"
build_module "applications/filelight"
diff --git a/debian/_buildscripts/local/09_applications_06.sh b/debian/_buildscripts/local/09_applications_06.sh
index 92ee021a0..46dc9239c 100755
--- a/debian/_buildscripts/local/09_applications_06.sh
+++ b/debian/_buildscripts/local/09_applications_06.sh
@@ -11,6 +11,7 @@ build_module "applications/tdeio-gopher"
build_module "applications/tdeio-locate"
build_module "applications/tdeio-umountwrapper"
build_module "applications/tdenetworkmanager"
+build_module "applications/tdepacman"
build_module "applications/tdepowersave"
build_module "applications/tderadio"
build_module "applications/tde-guidance"
diff --git a/debian/_buildscripts/local/10_others_01.sh b/debian/_buildscripts/local/10_others_01.sh
index 5f1908833..febd66f57 100755
--- a/debian/_buildscripts/local/10_others_01.sh
+++ b/debian/_buildscripts/local/10_others_01.sh
@@ -19,6 +19,7 @@ build_module "libraries/libksquirrel"
build_module "applications/ksquirrel"
#build_module "applications/qt4-tqt-theme-engine"
build_module "applications/rosegarden"
+build_module "applications/mathemagics"
build_module "applications/smartcardauth"
build_module "applications/smb4k"
build_module "applications/tdesvn"
diff --git a/debian/_buildscripts/local/11_others_02.sh b/debian/_buildscripts/local/11_others_02.sh
index d32da9a42..e8a900094 100755
--- a/debian/_buildscripts/local/11_others_02.sh
+++ b/debian/_buildscripts/local/11_others_02.sh
@@ -7,13 +7,13 @@ set_log_start
build_module "tde-i18n"
if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
- build_module "edeps/compiz-trinity"
- build_module "edeps/libcompizconfig-trinity"
- build_module "edeps/compiz-fusion-bcop-trinity"
- build_module "edeps/compiz-fusion-plugins-main-trinity"
- build_module "edeps/compiz-fusion-plugins-extra-trinity"
- build_module "edeps/compizconfig-python-trinity"
- build_module "edeps/pilot-link"
+ build_module "$CFG_EXTRA_DEPS_DIR/compiz-trinity"
+ build_module "$CFG_EXTRA_DEPS_DIR/libcompizconfig-trinity"
+ build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-bcop-trinity"
+ build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-plugins-main-trinity"
+ build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-plugins-extra-trinity"
+ build_module "$CFG_EXTRA_DEPS_DIR/compizconfig-python-trinity"
+ build_module "$CFG_EXTRA_DEPS_DIR/pilot-link"
fi
build_module "applications/compizconfig-backend-tdeconfig"
build_module "applications/kpilot"
diff --git a/debian/_buildscripts/local/README.txt b/debian/_buildscripts/local/README.txt
index c5daf21fb..e36f5ceed 100644
--- a/debian/_buildscripts/local/README.txt
+++ b/debian/_buildscripts/local/README.txt
@@ -26,28 +26,31 @@ A) Environment preparation
2_build: folder used for build preparation and for local builds
3_repo : local repo for package installation (to be configured in /etc/apt/sources.list)
buildscripts: contains a local copy of the build scripts, which can be modified as required
- - in TDE_DIR/1_git:
+ - in TDE_DIR/1_git:
edeps : contains extra dependency modules necessary to build TDE (this folder is not necessary
- is pre-built extra dependencies are used - see point 9 for more info)
+ if pre-built extra dependencies are used - see point 9 for more info)
hooks : contains build hook scripts to execute ad-hoc code before and after the building process.
Mainly used to apply patches automatically during the building process
-
+
4) Clone TDE git repositories
- TDE main repo
cd "$TDE_DIR/1_git"
- git clone https://mirror.git.trinitydesktop.org/gitea/TDE/tde
+ git clone https://mirror.git.trinitydesktop.org/gitea/TDE/tde.git
+ git clone https://mirror.git.trinitydesktop.org/gitea/TDE/scripts.git tde/scripts
cd tde
- git submodule init -- scripts
- git submodule update -- scripts
./scripts/switch_all_submodules_to_head_and_clean anonymous
+ - If you are not using pre-built extra dependencies:
+ cd "$TDE_DIR/1_git"
+ git clone https://mirror.git.trinitydesktop.org/gitea/TDE/extra-dependencies.git edeps
+
5) Add your user to the sudo group (not required if you are root)
su -c "adduser <username> sudo"
Logout and login again to make sure the new settings are applied.
* Optionally, consider extending your sudo timeout interval to avoid having to type your password too often
(this could be quite painful especially during long builds, which would not be able to complete if unattended).
To do this, type "sudo visudo" and then add "Defaults timestamp_timeout=<new timeout>", where the value is in
- minutes. Use a value of -1 to set an infinite timeout.
+ minutes. Use a value of -1 to set an infinite timeout.
6) Copy the files from "TDE_DIR/1_git/tde/packaging/debian/_buildscripts/local/additional_files" folder
to the respectivily named folders.
@@ -56,7 +59,7 @@ A) Environment preparation
sudo pbuilder create
If you wish to build for a different distro or architecture, use the command:
sudo DISTRO_NAME=<target distro> ARCHITECTURE=<target architecture> pbuilder create
-
+
8) Setup the build scripts locally:
- copy build scripts from "TDE_DIR/1_git/tde/packaging/debian/_buildscripts/local" to "TDE_DIR/buildscripts"
and make sure all shell scripts are executable
@@ -67,54 +70,42 @@ A) Environment preparation
* TDE_DIR to the correct path.
* DISTRO, DISTRO_NAME and ARCHITECTURE to match the distro and architecture you want to build for if different
from your current setup. Otherwise the variables can be left empty and auto detection will be performed.
- * UPDATE_BRANCHES to the branches you want to keep updated from the main repositories.
+ * UPDATE_BRANCHES to the branches you want to keep updated from the main repositories.
* DEFAULT_REPO_BRANCH to the branch to check out at the end of the repositories update process.
-9) Some additional packages (referred to as extra dependencies) are required to build and install TDE in debian/ubuntu.
- These modules can be built locally, but the procedure is a bit cumbersome. Alternatively, Slavek Banko's
- pre-built binaries can be used.
-
- 9.1) Using pre-built extra dependencies (recommended option)
+9) Some additional packages (referred to as extra dependencies) are required to build and install TDE in debian/ubuntu.
+ These modules can be built locally or alternatively Slavek Banko's pre-built binaries can be used.
+
+ 9.1) Using pre-built extra dependencies
- open "_config.sh" and set the variable USE_PREBUILD_EXTRA_DEPS to "y" (this is the default initial setting)
- - add the following lines to the /etc/apt/sources.list file. This will setup Slavek's repositories in apt for
+ - add the following lines to the /etc/apt/sources.list file. This will setup Slavek's repositories in apt for
installing the extra dependency packages when TDE is installed.
- * For R14.1.x series (repository branch "master")
- # --- SLAVEK BANKO'S EXTRA DEPENDENCIES REPOSITORY ---
- # - temporarily disabled -
- # - http://mirror.ppa.trinitydesktop.org/trinity-testing/dists <YOUR DISTRO> deps
- deb http://mirror.ppa.trinitydesktop.org/trinity-sb <YOUR DISTRO> deps-r14
- * For R14.0.x series (repository branch "r14.0.x")
- # --- SLAVEK BANKO'S EXTRA DEPENDENCIES REPOSITORY ---
- deb http://mirror.ppa.trinitydesktop.org/trinity-sb <YOUR DISTRO> deps-r14
- For example:
- deb http://mirror.ppa.trinitydesktop.org/trinity-sb buster deps-r14
- - install package dirmngr if required
- - import TDE Archive Signing key into your apt keyring
- sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-key C93AF1698685AD8B
-
- 9.2) Building extra dependencies locally
- - open "_config.sh" and set the variable USE_PREBUILD_EXTRA_DEPS to "n"
- - install the following packages: links2 and required dependencies.
- - using links2 (or another browser), download the source code for the extra dependency modules from
- Slavek's PPA (usually more recently updated):
- https://quickbuild.pearsoncomputing.net/~slavek-banko/+archive/deps-r14/+packages
- or from the official PPA:
- https://quickbuild.pearsoncomputing.net/~trinity/+archive/trinity-nightly-build-dependencies/+packages
- NOTES:
- * Once the page open in your browser, select your distro in the combobox near the "Filter" button and click
- the button to update. You should get a list of 10-15 modules, depending on the distro.
- * Click on one module at a time, it will expand (or open another page) and show a list of .deb and other files.
- * Save those files (exclude .deb files. Only .orig.tar.xz, .dsc, .debian.tar.xz are required) and store
- them to TDE_DIR/1_git/edeps/<MODULE NAME> folder (one folder per module).
+ * For R14.1.x series (repository branch "master")
+ # --- SLAVEK BANKO'S EXTRA DEPENDENCIES REPOSITORY ---
+ deb http://mirror.ppa.trinitydesktop.org/trinity-testing <YOUR DISTRO> deps
+ * For R14.0.x series (repository branch "r14.0.x")
+ # --- SLAVEK BANKO'S EXTRA DEPENDENCIES REPOSITORY ---
+ deb http://mirror.ppa.trinitydesktop.org/trinity-sb <YOUR DISTRO> deps-r14
+ For example:
+ deb http://mirror.ppa.trinitydesktop.org/trinity-sb buster deps-r14
+
+ - install package dirmngr if required
+ - import TDE Archive Signing key into your apt keyring
+ sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-key C93AF1698685AD8B
+
+ 9.2) Building extra dependencies locally (recommended option)
+ - open "_config.sh" and set the variables USE_PREBUILD_EXTRA_DEPS to "n" and
+ CFG_EXTRA_DEPS_DIR to "edeps"
+ - build the extra dependency as any other normal module
10) Add the following lines to the /etc/apt/sources.list file. This will setup your local repo in apt.
- # --- LOCAL TDE REPOSITORY ---
- deb [trusted=yes] file:TDE_DIR/3_repo <YOUR DISTRO> main
- For example:
- deb [trusted=yes] file:/home/tde_src/3_repo buster main
+ # --- LOCAL TDE REPOSITORY ---
+ deb [trusted=yes] file:TDE_DIR/3_repo <YOUR DISTRO> main
+ For example:
+ deb [trusted=yes] file:/home/tde_src/3_repo buster main
+
-
----------------------
B) Notes about scripts
----------------------
@@ -145,7 +136,7 @@ When building sets of modules or the whole TDE, a global build summary is automa
update_git_repository.sh [options]
Options:
-i (Incremental) : in case the previous update was interrupted, continue from the last known updated module.
- (useful on slow/unstable internet connections). If the previous update had completed,
+ (useful on slow/unstable internet connections). If the previous update had completed,
this option is ignored.
-v (Verbose) : display and log more output. Useful for troubleshooting.
-ub "<branches>" (Update Branches) : allows to specify the branches to update. This override the variable
@@ -164,13 +155,16 @@ When building sets of modules or the whole TDE, a global build summary is automa
tdebase
applications/abakus
dependencies/libr
- edeps/imlib
+ edeps/debian/imlib
2) by providing only the module name and let the script look up for a unique match among the known modules.
Examples:
tdebase
abakus
libr
imlib
+ 3) for extra dependencies only, by providing the repository folder and the module name without the "debian"
+ subfolder
+ edeps/imlib
Usage:
build_module.sh [options] module_name
Options:
@@ -183,17 +177,17 @@ When building sets of modules or the whole TDE, a global build summary is automa
doing local changes/development. The module can then be built from the modified local folder
-d (Debug) : enable debug symbols if possible (debian/rules file must contain "RelWithDebInfo" for this to work)
-ip (Internal Pbuilder): build using internal pbuilder mode (experimental)
-
+
- <dd>_<set_name>.sh
A number of scripts used to build sets of modules. Each script builds an individual set.
- Modules are built from the git sources and the build result is automatically appended to
+ Modules are built from the git sources and the build result is automatically appended to
TDE_DIR/0_logs/build_result.log.
Usage:
<dd>_<set_name>.sh [options] set_name
Options:
-s N: if specified, skip first N modules from the set of modules
- The sets are logically grouped as "base system", "applications" and "others"
+ The sets are logically grouped as "base system", "applications" and "others"
00_extradeps.sh : extra dependencies modules
01_base_01.sh - 03_base_03.sh : TDE base system
04_application_01.sh - 09_application_06.sh : application modules
@@ -206,20 +200,20 @@ When building sets of modules or the whole TDE, a global build summary is automa
Script used to build the complete TDE at once. Calls the dd_setname.sh set scripts in order.
Usage:
build_TDE.sh
-
+
- create_repo.sh
- Creates a local repository from the .deb files currently stored in TDE_DIR/2_build/debs.
+ Creates a local repository from the .deb files currently stored in TDE_DIR/2_build/debs.
Usage:
[sudo] create_repo.sh [options]
Options:
-b (Backup) : create a backup of the existing repository in TDE_DIR/CFG_REPO_DIR.backup
-
+
3) * Building hooks *
Hooks are available to execute ad-hoc code before and after the build process. For example this is very useful to automatically apply patches.
-There are two type of hooks:
+There are two type of hooks:
- pre_build : applied before switching the module to quilt format and build
-- post_build: applied after the build (dpkg-buildpackage or pbuilder) has terminated
+- post_build: applied after the build (dpkg-buildpackage or pbuilder) has terminated
To use a hook, create an executable script (pre_build.sh and/or post_build.sh) in the TDE_DIR/1_git/hooks/<MODULE NAME> folder. The scripts are executed in the build_module.sh environment, so have access to all the variables defined in that file. See the files in the "hook examples" folder for real usage samples.
@@ -235,7 +229,7 @@ C) How to use the scripts
the process when building several modules in sequence.
5) Build modules as per your needs. You don't need to use "sudo" directly since the scripts will do that automatically if
required. Just type your sudo password when prompted to do so.
-6) Create a local repository from the packages you have just built, to be used as installation repository.
+6) Create a local repository from the packages you have just built, to be used as installation repository.
[sudo] ./create_repo.sh
7) Install TDE as you usually do. For example as follow:
- sudo apt-get update
@@ -243,15 +237,15 @@ C) How to use the scripts
or
sudo aptitude install tde-trinity (for a standard TDE environment)
-
-
+
+
Examples of real usage:
1) build a single module
- ./build_module.sh -g -sl "dependencies/libr" -> build libr package. This is a good test to check
whether everything is working fine
- ./build_module.sh -g "tdelibs" -> build "tdelibs" from git sources in a clean chroot environment
- - ./build_module.sh -g -l -sl "applications/amarok" -> build "amarok" locally from git sources and
+ - ./build_module.sh -g -l -sl "applications/amarok" -> build "amarok" locally from git sources and
display building logs during building
- ./build_module.sh -sh -lr "tdebase" -> build "tdebase" from the local sources (in TDE_DIR/2_build/build/tdebase)
in a clean chroot environment and launch a shell in case of building failure.
@@ -259,13 +253,13 @@ Examples of real usage:
- ./build_module.sh -g -po "tdelibs" -> prepare "tdelibs" for building from git sources. Source code will be available
in TDE_DIR/2_build/build/tdelibs. After you have made changes to the source and
want to build the modified package, run './build_module.sh "tdelibs"'
-
+
2) build a single set
(optional) delete the TDE_DIR/0_logs/build_result.log file
- ./01_base_01.sh -> build this set.
+ ./01_base_01.sh -> build this set.
./03_base_03.sh -s 3 -> build this set but skip the first 3 modules of the set.
3) build all TDE
./99_build_TDE.sh -> build all TDE
-4) [sudo] ./create_repo.sh -> build or update your local TDE repository \ No newline at end of file
+4) [sudo] ./create_repo.sh -> build or update your local TDE repository
diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh
index f999da0eb..d34324595 100755
--- a/debian/_buildscripts/local/build_module.sh
+++ b/debian/_buildscripts/local/build_module.sh
@@ -17,7 +17,7 @@ exec_time_start $_BUILDMOD_TIMER_NUM
# Need sudo for non-root users
SUDO_CMD=""
if [ "`whoami`" != "root" ]; then
- SUDO_CMD="sudo -E"
+ SUDO_CMD="sudo -E"
fi
@@ -26,19 +26,19 @@ fi
# $1 - error code
function do_exit()
{
- cd "$SCRIPT_DIR"
- if [ $1 -eq 0 ]; then
- echo -e "${CGreen}#### Processing module ${CLightGreen}\"$MOD_GIVEN\"${CGreen} succeeded ####${CNone}"
+ cd "$SCRIPT_DIR"
+ if [ $1 -eq 0 ]; then
+ echo -e "${CGreen}#### Processing module ${CLightGreen}\"$MOD_GIVEN\"${CGreen} succeeded ####${CNone}"
if [ "$bool_LOG_RESULT" = "y" ]; then
echo "[ OK ] [$_BUILDMOD_TIME] \"$MOD_NAME\"" >>"$LOG_BUILD_RESULT_FILENAME"
fi
- else
- echo -e "${CRed}#### Processing module ${CLightRed}\"$MOD_GIVEN\"${CRed} failed ($1) ####${CNone}"
+ else
+ echo -e "${CRed}#### Processing module ${CLightRed}\"$MOD_GIVEN\"${CRed} failed ($1) ####${CNone}"
if [ "$bool_LOG_RESULT" = "y" ]; then
echo "[FAILED] [$_BUILDMOD_TIME] \"$MOD_NAME\"" >>"$LOG_BUILD_RESULT_FILENAME"
fi
- fi
- exit $1
+ fi
+ exit $1
}
@@ -48,35 +48,15 @@ function do_exit()
function recreate_folder()
{
if [ -d "$1" ]; then
- $SUDO_CMD rm -R "$1"
- fi
- mkdir -p "$1"
-}
-
-
-#----------------------------
-# Set module related path variables
-# Parameters:
-# $1 - module name
-function set_module_paths()
-{
- local LOC_MOD_NAME=$1
- if [ "$bool_EXTRADEP_MOD" != "y" ]; then
- # Standard module
- MOD_GIT_PATH="$REPO_TDE_MAIN/$LOC_MOD_NAME"
- MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$LOC_MOD_NAME/debian"
- else
- # Extra dependency module
- MOD_GIT_PATH="$REPO_DIR/$LOC_MOD_NAME"
- fi
- export MOD_BUILD_PATH="$TDE_BUILD_DIR/$LOC_MOD_NAME"
- MOD_BUILD_PKGING_PATH="$MOD_BUILD_PATH/debian"
+ $SUDO_CMD rm -R "$1"
+ fi
+ mkdir -p "$1"
}
#----------------------------
# Look for a module in the git repository or in the extra dependency folder.
-# Set the new module name if found.
+# Set the module name and paths if found.
# Parameters:
# $1 - module name
function search_module()
@@ -85,6 +65,7 @@ function search_module()
IFS="*"
local LOC_MOD_NAME=$1
local LOC_MATCH
+
MODULE_FOUND="n"
# Search in GIT repository
@@ -93,18 +74,23 @@ function search_module()
# Unique module found in GIT
MODULE_FOUND="y"
MOD_NAME=$LOC_MATCH
- set_module_paths $MOD_NAME
- else
+ MOD_GIT_PATH="$REPO_TDE_MAIN/$MOD_NAME"
+ MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian"
+ MOD_BUILD_PATH="$TDE_BUILD_DIR/$MOD_NAME"
+ else
# Search in extra dependency folder
- LOC_MATCH=`ls "$REPO_EXTRA_DEPENDENCIES" | grep "^$LOC_MOD_NAME$"`
+ LOC_BASENAME=`echo "$LOC_MOD_NAME" | sed -r "s|^${CFG_EXTRA_DEPS_DIR}/(debian/)?||"`
+ LOC_MATCH=`ls "$REPO_EXTRA_DEPENDENCIES/debian" | grep "^$LOC_BASENAME"`
if [ "$LOC_MATCH" != "" -a "`echo $LOC_MATCH | wc -l`" = "1" ]; then
# Unique module found in extra dependency folder
MODULE_FOUND="y"
bool_EXTRADEP_MOD="y"
MOD_NAME="$CFG_EXTRA_DEPS_DIR/$LOC_MATCH"
- set_module_paths $MOD_NAME
+ MOD_GIT_PATH="$REPO_EXTRA_DEPENDENCIES/debian/$LOC_BASENAME"
+ MOD_BUILD_PATH="$TDE_BUILD_DIR/$CFG_EXTRA_DEPS_DIR/$LOC_BASENAME"
fi
fi
+ MOD_BUILD_PKGING_PATH="$MOD_BUILD_PATH/debian"
IFS=$OLDIFS
}
@@ -123,27 +109,27 @@ bool_PREPARE_ONLY="n"
bool_DEBUG_MODE="n"
bool_INTERNAL_PBUILDER="n"
for arg in $@; do
- if [ "$arg" = "-g" ]; then # select code to build from Git repo (-g) or from local build copy
- bool_BUILD_FROM_GIT="y"
- elif [ "$arg" = "-l" ]; then # build module Locally instead of in a clean chroot environment
- bool_BUILD_LOCALLY="y"
- elif [ "$arg" = "-sl" ]; then # output the building logs to terminal (ShowLog)
- bool_SHOW_BUILD_LOGS="y"
- elif [ "$arg" = "-lr" ]; then # Log build Result to file
- bool_LOG_RESULT="y"
- elif [ "$arg" = "-sh" ]; then # install Shell Hook for failing builds (only valid if NOT building locally)
- bool_SHELL_HOOK="y"
- elif [ "$arg" = "-po" ]; then # Prepare build folder Only but do not build
- bool_PREPARE_ONLY="y"
- elif [ "$arg" = "-d" ]; then # build with Debug symbols (used in hook scripts)
- bool_DEBUG_MODE="y"
- elif [ "$arg" = "-ip" ]; then # build using Internal Pbuilder (experimental)
- bool_INTERNAL_PBUILDER="y"
- elif [ "$MOD_GIVEN" = "" ]; then # module to be built
- MOD_GIVEN="$arg"
- fi
+ if [ "$arg" = "-g" ]; then # select code to build from Git repo (-g) or from local build copy
+ bool_BUILD_FROM_GIT="y"
+ elif [ "$arg" = "-l" ]; then # build module Locally instead of in a clean chroot environment
+ bool_BUILD_LOCALLY="y"
+ elif [ "$arg" = "-sl" ]; then # output the building logs to terminal (ShowLog)
+ bool_SHOW_BUILD_LOGS="y"
+ elif [ "$arg" = "-lr" ]; then # Log build Result to file
+ bool_LOG_RESULT="y"
+ elif [ "$arg" = "-sh" ]; then # install Shell Hook for failing builds (only valid if NOT building locally)
+ bool_SHELL_HOOK="y"
+ elif [ "$arg" = "-po" ]; then # Prepare build folder Only but do not build
+ bool_PREPARE_ONLY="y"
+ elif [ "$arg" = "-d" ]; then # build with Debug symbols (used in hook scripts)
+ bool_DEBUG_MODE="y"
+ elif [ "$arg" = "-ip" ]; then # build using Internal Pbuilder (experimental)
+ bool_INTERNAL_PBUILDER="y"
+ elif [ "$MOD_GIVEN" = "" ]; then # module to be built
+ MOD_GIVEN="$arg"
+ fi
done
-MOD_NAME=$MOD_GIVEN # the actal module to be built
+MOD_NAME=$MOD_GIVEN # the actal module to be built
echo -e "${CLightCyan}#### Processing module \"$MOD_GIVEN\" ####${CNone}"
@@ -167,19 +153,19 @@ OPT_SIGN_PKG_LOCAL="--no-sign"
# - show logs
OPT_SHOW_LOGS="&>"
if [ "$bool_SHOW_BUILD_LOGS" = "y" ]; then
- OPT_SHOW_LOGS=" | tee "
+ OPT_SHOW_LOGS=" | tee "
fi
export OPT_SHOW_LOGS
# This folders must exists
BASE_DIRS=("REPO_DIR" "BUILD_DIR" "SCRIPT_DIR" "REPO_TDE_MAIN" "REPO_TDE_PACKAGING" "HOOK_DIR")
if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
- BASE_DIRS+=("REPO_EXTRA_DEPENDENCIES")
+ BASE_DIRS+=("REPO_EXTRA_DEPENDENCIES")
fi
for var_name in ${BASE_DIRS[@]}; do
if [ ! -d "${!var_name}" ]; then
echo -e "${CYellow}$var_name${CNone} folder missing (${CLightPurple}${!var_name}${CNone}). Check your config or create it."
- do_exit 4
+ do_exit 4
fi
done
@@ -204,24 +190,22 @@ if [[ $MOD_NAME =~ ^$CFG_EXTRA_DEPS_DIR/ ]]; then
bool_EXTRADEP_MOD="y"
fi
-set_module_paths $MOD_NAME
+# Make sure the module exists
+search_module $MOD_NAME
+if [ "$MODULE_FOUND" != "y" ]; then
+ echo "Module \"$MOD_NAME\" not found in GIT"
+ do_exit 5
+fi
+
if [ "$bool_BUILD_FROM_GIT" = "y" ]; then
echo -e "${CYellow}> Building from GIT repo${CNone}"
# source files
- if [ ! -d "$MOD_GIT_PATH" ]; then
- MODULE_FOUND="n"
- search_module $MOD_NAME
- if [ "$MODULE_FOUND" != "y" -o ! -d "$MOD_GIT_PATH" ]; then
- echo "Module \"$MOD_NAME\" not found in GIT"
- do_exit 5
- fi
- fi
bool_COPY_MOD_SRC="y"
# packaging scripts
if [ "$bool_EXTRADEP_MOD" != "y" -a ! -d "$MOD_GIT_PKGING_PATH" ]; then
echo "Packaging for \"$MOD_NAME\" not found in GIT"
- do_exit 6
+ do_exit 6
fi
bool_COPY_PKGING_FILES="y"
#
@@ -230,17 +214,7 @@ else
# source files
bool_COPY_MOD_SRC="n"
if [ ! -d "$MOD_BUILD_PATH" ]; then
- if [ ! -d "$MOD_GIT_PATH" ]; then
- MODULE_FOUND="n"
- search_module $MOD_NAME
- if [ "$MODULE_FOUND" != "y" -o ! -d "$MOD_GIT_PATH" ]; then
- echo "Module \"$MOD_NAME\" not found neither in BUILD nor in GIT"
- do_exit 7
- fi
- fi
- if [ ! -d "$MOD_BUILD_PATH" ]; then
- bool_COPY_MOD_SRC="y"
- fi
+ bool_COPY_MOD_SRC="y"
fi
# packaging scripts
@@ -266,7 +240,7 @@ fi
# copy main repo source files, if needed
if [ "$bool_COPY_MOD_SRC" = "y" ]; then
- bool_COPY_PKGING_FILES="y"
+ bool_COPY_PKGING_FILES="y"
recreate_folder "$MOD_BUILD_PATH"
if [ "$bool_EXTRADEP_MOD" != "y" ]; then
# Normal module
@@ -275,27 +249,28 @@ if [ "$bool_COPY_MOD_SRC" = "y" ]; then
echo "# TDE SCM module information" > "$MOD_BUILD_PATH/.tdescminfo"
echo "Name: $MOD_NAME" >> "$MOD_BUILD_PATH/.tdescminfo"
cd "$MOD_GIT_PATH"
- MOD_BRANCH=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"`
- if [[ -z "$MOD_BRANCH" ]]; then
- MOD_BRANCH=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-`
- fi
+ MOD_BRANCH=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"`
+ if [[ -z "$MOD_BRANCH" ]]; then
+ MOD_BRANCH=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-`
+ fi
COMMIT_HASH=`git rev-parse HEAD`
echo "Revision: $MOD_BRANCH-$COMMIT_HASH" >> "$MOD_BUILD_PATH/.tdescminfo"
git log -1 --pretty=format:"DateTime: %cd%n" --date=format:"%m/%d/%Y %H:%M" >> "$MOD_BUILD_PATH/.tdescminfo"
else
- # Extra dependency module
- if [ `find "$MOD_GIT_PATH" -name '*.dsc' | wc -l` == 1 ]; then
- if [ -d "$MOD_BUILD_PATH" ]; then
- $SUDO_CMD rm -R "$MOD_BUILD_PATH"
- fi
- eval dpkg-source --no-copy --no-check -x `find "$MOD_GIT_PATH" -name '*.dsc'` \
- \"$MOD_BUILD_PATH\" $OPT_SHOW_LOGS/dev/null
+ # Extra dependency module: copy and apply patches
+ # -- move to the correct folder
+ cd "$MOD_GIT_PATH"
+ if [ `ls -d */ | wc -l` == 1 ]; then
+ cd `ls -d */`
+ cp -R "." "$MOD_BUILD_PATH"
+ cd $MOD_BUILD_PATH
+ QUILT_PATCHES="debian/patches" quilt push -a >/dev/null
# Make sure patches are not reapplied in future local builds. This could stop pdebuild from working.
if [ -f "$MOD_BUILD_PATH/debian/patches/series" ]; then
- cp /dev/null "$MOD_BUILD_PATH/debian/patches/series"
+ cp /dev/null "$MOD_BUILD_PATH/debian/patches/series"
fi
else
- echo "There must be one and only one .dsc file in \"$MOD_GIT_PATH\""
+ echo "There must be one and only one module folder in \"$MOD_GIT_PATH\""
do_exit 9
fi
fi
@@ -304,59 +279,59 @@ fi
# copying packaging scripts, if needed
if [ "$bool_EXTRADEP_MOD" != "y" -a "$bool_COPY_PKGING_FILES" = "y" ]; then
if [ -d "$MOD_BUILD_PKGING_PATH" ]; then
- $SUDO_CMD rm -R $MOD_BUILD_PKGING_PATH
- fi
- cp -R "$MOD_GIT_PKGING_PATH" "$MOD_BUILD_PKGING_PATH"
-
+ $SUDO_CMD rm -R $MOD_BUILD_PKGING_PATH
+ fi
+ cp -R "$MOD_GIT_PKGING_PATH" "$MOD_BUILD_PKGING_PATH"
+
# TODO metapackage support
-
- # Default package name
- # Calculate package version
- cd $MOD_GIT_PATH
- branch=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"`
- if [[ -z "$branch" ]]; then
- branch=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-`
- fi
- target_tag=`git tag | grep -F "$TDE_RELEASE" | head -n1`
- tag=`git tag | \
- sed "s|^\([^0-9]\)|\1.|" | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr -k 5,5nr | sed "s|^\([^0-9]\)\.|\1|" | \
- while read t; do \
- git branch --contains $t | cut -c 3- | grep -x "$branch" >/dev/null && \
- echo "$t..HEAD" && break; done`
- count=`git log $tag --pretty=oneline | wc -l`
- package=$(basename $PWD)-trinity-$TDE_RELEASE
- if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then
- package=$package~pre$count+$(git rev-parse HEAD | cut -c 1-8)
- fi
- REL=4:$TDE_RELEASE${package#*$TDE_RELEASE}
- REL=${REL%+*}
- REL=${REL/4:14.0.0/4:14.0.0-s}
- REL=${REL/4:14.0.0-s~pre/4:14.0.0-s~}
- REL=${REL/.0~pre/.0~s}
- # Get package name and packaging release
- PKG_NAME=$(head -n1 $MOD_BUILD_PKGING_PATH/changelog)
- PKG_NAME=${PKG_NAME%% *}
- PKG_TAG=$(cd "$REPO_TDE_PACKAGING/$MOD_NAME" &&
- git tag | \
- sed "s|^\([^0-9]\)|\1.|" | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr -k 5,5nr | sed "s|^\([^0-9]\)\.|\1|" | \
- while read t; do \
- git branch --contains $t | cut -c 3- | grep -x "$branch" >/dev/null && \
- echo "$t..HEAD" && break; done)
- PKG_REL=$(cd "$REPO_TDE_PACKAGING/$MOD_NAME" &&
- git log $PKG_TAG --pretty=oneline . | wc -l)
- if [ -n "$REL_SUFFIX" ]; then
- PKG_REL="${PKG_REL}${REL_SUFFIX}"
- fi
- # TODO add relative patch count
- ADD_REL=0
-
- # Update changelog
- REPO_DATE=`git log -1 --pretty=format:"%cd%n" --date=rfc`
- GITUSER="$(git config --get user.name) <$(git config --get user.email)>"
- echo "$PKG_NAME ($REL-0$DISTRO$DISTRO_VERSION.$ADD_REL+$PKG_REL) $DISTRO_NAME; urgency=low" > "$MOD_BUILD_PKGING_PATH/changelog"
- echo -e "\n * Automated git build\n\n -- $GITUSER $REPO_DATE\n" >> "$MOD_BUILD_PKGING_PATH/changelog"
- cat "$REPO_TDE_PACKAGING/$MOD_NAME/debian/changelog" >> "$MOD_BUILD_PKGING_PATH/changelog"
- touch -d "$REPO_DATE" "$MOD_BUILD_PKGING_PATH/changelog"
+
+ # Default package name
+ # Calculate package version
+ cd $MOD_GIT_PATH
+ branch=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"`
+ if [[ -z "$branch" ]]; then
+ branch=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-`
+ fi
+ target_tag=`git tag | grep -F "$TDE_RELEASE" | head -n1`
+ tag=`git tag | \
+ sed "s|^\([^0-9]\)|\1.|" | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr -k 5,5nr | sed "s|^\([^0-9]\)\.|\1|" | \
+ while read t; do \
+ git branch --contains $t | cut -c 3- | grep -x "$branch" >/dev/null && \
+ echo "$t..HEAD" && break; done`
+ count=`git log $tag --pretty=oneline | wc -l`
+ package=$(basename $PWD)-trinity-$TDE_RELEASE
+ if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then
+ package=$package~pre$count+$(git rev-parse HEAD | cut -c 1-8)
+ fi
+ REL=4:$TDE_RELEASE${package#*$TDE_RELEASE}
+ REL=${REL%+*}
+ REL=${REL/4:14.0.0/4:14.0.0-s}
+ REL=${REL/4:14.0.0-s~pre/4:14.0.0-s~}
+ REL=${REL/.0~pre/.0~s}
+ # Get package name and packaging release
+ PKG_NAME=$(head -n1 $MOD_BUILD_PKGING_PATH/changelog)
+ PKG_NAME=${PKG_NAME%% *}
+ PKG_TAG=$(cd "$REPO_TDE_PACKAGING/$MOD_NAME" &&
+ git tag | \
+ sed "s|^\([^0-9]\)|\1.|" | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr -k 5,5nr | sed "s|^\([^0-9]\)\.|\1|" | \
+ while read t; do \
+ git branch --contains $t | cut -c 3- | grep -x "$branch" >/dev/null && \
+ echo "$t..HEAD" && break; done)
+ PKG_REL=$(cd "$REPO_TDE_PACKAGING/$MOD_NAME" &&
+ git log $PKG_TAG --pretty=oneline . | wc -l)
+ if [ -n "$REL_SUFFIX" ]; then
+ PKG_REL="${PKG_REL}${REL_SUFFIX}"
+ fi
+ # TODO add relative patch count
+ ADD_REL=0
+
+ # Update changelog
+ REPO_DATE=`git log -1 --pretty=format:"%cd%n" --date=rfc`
+ GITUSER="$(git config --get user.name) <$(git config --get user.email)>"
+ echo "$PKG_NAME ($REL-0$DISTRO$DISTRO_VERSION.$ADD_REL+$PKG_REL) $DISTRO_NAME; urgency=low" > "$MOD_BUILD_PKGING_PATH/changelog"
+ echo -e "\n * Automated git build\n\n -- $GITUSER $REPO_DATE\n" >> "$MOD_BUILD_PKGING_PATH/changelog"
+ cat "$REPO_TDE_PACKAGING/$MOD_NAME/debian/changelog" >> "$MOD_BUILD_PKGING_PATH/changelog"
+ touch -d "$REPO_DATE" "$MOD_BUILD_PKGING_PATH/changelog"
fi
# prepare destination directory for building
@@ -372,24 +347,26 @@ recreate_folder "$MOD_DEBSRC_PATH"
if [ -x "$HOOK_DIR/$MOD_NAME/pre_build.sh" ]; then
echo -e "${CYellow}> Applying pre-build hook${CNone}"
. "$HOOK_DIR/$MOD_NAME/pre_build.sh"
- if [ $? -eq 0 ]; then
- echo -e "> ${CBrown}Pre-build hook applied successfully${CNone}"
- else
- echo -e "> ${CLightBlue}Pre-build hook failed${CNone}"
- fi
+ if [ $? -eq 0 ]; then
+ echo -e "> ${CBrown}Pre-build hook applied successfully${CNone}"
+ else
+ echo -e "> ${CLightBlue}Pre-build hook failed${CNone}"
+ fi
fi
+
#----------------------------
# Switch to 3.0(quilt) format
#----------------------------
# create orig tarball
cd "$MOD_BUILD_PATH"
+
MOD_BASENAME=`head -n 1 "$MOD_BUILD_PKGING_PATH/changelog" | sed -r "s/^([^ ]+).*/\1/"`
MOD_MAJOR_VER=`head -n 1 "$MOD_BUILD_PKGING_PATH/changelog" | sed -r "s/^[^ ]+ \(([^:]+:)?.*/\1/"`
-MOD_UP_VER=`head -n 1 "$MOD_BUILD_PKGING_PATH/changelog" | sed -r "s/^[^ ]+ \(([^:]+:)?([^-]+).*/\2/"`
-MOD_DEB_VER=`head -n 1 "$MOD_BUILD_PKGING_PATH/changelog" | sed -r "s/^[^ ]+ \([^-]+-([^\)]+).*/\1/"`
+MOD_UP_VER=`head -n 1 "$MOD_BUILD_PKGING_PATH/changelog" | sed -r "s/^[^ ]+ \(([^:]+:)?(.*+)-.*/\2/"`
+MOD_DEB_VER=`head -n 1 "$MOD_BUILD_PKGING_PATH/changelog" | sed -r "s/^[^ ]+ \(.*+-([^\)]+).*/\1/"`
-REPO_DATE=`dpkg-parsechangelog -l "$MOD_BUILD_PATH/debian/changelog" | sed -n -e 's|^Date: ||p'`
+REPO_DATE=`dpkg-parsechangelog -l "$MOD_BUILD_PKGING_PATH/changelog" | sed -n -e 's|^Date: ||p'`
tar cJf "../${MOD_BASENAME}_${MOD_UP_VER}.orig.tar.xz" --exclude="debian" --exclude=".git*" \
--mtime "$REPO_DATE" --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime .
touch -d "$REPO_DATE" "../${MOD_BASENAME}_${MOD_UP_VER}.orig.tar.xz"
@@ -439,19 +416,19 @@ if [ "$bool_BUILD_LOCALLY" = "y" ]; then
if [ $build_retval -eq 0 ]; then
eval dpkg-buildpackage -b $OPT_SIGN_PKG_LOCAL $OPT_SHOW_LOGS\"$BUILDING_LOG_FILE\"
fi
- build_retval=$?
+ build_retval=$?
else
## Build module in a clean chroot environment using pbuilder
$SUDO_CMD "$SCRIPT_DIR/internals/_pbuilder.sh"
- build_retval=$?
- if [ "`whoami`" != "root" ]; then
- cd "$MOD_DEB_PATH"
- $SUDO_CMD chown -R `id -u -n`:`id -g -n` . &>/dev/null
- cd "$MOD_BUILD_PATH/.."
- $SUDO_CMD chown `id -u -n`:`id -g -n` *.dsc *.changes *.tar.xz *.tar.bz2 *.tar.gz *.buildinfo &>/dev/null
- $SUDO_CMD chown `id -u -n`:`id -g -n` "$TDE_DEBS_DIR/Packages" &>/dev/null
- cd "$MOD_BUILD_PATH"
- fi
+ build_retval=$?
+ if [ "`whoami`" != "root" ]; then
+ cd "$MOD_DEB_PATH"
+ $SUDO_CMD chown -R `id -u -n`:`id -g -n` . &>/dev/null
+ cd "$MOD_BUILD_PATH/.."
+ $SUDO_CMD chown `id -u -n`:`id -g -n` *.dsc *.changes *.tar.xz *.tar.bz2 *.tar.gz *.buildinfo &>/dev/null
+ $SUDO_CMD chown `id -u -n`:`id -g -n` "$TDE_DEBS_DIR/Packages" &>/dev/null
+ cd "$MOD_BUILD_PATH"
+ fi
fi
if [ $build_retval -eq 0 ]; then
@@ -467,11 +444,11 @@ fi
if [ -x "$HOOK_DIR/$MOD_NAME/post_build.sh" ]; then
echo -e "${CYellow}> Applying post-build hook${CNone}"
. "$HOOK_DIR/$MOD_NAME/post_build.sh"
- if [ $? -eq 0 ]; then
- echo -e "${CBrown}Post-build hook applied successfully${CNone}"
- else
- echo -e "${CLightBlue}Post-build hook failed${CNone}"
- fi
+ if [ $? -eq 0 ]; then
+ echo -e "${CBrown}Post-build hook applied successfully${CNone}"
+ else
+ echo -e "${CLightBlue}Post-build hook failed${CNone}"
+ fi
fi
#----------------------------
diff --git a/debian/_buildscripts/local/generate_tags.sh b/debian/_buildscripts/local/generate_tags.sh
new file mode 100755
index 000000000..d11ecdb10
--- /dev/null
+++ b/debian/_buildscripts/local/generate_tags.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Load common code
+. ./internals/_build_common.sh
+init_common
+
+#----------------------------
+# Check for ctags existance
+if hash ctags 2>/dev/null; then
+
+ # Generate tags
+ if [ ! -d "$TDE_TAGS_DIR" ]; then
+ mkdir "$TDE_TAGS_DIR"
+ fi
+
+ echo "Generating all tags"
+ ctags -f "$TDE_TAGS_DIR/tags.all" "$REPO_TDE_MAIN"
+
+ echo "Generating core tags"
+ ctags -f "$TDE_TAGS_DIR/tags.core" "$REPO_TDE_MAIN/dependencies/tqt3"
+ ctags -a -f "$TDE_TAGS_DIR/tags.core" "$REPO_TDE_MAIN/tdelibs"
+ ctags -a -f "$TDE_TAGS_DIR/tags.core" "$REPO_TDE_MAIN/tdebase"
+
+fi
diff --git a/debian/_buildscripts/local/internals/_build_common.sh b/debian/_buildscripts/local/internals/_build_common.sh
index 105134084..04ce3377b 100755
--- a/debian/_buildscripts/local/internals/_build_common.sh
+++ b/debian/_buildscripts/local/internals/_build_common.sh
@@ -67,8 +67,9 @@ function _set_path_variables()
REPO_EXTRA_DEPENDENCIES="$TDE_DIR/$CFG_GIT_DIR/$CFG_EXTRA_DEPS_DIR"
BUILD_DIR="$TDE_DIR/$CFG_BUILD_DIR"
- TDE_BUILD_DIR="$TDE_DIR/$CFG_BUILD_DIR/build"
- TDE_DEBS_DIR="$TDE_DIR/$CFG_BUILD_DIR/debs"
+ TDE_BUILD_DIR="$BUILD_DIR/build"
+ TDE_DEBS_DIR="$BUILD_DIR/debs"
+ TDE_TAGS_DIR="$BUILD_DIR/tags"
HOOK_DIR="$TDE_DIR/$CFG_GIT_DIR/$CFG_HOOKS_DIR"
diff --git a/debian/_buildscripts/local/update_repositories.sh b/debian/_buildscripts/local/update_repositories.sh
index 91425f8a7..4e5e4b2e7 100755
--- a/debian/_buildscripts/local/update_repositories.sh
+++ b/debian/_buildscripts/local/update_repositories.sh
@@ -5,35 +5,42 @@
flag_INCREMENTAL="n"
flag_VERBOSE_LOG="n"
flag_SWITCH_ONLY="n"
+flag_SKIP_TAGS="n"
OVERRIDE_DEFAULT_REPO_BRANCH=""
for ((idx=1; idx<=$#; idx++)); do
arg="${!idx}"
- if [ "$arg" = "-i" ]; then # continue from last updated module (Incremental)
- flag_INCREMENTAL="y"
- elif [ "$arg" = "-v" ]; then # display and log git command output (Verbose)
- flag_VERBOSE_LOG="y"
- elif [ "$arg" = "-ub" ]; then # branches to update (Update Branches)
- ((idx++))
- OVERRIDE_UPDATE_BRANCHES="${!idx}"
- [[ -z "$OVERRIDE_DEFAULT_REPO_BRANCH" ]] && OVERRIDE_DEFAULT_REPO_BRANCH="${!idx}"
- elif [ "$arg" = "-db" ]; then # default branch after update (Default Branch)
- ((idx++))
- if [[ "$flag_SWITCH_ONLY" != 'y' ]]; then
- # '-db' is only used if no '-so' argument is specified. If '-so <branch>'
- # is given, '-db <branch> is ignored
- OVERRIDE_DEFAULT_REPO_BRANCH="${!idx}"
- fi
- elif [ "$arg" = "-so" ]; then # switch branch only (Switch Only)
- flag_SWITCH_ONLY="y" && ((idx++))
- OVERRIDE_DEFAULT_REPO_BRANCH="${!idx}"
- fi
+ if [ "$arg" = "-i" ]; then # continue from last updated module (Incremental)
+ flag_INCREMENTAL="y"
+ elif [ "$arg" = "-v" ]; then # display and log git command output (Verbose)
+ flag_VERBOSE_LOG="y"
+ elif [ "$arg" = "-ub" ]; then # branches to update (Update Branches)
+ ((idx++))
+ OVERRIDE_UPDATE_BRANCHES="${!idx}"
+ [[ -z "$OVERRIDE_DEFAULT_REPO_BRANCH" ]] && OVERRIDE_DEFAULT_REPO_BRANCH="${!idx}"
+ elif [ "$arg" = "-db" ]; then # default branch after update (Default Branch)
+ ((idx++))
+ if [[ "$flag_SWITCH_ONLY" != 'y' ]]; then
+ # '-db' is only used if no '-so' argument is specified. If '-so <branch>'
+ # is given, '-db <branch> is ignored
+ OVERRIDE_DEFAULT_REPO_BRANCH="${!idx}"
+ fi
+ elif [ "$arg" = "-so" ]; then # switch branch only (Switch Only)
+ flag_SWITCH_ONLY="y" && ((idx++))
+ if ! [[ "${!idx}" =~ ^- ]]; then
+ OVERRIDE_DEFAULT_REPO_BRANCH="${!idx}"
+ else
+ ((idx--))
+ fi
+ elif [ "$arg" = "-st" ]; then # skip ctags generation (Skip Tags)
+ flag_SKIP_TAGS="y"
+ fi
done
# Load common code
. ./internals/_build_common.sh
init_common
-UPDATE_LOCK_FILENAME="/var/lock/TDE_update_repo_lock" # Lock file for incremental update
+UPDATE_LOCK_FILENAME="/var/lock/TDE_update_repo_lock" # Lock file for incremental update
declare -A RESULT_STRINGS=(
[OK]="[ OK ]"
@@ -58,131 +65,131 @@ declare -A COLOR_STRINGS=(
# $3 - branch to update
function _do_update()
{
- local MOD_PATH=$1
- local OP_TYPE=$2
- local BRANCH=$3
- local RESULT=""
- local LINE_CTRL_SUFFIX=""
-
- case "$OP_TYPE" in
- "fetch")
- if [[ -z `grep "^$BRANCH - $MOD_PATH$" "$UPDATE_LOCK_FILENAME"` ]]; then
- cd "$MOD_PATH" &>/dev/null
- eval git fetch --all --prune $GIT_NO_RECURSE_SUBMODULES $OPT_VERBOSE_LOG
- if [ $? -eq 0 ]; then
- RESULT="OK"
- else
- RESULT="FAIL"
- fi
- echo "$BRANCH - $MOD_PATH" >> "$UPDATE_LOCK_FILENAME"
- else
- RESULT="SKIP"
- fi
- ;;
-
-
- "update")
- cd "$MOD_PATH" &>/dev/null
- if [ $? -eq 0 ]; then
- # Clean up any possible uncommitted changes
- if [[ ! -z "`git status --porcelain $GIT_IGNORE_SUBMODULES`" ]]; then
- git reset --hard HEAD &>/dev/null
- git clean -dxff &>/dev/null
- fi
- # Make sure the local branch exists
- if [[ -z `git branch | grep -E "\b$BRANCH\b"` ]]; then
- eval git checkout -b \"$BRANCH\" \"origin/$BRANCH\" $OPT_VERBOSE_LOG
- else
- eval git checkout \"$BRANCH\" $OPT_VERBOSE_LOG
- fi
- # Make sure the local branch is a tracking branch
- if [[ -z `git config branch."$BRANCH".remote` ]]; then
- git branch -u "origin/$BRANCH" &>/dev/null #$
- git reset --hard "origin/$BRANCH" &>/dev/null
- fi
- # Update
- eval git reset --hard HEAD $OPT_VERBOSE_LOG
- eval git clean -dxff $OPT_VERBOSE_LOG
- if [[ $(git rev-parse HEAD) != $(git rev-parse "origin/$BRANCH") ]]; then
- eval git rebase $OPT_VERBOSE_LOG
- if [[ `git rev-parse HEAD` == `git rev-parse "origin/$BRANCH"` ]]; then
- RESULT="UPDATE"
- else
- RESULT="FAIL"
- fi
- else
- RESULT="OK"
- fi
- else
- RESULT="FAIL"
- fi
- ;;
-
- "switch-to")
- cd "$MOD_PATH" &>/dev/null
- eval git checkout \"$BRANCH\" $OPT_VERBOSE_LOG
- eval git reset --hard HEAD $OPT_VERBOSE_LOG
- eval git clean -dxff $OPT_VERBOSE_LOG
- if [[ ! -z `git branch -v | grep -E "^\*\s+$BRANCH"` ]]; then
- RESULT="OK"
- else
- RESULT="FAIL"
- fi
- ;;
-
- *)
- RESULT="INV-OP"
- ;;
- esac
-
- if [ "$RESULT" != "OK" -o "$flag_VERBOSE_LOG" = "y" ]; then
- LINE_CTRL_SUFFIX="\n"
- fi
- echo -ne "\033[2K\r${COLOR_STRINGS[$RESULT]}${RESULT_STRINGS[$RESULT]} $MOD_PATH${CNone}$LINE_CTRL_SUFFIX"
- echo "${RESULT_STRINGS[$RESULT]} $MOD_PATH" >> "$LOG_UPDATE_REPO_FILENAME"
+ local MOD_PATH=$1
+ local OP_TYPE=$2
+ local BRANCH=$3
+ local RESULT=""
+ local LINE_CTRL_SUFFIX=""
+
+ case "$OP_TYPE" in
+ "fetch")
+ if [[ -z `grep "^$BRANCH - $MOD_PATH$" "$UPDATE_LOCK_FILENAME"` ]]; then
+ cd "$MOD_PATH" &>/dev/null
+ eval git fetch --all --prune $GIT_NO_RECURSE_SUBMODULES $OPT_VERBOSE_LOG
+ if [ $? -eq 0 ]; then
+ RESULT="OK"
+ else
+ RESULT="FAIL"
+ fi
+ echo "$BRANCH - $MOD_PATH" >> "$UPDATE_LOCK_FILENAME"
+ else
+ RESULT="SKIP"
+ fi
+ ;;
+
+
+ "update")
+ cd "$MOD_PATH" &>/dev/null
+ if [ $? -eq 0 ]; then
+ # Clean up any possible uncommitted changes
+ if [[ ! -z "`git status --porcelain $GIT_IGNORE_SUBMODULES`" ]]; then
+ git reset --hard HEAD &>/dev/null
+ git clean -dxff &>/dev/null
+ fi
+ # Make sure the local branch exists
+ if [[ -z `git branch | grep -E "\b$BRANCH\b"` ]]; then
+ eval git checkout -b \"$BRANCH\" \"origin/$BRANCH\" $OPT_VERBOSE_LOG
+ else
+ eval git checkout \"$BRANCH\" $OPT_VERBOSE_LOG
+ fi
+ # Make sure the local branch is a tracking branch
+ if [[ -z `git config branch."$BRANCH".remote` ]]; then
+ git branch -u "origin/$BRANCH" &>/dev/null #$
+ git reset --hard "origin/$BRANCH" &>/dev/null
+ fi
+ # Update
+ eval git reset --hard HEAD $OPT_VERBOSE_LOG
+ eval git clean -dxff $OPT_VERBOSE_LOG
+ if [[ $(git rev-parse HEAD) != $(git rev-parse "origin/$BRANCH") ]]; then
+ eval git rebase $OPT_VERBOSE_LOG
+ if [[ `git rev-parse HEAD` == `git rev-parse "origin/$BRANCH"` ]]; then
+ RESULT="UPDATE"
+ else
+ RESULT="FAIL"
+ fi
+ else
+ RESULT="OK"
+ fi
+ else
+ RESULT="FAIL"
+ fi
+ ;;
+
+ "switch-to")
+ cd "$MOD_PATH" &>/dev/null
+ eval git checkout \"$BRANCH\" $OPT_VERBOSE_LOG
+ eval git reset --hard HEAD $OPT_VERBOSE_LOG
+ eval git clean -dxff $OPT_VERBOSE_LOG
+ if [[ ! -z `git branch -v | grep -E "^\*\s+$BRANCH"` ]]; then
+ RESULT="OK"
+ else
+ RESULT="FAIL"
+ fi
+ ;;
+
+ *)
+ RESULT="INV-OP"
+ ;;
+ esac
+
+ if [ "$RESULT" != "OK" -o "$flag_VERBOSE_LOG" = "y" ]; then
+ LINE_CTRL_SUFFIX="\n"
+ fi
+ echo -ne "\033[2K\r${COLOR_STRINGS[$RESULT]}${RESULT_STRINGS[$RESULT]} $MOD_PATH${CNone}$LINE_CTRL_SUFFIX"
+ echo "${RESULT_STRINGS[$RESULT]} $MOD_PATH" >> "$LOG_UPDATE_REPO_FILENAME"
}
#----------------------------
# Update a given module and all submodules from the upstream repo
# Parameters:
# $1 - module folder
-# $2 - operation type
+# $2 - operation type
# $3 - branch to update
function _update_module()
{
- local MOD_PATH=$1
- local OP_TYPE=$2
- local BRANCH=$3
-
- # Current module
- _do_update "$@"
+ local MOD_PATH=$1
+ local OP_TYPE=$2
+ local BRANCH=$3
+
+ # Current module
+ _do_update "$@"
# Submodules
local SUBMOD_LIST="$MOD_PATH/.gitmodules"
- if [[ -e "$SUBMOD_LIST" ]]; then
- sed -n "s|^\[submodule \"\([^\"]*\)\"\]$|\1|p" <$SUBMOD_LIST |\
- while read -r SUBMOD_PATH; do
- cd "$MOD_PATH" &>/dev/null
- if [[ -z "`git config --get submodule.$SUBMOD_PATH.url`" ]]; then
- eval git submodule init -- \"$SUBMOD_PATH\" $OPT_VERBOSE_LOG
- fi
- if [[ ! -e "$MOD_PATH/$SUBMOD_PATH/.git" ]]; then
- eval git submodule update -- \"$SUBMOD_PATH\" $OPT_VERBOSE_LOG
- fi
- _update_module "$MOD_PATH/$SUBMOD_PATH" "$OP_TYPE" "$BRANCH"
- done
- fi
+ if [[ -e "$SUBMOD_LIST" ]]; then
+ sed -n "s|^\[submodule \"\([^\"]*\)\"\]$|\1|p" <$SUBMOD_LIST |\
+ while read -r SUBMOD_PATH; do
+ cd "$MOD_PATH" &>/dev/null
+ if [[ -z "`git config --get submodule.$SUBMOD_PATH.url`" ]]; then
+ eval git submodule init -- \"$SUBMOD_PATH\" $OPT_VERBOSE_LOG
+ fi
+ if [[ ! -e "$MOD_PATH/$SUBMOD_PATH/.git" ]]; then
+ eval git submodule update -- \"$SUBMOD_PATH\" $OPT_VERBOSE_LOG
+ fi
+ _update_module "$MOD_PATH/$SUBMOD_PATH" "$OP_TYPE" "$BRANCH"
+ done
+ fi
}
#----------------------------
if [ "$flag_INCREMENTAL" = "y" ]; then
[ ! -f "$UPDATE_LOCK_FILENAME" ] && flag_INCREMENTAL="n"
else
- [ -f "$UPDATE_LOCK_FILENAME" ] && rm "$UPDATE_LOCK_FILENAME"
+ [ -f "$UPDATE_LOCK_FILENAME" ] && rm "$UPDATE_LOCK_FILENAME"
fi
OPT_VERBOSE_LOG="&>/dev/null"
if [[ "$flag_VERBOSE_LOG" = "y" ]]; then
- OPT_VERBOSE_LOG=" |& tee -a \"$LOG_UPDATE_REPO_FILENAME\""
+ OPT_VERBOSE_LOG=" |& tee -a \"$LOG_UPDATE_REPO_FILENAME\""
fi
#----------------------------
@@ -198,50 +205,70 @@ fi
# Start update
if [ "$flag_INCREMENTAL" != "y" ]; then
- echo "TDE repositories update started" > "$UPDATE_LOCK_FILENAME"
+ echo "TDE repositories update started" > "$UPDATE_LOCK_FILENAME"
fi
_LAST_BRANCH=""
if [[ "$flag_SWITCH_ONLY" != "y" ]]; then
- # Fetch all remotes first
- echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME" "y"
- echo_and_tee "${CLightCyan} Fetching remotes ${CNone}" "$LOG_UPDATE_REPO_FILENAME"
- echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME"
-
- # Fetch TDE main repository
- _update_module "$REPO_TDE" "fetch"
-
- echo -e "\033[2K"
- echo "" >> "$LOG_UPDATE_REPO_FILENAME"
-
- # Branch update
- for branch in "${BRANCHES[@]}"; do
- _LAST_BRANCH="$branch"
- echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME"
- echo_and_tee "${CLightCyan} Updating branch ${CYellow}$branch ${CNone}" "$LOG_UPDATE_REPO_FILENAME"
- echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME"
-
- # Update TDE main repository
- _update_module "$REPO_TDE" "update" "$branch"
-
- echo -e "\033[2K"
- echo "" >> "$LOG_UPDATE_REPO_FILENAME"
- done
+ # Update extra dependency repository
+ if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
+ echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME" "y"
+ echo_and_tee "${CLightCyan} Fetching extra dependencies ${CNone}" "$LOG_UPDATE_REPO_FILENAME"
+ echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME"
+
+ # Fetch TDE extra dependency repository
+ _update_module "$REPO_EXTRA_DEPENDENCIES" "fetch"
+ _update_module "$REPO_EXTRA_DEPENDENCIES" "update" "master"
+
+ echo -e "\033[2K"
+ echo "" >> "$LOG_UPDATE_REPO_FILENAME"
+ fi
+
+ # Fetch all remotes first
+ echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME" "y"
+ echo_and_tee "${CLightCyan} Fetching remotes ${CNone}" "$LOG_UPDATE_REPO_FILENAME"
+ echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME"
+
+ # Fetch TDE main repository
+ _update_module "$REPO_TDE" "fetch"
+
+ echo -e "\033[2K"
+ echo "" >> "$LOG_UPDATE_REPO_FILENAME"
+
+ # Branch update
+ for branch in "${BRANCHES[@]}"; do
+ _LAST_BRANCH="$branch"
+ echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME"
+ echo_and_tee "${CLightCyan} Updating branch ${CYellow}$branch ${CNone}" "$LOG_UPDATE_REPO_FILENAME"
+ echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME"
+
+ # Update TDE main repository
+ _update_module "$REPO_TDE" "update" "$branch"
+
+ echo -e "\033[2K"
+ echo "" >> "$LOG_UPDATE_REPO_FILENAME"
+ done
fi
# Switch to specified branch if necessary
if [[ "$DEFAULT_REPO_BRANCH" != "$_LAST_BRANCH" ]]; then
- echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME" "$flag_SWITCH_ONLY"
- echo_and_tee "${CLightCyan} Switching to branch ${CYellow}$DEFAULT_REPO_BRANCH ${CNone}" "$LOG_UPDATE_REPO_FILENAME"
- echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME"
-
- # Switch TDE main repository
- _update_module "$REPO_TDE" "switch-to" "$DEFAULT_REPO_BRANCH"
-
- echo -e "\033[2K"
- echo "" >> "$LOG_UPDATE_REPO_FILENAME"
+ echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME" "$flag_SWITCH_ONLY"
+ echo_and_tee "${CLightCyan} Switching to branch ${CYellow}$DEFAULT_REPO_BRANCH ${CNone}" "$LOG_UPDATE_REPO_FILENAME"
+ echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME"
+
+ # Switch TDE main repository
+ _update_module "$REPO_TDE" "switch-to" "$DEFAULT_REPO_BRANCH"
+
+ echo -e "\033[2K"
+ echo "" >> "$LOG_UPDATE_REPO_FILENAME"
fi
# Update completed
[ -f "$UPDATE_LOCK_FILENAME" ] && rm "$UPDATE_LOCK_FILENAME"
cd $SCRIPT_DIR
+
+# Generate ctags
+if [ "$flag_SKIP_TAGS" != "y" ]; then
+ $SCRIPT_DIR/generate_tags.sh
+fi
+
diff --git a/dilos/dependencies/tqt3/debian/rules b/dilos/dependencies/tqt3/debian/rules
index 228582b63..d89739167 100755
--- a/dilos/dependencies/tqt3/debian/rules
+++ b/dilos/dependencies/tqt3/debian/rules
@@ -35,6 +35,8 @@ P_APPSDEV = $(DEBIAN)/tqt3-apps-dev
P_HEADERS = $(DEBIAN)/libtqt3-headers
P_QTMTDEV = $(DEBIAN)/libtqt3-mt-dev
+RPC_INCLUDES = $(if $(wildcard /usr/include/tirpc),-I/usr/include/tirpc,)
+
TMP_INSTALL = $(DEBIAN)/tmp-install
CONFIGURE_OPTS = \
@@ -94,6 +96,8 @@ CONFIGURE_OPTS = \
-I/usr/include/freetype2 \
-I`pg_config --includedir` \
-I`pg_config --includedir-server` \
+ $(RPC_INCLUDES) \
+ \
-L/usr/lib/$(DEB_HOST_MULTIARCH)\
\
-lfontconfig \
diff --git a/dilos/tdeaddons/debian/control b/dilos/tdeaddons/debian/control
index 5c5373b84..6bd19456f 100644
--- a/dilos/tdeaddons/debian/control
+++ b/dilos/tdeaddons/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev [!solaris-any], cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, autotools-dev, gawk, 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, automake, autoconf, libtool, libltdl-dev, libiconv-dev [solaris-any]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, gawk, 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]
Standards-Version: 3.8.4
Package: tdeaddons-trinity
diff --git a/dilos/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff b/dilos/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/dilos/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/dilos/tdeaddons/debian/patches/common/06_disable_no_undefined.diff b/dilos/tdeaddons/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/dilos/tdeaddons/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/dilos/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/dilos/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 28c95742b..000000000
--- a/dilos/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/usr/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/dilos/tdeaddons/debian/patches/series b/dilos/tdeaddons/debian/patches/series
index 6b3ddc8ec..e69de29bb 100644
--- a/dilos/tdeaddons/debian/patches/series
+++ b/dilos/tdeaddons/debian/patches/series
@@ -1,3 +0,0 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
diff --git a/dilos/tdebase/debian/control b/dilos/tdebase/debian/control
index fced6828e..2d8140bd0 100644
--- a/dilos/tdebase/debian/control
+++ b/dilos/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev [!solaris-any], cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, autotools-dev, gawk, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-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, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, 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~), libtool, libltdl-dev, libssl-dev, libcpp [solaris-any]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, gawk, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-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, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, sharutils, 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, libcpp [solaris-any]
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.8.4
diff --git a/dilos/tdegames/debian/control b/dilos/tdegames/debian/control
index df125d9a7..ae2b83c9e 100644
--- a/dilos/tdegames/debian/control
+++ b/dilos/tdegames/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev [!solaris-any], cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, autotools-dev, gawk, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, gawk, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, sharutils, bzip2, sharutils, libogg-dev
Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc
Standards-Version: 3.8.4
diff --git a/dilos/tdegames/debian/libtdegames-trinity-dev.install b/dilos/tdegames/debian/libtdegames-trinity-dev.install
index d3ae290d8..91ca950b2 100644
--- a/dilos/tdegames/debian/libtdegames-trinity-dev.install
+++ b/dilos/tdegames/debian/libtdegames-trinity-dev.install
@@ -2,3 +2,4 @@
/usr/include/kgame
/usr/lib/*/libtdegames.so
/usr/lib/*/libtdegames.la
+/usr/lib/*/pkgconfig/libtdegames.pc
diff --git a/dilos/tdegames/debian/patches/common/04_am_maintainer_mode.diff b/dilos/tdegames/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/dilos/tdegames/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/dilos/tdegames/debian/patches/common/06_disable_no_undefined.diff b/dilos/tdegames/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/dilos/tdegames/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/dilos/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/dilos/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 28c95742b..000000000
--- a/dilos/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/usr/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/dilos/tdegames/debian/patches/series b/dilos/tdegames/debian/patches/series
index 6b3ddc8ec..e69de29bb 100644
--- a/dilos/tdegames/debian/patches/series
+++ b/dilos/tdegames/debian/patches/series
@@ -1,3 +0,0 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
diff --git a/dilos/tdelibs/debian/control b/dilos/tdelibs/debian/control
index 34936fa0a..791a66c8b 100644
--- a/dilos/tdelibs/debian/control
+++ b/dilos/tdelibs/debian/control
@@ -45,7 +45,7 @@ Section: libs
Architecture: all
Replaces: kdelibs-data-trinity (<< 4:14.0.0~)
Breaks: kdelibs-data-trinity (<< 4:14.0.0~)
-Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~), klinkstatus-trinity (<< 4:14.0.9~)
Depends: hicolor-icon-theme
Provides: tdelibs-data
Description: core shared data for all TDE applications
diff --git a/dilos/tdelibs/debian/tdelibs-data-trinity.install b/dilos/tdelibs/debian/tdelibs-data-trinity.install
index b4ca1ffe3..0abd36eb0 100644
--- a/dilos/tdelibs/debian/tdelibs-data-trinity.install
+++ b/dilos/tdelibs/debian/tdelibs-data-trinity.install
@@ -224,16 +224,6 @@ debian/tmp/usr/share/apps/tdewidgets/pics/kurlrequester.png
debian/tmp/usr/share/apps/tdehtml/css/html4.css
debian/tmp/usr/share/apps/tdehtml/css/quirks.css
debian/tmp/usr/share/apps/tdehtml/domain_info
-debian/tmp/usr/share/apps/tdehtml/icons/crystalsvg/128x128/actions/bug.png
-debian/tmp/usr/share/apps/tdehtml/icons/crystalsvg/16x16/actions/bug.png
-debian/tmp/usr/share/apps/tdehtml/icons/crystalsvg/16x16/actions/images_display.png
-debian/tmp/usr/share/apps/tdehtml/icons/crystalsvg/16x16/actions/wallet_open.png
-debian/tmp/usr/share/apps/tdehtml/icons/crystalsvg/22x22/actions/bug.png
-debian/tmp/usr/share/apps/tdehtml/icons/crystalsvg/22x22/actions/images_display.png
-debian/tmp/usr/share/apps/tdehtml/icons/crystalsvg/32x32/actions/bug.png
-debian/tmp/usr/share/apps/tdehtml/icons/crystalsvg/32x32/actions/images_display.png
-debian/tmp/usr/share/apps/tdehtml/icons/crystalsvg/48x48/actions/bug.png
-debian/tmp/usr/share/apps/tdehtml/icons/crystalsvg/64x64/actions/bug.png
debian/tmp/usr/share/apps/tdehtml/tdehtml_browser.rc
debian/tmp/usr/share/apps/tdehtml/tdehtml_popupmenu.rc
debian/tmp/usr/share/apps/tdehtml/tdehtml.rc
@@ -1907,7 +1897,6 @@ debian/tmp/usr/share/services/tderesources/tdeabc/file.desktop
debian/tmp/usr/share/services/tderesources/tdeabc/net.desktop
debian/tmp/usr/share/services/tderesources/tdeabc/ldaptdeio.desktop
debian/tmp/usr/share/services/tderesources/tdeabc_manager.desktop
-
debian/tmp/usr/share/services/tdespell_aspell.desktop
debian/tmp/usr/share/services/tdespell_hspell.desktop
debian/tmp/usr/share/services/tdespell_ispell.desktop
diff --git a/dilos/tdenetwork/debian/control b/dilos/tdenetwork/debian/control
index f7103eb69..52e8e1b3a 100644
--- a/dilos/tdenetwork/debian/control
+++ b/dilos/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev [!solaris-any], cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, 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, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel !solaris-any], libxxf86vm-dev, libv4l-dev [!solaris-any], automake, autoconf, libtool, libltdl-dev, libssl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, docbook-to-man, doxygen, gawk, 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, sharutils, valgrind [!armel !mips !mipsel !solaris-any], libxxf86vm-dev, libv4l-dev [!solaris-any], libssl-dev
Standards-Version: 3.8.4
Package: tdenetwork-trinity
diff --git a/dilos/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff b/dilos/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/dilos/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/dilos/tdenetwork/debian/patches/common/06_disable_no_undefined.diff b/dilos/tdenetwork/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/dilos/tdenetwork/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/dilos/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/dilos/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 28c95742b..000000000
--- a/dilos/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/usr/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/dilos/tdenetwork/debian/patches/series b/dilos/tdenetwork/debian/patches/series
index 8e96568f3..c77ae3ebe 100644
--- a/dilos/tdenetwork/debian/patches/series
+++ b/dilos/tdenetwork/debian/patches/series
@@ -1,4 +1 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
dilos.patch
diff --git a/dilos/tdepim/debian/control b/dilos/tdepim/debian/control
index a7f8cb3cb..5f368118d 100644
--- a/dilos/tdepim/debian/control
+++ b/dilos/tdepim/debian/control
@@ -4,15 +4,14 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev [!solaris-any], cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt,
- cdparanoia, gawk, tdelibs14-trinity-dev, bison, byacc, bzip2,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool,
+ gawk, tdelibs14-trinity-dev, bison, byacc, bzip2,
flex, groff-base, libogg-dev,
libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~),
libreadline-dev | libreadline6-dev | libreadline5-dev, libsasl2-dev, libssl-dev,
libxpm-dev, libxss-dev, sharutils, 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,
- cmake, libtool, libltdl-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-Conflicts: libkleopatra0-trinity-dev
Standards-Version: 3.8.4
diff --git a/dilos/tdesdk/debian/control b/dilos/tdesdk/debian/control
index a9d2f7454..438378641 100644
--- a/dilos/tdesdk/debian/control
+++ b/dilos/tdesdk/debian/control
@@ -4,12 +4,12 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev [!solaris-any], cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, autotools-dev, gawk,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, gawk,
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~),
- automake, autoconf, libtool, libltdl-dev, libiconv-dev [solaris-any]
+ libiconv-dev [solaris-any]
Standards-Version: 3.8.4
Package: tdesdk-trinity
diff --git a/dilos/tdesdk/debian/patches/common/04_am_maintainer_mode.diff b/dilos/tdesdk/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/dilos/tdesdk/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/dilos/tdesdk/debian/patches/common/06_disable_no_undefined.diff b/dilos/tdesdk/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/dilos/tdesdk/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/dilos/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/dilos/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 28c95742b..000000000
--- a/dilos/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/usr/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/dilos/tdesdk/debian/patches/series b/dilos/tdesdk/debian/patches/series
index 8e96568f3..c77ae3ebe 100644
--- a/dilos/tdesdk/debian/patches/series
+++ b/dilos/tdesdk/debian/patches/series
@@ -1,4 +1 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
dilos.patch
diff --git a/dilos/tdevelop/debian/control b/dilos/tdevelop/debian/control
index b878d9ba0..6bab2462b 100644
--- a/dilos/tdevelop/debian/control
+++ b/dilos/tdevelop/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev
Standards-Version: 3.8.4
Package: tdevelop-trinity
diff --git a/dilos/tdevelop/debian/patches/common/04_am_maintainer_mode.diff b/dilos/tdevelop/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/dilos/tdevelop/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/dilos/tdevelop/debian/patches/common/06_disable_no_undefined.diff b/dilos/tdevelop/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/dilos/tdevelop/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/dilos/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/dilos/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 28c95742b..000000000
--- a/dilos/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/usr/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/dilos/tdevelop/debian/patches/series b/dilos/tdevelop/debian/patches/series
index 6b3ddc8ec..e69de29bb 100644
--- a/dilos/tdevelop/debian/patches/series
+++ b/dilos/tdevelop/debian/patches/series
@@ -1,3 +0,0 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/_base/applications/desktop-effects-tde/debian/control b/ubuntu/_base/applications/desktop-effects-tde/debian/control
index 2d813ffa6..b62dd6b6a 100644
--- a/ubuntu/_base/applications/desktop-effects-tde/debian/control
+++ b/ubuntu/_base/applications/desktop-effects-tde/debian/control
@@ -2,7 +2,7 @@ Source: desktop-effects-tde-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 9~), python-support (>= 0.6) | python-all-dev
+Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 9~), python-support (>= 0.6) | dh-python, python-all-dev
Standards-Version: 3.8.4
XS-Python-Version: all
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..24191b2cd
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk
@@ -0,0 +1,227 @@
+# -*- 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
+
+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
+
+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" -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),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+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/kaffeine-mozilla/debian/cdbs/versions.pl b/ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/control b/ubuntu/_base/applications/kaffeine-mozilla/debian/control
index 857fcda38..40ddf44db 100644
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/control
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Riku Voipio <riku.voipio@iki.fi>
-Build-Depends: debhelper (>= 9~), pkg-config, libxaw7-dev, libnspr4-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, pkg-config, libxaw7-dev, libnspr4-dev
Standards-Version: 3.8.4
Package: kaffeine-mozilla-trinity
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install b/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install
deleted file mode 100644
index 30f14a91f..000000000
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kaffeine-mozilla/usr/lib/mozilla/plugins/kaffeineplugin.la
-debian/kaffeine-mozilla/usr/lib/mozilla/plugins/kaffeineplugin.so
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links b/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links
deleted file mode 100644
index 372fe38d5..000000000
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/mozilla/plugins/kaffeineplugin.so /usr/lib/mozilla-firefox/plugins/kaffeineplugin.so
-/usr/lib/mozilla/plugins/kaffeineplugin.so /usr/lib/mozilla-snapshot/plugins/kaffeineplugin.so
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/patches/series b/ubuntu/_base/applications/kaffeine-mozilla/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/patches/series
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/rules b/ubuntu/_base/applications/kaffeine-mozilla/debian/rules
index 228818f36..1e2d330b9 100755
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/rules
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/rules
@@ -1,196 +1,15 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-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)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-config.status:
- dh_testdir
-
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh ltmain.sh
-endif
-
- aclocal
- autoconf
- automake --add-missing
-
- # Apply Debian specific patches
- if test -d $(CURDIR)/debian/patches ;\
- then \
- for i in $(CURDIR)/debian/patches/*.diff.uu ;\
- do \
- cd $(CURDIR)/debian/patches ;\
- uudecode "$$i" ;\
- cd $(CURDIR) ;\
- done ;\
- patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort);\
- fi ;\
- if test ! -f patch-stamp; then \
- for patch in $$patches ;\
- do \
- echo APPLYING PATCH\: "$${patch##*/}" ;\
- patch -p1 < "$$patch" ;\
- done ;\
- touch patch-stamp ;\
- fi
-
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- #/usr/bin/docbook-to-man debian/kaffeine-mozilla.sgml > kaffeine-mozilla.1
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
-
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh ltmain.sh
-endif
-
- aclocal
- automake --add-missing
-
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
-
- # Remove Debian specific patches
- if test -d $(CURDIR)/debian/patches ;\
- then \
- patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort -r);\
- fi ;\
- if test -f patch-stamp; then \
- for patch in $$patches ;\
- do \
- echo REMOVING PATCH\: "$${patch##*/}" ;\
- patch -p1 -R < "$$patch" ;\
- done ;\
- for i in $(CURDIR)/debian/patches/*.diff.uu ;\
- do \
- rm -f "$${i%%.uu}" ;\
- done ;\
- rm -f patch-stamp ;\
- fi
-
- -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/kaffeine-mozilla.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kaffeine-mozilla-trinity
-
- mkdir -p debian/kaffeine-mozilla-trinity/opt/trinity/lib/mozilla/ && \
- mv -f debian/kaffeine-mozilla-trinity/opt/trinity/plugins/ \
- debian/kaffeine-mozilla-trinity/opt/trinity/lib/mozilla/
- mkdir -p debian/kaffeine-mozilla-trinity/usr/lib/mozilla/plugins/
- mv debian/kaffeine-mozilla-trinity/opt/trinity/lib/mozilla/plugins/kaffeineplugin.so debian/kaffeine-mozilla-trinity/usr/lib/mozilla/plugins/kaffeineplugin-trinity.so
- mv debian/kaffeine-mozilla-trinity/opt/trinity/lib/mozilla/plugins/kaffeineplugin.la debian/kaffeine-mozilla-trinity/usr/lib/mozilla/plugins/kaffeineplugin-trinity.la
- mv debian/kaffeine-mozilla-trinity/opt/trinity/lib/mozilla/plugins/kaffeineplugin.a debian/kaffeine-mozilla-trinity/usr/lib/mozilla/plugins/kaffeineplugin-trinity.a
- rm -rf debian/kaffeine-mozilla-trinity/opt
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs -V
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+DEB_CMAKE_EXTRA_FLAGS := \
+ -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/kdpkg/debian/control b/ubuntu/_base/applications/kdpkg/debian/control
index 6df551489..7e34286f0 100644
--- a/ubuntu/_base/applications/kdpkg/debian/control
+++ b/ubuntu/_base/applications/kdpkg/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Alexander Kopf <kopf-alexander@gmx.de>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: kdpkg-trinity
diff --git a/ubuntu/_base/applications/keep/debian/control b/ubuntu/_base/applications/keep/debian/control
index abe126a05..d9d28de32 100644
--- a/ubuntu/_base/applications/keep/debian/control
+++ b/ubuntu/_base/applications/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: keep-trinity
diff --git a/ubuntu/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff
deleted file mode 100644
index 696f9093c..000000000
--- a/ubuntu/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh
---- keep-0.4.0/admin/cvs.sh 2006-09-23 01:51:35.000000000 +0200
-+++ keep-0.4.0.new/admin/cvs.sh 2006-12-05 16:29:23.000000000 +0100
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/usr/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,7 +556,6 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi
diff --git a/ubuntu/_base/applications/keep/debian/patches/series b/ubuntu/_base/applications/keep/debian/patches/series
index 9ccf4a125..e69de29bb 100644
--- a/ubuntu/_base/applications/keep/debian/patches/series
+++ b/ubuntu/_base/applications/keep/debian/patches/series
@@ -1 +0,0 @@
-kubuntu_01_kdepot.diff
diff --git a/ubuntu/_base/applications/kima/debian/control b/ubuntu/_base/applications/kima/debian/control
index 99c9f47fc..ad1a1a500 100644
--- a/ubuntu/_base/applications/kima/debian/control
+++ b/ubuntu/_base/applications/kima/debian/control
@@ -2,7 +2,7 @@ Source: kima-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev,
libxnvctrl-dev [amd64 i386] | nvidia-settings [amd64 i386]
Standards-Version: 3.8.4
diff --git a/ubuntu/_base/applications/kima/debian/docs b/ubuntu/_base/applications/kima/debian/docs
index ca0272abf..1a4f0317f 100644
--- a/ubuntu/_base/applications/kima/debian/docs
+++ b/ubuntu/_base/applications/kima/debian/docs
@@ -1,3 +1,4 @@
AUTHORS
+FAQ
README
TODO
diff --git a/ubuntu/_base/applications/ksystemlog/debian/control b/ubuntu/_base/applications/ksystemlog/debian/control
index 6ee35e09f..2871da2f4 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/control
+++ b/ubuntu/_base/applications/ksystemlog/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: ksystemlog-trinity
diff --git a/ubuntu/_base/applications/ksystemlog/debian/ksystemlog.xml b/ubuntu/_base/applications/ksystemlog/debian/ksystemlog.xml
deleted file mode 100644
index 3261e6bf7..000000000
--- a/ubuntu/_base/applications/ksystemlog/debian/ksystemlog.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
- <refentryinfo>
- <author>
- <firstname>Riddell</firstname>
- <surname>Jonathan</surname>
- <email>jriddell@ubuntu.com</email>
- </author>
- <copyright>
- <year>2005</year>
- <holder>Jonathan Riddell</holder>
- </copyright>
- <!-- XXX IMPORTANT XXX -->
- <!-- Keep this date up to date: -->
- <date>2005-07-28</date>
- <!-- ^^^^^^^^^^ -->
- </refentryinfo>
- <refmeta>
- <refentrytitle>ksystemlog</refentrytitle>
- <manvolnum>1</manvolnum>
- </refmeta>
- <refnamediv>
- <refname>ksystemlog</refname>
- <refpurpose>A System Log Viewer</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>ksystemlog</command>
- <arg choice="opt">
- <option><replaceable>Qt-options</replaceable></option>
- </arg>
- <arg choice="opt">
- <option><replaceable>TDE-options</replaceable></option>
- </arg>
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- KSystemLog is an application to view system logs.
- </para>
- </refsect1>
- <refsect1>
- <title>OPTIONS</title>
- <para>
- All <productname>TDE</productname> and <productname>Qt</productname>
- programs accept a some common command-line options. KSystemLog has no
- application-specific options.
- </para>
- <para>
- <variablelist>
- <title>Generic options:</title>
- <varlistentry>
- <term> <option>--help</option> </term>
- <listitem> <para>Show help about options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-qt</option> </term>
- <listitem> <para>Show Qt specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-tde</option> </term>
- <listitem> <para>Show TDE specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-all</option> </term>
- <listitem> <para>Show all options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--author</option> </term>
- <listitem> <para>Show author information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>-v</option>, <option>--version</option> </term>
- <listitem> <para>Show version information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--license</option> </term>
- <listitem> <para>Show license information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--</option> </term>
- <listitem> <para>Indicates end of options</para> </listitem>
- </varlistentry>
- </variablelist>
- <!-- TODO * add all the rest of the options, but maybe find an automated
- way to keep it up to date -->
- </para>
- </refsect1>
- <refsect1>
- <title>COPYRIGHT</title>
- <para>
- This manual page was written by Jonathan Riddell
- <email>jriddell@ubuntu.com</email> for the
- <productname>Ubuntu</productname> 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>
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in
- <filename>/usr/share/common-licenses/GPL</filename>.
- </para>
- </refsect1>
-</refentry>
diff --git a/ubuntu/_base/applications/ksystemlog/debian/rules b/ubuntu/_base/applications/ksystemlog/debian/rules
index 4f6505558..18aa16b96 100755
--- a/ubuntu/_base/applications/ksystemlog/debian/rules
+++ b/ubuntu/_base/applications/ksystemlog/debian/rules
@@ -1,47 +1,19 @@
#!/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)
-
-DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
-
-build/ksystemlog-trinity::
- /usr/bin/docbook2x-man debian/ksystemlog.xml
-
-binary-install/ksystemlog-trinity::
- mv debian/ksystemlog-trinity/usr/share/man debian/ksystemlog-trinity/opt/trinity/share/
-
-binary-post-install/ksystemlog-trinity::
- rm -rf debian/ksystemlog/opt/trinity/share/applnk/
-
-clean::
- rm -f ksystemlog.1
+DEB_CMAKE_EXTRA_FLAGS := \
+ -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/ksystemlog/debian/watch b/ubuntu/_base/applications/ksystemlog/debian/watch
deleted file mode 100644
index b15cf467b..000000000
--- a/ubuntu/_base/applications/ksystemlog/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://ksystemlog.forum-software.org/archives/src/ksystemlog-(.*)\.tar\.bz2 debian svn-upgrade
diff --git a/ubuntu/_base/applications/mathemagics/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/mathemagics/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..24191b2cd
--- /dev/null
+++ b/ubuntu/_base/applications/mathemagics/debian/cdbs/debian-tde.mk
@@ -0,0 +1,227 @@
+# -*- 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
+
+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
+
+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" -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),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+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/mathemagics/debian/cdbs/versions.pl b/ubuntu/_base/applications/mathemagics/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/mathemagics/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/mathemagics/debian/changelog b/ubuntu/_base/applications/mathemagics/debian/changelog
new file mode 100644
index 000000000..590a849e0
--- /dev/null
+++ b/ubuntu/_base/applications/mathemagics/debian/changelog
@@ -0,0 +1,5 @@
+mathemagics-trinity (1.1-0) buster; urgency=low
+
+ * Initial Release for TDE.
+
+ -- Slávek Banko <slavek.banko@axis.cz> Sun, 10 Aug 2020 23:32:23 +0200
diff --git a/ubuntu/_base/applications/mathemagics/debian/compat b/ubuntu/_base/applications/mathemagics/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/mathemagics/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/mathemagics/debian/control b/ubuntu/_base/applications/mathemagics/debian/control
new file mode 100644
index 000000000..671e69dad
--- /dev/null
+++ b/ubuntu/_base/applications/mathemagics/debian/control
@@ -0,0 +1,14 @@
+Source: mathemagics-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
+
+Package: mathemagics-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A RPN scientific calculator for TDE
+ Mathemagics makes use of the Reverse Polish Notation or RPN.
+ Mathemagics can store and use user-defined functions and variables,
+ It comes with large number of built-in functions as well.
diff --git a/ubuntu/_base/applications/mathemagics/debian/copyright b/ubuntu/_base/applications/mathemagics/debian/copyright
new file mode 100644
index 000000000..b04d202a4
--- /dev/null
+++ b/ubuntu/_base/applications/mathemagics/debian/copyright
@@ -0,0 +1,12 @@
+This package was debianized by Slávek Banko <slavek.banko@axis.cz> on
+Sun, 10 Aug 2020 23:32:23 +0200.
+
+Upstream Author: Jason Katz-Brown <jason@katzbrown.com>
+
+mathemagics 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 of the License, or
+(at your option) any later version.
+
+On Debian systems, the full text of GNU's GPL can be found in
+/usr/share/common-licenses/GPL-2
diff --git a/ubuntu/_base/applications/mathemagics/debian/docs b/ubuntu/_base/applications/mathemagics/debian/docs
new file mode 100644
index 000000000..6f12db508
--- /dev/null
+++ b/ubuntu/_base/applications/mathemagics/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/ubuntu/_base/applications/mathemagics/debian/patches/series b/ubuntu/_base/applications/mathemagics/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/mathemagics/debian/patches/series
diff --git a/ubuntu/_base/applications/mathemagics/debian/rules b/ubuntu/_base/applications/mathemagics/debian/rules
new file mode 100755
index 000000000..18aa16b96
--- /dev/null
+++ b/ubuntu/_base/applications/mathemagics/debian/rules
@@ -0,0 +1,19 @@
+#!/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_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -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/mathemagics/debian/source/format b/ubuntu/_base/applications/mathemagics/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/mathemagics/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/mathemagics/debian/source/options b/ubuntu/_base/applications/mathemagics/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/mathemagics/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/bab-trinity.1 b/ubuntu/_base/applications/tde-style-baghira/debian/bab-trinity.1
deleted file mode 100644
index c88691405..000000000
--- a/ubuntu/_base/applications/tde-style-baghira/debian/bab-trinity.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\" Author: Jose Luis Tallon <jltallon@adv-solutions.net>
-.\"
-.\" This is free software; you may 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 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 the Debian GNU/Linux system; if not, write to the Free
-.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-.\" 02111-1307 USA
-.TH bab "1" "October 2004"
-.SH NAME
-bab \- Baghira's config tray applet
-.SH SYNOPSIS
-bab
-.SH DESCRIPTION
-.B bab
-is a simple systray application, which enables you to dinamically
-change some aspects of Baghira's configuration without accesing
-Trinity Control Center
-.PP
-Complete documentation can be found in docbook format in
-/opt/trinity/share/doc/kde/HTML/<lang>/baghira/ on this system.
-.SH AUTHOR
- Thomas L\[:u]bking <baghira-style@users.sourceforge.net>
-.PP
-This manual page was written by Jose Luis Tallon
-.nh
-<jltallon@adv\-solutions.net>
-for the \fBDebian\fP system (but may be used by others).
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/control b/ubuntu/_base/applications/tde-style-baghira/debian/control
index 46f2a54ef..ad7abf025 100644
--- a/ubuntu/_base/applications/tde-style-baghira/debian/control
+++ b/ubuntu/_base/applications/tde-style-baghira/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, automake, libtool, tdebase-trinity-dev, libxtst-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdebase-trinity-dev, libxtst-dev
Standards-Version: 3.8.0
Package: tde-style-baghira-trinity
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/rules b/ubuntu/_base/applications/tde-style-baghira/debian/rules
index 2aebaac7b..18aa16b96 100755
--- a/ubuntu/_base/applications/tde-style-baghira/debian/rules
+++ b/ubuntu/_base/applications/tde-style-baghira/debian/rules
@@ -1,12 +1,19 @@
#!/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
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -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/tde-style-baghira/debian/tde-style-baghira-trinity.manpages b/ubuntu/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.manpages
deleted file mode 100644
index c462e2d47..000000000
--- a/ubuntu/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/bab-trinity.1
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/control b/ubuntu/_base/applications/tde-systemsettings/debian/control
index 2f9fe16c4..81d75d500 100644
--- a/ubuntu/_base/applications/tde-systemsettings/debian/control
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/control
@@ -2,7 +2,7 @@ Source: tde-systemsettings-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 9~), quilt, patchutils (>= 0.2.25), tdelibs14-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tde-systemsettings-trinity
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/rules b/ubuntu/_base/applications/tde-systemsettings/debian/rules
index 14f491a3e..18aa16b96 100755
--- a/ubuntu/_base/applications/tde-systemsettings/debian/rules
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/rules
@@ -1,54 +1,19 @@
#!/usr/bin/make -f
-cdbs_kde_enable_debug = --disable-debug
-
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)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
-
-cleanbuilddir/tde-systemsettings-trinity::
- rm -f systemsettings.1
-
-build/tde-systemsettings-trinity::
- docbook2x-man debian/systemsettings.1.docbook
-
-install/tde-systemsettings-trinity::
- # Don't clash files, just Use the ones from kcontrol
- rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/tde-settings-power.directory
- rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/tde-settings-system.directory
- rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/tde/kcmfontinst.desktop
- rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/tde/laptop.desktop
- cp debian/tde-settings-laptops.directory debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/
-
-DEB_INSTALL_MANPAGES_tde-systemsettings-trinity = systemsettings.1
-
-binary-install/tde-systemsettings-trinity::
- mv debian/tde-systemsettings-trinity/usr/share/man debian/tde-systemsettings-trinity/opt/trinity/share/
+DEB_CMAKE_EXTRA_FLAGS := \
+ -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/tde-systemsettings/debian/systemsettings.1.docbook b/ubuntu/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook
deleted file mode 100644
index 33a640918..000000000
--- a/ubuntu/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
- <refentryinfo>
- <author>
- <firstname>Jonathan</firstname>
- <surname>Riddell</surname>
- <email>jriddell@ubuntu.com</email>
- </author>
- <copyright>
- <year>2005</year>
- <holder>Jonathan Riddell</holder>
- </copyright>
- <!-- XXX IMPORTANT XXX -->
- <!-- Keep this date up to date: -->
- <date>2005-06-09</date>
- <!-- ^^^^^^^^^^ -->
- </refentryinfo>
- <refmeta>
- <refentrytitle>systemsettings</refentrytitle>
- <manvolnum>1</manvolnum>
- </refmeta>
- <refnamediv>
- <refname>systemsettings</refname>
- <refpurpose>TDE System Settings.</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>systemsettings</command>
- <arg choice="opt">
- <option><replaceable>Qt-options</replaceable></option>
- </arg>
- <arg choice="opt">
- <option><replaceable>TDE-options</replaceable></option>
- </arg>
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- System Settings is a user friendly control centre for TDE.
- </para>
- </refsect1>
- <refsect1>
- <title>OPTIONS</title>
- <para>
- All <productname>TDE</productname> and <productname>Qt</productname>
- programs accept a some common command-line options.
- </para>
- <para>
- <variablelist>
- <title>Options:</title>
- <varlistentry>
- <term> <option>-e, --noembed</option> </term>
- <listitem> <para>Do not embed windows</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--menu &gt;argument&lt;</option> </term>
- <listitem> <para>XDG menu to use (default is systemsettings)</para> </listitem>
- </varlistentry>
- </variablelist>
- </para>
- <para>
- <variablelist>
- <title>Generic options:</title>
- <varlistentry>
- <term> <option>--help</option> </term>
- <listitem> <para>Show help about options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-qt</option> </term>
- <listitem> <para>Show Qt specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-tde</option> </term>
- <listitem> <para>Show TDE specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-all</option> </term>
- <listitem> <para>Show all options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--author</option> </term>
- <listitem> <para>Show author information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>-v</option>, <option>--version</option> </term>
- <listitem> <para>Show version information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--license</option> </term>
- <listitem> <para>Show license information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--</option> </term>
- <listitem> <para>Indicates end of options</para> </listitem>
- </varlistentry>
- </variablelist>
- <!-- TODO * add all the rest of the options, but maybe find an automated
- way to keep it up to date -->
- </para>
- </refsect1>
- <refsect1>
- <title>COPYRIGHT</title>
- <para>
- This manual page was written by Jonathan Riddell
- <email>jriddell@ubuntu.com</email> for
- <productname>Debian</productname> (but may be used by others).
- Permission is granted to copy, distribute and/or modify this document
- under either the terms of the <acronym>GNU</acronym> General Public License,
- Version 2 or any later version published by the Free Software Foundation or
- the <acronym>GNU</acronym> Free Documentation License 1.2 or any later version
- published by the Free Software Foundation.
- </para>
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in
- <filename>/usr/share/common-licenses/GPL</filename>.
- </para>
- </refsect1>
-</refentry>
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory b/ubuntu/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory
deleted file mode 100644
index 687a493c4..000000000
--- a/ubuntu/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Laptops & Power
-Name[br]=Gremm
-Name[el]=Ισχύς
-Name[it]=Energia
-Name[mt]=Elettriku
-Name[nl]=Energie
-Name[pa]=ਊਰਜਾ(power)
-Name[pt_BR]=Energia
-Name[ru]=Управление питанием
-Name[sv]=Effekt
-Icon=energy
diff --git a/ubuntu/_base/applications/tdepacman/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdepacman/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..24191b2cd
--- /dev/null
+++ b/ubuntu/_base/applications/tdepacman/debian/cdbs/debian-tde.mk
@@ -0,0 +1,227 @@
+# -*- 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
+
+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
+
+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" -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),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+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/tdepacman/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdepacman/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/tdepacman/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/tdepacman/debian/changelog b/ubuntu/_base/applications/tdepacman/debian/changelog
new file mode 100644
index 000000000..341323bf7
--- /dev/null
+++ b/ubuntu/_base/applications/tdepacman/debian/changelog
@@ -0,0 +1,5 @@
+tdepacman-trinity (0.3.2-0debian) testing; urgency=low
+
+ * Initial import in TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it> Sat, 05 Sep 2020 20:56:00 +0900
diff --git a/ubuntu/_base/applications/tdepacman/debian/compat b/ubuntu/_base/applications/tdepacman/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/tdepacman/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/tdepacman/debian/control b/ubuntu/_base/applications/tdepacman/debian/control
new file mode 100644
index 000000000..71bb44912
--- /dev/null
+++ b/ubuntu/_base/applications/tdepacman/debian/control
@@ -0,0 +1,19 @@
+Source: tdepacman-trinity
+Section: games
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: J.rg Th.nnissen <joe@dsite.de>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev, libtdegames-trinity-dev
+Standards-Version: 0.3.2
+
+Package: tdepacman-trinity
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Replaces: tdepacman-trinity (<< 4:14.0.0~)
+Breaks: tdepacman-trinity (<< 4:14.0.0~)
+Description: A pacman clone game for TDE.
+ TDEPacman is a classic arcade game.
+ .
+ Pac-Man was designed by Toru Iwatani, Namco first released the game in
+ Japan in May 1980.
diff --git a/ubuntu/_base/applications/tdepacman/debian/copyright b/ubuntu/_base/applications/tdepacman/debian/copyright
new file mode 100644
index 000000000..7cac470a4
--- /dev/null
+++ b/ubuntu/_base/applications/tdepacman/debian/copyright
@@ -0,0 +1,59 @@
+This package was debianized by Fabian Wuertz <xadras@sidux.com> on
+Fri, 3 Sep 2007 19:52:51 +0100.
+
+It was downloaded from http://www.wuertz.org/downloads
+
+Upstream Author: Fabian Wuertz <xadras@sidux.com>
+
+Copyright:
+ (C) 2008 Fabian Wuertz <xadras@sidux.com>
+
+ The following file are from knxcc
+ (C) 2006 Andreas Loibl <andreas@andreas-loibl.de>
+ process.cpp klamp/process.cpp
+ klamp-install/process.cpp
+ process.h klamp/process.h
+ klamp-install/process.h
+
+ --- icons ---
+
+ The following icons are from kde-icons-nuovext
+ (C) 2005 Alexandre Moore <alexandre.moore@gmail.com>
+ cancel.png in klamp/tdepacmandialog.ui
+ in klamp-install/installdialog.ui
+ info.png in klamp/tdepacmandialog.ui
+
+ The following icons are from tdelibs-data
+ (c) 2002 Kalle Dalheimer <kalle@kde.org> and many others
+ wizard.png in klamp/tdepacmandialog.ui
+ in klamp-install/installdialog.ui
+ messagebox_warning.png in klamp-install/installdialog.ui
+
+ The following icon is from kde-icons-crystalproject
+ (C) 2005 Everaldo Coelho <everaldo@everaldo.com>
+ help.png in klamp/tdepacmandialog.ui
+ in klamp-install/installdialog.ui
+ package.png in klamp/tdepacmandialog.ui
+ in klamp-install/installdialog.ui
+
+License:
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ 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
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2008, Alexander Kopf <kopf-alexander@gmx.de> and
+is licensed under the GPL, see above.
diff --git a/ubuntu/_base/applications/tdepacman/debian/docs b/ubuntu/_base/applications/tdepacman/debian/docs
new file mode 100644
index 000000000..ca0272abf
--- /dev/null
+++ b/ubuntu/_base/applications/tdepacman/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README
+TODO
diff --git a/ubuntu/_base/applications/tdepacman/debian/patches/series b/ubuntu/_base/applications/tdepacman/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/tdepacman/debian/patches/series
diff --git a/ubuntu/_base/applications/tdepacman/debian/rules b/ubuntu/_base/applications/tdepacman/debian/rules
new file mode 100755
index 000000000..cee2a3058
--- /dev/null
+++ b/ubuntu/_base/applications/tdepacman/debian/rules
@@ -0,0 +1,19 @@
+#!/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_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -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/tdepacman/debian/source/format b/ubuntu/_base/applications/tdepacman/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/tdepacman/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/tdepacman/debian/source/options b/ubuntu/_base/applications/tdepacman/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/tdepacman/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/tdepacman/debian/tdepacman-trinity.menu b/ubuntu/_base/applications/tdepacman/debian/tdepacman-trinity.menu
new file mode 100644
index 000000000..0c6870760
--- /dev/null
+++ b/ubuntu/_base/applications/tdepacman/debian/tdepacman-trinity.menu
@@ -0,0 +1,8 @@
+?package(tdepacman-trinity):\
+ needs="x11"\
+ section="Games/Arcade"\
+ hints="TDE"\
+ title="TDEPacMan"\
+ icon32x32="/opt/trinity/share/icons/hicolor/32x32/apps/tdepacman.png"\
+ command="/opt/trinity/bin/tdepacman"
+
diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules
index b83a3da10..070591030 100755
--- a/ubuntu/_base/dependencies/tqt3/debian/rules
+++ b/ubuntu/_base/dependencies/tqt3/debian/rules
@@ -43,6 +43,8 @@ P_APPSDEV = $(DEBIAN)/tqt3-apps-dev
P_HEADERS = $(DEBIAN)/libtqt3-headers
P_QTMTDEV = $(DEBIAN)/libtqt3-mt-dev
+RPC_INCLUDES = $(if $(wildcard /usr/include/tirpc),-I/usr/include/tirpc,)
+
TMP_INSTALL = $(DEBIAN)/tmp-install
CONFIGURE_OPTS = \
@@ -102,6 +104,8 @@ CONFIGURE_OPTS = \
-I/usr/include/freetype2 \
-I`pg_config --includedir` \
-I`pg_config --includedir-server` \
+ $(RPC_INCLUDES) \
+ \
-L/usr/lib/$(DEB_HOST_MULTIARCH)\
\
-lfontconfig \
diff --git a/ubuntu/_base/libraries/python-trinity/debian/control b/ubuntu/_base/libraries/python-trinity/debian/control
index 067613dea..0667493ad 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/control
+++ b/ubuntu/_base/libraries/python-trinity/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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, python-sip-tqt, python-sip-tqt-dev, python-sip-tqt-dbg, python-tqt-dev, python-tqt-dbg, tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), libtqtinterface-dev, python-support (>= 0.7.1) | dh-python, python-all, python-all-dev, python-all-dbg, python-sip-tqt, python-sip-tqt-dev, python-sip-tqt-dbg, python-tqt-dev, python-tqt-dbg, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
diff --git a/ubuntu/_base/tdeaddons/debian/control b/ubuntu/_base/tdeaddons/debian/control
index eeb208514..9fb81b410 100644
--- a/ubuntu/_base/tdeaddons/debian/control
+++ b/ubuntu/_base/tdeaddons/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, autotools-dev, gawk, 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, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, gawk, 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
Standards-Version: 3.8.4
Package: tdeaddons-trinity
diff --git a/ubuntu/_base/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/ubuntu/_base/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/ubuntu/_base/tdeaddons/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdeaddons/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/ubuntu/_base/tdeaddons/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/ubuntu/_base/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 39dd7745e..000000000
--- a/ubuntu/_base/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/opt/trinity/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/ubuntu/_base/tdeaddons/debian/patches/series b/ubuntu/_base/tdeaddons/debian/patches/series
index 6b3ddc8ec..e69de29bb 100644
--- a/ubuntu/_base/tdeaddons/debian/patches/series
+++ b/ubuntu/_base/tdeaddons/debian/patches/series
@@ -1,3 +0,0 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/_base/tdebase/debian/control b/ubuntu/_base/tdebase/debian/control
index 85de01a42..921fad2a0 100644
--- a/ubuntu/_base/tdebase/debian/control
+++ b/ubuntu/_base/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, autotools-dev, gawk, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, libssl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, gawk, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, sharutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.8.4
diff --git a/ubuntu/_base/tdegames/debian/control b/ubuntu/_base/tdegames/debian/control
index 7a16e3b22..94299f550 100644
--- a/ubuntu/_base/tdegames/debian/control
+++ b/ubuntu/_base/tdegames/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, autotools-dev, gawk, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, gawk, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, sharutils, bzip2, sharutils, libogg-dev
Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc
Standards-Version: 3.8.4
diff --git a/ubuntu/_base/tdegames/debian/libtdegames-trinity-dev.install b/ubuntu/_base/tdegames/debian/libtdegames-trinity-dev.install
index 9640a4bc8..fe44b3d68 100644
--- a/ubuntu/_base/tdegames/debian/libtdegames-trinity-dev.install
+++ b/ubuntu/_base/tdegames/debian/libtdegames-trinity-dev.install
@@ -2,3 +2,4 @@
/opt/trinity/include/kgame
/opt/trinity/lib/libtdegames.so
/opt/trinity/lib/libtdegames.la
+/opt/trinity/lib/pkgconfig/libtdegames.pc
diff --git a/ubuntu/_base/tdegames/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdegames/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/ubuntu/_base/tdegames/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/ubuntu/_base/tdegames/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdegames/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/ubuntu/_base/tdegames/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/ubuntu/_base/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 39dd7745e..000000000
--- a/ubuntu/_base/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/opt/trinity/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/ubuntu/_base/tdegames/debian/patches/series b/ubuntu/_base/tdegames/debian/patches/series
index 6b3ddc8ec..e69de29bb 100644
--- a/ubuntu/_base/tdegames/debian/patches/series
+++ b/ubuntu/_base/tdegames/debian/patches/series
@@ -1,3 +0,0 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/_base/tdelibs/debian/control b/ubuntu/_base/tdelibs/debian/control
index 46ba79e84..8be2490de 100644
--- a/ubuntu/_base/tdelibs/debian/control
+++ b/ubuntu/_base/tdelibs/debian/control
@@ -45,7 +45,7 @@ Section: libs
Architecture: all
Replaces: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~)
Breaks: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~)
-Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~)
+Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~), klinkstatus-trinity (<< 4:14.0.9~)
Depends: hicolor-icon-theme
Provides: tdelibs-data
Description: core shared data for all TDE applications
diff --git a/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.install
index 74f6b8d3f..92a201781 100644
--- a/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.install
@@ -224,16 +224,6 @@ debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kurlrequester.png
debian/tmp/opt/trinity/share/apps/tdehtml/css/html4.css
debian/tmp/opt/trinity/share/apps/tdehtml/css/quirks.css
debian/tmp/opt/trinity/share/apps/tdehtml/domain_info
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/128x128/actions/bug.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/bug.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/images_display.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/wallet_open.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/bug.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/images_display.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/bug.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/images_display.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/48x48/actions/bug.png
-debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/64x64/actions/bug.png
debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_browser.rc
debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_popupmenu.rc
debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml.rc
@@ -1907,7 +1897,6 @@ debian/tmp/opt/trinity/share/services/tderesources/tdeabc/file.desktop
debian/tmp/opt/trinity/share/services/tderesources/tdeabc/net.desktop
debian/tmp/opt/trinity/share/services/tderesources/tdeabc/ldaptdeio.desktop
debian/tmp/opt/trinity/share/services/tderesources/tdeabc_manager.desktop
-
debian/tmp/opt/trinity/share/services/tdespell_aspell.desktop
debian/tmp/opt/trinity/share/services/tdespell_hspell.desktop
debian/tmp/opt/trinity/share/services/tdespell_ispell.desktop
diff --git a/ubuntu/_base/tdenetwork/debian/control b/ubuntu/_base/tdenetwork/debian/control
index b35e4fa77..b3b4371a8 100644
--- a/ubuntu/_base/tdenetwork/debian/control
+++ b/ubuntu/_base/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev, libssl-dev, libtqca-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, docbook-to-man, doxygen, gawk, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev
Standards-Version: 3.8.4
Package: tdenetwork-trinity
diff --git a/ubuntu/_base/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/ubuntu/_base/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/ubuntu/_base/tdenetwork/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdenetwork/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/ubuntu/_base/tdenetwork/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/ubuntu/_base/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 39dd7745e..000000000
--- a/ubuntu/_base/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/opt/trinity/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/ubuntu/_base/tdenetwork/debian/patches/series b/ubuntu/_base/tdenetwork/debian/patches/series
index 6b3ddc8ec..8b1378917 100644
--- a/ubuntu/_base/tdenetwork/debian/patches/series
+++ b/ubuntu/_base/tdenetwork/debian/patches/series
@@ -1,3 +1 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
+
diff --git a/ubuntu/_base/tdepim/debian/control b/ubuntu/_base/tdepim/debian/control
index 81dad9eaa..a1878dd6a 100644
--- a/ubuntu/_base/tdepim/debian/control
+++ b/ubuntu/_base/tdepim/debian/control
@@ -4,15 +4,14 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt,
- cdparanoia, gawk, tdelibs14-trinity-dev, bison, byacc, bzip2,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool,
+ gawk, tdelibs14-trinity-dev, bison, byacc, bzip2,
flex, groff-base, libogg-dev,
libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~),
libreadline-dev | libreadline6-dev | libreadline5-dev, libsasl2-dev, libssl-dev,
libxpm-dev, libxss-dev, sharutils, 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,
- cmake, libtool, libltdl-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-Conflicts: libkleopatra0-trinity-dev
Standards-Version: 3.8.4
diff --git a/ubuntu/_base/tdesdk/debian/control b/ubuntu/_base/tdesdk/debian/control
index a75dbf666..2c485d56c 100644
--- a/ubuntu/_base/tdesdk/debian/control
+++ b/ubuntu/_base/tdesdk/debian/control
@@ -4,12 +4,11 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, autotools-dev, gawk,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, gawk,
pkg-config, tdelibs14-trinity-dev, binutils-dev, 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~),
- automake, autoconf, libtool, libltdl-dev
+ libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~)
Standards-Version: 3.8.4
Package: tdesdk-trinity
diff --git a/ubuntu/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/ubuntu/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/ubuntu/_base/tdesdk/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdesdk/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/ubuntu/_base/tdesdk/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/ubuntu/_base/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 39dd7745e..000000000
--- a/ubuntu/_base/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/opt/trinity/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/ubuntu/_base/tdesdk/debian/patches/series b/ubuntu/_base/tdesdk/debian/patches/series
index 6b3ddc8ec..e69de29bb 100644
--- a/ubuntu/_base/tdesdk/debian/patches/series
+++ b/ubuntu/_base/tdesdk/debian/patches/series
@@ -1,3 +0,0 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/_base/tdevelop/debian/control b/ubuntu/_base/tdevelop/debian/control
index 15181b67a..b22a46660 100644
--- a/ubuntu/_base/tdevelop/debian/control
+++ b/ubuntu/_base/tdevelop/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev
Standards-Version: 3.8.4
Package: tdevelop-trinity
diff --git a/ubuntu/_base/tdevelop/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdevelop/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/ubuntu/_base/tdevelop/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/ubuntu/_base/tdevelop/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdevelop/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/ubuntu/_base/tdevelop/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/ubuntu/_base/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 39dd7745e..000000000
--- a/ubuntu/_base/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/opt/trinity/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/ubuntu/_base/tdevelop/debian/patches/series b/ubuntu/_base/tdevelop/debian/patches/series
index 6b3ddc8ec..e69de29bb 100644
--- a/ubuntu/_base/tdevelop/debian/patches/series
+++ b/ubuntu/_base/tdevelop/debian/patches/series
@@ -1,3 +0,0 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.install b/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.install
index 9c6c7048d..78d214bfb 100644
--- a/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.install
+++ b/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.install
@@ -11,7 +11,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/*.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/*.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/*.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/bug.png
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/klinkstatus.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/klinkstatus.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/klinkstatus.png