summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/_base/applications/codeine/debian/cdbs/debian-tde.mk227
-rw-r--r--ubuntu/_base/applications/codeine/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/codeine/debian/changelog94
-rw-r--r--ubuntu/_base/applications/codeine/debian/codeine-trinity.menu7
-rw-r--r--ubuntu/_base/applications/codeine/debian/compat1
-rw-r--r--ubuntu/_base/applications/codeine/debian/control18
-rw-r--r--ubuntu/_base/applications/codeine/debian/copyright40
-rw-r--r--ubuntu/_base/applications/codeine/debian/patches/series1
-rwxr-xr-xubuntu/_base/applications/codeine/debian/rules19
-rw-r--r--ubuntu/_base/applications/codeine/debian/source/format1
-rw-r--r--ubuntu/_base/applications/codeine/debian/source/options6
-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/kmplayer/debian/kmplayer-base-trinity.install4
-rw-r--r--ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install1
-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-style-domino/debian/control2
-rwxr-xr-xubuntu/_base/applications/tde-style-domino/debian/rules17
-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/rules13
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.manpages1
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.postinst2
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.manpages5
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.postinst8
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.manpages1
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.postinst2
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.manpages1
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.postinst2
-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
105 files changed, 1458 insertions, 932 deletions
diff --git a/ubuntu/_base/applications/codeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/codeine/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..24191b2cd
--- /dev/null
+++ b/ubuntu/_base/applications/codeine/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/codeine/debian/cdbs/versions.pl b/ubuntu/_base/applications/codeine/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/codeine/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/codeine/debian/changelog b/ubuntu/_base/applications/codeine/debian/changelog
new file mode 100644
index 000000000..b3816312d
--- /dev/null
+++ b/ubuntu/_base/applications/codeine/debian/changelog
@@ -0,0 +1,94 @@
+codeine-trinity (1.0.1-3.dfsg-3.1) testing; urgency=low
+
+ * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it> Tue, 24 Jun 2020 16:03:12 +0900
+
+codeine (1.0.1-3.dfsg-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with GCC 4.4, patch by Martin Michlmayr (Closes: #505078)
+ * Fixed typo in debian/README.Debian
+
+ -- David Paleino <dapal@debian.org> Sun, 20 Dec 2009 12:38:59 +0100
+
+codeine (1.0.1-3.dfsg-3) unstable; urgency=low
+
+ [ Ana Beatriz Guerrero Lopez ]
+
+ * Apply patch from Cyril Brulebois to fix FTBFS with GCC 4.3.
+ (Closes: #461666)
+ * Add dependency on libxine1-x. (Closes: #448088)
+ * Move Homepage into control field.
+ * Update to Standards-Version: 3.7.3, no changes required.
+
+ [ Mark Purcell ]
+
+ * cleanbuilddir common-configure-arch::
+ * Add debian/watch
+ * debian/rules clean: [ ! -f Makefile ]|| rule
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Sun, 23 Mar 2008 14:07:22 +0100
+
+codeine (1.0.1-3.dfsg-2) unstable; urgency=medium
+
+ [ Achim Bohnet ]
+
+ * debian/rules: redefine $HOME to a writable (tmp)dir: KDE apps called
+ in configure script try to create $HOME/.kde. This fails on some
+ autobuild daemons. (Redefining KDEHOME instead of HOME did not work.)
+ Closes: #403131: codeine_1.0.1-3.dfsg-1(alpha/unstable): FTBFS with -rsudo
+
+ * Set urgency to medium, 'cause RC bug fixed
+
+ * Bump StandardsVersion to 3.6.2 -> 3.7.2. No changes necessary
+
+ * Add Translation to codeine's desktop file (from kdesvn)
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Sat, 16 Dec 2006 19:15:13 +0100
+
+codeine (1.0.1-3.dfsg-1) unstable; urgency=low
+
+ [ Mark Purcell ]
+ * Initial release. (Closes: #372113: ITP: codeine -- Simple,
+ uncluttered KDE video player - Debian Bug report logs)
+ * .dfsg version removes redundant/ FDL doc/ dir
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Sun, 25 Jun 2006 21:46:06 +0100
+
+codeine (1.0.1-3-1) unstable; urgency=low
+
+ * New upstream release (Closes: Bug#372113)
+
+ [ Achim Bohnet ]
+ * fix typos in codeine manpage
+ * renamed patches/kubuntu_01_add_translations_to_desktop_file.diff
+ to patches/01_add_translations_to_desktop_file.diff. Patch is not
+ kubuntu specific
+
+ [ Tom Albers ]
+ * New upstream release
+ * Removed rule for codeine_part.desktop, upstream fixed that
+ * Added --play-dvd to man page
+ * Added me as debian maintainer for this package
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Thu, 8 Jun 2006 11:31:26 +0100
+
+codeine (1.0-0ubuntu1) dapper; urgency=low
+
+ [ Achim Bohnet ]
+
+ * Initial Release.
+
+ * patches/kubuntu_01_add_translations_to_desktop_file.diff:
+ Replace GenericName "Vidio Player" with "Media Player" as used for
+ kaffeine and kmplayer. Add dozends "Media Player" translations
+ from kaffeine.desktop to codeine.desktop. Replaces
+ patches/kubuntu_01_fix_desktop_file.patch
+
+ * rules: codeine_part.desktop is of Type=Service so install it in
+ /usr/share/services/ not /usr/share/applications/kde/
+
+ * Add codeine.1 manpage
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 17 Jan 2006 23:26:41 +0100
diff --git a/ubuntu/_base/applications/codeine/debian/codeine-trinity.menu b/ubuntu/_base/applications/codeine/debian/codeine-trinity.menu
new file mode 100644
index 000000000..d30aa8074
--- /dev/null
+++ b/ubuntu/_base/applications/codeine/debian/codeine-trinity.menu
@@ -0,0 +1,7 @@
+?package(codeine-trinity):\
+ needs="X11"\
+ section="Applications/Video"\
+ title="Codeine"\
+ command="/opt/trinity/bin/codeine"\
+ hints="TDE"
+
diff --git a/ubuntu/_base/applications/codeine/debian/compat b/ubuntu/_base/applications/codeine/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/codeine/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/codeine/debian/control b/ubuntu/_base/applications/codeine/debian/control
new file mode 100644
index 000000000..d1b226457
--- /dev/null
+++ b/ubuntu/_base/applications/codeine/debian/control
@@ -0,0 +1,18 @@
+Source: codeine-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE team
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev
+Standards-Version: 3.7.3
+Homepage: http://codeine.sourceforge.net/
+
+Package: codeine-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Simple TDE video player
+ A video player with a different philosophy: simple, uncluttered interface
+ .
+ Features:
+ - Plays DVDs, VCDs, all video formats supported by Xine
+ - Bundled with a simple web-page KPart
+ - Starts quickly
diff --git a/ubuntu/_base/applications/codeine/debian/copyright b/ubuntu/_base/applications/codeine/debian/copyright
new file mode 100644
index 000000000..c5c11bb09
--- /dev/null
+++ b/ubuntu/_base/applications/codeine/debian/copyright
@@ -0,0 +1,40 @@
+This package was debianized by Anthony Mercatante
+<anthony.mercatante@laposte.net> on Mon, 24 oct 2005 17:39:28 +0200.
+2006 reworked by Achim Bohnet <ach@mpe.mpg.de>
+
+ * .dfsg version removes redundant/ FDL doc/ dir
+
+It was downloaded from: http://www.methylblue.com/codeine/
+
+Upstream Author:
+ Max Howell <max.howell@methylblue.com>
+
+License:
+
+All the software and debian/codeine.1.docbook are under the GPL:
+
+ 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 of the License, 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.
+
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
+
+Copyright
+
+codeine:
+
+ (C) 2005-2006 Max Howell <max.howell@methylblue.com>
+
+debian/codeine.1.docbook:
+
+ Copyright (C) 2005 by Anthony Mercatante <anthony.mercatante@laposte.net>
+ Copyright (C) 2006 by Achim Bohnet <ach@mpe.mpg.de>
+ Copyright (C) 2006 by Tom Albers <tomalbers@kde.nl>
+
diff --git a/ubuntu/_base/applications/codeine/debian/patches/series b/ubuntu/_base/applications/codeine/debian/patches/series
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/ubuntu/_base/applications/codeine/debian/patches/series
@@ -0,0 +1 @@
+
diff --git a/ubuntu/_base/applications/codeine/debian/rules b/ubuntu/_base/applications/codeine/debian/rules
new file mode 100755
index 000000000..18aa16b96
--- /dev/null
+++ b/ubuntu/_base/applications/codeine/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/codeine/debian/source/format b/ubuntu/_base/applications/codeine/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/codeine/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/codeine/debian/source/options b/ubuntu/_base/applications/codeine/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/codeine/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/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/kmplayer/debian/kmplayer-base-trinity.install b/ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
index 0bf23d0be..b41e98590 100644
--- a/ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
+++ b/ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
@@ -1,5 +1,7 @@
-opt/trinity/lib/libkmplayercommon.so
opt/trinity/lib/libkmplayercommon.la
+opt/trinity/lib/libkmplayercommon.so
+opt/trinity/lib/libkmplayercommon.so.1
+opt/trinity/lib/libkmplayercommon.so.1.0.0
opt/trinity/bin/kxineplayer
etc/trinity/kmplayerrc
opt/trinity/share/apps/kmplayer/bookmarks.xml
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install b/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install
index ac07b829a..15f03279c 100644
--- a/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install
@@ -1,4 +1,5 @@
opt/trinity/lib/libtdeinit_kmplayer.so
+opt/trinity/lib/trinity/kmplayer.la
opt/trinity/lib/trinity/kmplayer.so
opt/trinity/bin/kgstplayer
opt/trinity/bin/kmplayer
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-style-domino/debian/control b/ubuntu/_base/applications/tde-style-domino/debian/control
index caf655075..70f633fed 100644
--- a/ubuntu/_base/applications/tde-style-domino/debian/control
+++ b/ubuntu/_base/applications/tde-style-domino/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
X-Original-Maintainer: Jonathan Patrick Davies <jpatrick@kubuntu.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, automake, libtool, tdebase-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdebase-trinity-dev
Standards-Version: 3.7.3
Homepage: http://kde-look.org/content/show.php?content=42804
diff --git a/ubuntu/_base/applications/tde-style-domino/debian/rules b/ubuntu/_base/applications/tde-style-domino/debian/rules
index 2aebaac7b..18aa16b96 100755
--- a/ubuntu/_base/applications/tde-style-domino/debian/rules
+++ b/ubuntu/_base/applications/tde-style-domino/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-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 8b800260a..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 \
@@ -281,6 +285,8 @@ binary-indep: build install
dh_installchangelogs -i changes-3.3.8
dh_installchangelogs -i changes-3.3.8b
+ dh_installman -i
+
find doc/man -path \*/CVS -prune -o -print | cpio -pmd $(P_DOC)/usr/share/tqt3/doc/
-rm -f `find $(P_DOC)/usr/share/tqt3/doc/ -name "*.o"`
@@ -404,11 +410,6 @@ binary-arch: build install
cd `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/ && for a in *; do cd "$$a" && cat qmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/tqt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/tqt3/g' | \
sed 's/\-I\/usr\/include/&\/tqt3/g' >> qmake.conf.new && mv qmake.conf.new qmake.conf && cd ../; done
- install -D doc/man/man1/moc.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/moc-tqt3.1
- install -D doc/man/man1/uic.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/uic-tqt3.1
- install -D doc/man/man1/lrelease.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lrelease-tqt3.1
- install -D doc/man/man1/lupdate.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lupdate-tqt3.1
-
dh_link -ptqt3-designer usr/share/tqt3/doc/html usr/share/doc/tqt3-designer/html
dh_link -ptqt3-assistant usr/share/tqt3/doc/html usr/share/doc/tqt3-assistant/html
dh_link -ptqt3-linguist usr/share/tqt3/doc/html usr/share/doc/tqt3-linguist/html
@@ -439,6 +440,8 @@ binary-arch: build install
dh_installchangelogs -a $(IBASE) changes-3.3.8
dh_installchangelogs -a $(IBASE) changes-3.3.8b
+ dh_installman -a $(IBASE)
+
dh_link -a $(IBASE)
dh_strip -a $(IBASE) --dbg-package=tqt-x11-free-dbg
$(if $(wildcard /usr/bin/dh_strip_nondeterminism),\
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.manpages b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.manpages
new file mode 100644
index 000000000..5fcb29982
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.manpages
@@ -0,0 +1 @@
+doc/man/man1/tqdesigner.1
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.postinst b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.postinst
index 91d69ce08..54bc5ea75 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.postinst
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.postinst
@@ -5,6 +5,6 @@ set -e
update-alternatives --install \
/usr/bin/designer designer "/usr/bin/tqdesigner" "45" \
--slave /usr/share/man/man1/designer.1.gz designer.1.gz \
- "/usr/share/man/man1/designer-tqt3.1.gz"
+ "/usr/share/man/man1/tqdesigner.1.gz"
#DEBHELPER#
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.manpages b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.manpages
new file mode 100644
index 000000000..2976f6c84
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.manpages
@@ -0,0 +1,5 @@
+doc/man/man1/tqembed.1
+doc/man/man1/tqlrelease.1
+doc/man/man1/tqlupdate.1
+doc/man/man1/tqmoc.1
+doc/man/man1/tquic.1
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.postinst b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.postinst
index b6c833de8..e7f14ec70 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.postinst
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.postinst
@@ -5,22 +5,22 @@ set -e
update-alternatives --install \
/usr/bin/moc moc "/usr/bin/tqmoc" "45" \
--slave /usr/share/man/man1/moc.1.gz moc.1.gz \
- "/usr/share/man/man1/moc-tqt3.1.gz"
+ "/usr/share/man/man1/tqmoc.1.gz"
update-alternatives --install \
/usr/bin/uic uic "/usr/bin/tquic" "45" \
--slave /usr/share/man/man1/uic.1.gz uic.1.gz \
- "/usr/share/man/man1/uic-tqt3.1.gz"
+ "/usr/share/man/man1/tquic.1.gz"
update-alternatives --install \
/usr/bin/lupdate lupdate "/usr/bin/tqlupdate" "45" \
--slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \
- "/usr/share/man/man1/lupdate-tqt3.1.gz"
+ "/usr/share/man/man1/tqlupdate.1.gz"
update-alternatives --install \
/usr/bin/lrelease lrelease "/usr/bin/tqlrelease" "45" \
--slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \
- "/usr/share/man/man1/lrelease-tqt3.1.gz"
+ "/usr/share/man/man1/tqlrelease.1.gz"
update-alternatives --install \
/usr/bin/qmake qmake "/usr/bin/tqmake" "45" \
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.manpages b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.manpages
new file mode 100644
index 000000000..14380e5ab
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.manpages
@@ -0,0 +1 @@
+doc/man/man1/tqlinguist.1
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.postinst b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.postinst
index 4c51e97bf..48b3216db 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.postinst
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.postinst
@@ -5,6 +5,6 @@ set -e
update-alternatives --install \
/usr/bin/linguist linguist "/usr/bin/tqlinguist" "45" \
--slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \
- "/usr/share/man/man1/linguist-tqt3.1.gz"
+ "/usr/share/man/man1/tqlinguist.1.gz"
#DEBHELPER#
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.manpages b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.manpages
new file mode 100644
index 000000000..025ff0ad8
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.manpages
@@ -0,0 +1 @@
+doc/man/man1/tqtconfig.1
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.postinst b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.postinst
index 68671a6ef..773022f72 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.postinst
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.postinst
@@ -5,6 +5,6 @@ set -e
update-alternatives --install \
/usr/bin/qtconfig qtconfig "/usr/bin/tqtconfig" "45" \
--slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \
- "/usr/share/man/man1/qtconfig-tqt3.1.gz"
+ "/usr/share/man/man1/tqtconfig.1.gz"
#DEBHELPER#
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