Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

63 files changed, 420 insertions, 632 deletions

diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/buildvars.mk
deleted file mode 100644
index 23d4709dc..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/buildvars.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002,2003 Colin Walters <walters@debian.org>
-# Description: Defines some useful variables, but no rules
-#
-# 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.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_rules_buildvars
-_cdbs_rules_buildvars = 1
-
-CDBS_VERSION = something
-
-# Common useful variables
-DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
-DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
-
-# Split into arch/indep packages
-ifneq ($(DEB_INDEP_PACKAGES),cdbs)
-DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
-DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
-endif
-# Split into normal and udeb packages
-ifeq ($(DEB_UDEB_PACKAGES),)
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-else
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-endif
-# Too much bother for now.  If someone complains we'll fix it.
-#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
-#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
-# A handy list of every package, udeb or not
-DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
-DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
-DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
-
-DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-
-# Some support for srcdir != builddir builds.
-# These are relative to the root of the package
-DEB_SRCDIR ?= .
-DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
-
-# Miscellaneous bits
-DEB_ARCH = $(shell dpkg --print-architecture)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-
-ifeq ($(words $(DEB_ALL_PACKAGES)),1)
-	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
-else
-	DEB_DESTDIR = $(CURDIR)/debian/tmp/
-endif
-
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
-
-endif
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
deleted file mode 100644
index c807eed8c..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-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
-
-# 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:
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-	touch debian/stamp-cvs-make
-
-include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-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)
-
-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
-
-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 )
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	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
-
-clean::
-	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
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk
deleted file mode 100644
index 765560c89..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Description: A class for KDE packages; sets KDE 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.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_kde
-_cdbs_class_kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-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
-
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-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
-
-cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-$(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
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-common-build-arch common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
-common-install-arch common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
-
-clean::
-	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
-
-# This is a convenience target for calling manually.  It's not part of
-# the build process.
-buildprep: clean apply-patches
-	$(MAKE) -f admin/Makefile.common dist
-	debian/rules clean
-
-endif
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/team-members b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/versions.pl b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/changelog b/ubuntu/maverick/applications/filelight-l10n/debian/changelog
deleted file mode 100644
index 1c4c5eee8..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/changelog
+++ /dev/null
@@ -1,37 +0,0 @@
-filelight-l10n-trinity (1.0-4) karmic; urgency=low
-
-  * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
-
-filelight-l10n-trinity (1.0-3) intrepid; urgency=low
-
-  * Moved Trinity to /opt/trinity
-  * Integrated properly with KDE4.2+
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
-
-filelight-l10n-trinity (1.0-2) intrepid; urgency=low
-
-  * Added -trinity suffix
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 09 Feb 2009 10:33:00 -0600
-
-filelight-l10n (1.0-2) unstable; urgency=low
-
-  * Depends on filelight. 
-  * Updated policy to 3.7.3.0. No changes needed.
-  * Added homepage as control field.
-  * Fix copyright file to sort out lintian warnings. 
-
- -- Raúl Sánchez Siles <rasasi78@gmail.com>  Sat, 19 Apr 2008 23:39:34 +0200
-
-filelight-l10n (1.0-1) unstable; urgency=low
-
-  * Initial release. (Closes: #447414).
-  * filelight: [INTL:de] German PO file corrections (Closes: #313714)
-  * filelight: No help: "Could not find service 'khelpcenter'"(Closes:
-  #263393).
-  * filelight: [INTL:sv] Swedish PO translation (Closes: #353796)
-
- -- Raúl Sánchez Siles <rasasi78@gmail.com>  Mon, 22 Oct 2007 00:53:30 +0200
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/compat b/ubuntu/maverick/applications/filelight-l10n/debian/compat
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/control b/ubuntu/maverick/applications/filelight-l10n/debian/control
deleted file mode 100644
index 2a83b443e..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/control
+++ /dev/null
@@ -1,21 +0,0 @@
-Source: filelight-l10n-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Uploaders: Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: tdelibs14-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake, autoconf, libtool, libltdl-dev
-Standards-Version: 3.8.4
-Homepage: http://www.methylblue.com/filelight/
-
-Package: filelight-l10n-trinity
-Architecture: all
-Depends: ${shlibs:Depends} , filelight-trinity
-Replaces: filelight-l10n-kde3 (<< 4:14.0.0~), filelight-l10n-trinity (<< 4:14.0.0~)
-Breaks: filelight-l10n-kde3 (<< 4:14.0.0~), filelight-l10n-trinity (<< 4:14.0.0~)
-Description: Localization (l10n) for Filelight, disk space usage tool [Trinity]
- This package provides localization(l10n) files (translations and docs) for
- Filelight, Filelight allows you to understand your disk usage by graphically
- representing your filesystem as a set of concentric, segmented rings.
- .
- See the 'filelight-trinity' package description for more information.
-
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/copyright b/ubuntu/maverick/applications/filelight-l10n/debian/copyright
deleted file mode 100644
index f840087a2..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/copyright
+++ /dev/null
@@ -1,38 +0,0 @@
-This package was debianized by Raúl Sánchez Siles<rasasi78@gmail.com>
-on Mon Oct 1 08:59:34 CEST 2007 based on the work by Christopher Martin
-<chrsmrtn@debian.org> with the help of Ana Guerrero<ana@ekaia.org> and
-others.
-
-The Debian packaging is Copyright 2007, Raul Sánchez Siles <rasasi78@gmail.com>
-and Christopher Martin <chrsmrtn@debian.org> is licensed under the GPLv2,
-which can be found at '/usr/share/common-licenses/GPL-2'.
-
-It was downloaded from: http://www.methylblue.com/filelight/
-
-Primary Developers:
-   Max Howell <mxcl@users.sf.net>
-
-License:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-Copyright
-
-Filelight:
-
-    Copyright 2005-2006 Max Howell <max.howell@methylblue.com>
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/patches/series b/ubuntu/maverick/applications/filelight-l10n/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/patches/series
+++ /dev/null
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/rules b/ubuntu/maverick/applications/filelight-l10n/debian/rules
deleted file mode 100755
index 660db576c..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/rules
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /usr/bin/make -f
-
-DEB_PATCHDIRS := debian/patches/common debian/patches
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.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_PATCHDIRS := debian/patches/common debian/patches
-#DEB_INSTALL_DOCS_ALL :=
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/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:
-	! [ -f /usr/share/libtool/ltmain.sh ] || \
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/source/format b/ubuntu/maverick/applications/filelight-l10n/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/source/options b/ubuntu/maverick/applications/filelight-l10n/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/maverick/applications/filelight-l10n/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/maverick/applications/kcmldap/debian/control b/ubuntu/maverick/applications/kcmldap/debian/control
index c5a4996fe..2b1abb591 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/control
+++ b/ubuntu/maverick/applications/kcmldap/debian/control
@@ -14,6 +14,6 @@ Description: Kerberos control module for the Trinity control center
 
 Package: tde-ldap-cert-updater
 Architecture: any
-Depends: kcontrol-ldap-bonding-trinity (>= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp
 Description: Service to keep LDAP certificates up-to-date
  This is a small daemon which keeps the LDAP root certificate up to date with the LDAP server
diff --git a/ubuntu/maverick/applications/koffice/debian/control b/ubuntu/maverick/applications/koffice/debian/control
index b5fe69b98..77d68190a 100644
--- a/ubuntu/maverick/applications/koffice/debian/control
+++ b/ubuntu/maverick/applications/koffice/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>, Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
 Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.4
 Homepage: http://www.koffice.org
diff --git a/ubuntu/maverick/applications/kvirc/debian/control b/ubuntu/maverick/applications/kvirc/debian/control
index 304aa4d02..19c3fb1a4 100644
--- a/ubuntu/maverick/applications/kvirc/debian/control
+++ b/ubuntu/maverick/applications/kvirc/debian/control
@@ -28,7 +28,6 @@ Section: net
 Architecture: all
 Replaces: kvirc-data-kde3 (<< 4:14.0.0~), kvirc-data-trinity (<< 4:14.0.0~)
 Breaks: kvirc-data-kde3 (<< 4:14.0.0~), kvirc-data-trinity (<< 4:14.0.0~)
-Depends: kvirc-trinity (>= ${source:Version})
 Description: Data files for KVIrc
  This package contains the architecture-independent data needed by KVIrc in
  order to run, such as icons and images, language files, and shell scripts.
diff --git a/ubuntu/maverick/applications/smb4k/debian/control b/ubuntu/maverick/applications/smb4k/debian/control
index 6145f23e1..b486cc035 100644
--- a/ubuntu/maverick/applications/smb4k/debian/control
+++ b/ubuntu/maverick/applications/smb4k/debian/control
@@ -8,7 +8,7 @@ Homepage: http://smb4k.berlios.de/
 
 Package: smb4k-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, samba-common, smbclient, smbfs
+Depends: ${shlibs:Depends}, samba-common, smbclient, smbfs | cifs-utils
 Replaces: smb4k-kde3 (<< 4:14.0.0~), smb4k-trinity (<< 4:14.0.0~)
 Breaks: smb4k-kde3 (<< 4:14.0.0~), smb4k-trinity (<< 4:14.0.0~)
 Recommends: super | sudo-trinity
diff --git a/ubuntu/maverick/applications/tdesvn/debian/control b/ubuntu/maverick/applications/tdesvn/debian/control
index 546f06f55..5a36a8620 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/control
+++ b/ubuntu/maverick/applications/tdesvn/debian/control
@@ -32,6 +32,7 @@ Description: TQt wrapper library for subversion (development files) [Trinity]
 Package: tdesvn-trinity
 Section: devel
 Architecture: any
+Conflicts: libsvnqt4-trinity
 Replaces: kdesvn-kde3 (<< 4:14.0.0~), kdesvn-trinity (<< 4:14.0.0~)
 Breaks: kdesvn-kde3 (<< 4:14.0.0~), kdesvn-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/Makefile b/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/Makefile
index f0e466b3f..6552ca238 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/Makefile
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/Makefile
@@ -6,6 +6,7 @@ EMBLEMS=$(wildcard emblems/*png emblems/*icon)
 SPLASH=$(wildcard splash/*.png)
 PIXMAPS=$(wildcard pixmaps/*.png)
 DESKTOPFILES=$(wildcard *.desktop)
+SKELETON_DIR = $(DESTDIR)/etc/skel
 
 all:
 #	make -C usplash/moreblue-orbit
@@ -71,4 +72,8 @@ install:
 	# GNOME background descriptor
 	mkdir -p $(DESTDIR)/usr/share/gnome-background-properties
 	$(INSTALL) gnome-backgrounds.xml $(DESTDIR)/usr/share/gnome-background-properties/debian.xml
+	# Compositor control files
+	mkdir -p "$(SKELETON_DIR)"
+	$(INSTALL) kompmgr-rc-files/xcompmgrrc "$(SKELETON_DIR)/.xcompmgrrc"
+	$(INSTALL) kompmgr-rc-files/compton-tde.conf "$(SKELETON_DIR)/.compton-tde.conf"
 
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/kompmgr-rc-files/compton-tde.conf b/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/kompmgr-rc-files/compton-tde.conf
new file mode 100644
index 000000000..26c725969
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/kompmgr-rc-files/compton-tde.conf
@@ -0,0 +1,45 @@
+# WARNING
+# This file was automatically generated by TDE
+# All changes will be lost!
+shadow = false;
+shadow-offset-y = 0;
+shadow-offset-x = 0;
+shadow-red = 0;
+shadow-green = 0;
+shadow-blue = 0;
+shadow-radius = 4;
+fading = true;
+no-fading-opacitychange = true;
+no-fading-openclose = false;
+wintypes:
+{
+  menu = { shadow = false; fade = true; no-fading-openclose = false; };
+  dropdown_menu = { shadow = false; fade = true; no-fading-openclose = false; };
+  popup_menu = { shadow = false; fade = true; no-fading-openclose = false; };
+  tooltip = { shadow = false; fade = true; no-fading-openclose = false; };
+  normal = { shadow = false; fade = false; no-fading-openclose = true; };
+  dialog = { shadow = false; fade = false; no-fading-openclose = true; };
+  unknown = { shadow = false; fade = false; no-fading-openclose = true; };
+  toolbar = { shadow = false; fade = false; no-fading-openclose = true; };
+  utility = { shadow = false; fade = false; no-fading-openclose = true; };
+  splash = { shadow = false; fade = false; no-fading-openclose = true; };
+  notify = { shadow = false; fade = false; no-fading-openclose = true; };
+  combo = { shadow = false; fade = false; no-fading-openclose = true; };
+  desktop = { shadow = false; fade = false; no-fading-openclose = true; };
+  dnd = { shadow = false; fade = false; no-fading-openclose = true; };
+  dock = { shadow = false; fade = false; no-fading-openclose = true; };
+};
+fade-in-step = 0.07;
+fade-out-step = 0.07;
+backend = "xrender";
+vsync = "none";
+blur-background = "false";
+blur-background-fixed = true;
+blur-background-exclude = [
+  "window_type = 'dock'",
+  "window_type = 'desktop'"
+];
+no-dock-shadow = true;
+no-dnd-shadow = true;
+clear-shadow = true;
+shadow-ignore-shaped = false;
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/kompmgr-rc-files/xcompmgrrc b/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
new file mode 100644
index 000000000..9c9b9ff17
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
@@ -0,0 +1,17 @@
+[xcompmgr]
+Compmode=
+DisableARGB=false
+FadeInStep=0.07
+FadeMenuWindows=true
+FadeOutStep=0.07
+FadeToolTipWindows=true
+FadeTrans=false
+FadeWindows=false
+ShadowColor=0x000000
+ShadowOffsetX=0
+ShadowOffsetY=0
+ShadowRadius=4
+ShadowsOnMenuWindows=true
+ShadowsOnToolTipWindows=true
+blurBackground=false
+useOpenGL=false
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/profiles/tde-profile/share/config/twinrc b/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/profiles/tde-profile/share/config/twinrc
new file mode 100644
index 000000000..b3301f1db
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/profiles/tde-profile/share/config/twinrc
@@ -0,0 +1,2 @@
+[Notification Messages]
+UseTranslucency=true
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/tdm-theme/tdm.d/10_desktop-base b/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/tdm-theme/tdm.d/10_desktop-base
index eadf355ac..280a58042 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/tdm-theme/tdm.d/10_desktop-base
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/tdm-theme/tdm.d/10_desktop-base
@@ -1,3 +1,5 @@
 USETHEME="true"
 THEME="/usr/share/apps/tdm/themes/moreblue-orbit"
 WALLPAPER="/usr/share/apps/tdm/themes/moreblue-orbit/background.png"
+COMPOSITOR="compton-tde"
+
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/Makefile b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/Makefile
index 466e1bf0f..21080b3cd 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/Makefile
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/Makefile
@@ -12,6 +12,7 @@ TDM_SETTINGS_DIR = $(DESTDIR)/etc/trinity/tdm/
 KSPLASH_THEME_DIR = $(DESTDIR)/opt/trinity/share/apps/ksplash/Themes/kubuntu
 SETTINGS_DIR = $(DESTDIR)/usr/share/kubuntu-default-settings-trinity
 CURSOR_DIR = $(DESTDIR)/usr/share/icons/contrastlarge
+SKELETON_DIR = $(DESTDIR)/etc/skel
 
 build:
 
@@ -158,6 +159,13 @@ install:
 	install -m644 gtk-qt-engine-rc-files/gtkrc-2.0-kde "$(SETTINGS_DIR)/.gtkrc-2.0-kde"
 	install -m644 gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh "$(SETTINGS_DIR)/gtk-qt-engine.rc.sh"
 
+	mkdir -p "$(SKELETON_DIR)"
+	install -m644 kompmgr-rc-files/xcompmgrrc "$(SKELETON_DIR)/.xcompmgrrc"
+	install -m644 kompmgr-rc-files/compton-tde.conf "$(SKELETON_DIR)/.compton-tde.conf"
+
+	mkdir -p "$(SKELETON_DIR)/.config/qtcurve"
+	install -m644 qtcurve-rc-files/stylerc "$(SKELETON_DIR)/.config/qtcurve/stylerc"
+
 	mkdir -p "$(SETTINGS_DIR)/tde-profile/lesser-visual-impairment/share/config/"
 	cp -r accessibility/lesser-visual-impairment/* "$(SETTINGS_DIR)/tde-profile/lesser-visual-impairment/share/config/"
 	mkdir -p "$(SETTINGS_DIR)/tde-profile/moderate-visual-impairment/share/config/"
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twinrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twinrc
index 5eba99592..bf263a870 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twinrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twinrc
@@ -9,3 +9,6 @@ ButtonsOnLeft=M
 ButtonsOnRight=HIA_X
 CustomButtonPositions=true
 PluginLib=twin3_crystal
+
+[Notification Messages]
+UseTranslucency=true
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf
new file mode 100644
index 000000000..26c725969
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf
@@ -0,0 +1,45 @@
+# WARNING
+# This file was automatically generated by TDE
+# All changes will be lost!
+shadow = false;
+shadow-offset-y = 0;
+shadow-offset-x = 0;
+shadow-red = 0;
+shadow-green = 0;
+shadow-blue = 0;
+shadow-radius = 4;
+fading = true;
+no-fading-opacitychange = true;
+no-fading-openclose = false;
+wintypes:
+{
+  menu = { shadow = false; fade = true; no-fading-openclose = false; };
+  dropdown_menu = { shadow = false; fade = true; no-fading-openclose = false; };
+  popup_menu = { shadow = false; fade = true; no-fading-openclose = false; };
+  tooltip = { shadow = false; fade = true; no-fading-openclose = false; };
+  normal = { shadow = false; fade = false; no-fading-openclose = true; };
+  dialog = { shadow = false; fade = false; no-fading-openclose = true; };
+  unknown = { shadow = false; fade = false; no-fading-openclose = true; };
+  toolbar = { shadow = false; fade = false; no-fading-openclose = true; };
+  utility = { shadow = false; fade = false; no-fading-openclose = true; };
+  splash = { shadow = false; fade = false; no-fading-openclose = true; };
+  notify = { shadow = false; fade = false; no-fading-openclose = true; };
+  combo = { shadow = false; fade = false; no-fading-openclose = true; };
+  desktop = { shadow = false; fade = false; no-fading-openclose = true; };
+  dnd = { shadow = false; fade = false; no-fading-openclose = true; };
+  dock = { shadow = false; fade = false; no-fading-openclose = true; };
+};
+fade-in-step = 0.07;
+fade-out-step = 0.07;
+backend = "xrender";
+vsync = "none";
+blur-background = "false";
+blur-background-fixed = true;
+blur-background-exclude = [
+  "window_type = 'dock'",
+  "window_type = 'desktop'"
+];
+no-dock-shadow = true;
+no-dnd-shadow = true;
+clear-shadow = true;
+shadow-ignore-shaped = false;
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
new file mode 100644
index 000000000..96e6b3c15
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
@@ -0,0 +1,17 @@
+[xcompmgr]
+Compmode=
+DisableARGB=false
+FadeInStep=0.07
+FadeMenuWindows=true
+FadeOutStep=0.07
+FadeToolTipWindows=true
+FadeTrans=false
+FadeWindows=false
+ShadowColor=0x000000
+ShadowOffsetX=0
+ShadowOffsetY=0
+ShadowRadius=4
+ShadowsOnMenuWindows=false
+ShadowsOnToolTipWindows=false
+blurBackground=false
+useOpenGL=false
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/qtcurve-rc-files/stylerc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/qtcurve-rc-files/stylerc
new file mode 100644
index 000000000..73c2faa15
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/qtcurve-rc-files/stylerc
@@ -0,0 +1,55 @@
+[Settings]
+activeTabAppearance=gradient
+animatedProgress=true
+appearance=shinyglass
+borderMenuitems=true
+borderTab=false
+coloredMouseOver=plastik
+comboSplitter=true
+crButton=false
+customShades=0
+defBtnIndicator=colored
+doubleGtkComboArrow=false
+dwtAppearance=flat
+etchEntry=true
+flatSbarButtons=false
+focus=standard
+gtkScrollViews=false
+handles=dots
+highlightFactor=5
+highlightTab=true
+inactiveTitlebarAppearance=gradient
+lighterPopupMenuBgnd=15
+lvAppearance=shinyglass
+menuStripeAppearance=gradient
+menubarAppearance=shinyglass
+menuitemAppearance=shinyglass
+progressAppearance=shinyglass
+progressGrooveColor=base
+round=full
+roundAllTabs=false
+selectionAppearance=flat
+shadeMenubarOnlyWhenActive=true
+shadeMenubars=darken
+shadeSliders=selected
+sliderAppearance=shinyglass
+sliderStyle=round
+sliderThumbs=dots
+smallRadio=false
+splitters=dots
+square=0
+stripedProgress=plain
+sunkenAppearance=inverted
+tabAppearance=gradient
+tabMouseOver=top
+thinSbarGroove=false
+thinnerBtns=false
+titlebarAlignment=left
+titlebarAppearance=gradient
+toolbarAppearance=shinyglass
+toolbarSeparators=dots
+unifyCombo=false
+unifySpin=false
+useHighlightForMenu=true
+vArrows=false
+version=1.6.2
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/tdmdistrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/tdmdistrc
index ab17e1e86..d0fc250a5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/tdmdistrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/tdmdistrc
@@ -297,7 +297,7 @@ ClientLogFile=.xsession-errors-%s
 #GUIStyle=Windows
 # Compositor binary name, if compositing is desired. "" means no compositing support.
 # Default is ""
-#Compositor=
+Compositor=compton-tde
 # Window manager binary name, if window decorations are desired. "" means no window manager support.
 # Default is "twin"
 #WindowManager=
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/Makefile b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/Makefile
index ff726b836..7270b7db6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/Makefile
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/Makefile
@@ -308,6 +308,7 @@ install:
 
 	mkdir -p "$(SKELETON_DIR)"
 	install -m644 kompmgr-rc-files/xcompmgrrc "$(SKELETON_DIR)/.xcompmgrrc"
+	install -m644 kompmgr-rc-files/compton-tde.conf "$(SKELETON_DIR)/.compton-tde.conf"
 
 	mkdir -p "$(KDESKEL_DIR)/share"
 	mkdir -p "$(KDESKEL_DIR)/share/apps"
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kompmgr-rc-files/compton-tde.conf b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kompmgr-rc-files/compton-tde.conf
new file mode 100644
index 000000000..26c725969
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kompmgr-rc-files/compton-tde.conf
@@ -0,0 +1,45 @@
+# WARNING
+# This file was automatically generated by TDE
+# All changes will be lost!
+shadow = false;
+shadow-offset-y = 0;
+shadow-offset-x = 0;
+shadow-red = 0;
+shadow-green = 0;
+shadow-blue = 0;
+shadow-radius = 4;
+fading = true;
+no-fading-opacitychange = true;
+no-fading-openclose = false;
+wintypes:
+{
+  menu = { shadow = false; fade = true; no-fading-openclose = false; };
+  dropdown_menu = { shadow = false; fade = true; no-fading-openclose = false; };
+  popup_menu = { shadow = false; fade = true; no-fading-openclose = false; };
+  tooltip = { shadow = false; fade = true; no-fading-openclose = false; };
+  normal = { shadow = false; fade = false; no-fading-openclose = true; };
+  dialog = { shadow = false; fade = false; no-fading-openclose = true; };
+  unknown = { shadow = false; fade = false; no-fading-openclose = true; };
+  toolbar = { shadow = false; fade = false; no-fading-openclose = true; };
+  utility = { shadow = false; fade = false; no-fading-openclose = true; };
+  splash = { shadow = false; fade = false; no-fading-openclose = true; };
+  notify = { shadow = false; fade = false; no-fading-openclose = true; };
+  combo = { shadow = false; fade = false; no-fading-openclose = true; };
+  desktop = { shadow = false; fade = false; no-fading-openclose = true; };
+  dnd = { shadow = false; fade = false; no-fading-openclose = true; };
+  dock = { shadow = false; fade = false; no-fading-openclose = true; };
+};
+fade-in-step = 0.07;
+fade-out-step = 0.07;
+backend = "xrender";
+vsync = "none";
+blur-background = "false";
+blur-background-fixed = true;
+blur-background-exclude = [
+  "window_type = 'dock'",
+  "window_type = 'desktop'"
+];
+no-dock-shadow = true;
+no-dnd-shadow = true;
+clear-shadow = true;
+shadow-ignore-shaped = false;
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kompmgr-rc-files/xcompmgrrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
index 9d201d296..9c9b9ff17 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
@@ -4,9 +4,14 @@ DisableARGB=false
 FadeInStep=0.07
 FadeMenuWindows=true
 FadeOutStep=0.07
+FadeToolTipWindows=true
 FadeTrans=false
 FadeWindows=false
 ShadowColor=0x000000
-ShadowOffsetX=-122
-ShadowOffsetY=-80
-ShadowRadius=6
+ShadowOffsetX=0
+ShadowOffsetY=0
+ShadowRadius=4
+ShadowsOnMenuWindows=true
+ShadowsOnToolTipWindows=true
+blurBackground=false
+useOpenGL=false
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/Makefile b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/Makefile
index 3e5f67f26..a83a8de3f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/Makefile
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/Makefile
@@ -12,6 +12,7 @@ TDM_SETTINGS_DIR = $(DESTDIR)/etc/trinity/tdm/
 KSPLASH_THEME_DIR = $(DESTDIR)/opt/trinity/share/apps/ksplash/Themes/kubuntu
 SETTINGS_DIR = $(DESTDIR)/usr/share/redmond-default-settings-trinity
 CURSOR_DIR = $(DESTDIR)/usr/share/icons/contrastlarge
+SKELETON_DIR = $(DESTDIR)/etc/skel
 DESKTOP_DIR = $(DESTDIR)/etc/skel/Desktop
 KDESKEL_DIR = $(DESTDIR)/etc/skel/.trinity
 
@@ -304,6 +305,10 @@ install:
 	mkdir -p "$(KDESKEL_DIR)/env"
 	install -m644 gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh "$(KDESKEL_DIR)/env/gtk-qt-engine.rc.sh"
 
+	mkdir -p "$(SKELETON_DIR)"
+	install -m644 kompmgr-rc-files/xcompmgrrc "$(SKELETON_DIR)/.xcompmgrrc"
+	install -m644 kompmgr-rc-files/compton-tde.conf "$(SKELETON_DIR)/.compton-tde.conf"
+
 	mkdir -p "$(KDESKEL_DIR)/share"
 	mkdir -p "$(KDESKEL_DIR)/share/apps"
 	mkdir -p "$(KDESKEL_DIR)/share/apps/kdesktop"
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/twinrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/twinrc
index 14863cc1e..c8f1bcf6a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/twinrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/twinrc
@@ -69,3 +69,6 @@ ShadeHoverInterval=250
 SnapOnlyWhenOverlapping=false
 TitlebarDoubleClickCommand=Maximize
 WindowSnapZone=10
+
+[Notification Messages]
+UseTranslucency=true
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf
new file mode 100644
index 000000000..26c725969
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf
@@ -0,0 +1,45 @@
+# WARNING
+# This file was automatically generated by TDE
+# All changes will be lost!
+shadow = false;
+shadow-offset-y = 0;
+shadow-offset-x = 0;
+shadow-red = 0;
+shadow-green = 0;
+shadow-blue = 0;
+shadow-radius = 4;
+fading = true;
+no-fading-opacitychange = true;
+no-fading-openclose = false;
+wintypes:
+{
+  menu = { shadow = false; fade = true; no-fading-openclose = false; };
+  dropdown_menu = { shadow = false; fade = true; no-fading-openclose = false; };
+  popup_menu = { shadow = false; fade = true; no-fading-openclose = false; };
+  tooltip = { shadow = false; fade = true; no-fading-openclose = false; };
+  normal = { shadow = false; fade = false; no-fading-openclose = true; };
+  dialog = { shadow = false; fade = false; no-fading-openclose = true; };
+  unknown = { shadow = false; fade = false; no-fading-openclose = true; };
+  toolbar = { shadow = false; fade = false; no-fading-openclose = true; };
+  utility = { shadow = false; fade = false; no-fading-openclose = true; };
+  splash = { shadow = false; fade = false; no-fading-openclose = true; };
+  notify = { shadow = false; fade = false; no-fading-openclose = true; };
+  combo = { shadow = false; fade = false; no-fading-openclose = true; };
+  desktop = { shadow = false; fade = false; no-fading-openclose = true; };
+  dnd = { shadow = false; fade = false; no-fading-openclose = true; };
+  dock = { shadow = false; fade = false; no-fading-openclose = true; };
+};
+fade-in-step = 0.07;
+fade-out-step = 0.07;
+backend = "xrender";
+vsync = "none";
+blur-background = "false";
+blur-background-fixed = true;
+blur-background-exclude = [
+  "window_type = 'dock'",
+  "window_type = 'desktop'"
+];
+no-dock-shadow = true;
+no-dnd-shadow = true;
+clear-shadow = true;
+shadow-ignore-shaped = false;
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
new file mode 100644
index 000000000..9c9b9ff17
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
@@ -0,0 +1,17 @@
+[xcompmgr]
+Compmode=
+DisableARGB=false
+FadeInStep=0.07
+FadeMenuWindows=true
+FadeOutStep=0.07
+FadeToolTipWindows=true
+FadeTrans=false
+FadeWindows=false
+ShadowColor=0x000000
+ShadowOffsetX=0
+ShadowOffsetY=0
+ShadowRadius=4
+ShadowsOnMenuWindows=true
+ShadowsOnToolTipWindows=true
+blurBackground=false
+useOpenGL=false
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc
index d21f33a1f..53ab306a1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc
@@ -297,7 +297,7 @@ ClientLogFile=.xsession-errors-%s
 #GUIStyle=Windows
 # Compositor binary name, if compositing is desired. "" means no compositing support.
 # Default is ""
-#Compositor=
+Compositor=compton-tde
 # Window manager binary name, if window decorations are desired. "" means no window manager support.
 # Default is "twin"
 #WindowManager=
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control b/ubuntu/maverick/libraries/kipi-plugins/debian/control
index eaab27dbe..f4a908d4b 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/control
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs14-trinity-dev,
  libexiv2-dev, libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
- libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
+ libtdepim1-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
  libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, tdepim-trinity-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/libraries/mlt/debian/control b/ubuntu/maverick/libraries/mlt/debian/control
index 6b29f3cf8..ffa80b828 100644
--- a/ubuntu/maverick/libraries/mlt/debian/control
+++ b/ubuntu/maverick/libraries/mlt/debian/control
@@ -31,7 +31,7 @@ Description: An open source multimedia framework - Core files [Trinity]
 
 Package: libmiracle0.2.5-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, libmlt0.2.5-trinity (= ${binary:Version}), libvalerie0.2.5-trinity (= ${binary:Version})
+Depends: ${shlibs:Depends}, libmlt0.2.5-trinity (= ${binary:Version})
 Replaces: libmiracle0.2.5-kde3 (<< 4:14.0.0~), libmiracle0.2.5-trinity (<< 4:14.0.0~)
 Breaks: libmiracle0.2.5-kde3 (<< 4:14.0.0~), libmiracle0.2.5-trinity (<< 4:14.0.0~)
 Description: An open source multimedia framework - Core files [Trinity]
@@ -46,7 +46,7 @@ Description: An open source multimedia framework - Core files [Trinity]
 
 Package: libvalerie0.2.5-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, libmlt0.2.5-trinity (= ${binary:Version}), libmiracle0.2.5-trinity (= ${binary:Version})
+Depends: ${shlibs:Depends}, libmlt0.2.5-trinity (= ${binary:Version})
 Replaces: libvalerie0.2.5-kde3 (<< 4:14.0.0~), libvalerie0.2.5-trinity (<< 4:14.0.0~)
 Breaks: libvalerie0.2.5-kde3 (<< 4:14.0.0~), libvalerie0.2.5-trinity (<< 4:14.0.0~)
 Description: An open source multimedia framework - Core files [Trinity]
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/control b/ubuntu/maverick/metapackages/rename-meta/debian/control
index 8ded7ef62..7e00cd9b5 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/control
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/control
@@ -1200,12 +1200,6 @@ Depends: tdeartwork-trinity-dbg
 Conflicts: kdeartwork-trinity-dbg (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
-Package: kdebindings-trinity
-Architecture: all
-Depends: tdebindings-trinity
-Conflicts: kdebindings-trinity (<< 4:13.9.9)
-Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
-
 Package: kdebindings-java-trinity
 Architecture: all
 Depends: tdebindings-java-trinity
@@ -1236,6 +1230,12 @@ Depends: libsmoketde-trinity-dev
 Conflicts: libsmokekde-trinity-dev (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: kde-xparts-extras-trinity
+Architecture: all
+Depends: tde-xparts-extras-trinity
+Conflicts: kde-xparts-extras-trinity (<< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: pykdeextensions-trinity
 Architecture: all
 Depends: pytdeextensions-trinity
@@ -1248,12 +1248,6 @@ Depends: tde-guidance-trinity
 Conflicts: kde-guidance-trinity (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
-Package: kde-guidance-powermanager-trinity
-Architecture: all
-Depends: tde-guidance-powermanager-trinity
-Conflicts: kde-guidance-powermanager-trinity (<< 4:13.9.9)
-Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
-
 Package: kdmtheme-trinity
 Architecture: all
 Depends: tdmtheme-trinity
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/control b/ubuntu/maverick/metapackages/synaptic-trinity/debian/control
index 9bacfcdca..53306aa95 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/control
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/control
@@ -6,7 +6,6 @@ Build-Depends: debhelper (>=5.0), cdbs
 Standards-Version: 3.8.4
 
 Package: synaptic-trinity
-Priority: important
 Architecture: all
 Depends: synaptic
 Description: Synaptic for the Trinity Desktop Environment
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/control b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/control
index ba5158009..ada62907e 100644
--- a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/control
+++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>=5.0), cdbs
 Standards-Version: 3.8.4
 
 Package: trinity-apt-archive
-Priority: important
+Priority: optional
 Architecture: all
 Depends: apt
 Pre-Depends: trinity-keyring
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
index cea2cf093..34f4c6128 100644
--- a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
+++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
@@ -1,6 +1,6 @@
 # Trinity repositories
 
-deb http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-nightly-build-dependencies/ubuntu maverick main
-deb-src http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-nightly-build-dependencies/ubuntu maverick main
-deb http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-nightly-builds/ubuntu maverick main
-deb-src http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-nightly-builds/ubuntu maverick main
+deb http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-builddeps-r14.0.0/ubuntu maverick main
+deb-src http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-builddeps-r14.0.0/ubuntu maverick main
+deb http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-r14.0.0/ubuntu maverick main
+deb-src http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-r14.0.0/ubuntu maverick main
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index 47de154c6..9397884f0 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -33,7 +33,6 @@ Section: tde
 Architecture: all
 Replaces: kdebase-runtime-data-common-kde3 (<< 4:14.0.0~), kdebase-runtime-data-common-trinity (<< 4:14.0.0~)
 Breaks: kdebase-runtime-data-common-kde3 (<< 4:14.0.0~), kdebase-runtime-data-common-trinity (<< 4:14.0.0~)
-Depends: tdebase-trinity
 Description: Shared common files for Trinity and KDE4
  .
  Shared common files for both Trinity and KDE4
@@ -220,9 +219,8 @@ Section: utils
 Architecture: any
 Replaces: kdeprint-kde3 (<< 4:14.0.0~), kdeprint-trinity (<< 4:14.0.0~)
 Breaks: kdeprint-kde3 (<< 4:14.0.0~), kdeprint-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, enscript, poster, psutils
+Depends: ${shlibs:Depends}, enscript, poster, psutils, foomatic-db | foomatic-db-compressed-ppds
 Recommends: kghostview-trinity | postscript-viewer
-Conflicts: foomatic-db-compressed-ppds
 Suggests: khelpcenter-trinity, efax | hylafax-client | mgetty-fax, smbclient
 Description: print system for TDE
  This package contains the TDE printing subsystem. It can use CUPS,
@@ -359,7 +357,8 @@ Architecture: any
 Replaces: konqueror-kde3 (<< 4:14.0.0~), konqueror-trinity (<< 4:14.0.0~)
 Breaks: konqueror-kde3 (<< 4:14.0.0~), konqueror-trinity (<< 4:14.0.0~)
 Provides: info-browser, man-browser, www-browser, konqueror
-Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-tdeio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
+Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-tdeio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version})
+Recommends: konqueror-nsplugins-trinity
 Suggests: khelpcenter-trinity, konq-plugins-trinity, ksvg-trinity, gij-4.1, libgcj7-awt, libjessie-java
 Conflicts: tdebase-audiolibs-trinity (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
 Description: TDE's advanced file manager, web browser and document viewer
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.txt b/ubuntu/maverick/tdebase/debian/tdm-trinity.txt
index bdae3fc62..2aa4cd688 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.txt
+++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.txt
@@ -70,6 +70,7 @@ gentdmconf --in $TDMCFGDIR 1> /dev/null
 [ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $TDMCFG
 [ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $TDMCFG
 [ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $TDMCFG
+[ -n "$COMPOSITOR" ] && sed -i "s|^#\?Compositor=.*|Compositor=$COMPOSITOR|" $TDMCFG
 [ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG
 
 
diff --git a/ubuntu/maverick/tdebase/debian/twin-trinity.install b/ubuntu/maverick/tdebase/debian/twin-trinity.install
index d9a6a12eb..515dfd1f0 100644
--- a/ubuntu/maverick/tdebase/debian/twin-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/twin-trinity.install
@@ -1,4 +1,3 @@
-debian/tmp/opt/trinity/bin/kompmgr
 debian/tmp/opt/trinity/bin/compton-tde
 debian/tmp/opt/trinity/bin/twin
 debian/tmp/opt/trinity/bin/twin_killer_helper
diff --git a/ubuntu/maverick/tdegraphics/debian/control b/ubuntu/maverick/tdegraphics/debian/control
index 601f51693..d0f91bb89 100644
--- a/ubuntu/maverick/tdegraphics/debian/control
+++ b/ubuntu/maverick/tdegraphics/debian/control
@@ -194,8 +194,7 @@ Section: tde
 Architecture: any
 Replaces: kmrml-kde3 (<< 4:14.0.0~), kmrml-trinity (<< 4:14.0.0~)
 Breaks: kmrml-kde3 (<< 4:14.0.0~), kmrml-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
-Recommends: gnuift
+Depends: ${shlibs:Depends}, gnuift
 Description: a Konqueror plugin for searching pictures
  MRML is short for Multimedia Retrieval Markup Language, which defines a
  protocol for querying a server for images based on their content. See 
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index 007a31d65..f6568c7a3 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -15,6 +15,7 @@ debian/tmp/etc/trinity/kthemestylerc
 debian/tmp/etc/trinity/language.codes
 debian/tmp/etc/trinity/ui/kprintpreviewui.rc
 debian/tmp/etc/trinity/ui/ui_standards.rc
+debian/tmp/etc/trinity/magic
 debian/tmp/opt/trinity/share/applications/tde/tderesources.desktop
 debian/tmp/opt/trinity/share/apps/dcopidlng/Ast.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/Iter.pm
diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules
index 51643631e..ec0abfcde 100755
--- a/ubuntu/maverick/tdenetwork/debian/rules
+++ b/ubuntu/maverick/tdenetwork/debian/rules
@@ -54,8 +54,6 @@ PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-
 DEB_FIXPERMS_EXCLUDE := opt/trinity/bin/kppp opt/trinity/bin/kppplogview \
 	opt/trinity/etc/ppp/peers/kppp-options
 
-DOC_HTML_PRUNE := kcontrol
-
 binary-install/kppp-trinity::
 	chown root:dip debian/kppp-trinity/opt/trinity/bin/kppp*
 	chown root:dip debian/kppp-trinity/opt/trinity/etc/ppp/peers/kppp-options
diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index 46481b8f1..1cd17adbd 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -22,7 +22,7 @@ Section: tde
 Architecture: all
 Replaces: kdepim-kde3 (<< 4:14.0.0~), kdepim-trinity (<< 4:14.0.0~)
 Breaks: kdepim-kde3 (<< 4:14.0.0~), kdepim-trinity (<< 4:14.0.0~)
-Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-tdefile-plugins-trinity (>= ${Source-Version}), tdepim-tdeio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
+Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-tdefile-plugins-trinity (>= ${Source-Version}), tdepim-tdeio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
 Suggests: tdepim-trinity-doc-html
 Description: Personal Information Management apps from the official Trinity release
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@@ -60,7 +60,7 @@ Depends: kaddressbook-trinity (= ${Source-Version}),
  kontact-trinity (= ${Source-Version}),
  korganizer-trinity (= ${Source-Version}),
  libkpimidentities1-trinity (= ${Source-Version}),
- libkcal2-trinity-dev (= ${Source-Version}), libical-dev,
+ libical-dev,
  libtdepim1-trinity-dev (= ${Source-Version}),
  libkgantt0-trinity-dev (= ${Source-Version}),
  libkleopatra1-trinity-dev (= ${Source-Version}),
@@ -477,48 +477,19 @@ Description: Trinity indexing library [development]
  This package is part of Trinity, and a component of the TDE PIM module.
  See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
-Package: libkcal2b-trinity
-Section: libs
-Architecture: any
-Replaces: libkcal2b-kde3 (<< 4:14.0.0~), libkcal2b-trinity (<< 4:14.0.0~)
-Breaks: libkcal2b-kde3 (<< 4:14.0.0~), libkcal2b-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
-Recommends: ${shlibs:Recommends}
-Conflicts: libkcal2-trinity, libkcal2a-trinity
-Suggests: tdepim-tderesources-trinity
-Description: Trinity calendaring library
- This library provides a C++ API for handling the vCalendar and iCalendar
- formats.
- .
- This is the runtime package for programs that use the libkcal-trinity library.
- .
- This package is part of Trinity, and a component of the TDE PIM module.
- See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
-
-Package: libkcal2-trinity-dev
-Section: libdevel
-Architecture: any
-Replaces: libkcal2-kde3-dev (<< 4:14.0.0~), libkcal2-trinity-dev (<< 4:14.0.0~)
-Breaks: libkcal2-kde3-dev (<< 4:14.0.0~), libkcal2-trinity-dev (<< 4:14.0.0~)
-Depends: libkcal2b-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version})
-Description: Trinity calendaring library [development]
- This library provides a C++ API for handling the vCalendar and iCalendar
- formats.
- .
- This is the development package which contains the headers for the libkcal-trinity
- library.
- .
- This package is part of Trinity, and a component of the TDE PIM module.
- See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
-
 Package: libtdepim1a-trinity
 Section: libs
 Architecture: any
-Replaces: libkdepim1a-kde3 (<< 4:14.0.0~), libkdepim1a-trinity (<< 4:14.0.0~)
+Provides: libkcal2b-trinity
+Replaces: libkdepim1a-kde3 (<< 4:14.0.0~), libkdepim1a-trinity (<< 4:14.0.0~), libkcal2b-kde3, libkcal2b-trinity
 Breaks: libkdepim1a-kde3 (<< 4:14.0.0~), libkdepim1a-trinity (<< 4:14.0.0~)
+Conflicts: libkcal2-trinity, libkcal2a-trinity, libkcal2b-kde3, libkcal2b-trinity
 Depends: ${shlibs:Depends}
+Suggests: tdepim-tderesources-trinity
 Description: Trinity PIM library
  This is the runtime package for programs that use the libtdepim-trinity library.
+ This package also provides a C++ API for handling the vCalendar and iCalendar
+ formats (libkcal-trinity).
  .
  This package is part of Trinity, and a component of the TDE PIM module.
  See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
@@ -526,12 +497,13 @@ Description: Trinity PIM library
 Package: libtdepim1-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libkdepim1-kde3-dev (<< 4:14.0.0~), libkdepim1-trinity-dev (<< 4:14.0.0~)
+Replaces: libkdepim1-kde3-dev (<< 4:14.0.0~), libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-kde3-dev, libkcal2-trinity-dev
 Breaks: libkdepim1-kde3-dev (<< 4:14.0.0~), libkdepim1-trinity-dev (<< 4:14.0.0~)
-Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev
+Conflicts: libkcal2-kde3-dev, libkcal2-trinity-dev
+Depends: libtdepim1a-trinity (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), tdelibs14-trinity-dev
 Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libtdepim-trinity
- library.
+ library and libkcal-trinity library.
  .
  This package is part of Trinity, and a component of the TDE PIM module.
  See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
@@ -626,7 +598,7 @@ Section: libdevel
 Architecture: any
 Replaces: libkpimexchange1-kde3-dev (<< 4:14.0.0~), libkpimexchange1-trinity-dev (<< 4:14.0.0~)
 Breaks: libkpimexchange1-kde3-dev (<< 4:14.0.0~), libkpimexchange1-trinity-dev (<< 4:14.0.0~)
-Depends: libkpimexchange1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
+Depends: libkpimexchange1-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
 Description: Trinity PIM Exchange library [development]
  This is the development package which contains the headers for the
  libkpimexchange-trinity library.
diff --git a/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install
deleted file mode 100644
index a36a88caa..000000000
--- a/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install
+++ /dev/null
@@ -1,8 +0,0 @@
-/opt/trinity/include/libemailfunctions/idmapper.h
-/opt/trinity/include/libkcal
-/opt/trinity/lib/libkcal.la
-/opt/trinity/lib/libkcal.so
-/opt/trinity/lib/libkcal_resourceremote.la
-/opt/trinity/lib/libkcal_resourceremote.so
-/opt/trinity/lib/libkholidays.la
-/opt/trinity/lib/libkholidays.so
diff --git a/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install b/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install
deleted file mode 100644
index 8f9263fcd..000000000
--- a/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install
+++ /dev/null
@@ -1,21 +0,0 @@
-/opt/trinity/lib/trinity/kcal_tdeabc.la
-/opt/trinity/lib/trinity/kcal_tdeabc.so
-/opt/trinity/lib/trinity/kcal_localdir.la
-/opt/trinity/lib/trinity/kcal_localdir.so
-/opt/trinity/lib/trinity/kcal_local.la
-/opt/trinity/lib/trinity/kcal_local.so
-/opt/trinity/lib/trinity/kcal_remote.la
-/opt/trinity/lib/trinity/kcal_remote.so
-/opt/trinity/lib/libkcal.so.2
-/opt/trinity/lib/libkcal.so.2.0.0
-/opt/trinity/lib/libkcal_resourceremote.so.1
-/opt/trinity/lib/libkcal_resourceremote.so.1.0.0
-/opt/trinity/lib/libkholidays.so.1
-/opt/trinity/lib/libkholidays.so.1.0.0
-/opt/trinity/share/apps/libkholidays
-/opt/trinity/share/services/tderesources/kcal/imap.desktop
-/opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
-/opt/trinity/share/services/tderesources/kcal/local.desktop
-/opt/trinity/share/services/tderesources/kcal/localdir.desktop
-/opt/trinity/share/services/tderesources/kcal/remote.desktop
-/opt/trinity/share/services/tderesources/kcal_manager.desktop
diff --git a/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install
index c60c55a41..632541749 100644
--- a/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install
@@ -1,3 +1,11 @@
+/opt/trinity/include/libemailfunctions/idmapper.h
+/opt/trinity/include/libkcal
 /opt/trinity/include/tdepimmacros.h
+/opt/trinity/lib/libkcal.la
+/opt/trinity/lib/libkcal.so
+/opt/trinity/lib/libkcal_resourceremote.la
+/opt/trinity/lib/libkcal_resourceremote.so
+/opt/trinity/lib/libkholidays.la
+/opt/trinity/lib/libkholidays.so
 /opt/trinity/lib/libtdepim.la
 /opt/trinity/lib/libtdepim.so
diff --git a/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install b/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install
index e018f4bdf..9e52e618f 100644
--- a/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install
@@ -1,12 +1,33 @@
-/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la
-/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so
-/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la
-/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so
+/opt/trinity/lib/libkcal.so.2
+/opt/trinity/lib/libkcal.so.2.0.0
+/opt/trinity/lib/libkcal_resourceremote.so.1
+/opt/trinity/lib/libkcal_resourceremote.so.1.0.0
+/opt/trinity/lib/libkholidays.so.1
+/opt/trinity/lib/libkholidays.so.1.0.0
 /opt/trinity/lib/libtdepim.so.1
 /opt/trinity/lib/libtdepim.so.1.0.0
-/opt/trinity/share/apps/tdepimwidgets
+/opt/trinity/lib/trinity/kcal_local.la
+/opt/trinity/lib/trinity/kcal_local.so
+/opt/trinity/lib/trinity/kcal_localdir.la
+/opt/trinity/lib/trinity/kcal_localdir.so
+/opt/trinity/lib/trinity/kcal_remote.la
+/opt/trinity/lib/trinity/kcal_remote.so
+/opt/trinity/lib/trinity/kcal_tdeabc.la
+/opt/trinity/lib/trinity/kcal_tdeabc.so
+/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la
+/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so
+/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la
+/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so
+/opt/trinity/share/apps/libkholidays
 /opt/trinity/share/apps/libtdepim
 /opt/trinity/share/apps/tdepim
+/opt/trinity/share/apps/tdepimwidgets
 /opt/trinity/share/config.kcfg/pimemoticons.kcfg
 /opt/trinity/share/icons/crystalsvg/22x22/actions/button_fewer.png
 /opt/trinity/share/icons/crystalsvg/22x22/actions/button_more.png
+/opt/trinity/share/services/tderesources/kcal/imap.desktop
+/opt/trinity/share/services/tderesources/kcal/local.desktop
+/opt/trinity/share/services/tderesources/kcal/localdir.desktop
+/opt/trinity/share/services/tderesources/kcal/remote.desktop
+/opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
+/opt/trinity/share/services/tderesources/kcal_manager.desktop
diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules
index 135929c4e..25005d459 100755
--- a/ubuntu/maverick/tdepim/debian/rules
+++ b/ubuntu/maverick/tdepim/debian/rules
@@ -37,7 +37,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 
 shlibs_ver=4:3.5.7
 DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_libkcal2b-trinity := -V'libkcal2b-trinity (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libtdenetwork2-trinity := -V'libtdenetwork2-trinity (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libtdepim1a-trinity := -V'libtdepim1a-trinity (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkgantt0-trinity := -V'libkgantt0-trinity (>= $(shlibs_ver))'
@@ -62,20 +61,6 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
 
-## Move kaddressbook-trinity dependency (from libtdeabc_xmlrpc.so) to Recommends
-#DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \
-#	-Xopt/lib/trinity/libtdeabc_xmlrpc.so.1 \
-#	-- -dRecommends \
-#	debian/tdepim-tderesources/opt/trinity/lib/libtdeabc_xmlrpc.so.1.* \
-#	-dDepends
-#
-## Move kaddressbook dependency of libkcal2b-trinity to Recommends
-#DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
-#	-Xopt/trinity/lib/trinity/kcal_tdeabc.so \
-#	-- -dRecommends \
-#	debian/libkcal2b/opt/trinity/lib/trinity/kcal_tdeabc.so \
-#	-dDepends
-
 test-shlibdeps:
 	@echo $(DEB_DH_SHLIBDEPS_ARGS_kontact-trinity)
 
diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control
index 654074e7b..25b13b204 100644
--- a/ubuntu/maverick/tdesdk/debian/control
+++ b/ubuntu/maverick/tdesdk/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.
 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 (>= 5.0.31), quilt, cmake, autotools-dev, gawk,
  gettext, pkg-config, tdelibs14-trinity-dev, binutils-dev, bison, flex,
- tdepim-trinity-dev, libapr1-dev, libkcal2-trinity-dev,
+ 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
diff --git a/ubuntu/maverick/tdevelop/debian/control b/ubuntu/maverick/tdevelop/debian/control
index 53920834b..f6c009e5b 100644
--- a/ubuntu/maverick/tdevelop/debian/control
+++ b/ubuntu/maverick/tdevelop/debian/control
@@ -8,11 +8,11 @@ Standards-Version: 3.8.4
 
 Package: tdevelop-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebase-trinity-bin, tdelibs-trinity-dev, g++
+Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebase-trinity-bin
 Replaces: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python, g++, kdevdesigner-trinity
 Description: An IDE for Unix/X11
  TDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
@@ -53,6 +53,12 @@ Description: An IDE for Unix/X11 - data
  .
  This package contains arch independent data for TDevelop.
 
+Package: kdevdesigner-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, tdevelop-trinity (= ${source:Version})
+Description: KDevDesigner part for TDevelop
+ This package provides the KDevDesigner part for TDevelop
+
 Package: tdevelop-trinity-dev
 Architecture: any
 Depends: tdevelop-trinity (= ${binary:Version}), tdelibs14-trinity-dev
diff --git a/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.install b/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.install
new file mode 100644
index 000000000..e57f4a7b3
--- /dev/null
+++ b/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/lib/trinity/libkdevdesignerpart.*
+debian/tmp/opt/trinity/bin/kdevdesigner
+debian/tmp/opt/trinity/share/services/kdevdesigner_part.desktop
diff --git a/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.manpages b/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.manpages
new file mode 100644
index 000000000..d7d59e386
--- /dev/null
+++ b/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.manpages
@@ -0,0 +1 @@
+debian/man/out/kdevdesigner.1
diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules
index 20d310e1c..d07b4750e 100755
--- a/ubuntu/maverick/tdevelop/debian/rules
+++ b/ubuntu/maverick/tdevelop/debian/rules
@@ -1,5 +1,14 @@
 #!/usr/bin/make -f
 
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=/opt/trinity/lib:debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :/opt/trinity/lib:debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
 # work around debian/cdbs/uploaders.mk
 makebuilddir::
 	[ -f debian/control.tmp ] || cp debian/control debian/control.tmp
@@ -78,4 +87,5 @@ binary-install/tdevelop-trinity::
 	mkdir -p debian/tdevelop-trinity/opt/trinity/share/pixmaps
 	cp debian/tdevelop.xpm debian/tdevelop-trinity/opt/trinity/share/pixmaps
 	mv debian/tdevelop-trinity/usr/share/man debian/tdevelop-trinity/opt/trinity/share/
-
+	rm debian/tdevelop-trinity/opt/trinity/lib/trinity/libkdevdesignerpart.*
+	rm debian/tdevelop-trinity/opt/trinity/share/services/kdevdesigner_part.desktop
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
index 4f53c0795..c5d963303 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
@@ -1,7 +1,6 @@
 debian/tmp/etc/trinity/kdevassistantrc
 debian/tmp/etc/trinity/tdeveloprc
 debian/tmp/opt/trinity/bin/tdevelop-htdig
-debian/tmp/opt/trinity/bin/kdevdesigner
 debian/tmp/opt/trinity/bin/kdevprofileeditor
 debian/tmp/opt/trinity/bin/kdevassistant
 debian/tmp/opt/trinity/bin/kdevprj2tdevelop
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
index 1e10ab62e..e3fa64301 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
@@ -1,5 +1,4 @@
 debian/man/out/tdevelop.1
-debian/man/out/kdevdesigner.1
 debian/man/out/kdevassistant.1
 debian/man/out/kdevprj2tdevelop.1
 debian/man/out/kdevprofileeditor.1