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

16 files changed, 878 insertions, 0 deletions

diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- 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/tde-systemsettings/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..47e83ef4a
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+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
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+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/kde/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/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/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/kde/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/tde-systemsettings/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk
new file mode 100644
index 000000000..5b6508f8c
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- 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/kde/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/kde"
+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/tde-systemsettings/debian/cdbs/team-members b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/team-members
new file mode 100644
index 000000000..05761af6e
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/team-members
@@ -0,0 +1,16 @@
+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/tde-systemsettings/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+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/tde-systemsettings/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/versions.pl
new file mode 100644
index 000000000..9ce11d8a3
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/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/-[^-]+$//;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/changelog b/ubuntu/maverick/applications/tde-systemsettings/debian/changelog
new file mode 100644
index 000000000..49bc830e9
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/changelog
@@ -0,0 +1,257 @@
+tde-systemsettings-trinity (0.0svn20070312-0ubuntu5) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
+
+tde-systemsettings-trinity (0.0svn20070312-0ubuntu4) intrepid; urgency=low
+
+  * Removed long-broken Bluetooth configuration icon
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 22 April 2009 20:44:00 -0600
+
+tde-systemsettings-trinity (0.0svn20070312-0ubuntu3) intrepid; urgency=low
+
+  * Moved Trinity to /opt/trinity
+  * Integrated properly with KDE4.2+
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
+
+tde-systemsettings-trinity (0.0svn20070312-0ubuntu2) intrepid; urgency=low
+
+  * Added -trinity suffix
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 Dec 2008 18:44:00 -0600
+
+tde-systemsettings (0.0svn20070312-0ubuntu5) hardy; urgency=low
+
+  * Cleanup previous installed
+    /etc/xdg/menus/kde-applications-merged/system-settings-merge.menu
+    (LP: #127722)
+  * Add link for file association handling to system settings (LP: #50320)
+    - Added debian/patches/kubuntu_05_add_filetypes_submenu.diff:
+    - Patch from Slammer
+  * Fix "Settings Menu cannot launch default applications module"
+    - LP: #132688
+    - Patch from Marcus Harris
+  * Fix lintian warnings in debian/control:
+    - Standards-Version: 3.7.3
+    - Remove build-essential from Build-Depends
+
+ -- dAniel hAhler <ubuntu@thequod.de>  Sat, 29 Dec 2007 12:23:42 +0100
+
+tde-systemsettings (0.0svn20070312-0ubuntu4) gutsy; urgency=low
+
+  * Added kubuntu_04_fix_share_submenu.diff, adds missing 'Desktop
+    Share' entry
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 15 Oct 2007 11:59:04 +0200
+
+tde-systemsettings (0.0svn20070312-0ubuntu3) gutsy; urgency=low
+
+  * Added kubuntu_02_checkadmin_fix.diff, fixes the way systemsettings
+    checks if kcm module requires admin privileges, to make it to work
+    the way kcontrol does.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 22 Aug 2007 13:02:07 +0200
+
+tde-systemsettings (0.0svn20070312-0ubuntu2) gutsy; urgency=low
+
+  * Use applications-merged not kde-applications-merged, XDG prefix
+    not used for merge directories, closes 
+    https://bugs.launchpad.net/ubuntu/gutsy/+source/tde-systemsettings/+bug/114286
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 05 Jun 2007 01:57:42 +0100
+
+tde-systemsettings (0.0svn20070312-0ubuntu1) feisty; urgency=low
+
+  * New snapshot
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 12 Mar 2007 23:25:11 +0000
+
+tde-systemsettings (0.0svn20070104-0ubuntu3) feisty; urgency=low
+
+  * Added kubuntu_05_more_categories.diff to allow universe
+    apps with kcm to go in the right section
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 22 Jan 2007 18:56:37 +0100
+
+tde-systemsettings (0.0svn20070104-0ubuntu2) feisty; urgency=low
+
+  * Added kubuntu_04_kcmgtk to get gtk-qt-engines in the
+    Appearance section
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 19 Jan 2007 05:42:21 +0100
+
+tde-systemsettings (0.0svn20070104-0ubuntu1) feisty; urgency=low
+
+  * New SVN snapshot
+  * Don't build with unsermake
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  4 Jan 2007 19:51:18 +0000
+
+tde-systemsettings (0.0svn20060929-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  29 Sep 2006 00:02:55 +0200
+
+tde-systemsettings (0.0svn20060908-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  8 Sep 2006 20:41:55 +0200
+
+tde-systemsettings (0.0svn20060906-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  6 Sep 2006 20:51:55 +0000
+
+tde-systemsettings (0.0svn20060830-0ubuntu3) edgy; urgency=low
+
+  * Changed debian/rules to remove laptoppowermanagement.desktop
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue,  5 Sep 2006 21:17:25 +0200
+
+tde-systemsettings (0.0svn20060830-0ubuntu2) edgy; urgency=low
+
+  * Changed debian/rules to install kde-settings-accessibility_ss.directory
+    correctly
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue,  5 Sep 2006 21:03:25 +0200
+
+tde-systemsettings (0.0svn20060830-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot, includes changes for 
+    kubuntu-system-settings-usability by Simon Edwards
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed,  30 Aug 2006 16:03:25 +0200
+
+tde-systemsettings (0.0svn20060803-0ubuntu2) edgy; urgency=low
+
+  * Stopped tde-systemsettings installing
+    kde-settings-accessibility.directory (also in tdebase-data).
+    Closes bug #55135
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri,  4 Aug 2006 13:01:09 +1000
+
+tde-systemsettings (0.0svn20060803-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot, includes changes for 
+    kubuntu-system-settings-usability by Simon Edwards
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  3 Aug 2006 16:44:25 +0100
+
+tde-systemsettings (0.0svn20060512-0ubuntu1) dapper; urgency=low
+
+  [ Jonathan Riddell ]
+  * New SVN snapshot, includes our Debian patches now 
+    upstream plus new translations
+
+  [ Anthony Mercatante ]
+  * Move componentchooser to components
+  * Show spellchecking
+  * Move kcmsmserver to components
+  * Move Accessibility to Personal
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 12 May 2006 16:10:16 +0300
+
+tde-systemsettings (0.0svn20060502-0ubuntu1) dapper; urgency=low
+
+  [ Jonathan Riddell ]
+  * New SVN snapshot
+  * Adds languages cs, ka, lt
+  * Bump standards-version to 3.6.2
+
+  [ Simon Edwards ]
+  * Support the "Close" button for modules that want it, 
+    closes Malone #38582
+  * Disable and enable the Reset button properly.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  2 May 2006 02:14:19 +0100
+
+tde-systemsettings (0.0svn20060413-0ubuntu1) dapper; urgency=low
+
+  * New SVN snapshot, no code changes only new translations 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Apr 2006 17:31:56 +0100
+
+tde-systemsettings (0.0svn20060314-0ubuntu4) dapper; urgency=low
+
+  * Fix format in kubuntu_02_update_menus.diff.
+
+ -- Raphaël Pinson <raphink@ubuntu.com>  Fri, 17 Mar 2006 16:48:12 +0100
+
+tde-systemsettings (0.0svn20060314-0ubuntu3) dapper; urgency=low
+
+  * Modify kubuntu_02_update_menus.diff to prevent k3bsetup from showing up.
+
+ -- Raphaël Pinson <raphink@ubuntu.com>  Fri, 17 Mar 2006 15:02:49 +0100
+
+tde-systemsettings (0.0svn20060314-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_03_no_kbuildsycoca.diff, stop it running kbuildsycocoa 
+    during 'make install'
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Mar 2006 01:12:43 +0000
+
+tde-systemsettings (0.0svn20060314-0ubuntu1) dapper; urgency=low
+
+  * New upstream snapshot, adds various bugfixes by Simon Edwards
+    - Remove text for the "reset" button and put the icon text 
+      of the right hand side.
+    - Fix when going from a module back to the module overview, the
+      last selected module icon would stay selected
+    - If the dialog contents don't fit then scrollbars are shown
+    - Fix the evil "This module is already loaded in systemsettings"
+      error.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 14 Mar 2006 00:44:10 +0000
+
+tde-systemsettings (0.0svn20051207-0ubuntu4) dapper; urgency=low
+
+  * Don't use DEB_AUTO_UPDATE_DEBIAN_CONTROL
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Dec 2005 18:52:52 +0000
+
+tde-systemsettings (0.0svn20051207-0ubuntu3) dapper; urgency=low
+
+  * Add build-dep on automake1.9
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Dec 2005 03:55:12 +0000
+
+tde-systemsettings (0.0svn20051207-0ubuntu2) dapper; urgency=low
+
+  * Add build-dep on autoconf
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  7 Dec 2005 18:26:47 +0000
+
+tde-systemsettings (0.0svn20051207-0ubuntu1) dapper; urgency=low
+
+  * New snapshot
+  * Rebuild for libstdc++ transition
+  * Add kubuntu_01_kdepot.diff to be able to generate .pot file
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  7 Dec 2005 16:20:32 +0000
+
+tde-systemsettings (0.0svn20050613-0ubuntu3) breezy; urgency=low
+
+  * Add kubuntu_02_update_menus.diff, kde-settings-bluetooth.directory
+    and kde-settings-laptops.directory to tidy up menus
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 24 Sep 2005 18:11:08 +0100
+
+tde-systemsettings (0.0svn20050613-0ubuntu2) breezy; urgency=low
+
+  * Add kubuntu_01_only_show_in_kde.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Jun 2005 17:10:56 +0000
+
+tde-systemsettings (0.0svn20050613-0ubuntu1) breezy; urgency=low
+
+  * Initial Release.
+  * Added manpage (from docbook source).
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Jun 2005 13:04:26 +0000
+
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/compat b/ubuntu/maverick/applications/tde-systemsettings/debian/compat
new file mode 100644
index 000000000..b8626c4cf
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/control b/ubuntu/maverick/applications/tde-systemsettings/debian/control
new file mode 100644
index 000000000..d0ddb0d48
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/control
@@ -0,0 +1,15 @@
+Source: tde-systemsettings-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), patchutils (>= 0.2.25), tdelibs4-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: tde-systemsettings-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, kcontrol-trinity
+Replaces: tde-systemsettings-kde3 (<< 4:3.5.13)
+Breaks: tde-systemsettings-kde3 (<< 4:3.5.13)
+Description: easy to use control centre for TDE
+ System preferences is a replacement for the TDE
+ Control Centre with an improved user interface.
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/copyright b/ubuntu/maverick/applications/tde-systemsettings/debian/copyright
new file mode 100644
index 000000000..04a4bdce1
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/copyright
@@ -0,0 +1,36 @@
+This package was debianised by Jonathan Riddell <jriddell@ubuntu.com> on
+Thu,  9 Jun 2005 13:04:26 +0000.
+
+Debian packagers:
+    Copyright (C) 2005 Jonathan Riddell <jriddell@ubuntu.com>
+
+Upstream Author:
+    Benjamin Charles Meyer <ben+kubuntusystempreferences@meyerhome.net>
+
+Copyright and license:
+
+All the software and systemsettings.1.docbook is 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
+
+all the software:
+
+    Copyright (C) 2005 by Benjamin Charles Meyer <ben+kubuntusystempreferences@meyerhome.net>
+
+debian/systemsettings.1.docbook :
+
+    Copyright (C) 2005 by Jonathan Riddell <jriddell@ubuntu.com>
+
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/docs b/ubuntu/maverick/applications/tde-systemsettings/debian/docs
new file mode 100644
index 000000000..0eb1e7d11
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/docs
@@ -0,0 +1,4 @@
+AUTHOR
+
+
+
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/kde-settings-laptops.directory b/ubuntu/maverick/applications/tde-systemsettings/debian/kde-settings-laptops.directory
new file mode 100644
index 000000000..687a493c4
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/kde-settings-laptops.directory
@@ -0,0 +1,13 @@
+[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/maverick/applications/tde-systemsettings/debian/patches/.gitignore b/ubuntu/maverick/applications/tde-systemsettings/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/rules b/ubuntu/maverick/applications/tde-systemsettings/debian/rules
new file mode 100755
index 000000000..82d5c2429
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/rules
@@ -0,0 +1,44 @@
+#!/usr/bin/make -f
+
+cdbs_kde_enable_debug = --disable-debug
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include debian/cdbs/kde.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
+
+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
+
+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/kde-settings-power.directory
+	rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/kde-settings-system.directory
+	rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/kde/kcmfontinst.desktop
+	rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/kde/laptoppowermanagement.desktop
+	cp debian/kde-settings-laptops.directory debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/
+
+DEB_INSTALL_MANPAGES_tde-systemsettings-trinity = systemsettings.1
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/systemsettings.1.docbook b/ubuntu/maverick/applications/tde-systemsettings/debian/systemsettings.1.docbook
new file mode 100644
index 000000000..2b260e626
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/systemsettings.1.docbook
@@ -0,0 +1,123 @@
+<?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>KDE System Settings.</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>systemsettings</command>
+      <arg choice="opt">
+        <option><replaceable>Qt-options</replaceable></option>
+      </arg>
+      <arg choice="opt">
+        <option><replaceable>KDE-options</replaceable></option>
+      </arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+    <para>
+        System Settings is a user friendly control centre for KDE.
+    </para>
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+    <para>
+      All <productname>KDE</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-kde</option> </term>
+          <listitem> <para>Show KDE 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/maverick/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst b/ubuntu/maverick/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
new file mode 100644
index 000000000..f7b840ea2
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+
+case "$1" in
+
+    upgrade)
+
+	# Remove wrong previous used file/dir:
+	FILE="/etc/xdg/menus/kde-applications-merged/system-settings-merge.menu"
+	SUBDIR="/etc/xdg/menus/kde-applications-merged"
+        if [ ! -L "$SUBDIR" ] && [ -d "$SUBDIR" ]; then
+		if [ -f "$FILE" ]; then rm -f "$FILE"; fi
+		rmdir --ignore-fail-on-non-empty "$SUBDIR"
+	fi
+    ;;
+
+    install|abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0
+