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

71 files changed, 1366 insertions, 18 deletions

diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/buildvars.mk
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/buildvars.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..47e83ef4a 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
index 5b6508f8c..5b6508f8c 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/team-members b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/team-members
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/team-members
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/uploaders.mk
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/uploaders.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/changelog b/ubuntu/maverick/applications/kdbusnotification/debian/changelog
new file mode 100644
index 000000000..cfe6b75c1
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/changelog
@@ -0,0 +1,9 @@
+kdbusnotification-trinity (0.1-0ubuntu1) maverick; urgency=low
+
+  * Initial upload
+
+ -- Timothy Pearson <[email protected]>  Mon, 17 Oct 2010 19:35:00 -0600
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/compat b/ubuntu/maverick/applications/kdbusnotification/debian/compat
new file mode 100644
index 000000000..8adb55bea
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/compat
@@ -0,0 +1 @@
+4 
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/control b/ubuntu/maverick/applications/kdbusnotification/debian/control
new file mode 100644
index 000000000..dfd6737bd
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/control
@@ -0,0 +1,14 @@
+Source: kdbusnotification-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <[email protected]>
+Build-Depends: debhelper (>> 4.0.0), kdelibs4-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kdbusnotification-trinity
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Description: a DBUS notification service [Trinity]
+ kdbusnotification is a small program for Trinity that displays
+ DBUS notifications via unobtrusive, easily dismissed passive popups.
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/copyright b/ubuntu/maverick/applications/kdbusnotification/debian/copyright
new file mode 100644
index 000000000..760904ce9
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/copyright
@@ -0,0 +1,24 @@
+This package was debianized by Timothy Pearson <[email protected]> on
+Mon, 17 Oct 2011 09:37:00 -0600.
+
+Upstream Authors: Timothy Pearson <[email protected]>
+
+Copyright:
+
+   Copyright    (c) 2011, Timothy Pearson
+
+   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'.
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/patches/series b/ubuntu/maverick/applications/kdbusnotification/debian/links
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/patches/series
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/links
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/rules b/ubuntu/maverick/applications/kdbusnotification/debian/rules
new file mode 100755
index 000000000..3fbf27bb0
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/rules
@@ -0,0 +1,191 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+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)
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+INSTALL_DIR = install -p -d -o root -g root -m 755
+INSTALL_FILE = install -p -o root -g root -m 644
+
+objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+
+tmp = debian/kdbusnotification-trinity
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+ifeq ($(DEB_BUILD_GNU_TYPE),i386-linux)
+  # Uncomment the following 2 lines to enable i686 optimziation
+  # You may want to tweak the settings to your likings
+  #export CFLAGS=-O3 -march=i686 -ffast-math -finline-functions
+  #export CXXFLAGS=-O3 -march=i686 -ffast-math -finline-functions
+endif
+
+-include debian/debiandirs
+
+debian/debiandirs: admin/debianrules
+	perl -w admin/debianrules echodirs > debian/debiandirs
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+
+	# Apply Debian specific patches
+	if test ! -f patch-stamp; then \
+		for patch in $(CURDIR)/debian/patches/*.diff ;\
+		do \
+			echo APPLYING PATCH\: $${patch##*/};\
+			patch -p1 < $$patch ;\
+		done ;\
+		touch patch-stamp ;\
+	fi
+
+	! [ -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
+
+	if test ! -f configure; then \
+		$(MAKE) -f admin/Makefile.common ;\
+	fi
+
+	# make build directory
+	mkdir $(objdir)
+
+	# run configure with build tree $(objdir)
+	cd $(objdir) && \
+	../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+
+	touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp 
+	dh_testdir
+
+	cd $(objdir) && \
+	$(MAKE)
+
+	touch build-stamp
+
+debian-clean:
+	dh_testdir
+	dh_testroot
+
+	dh_clean
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp debian/debiandirs
+
+	# Remove Debian specific patches
+	if test -f patch-stamp; then \
+		for patch in $(CURDIR)/debian/patches/*.diff ;\
+		do \
+			echo REMOVING PATCH\: $${patch##*/};\
+			patch -p1 -R < $$patch ;\
+		done ;\
+		rm -f patch-stamp ;\
+	fi
+
+	# Remove build tree
+	rm -rf $(objdir)
+
+	# if Makefile exists run distclean
+	if test -f Makefile; then \
+		$(MAKE) distclean; \
+	fi
+
+	if test -d CVS; then \
+		$(MAKE) -f admin/Makefile.common cvs-clean ;\
+	fi
+
+	dh_clean
+
+install: DH_OPTIONS=
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	cd $(objdir) && \
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/kdbusnotification-trinity
+
+	# Install additional files beyond the standard install.
+	dh_install
+
+	# Generate HTML docs.
+	for i in `find $(tmp) -name "index.docbook"`; do \
+	  ( cd `dirname $$i`; /opt/trinity/bin/meinproc `basename $$i` ); \
+	done
+
+	# Install standard documentation links.
+	for pkg in `dh_listpackages`; do \
+	  if test -d debian/$$pkg/opt/trinity/share/doc/kde/HTML/en/$$pkg; then \
+	    dh_link -p$$pkg opt/trinity/share/doc/kde/HTML/en/$$pkg \
+	      opt/trinity/share/doc/$$pkg/html; \
+	  fi; \
+	done
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installexamples
+	dh_installmanpages
+	dh_installmime
+	dh_strip
+	dh_link
+	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
+	dh_fixperms
+	dh_makeshlibs -V
+	dh_installdeb
+	dh_perl
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build install
+	# We have nothing to do by default.
+
+# Build architecture dependant packages using the common target.
+binary-arch: build install
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+	$(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/ubuntu/maverick/applications/kdesvn/debian/control b/ubuntu/maverick/applications/kdesvn/debian/control
index e3d86ed80..8345fa9de 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/control
+++ b/ubuntu/maverick/applications/kdesvn/debian/control
@@ -52,6 +52,7 @@ Architecture: any
 Replaces: kdesvn-kio-plugins-kde3 (<< 4:3.5.13)
 Breaks: kdesvn-kio-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kdesdk-kio-plugins-trinity
 Description: subversion I/O slaves for Trinity
  This packages includes KIO slaves for svn, svn+file, svn+http, 
  svn+https, svn+ssh. This allows you to access subversion repositories 
diff --git a/ubuntu/maverick/applications/kiosktool/debian/changelog b/ubuntu/maverick/applications/kiosktool/debian/changelog
new file mode 100644
index 000000000..a81e4659e
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/changelog
@@ -0,0 +1,92 @@
+kiosktool-trinity (1.0-2.0ubuntu0) maverick; urgency=low
+
+  * Trinity rebuild
+
+ -- Timothy Pearson <[email protected]>  Sat, 15 Oct 2011 04:19:00 -0600
+
+kiosktool (1.0-1.1ubuntu6) hardy; urgency=low
+
+  * Rebuild with recent g++ compiler version.
+
+ -- Matthias Klose <[email protected]>  Thu, 03 Apr 2008 11:24:40 +0000
+
+kiosktool (1.0-1.1ubuntu5) gutsy; urgency=low
+
+  * Add kubuntu_03_sudo_support.diff to support sudo
+  * Add depend on kdesudo
+  * Move maintainer to XSBC-Original-Maintainer: 
+
+ -- Jonathan Riddell <[email protected]>  Fri, 20 Jul 2007 16:57:11 +0100
+
+kiosktool (1.0-1.1ubuntu4) edgy; urgency=low
+
+  * Rebuild so it doesnt depend on libgamin0
+
+ -- Sarah Hobbs <[email protected]>  Tue, 25 Jul 2006 13:25:55 +1000
+
+kiosktool (1.0-1.1ubuntu3) dapper; urgency=low
+
+  * Add kubuntu_02_kmenu.diff use the correct menu file
+
+ -- Jonathan Riddell <[email protected]>  Sun, 18 Dec 2005 15:46:35 +0000
+
+kiosktool (1.0-1.1ubuntu2) dapper; urgency=low
+
+  * Add automake1.9 build-dep
+
+ -- Jonathan Riddell <[email protected]>  Wed, 14 Dec 2005 17:43:36 +0000
+
+kiosktool (1.0-1.1ubuntu1) dapper; urgency=low
+
+  * Rebuild for libstdc++ transition
+  * Add kubuntu_01_kdepot.diff for .pot generation
+
+ -- Jonathan Riddell <[email protected]>  Wed, 14 Dec 2005 11:35:56 +0000
+
+kiosktool (1.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Trigger rebuild for the Qt/KDE transition, no source changes needed.
+    (Closes: #327996)
+
+ -- Adeodato Simó <[email protected]>  Tue, 27 Sep 2005 16:07:52 +0200
+
+kiosktool (1.0-1) unstable; urgency=low
+
+  * Released kiosktool 1.0
+
+ -- Pedro Jurado Maqueda <[email protected]>  Tue, 26 Apr 2005 22:38:16 +0200
+
+kiosktool (0.9-2) unstable; urgency=low
+
+  * Solved a problem with upstream sources due to some messages translated to Spanish
+  * Changed description
+  * First Debian upload, closes: #267595
+  * Erased line Categories=Qt;KDE;System in kiosktool.desktop because this file is installed in Utilities category
+  
+ -- Pedro Jurado Maqueda <[email protected]>  Wed,  5 Jan 2005 15:18:17 +0100
+
+kiosktool (0.9-1) unstable; urgency=low
+
+   * Released kiosktool 0.9
+
+ -- Pedro Jurado Maqueda <[email protected]>  Wed, 13 Oct 2004 14:57:28 +0200
+ 
+kiosktool (0.8-1) unstable; urgency=low
+
+   * First use of cdbs for packaging
+   * Created a man page with kdemangen.pl (thanks to Dominique Devriese)	
+
+ -- Pedro Jurado Maqueda <[email protected]>  Mon, 23 Aug 2004 11:53:37 +0200
+
+kiosktool (0.7-1) unstable; urgency=low
+
+   * Correct a semantic error in description
+
+ -- Pedro Jurado Maqueda <[email protected]>  Wed, 7 Jul 2004 15:19:42 +0200
+
+kiosktool (0.6-1) unstable; urgency=low
+
+   * Initial release
+
+ -- Pedro Jurado Maqueda <[email protected]>  Wed, 7 Jul 2004 15:19:42 +0200
diff --git a/ubuntu/maverick/applications/kiosktool/debian/compat b/ubuntu/maverick/applications/kiosktool/debian/compat
new file mode 100644
index 000000000..b8626c4cf
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/ubuntu/maverick/applications/kiosktool/debian/control b/ubuntu/maverick/applications/kiosktool/debian/control
new file mode 100644
index 000000000..bbf9a457f
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/control
@@ -0,0 +1,15 @@
+Source: kiosktool-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <[email protected]>
+XSBC-Original-Maintainer: Pedro Jurado Maqueda <[email protected]>
+Build-Depends: debhelper (>= 4.1.0), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kiosktool-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, kdesudo-trinity
+Description: tool to configure the TDE kiosk framework
+ A Point&Click tool for system administrators to enable 
+ TDE's KIOSK features or otherwise preconfigure TDE for 
+ groups of users.
diff --git a/ubuntu/maverick/applications/kiosktool/debian/copyright b/ubuntu/maverick/applications/kiosktool/debian/copyright
new file mode 100644
index 000000000..a88b1d8d2
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Pedro Jurado Maqueda <[email protected]> on
+Fri, 14 Jul 2004 12:49:42 +0200.
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/admin
+
+Upstream Author: Waldo Bastian <[email protected]>
+
+Copyright:
+	2003, 2004  Waldo Bastian <[email protected]>
+	2004        Martijn Klingens <[email protected]>
+
+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., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
new file mode 100644
index 000000000..62faad5d3
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
@@ -0,0 +1,146 @@
+.\" This file was generated by kdemangen.pl
+.TH KIOSKTOOL\-KDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $KDEDIRS according to the current user profile."
+.SH NAME
+kiosktool\-kdedirs
+\- A tool to set $KDEDIRS according to the current user profile.
+.SH SYNOPSIS
+kiosktool\-kdedirs [Qt\-options] [KDE\-options] [options] 
+.SH DESCRIPTION
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-check  
+Output currently active prefixes
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar.
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon.
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar.
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file.
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'.
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps.
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B  \-\-style  <style>
+sets the application GUI style.
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget.
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'.
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'.
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display.
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard.
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override.
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging.
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font.
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color.
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color.
+.TP
+.B  \-\-name  <name>
+sets the application name.
+.TP
+.B  \-\-title  <title>
+sets the application title (caption).
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display.
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root.
+.TP
+.B  \-\-im  <XIM server>
+set XIM server.
+.TP
+.B  \-\-noxim  
+disable XIM.
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets.
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center.  You can also enter the URL
+.BR help:/kiosktool\-kdedirs/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kiosktool\-kdedirs/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
new file mode 100644
index 000000000..08ba2ec80
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
@@ -0,0 +1,150 @@
+.\" This file was generated by kdemangen.pl
+.TH KIOSKTOOL 1 "Ago 2004" "K Desktop Environment" "KIOSK Admin Tool"
+.SH NAME
+kiosktool
+\- KIOSK Admin Tool
+.SH SYNOPSIS
+kiosktool [Qt\-options] [KDE\-options] [options] 
+.SH DESCRIPTION
+With this application we can lock the access to some parts of KDE desktop
+and its applications.
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-kderc  <file>
+kderc file to save settings to [/etc/kderc]
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar.
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon.
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar.
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file.
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'.
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps.
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B  \-\-style  <style>
+sets the application GUI style.
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget.
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'.
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'.
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display.
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard.
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override.
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging.
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font.
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color.
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color.
+.TP
+.B  \-\-name  <name>
+sets the application name.
+.TP
+.B  \-\-title  <title>
+sets the application title (caption).
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display.
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root.
+.TP
+.B  \-\-im  <XIM server>
+set XIM server.
+.TP
+.B  \-\-noxim  
+disable XIM.
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets.
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center.  You can also enter the URL
+.BR help:/kiosktool/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kiosktool/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Waldo Bastian <[email protected]>
+.br
+
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages
new file mode 100644
index 000000000..2d009e1db
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages
@@ -0,0 +1,2 @@
+debian/kiosktool-trinity.1
+debian/kiosktool-kdedirs-trinity.1
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
new file mode 100644
index 000000000..77f7d912f
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
@@ -0,0 +1,13 @@
+--- kiosktool/kiosktool/menueditComponent.cpp	2005-04-25 09:46:33.000000000 +0000
++++ kiosktool/kiosktool/menueditComponent.cpp	2005-12-18 14:45:26.000000000 +0000
+@@ -104,8 +104,8 @@
+ {
+    bool result;
+    TQString menuEditFile = KioskRun::self()->locateLocal("xdgconf-menu", "applications-kmenuedit.menu");
+-   TQString menuFile = KioskRun::self()->locate("xdgconf-menu", "applications.menu");
+-   TQString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "applications.menu");
++   TQString menuFile = KioskRun::self()->locate("xdgconf-menu", "kde-applications.menu");
++   TQString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "kde-applications.menu");
+ 
+    kdDebug() << "MenuEditComponent: menuEditFile = " << menuEditFile << endl;
+    kdDebug() << "MenuEditComponent: menuFile = " << menuFile << endl;
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
new file mode 100644
index 000000000..d850db3da
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
@@ -0,0 +1,157 @@
+--- kiosktool/kiosktool/kioskrun.h	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/kioskrun.h	2007-07-18 17:47:04.000000000 +0100
+@@ -37,6 +37,18 @@
+ 
+ class KioskGui;
+ 
++class NETACCESS {
++ public:
++  static bool exists(const KURL &url, bool source, TQWidget *window);
++  static bool mkdir(const KURL &url, TQWidget *window, int permissions=-1);
++  static TQString lastErrorString();
++  static int lastError();
++  static bool file_copy (const KURL &src, const KURL &dest, int permissions=-1, bool overwrite=false, bool resume=false, TQWidget *window=0L);
++  static bool del(const KURL &url, TQWidget *window);
++  static bool file_move(const KURL &src, const KURL &target, int permissions=-1, bool overwrite=false, bool resume=false, TQWidget *window=0L);
++  static bool copy(const KURL &src, const KURL &target, TQWidget *window);
++};
++
+ class KioskRun : public TQObject
+ {
+   friend class KioskGui;
+--- kiosktool/kiosktool/kioskrun.cpp	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/kioskrun.cpp	2007-07-20 16:56:07.000000000 +0100
+@@ -28,6 +28,7 @@
+ 
+ #include <tqdir.h>
+ #include <tqfile.h>
++#include <tqprocess.h>
+ 
+ #include <kapplication.h>
+ #include <kcmdlineargs.h>
+@@ -45,10 +46,124 @@
+ #include "kiosksync.h"
+ 
+ #include <kio/netaccess.h>
+-#define NETACCESS	KIO::NetAccess
++// Kiosktool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using kdesu instead
++// #define NETACCESS	KIO::NetAccess
+ 
+ #undef DEBUG_ENTRIES
+ 
++bool NETACCESS::exists(const KURL &url, bool source, TQWidget *window)
++{
++  if (url.protocol() == "fish" && url.host() == "localhost") {
++    bool exists = TQFile::exists(url.path());
++    return exists;
++  } else {
++    bool result = KIO::NetAccess::exists(url, source, window);
++    return result;
++  }
++}
++
++bool NETACCESS::mkdir(const KURL &url, TQWidget *window, int permissions)
++{
++  if (url.protocol() == "fish" && url.host() == "localhost") {
++    TQProcess proc;
++    proc.addArgument("kdesudo");
++    proc.addArgument("mkdir " + url.path());
++    TQByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++    bool exists = TQFile::exists(url.path());
++    return exists;
++  } else {
++    bool result = KIO::NetAccess::mkdir(url, window, permissions);
++    return result;
++  }
++}
++
++TQString NETACCESS::lastErrorString()
++{
++  return "Error in Kiosktool Kubuntu modifications";
++}
++
++int NETACCESS::lastError()
++{
++  return 0;
++}
++
++bool NETACCESS::file_copy(const KURL &src, const KURL &dest, int permissions, bool overwrite, bool resume, TQWidget *window)
++{
++  if (dest.protocol() == "fish" && dest.host() == "localhost") {
++    TQProcess proc;
++    proc.addArgument("kdesudo");
++    proc.addArgument("cp " + src.path() + " " + dest.path());
++    TQByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++
++    TQProcess proc2;
++    proc2.addArgument("kdesudo");
++    proc2.addArgument("chmod 0644 " + dest.path());
++    proc2.launch(buffer);
++    while (!proc2.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++
++    bool exists = TQFile::exists(dest.path());
++    return exists;
++  } else {
++    bool result = KIO::NetAccess::file_copy(src, dest, permissions, overwrite, resume, window);
++    return result;
++  }
++}
++
++bool NETACCESS::del(const KURL &url, TQWidget *window)
++{
++  if (url.protocol() == "fish" && url.host() == "localhost") {
++    TQProcess proc;
++    proc.addArgument("kdesudo");
++    proc.addArgument("rm " + url.path());
++    TQByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++    bool exists = !TQFile::exists(url.path());
++    return exists;
++  } else {
++    bool result = KIO::NetAccess::del(url, window);
++    return result;
++  }
++}
++
++bool NETACCESS::file_move(const KURL &src, const KURL &target, int permissions, bool overwrite, bool resume, TQWidget *window)
++{
++  if (target.protocol() == "fish" && target.host() == "localhost") {
++    TQProcess proc;
++    proc.addArgument("kdesudo");
++    proc.addArgument("mv " + src.path() + " " + target.path());
++    TQByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++
++    bool exists = TQFile::exists(target.path());
++    return exists;
++  } else {
++    bool result = KIO::NetAccess::file_move(src, target, permissions, overwrite, resume, window);
++    return result;
++  }
++}
++
++//only used for local files
++bool NETACCESS::copy(const KURL &src, const KURL &target, TQWidget *window)
++{
++  return KIO::NetAccess::copy(src, target, window);
++}
++
+ KioskRun *KioskRun::s_self = 0;
+ 
+ KioskRun::KioskRun( TQObject* parent, const char* name)
diff --git a/ubuntu/maverick/applications/kiosktool/debian/rules b/ubuntu/maverick/applications/kiosktool/debian/rules
new file mode 100755
index 000000000..cb6ee7c18
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/kde.mk
+
+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/knetworkmanager/debian/README.source b/ubuntu/maverick/applications/knetworkmanager8/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/README.source
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/README.source
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <[email protected]>
+# 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/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..47e83ef4a
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/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/knetworkmanager8/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
new file mode 100644
index 000000000..5b6508f8c
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <[email protected]>
+# 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/knetworkmanager8/debian/cdbs/team-members b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/team-members
new file mode 100644
index 000000000..05761af6e
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/team-members
@@ -0,0 +1,16 @@
+Sune Vuorela <[email protected]>
+Ana Beatriz Guerrero Lopez <[email protected]>
+Fathi Boudra <[email protected]>
+Modestas Vainius <[email protected]>
+Josh Metzler <[email protected]>
+Isaac Clerencia <[email protected]>
+Adeodato Simó <[email protected]>
+Adeodato Simo <[email protected]>
+Christopher Martin <[email protected]>
+Daniel Schepler <[email protected]>
+Sarah Hobbs <[email protected]>
+Nacho Barrientos Arias <[email protected]>
+Ricardo Javier Cardenes Medina <[email protected]>
+Ricardo Cardenes <[email protected]>
+Armin Berres <[email protected]>
+Francesco Pedrini <[email protected]>
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <[email protected]>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "[email protected]" | 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/knetworkmanager8/debian/cdbs/versions.pl b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl
new file mode 100644
index 000000000..9ce11d8a3
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/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/knetworkmanager/debian/changelog b/ubuntu/maverick/applications/knetworkmanager8/debian/changelog
index ed0d32a81..04405984c 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/changelog
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/changelog
@@ -1,4 +1,4 @@
-knetworkmanager-trinity (1:0.8-0ubuntu12) karmic; urgency=low
+knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low
 
   * UI tweaks for discoverability
 
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/compat b/ubuntu/maverick/applications/knetworkmanager8/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/compat
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/compat
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/control b/ubuntu/maverick/applications/knetworkmanager8/debian/control
index b8b9c41dc..41a91963b 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control
@@ -1,4 +1,4 @@
-Source: knetworkmanager-trinity
+Source: knetworkmanager8-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
@@ -9,6 +9,7 @@ Build-Depends: cdbs,
  libnm-util-dev (>= 0.7.0),
  libnm-glib-dev (>= 0.7.0),
  network-manager-dev (>= 0.7.0),
+ network-manager-dev (<< 0.8.9),
  libhal-dev,
  libdbus-1-tqt-dev,
  libiw-dev,
@@ -24,7 +25,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
 
 Package: network-manager-kde-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9)
 Replaces: network-manager-kde-kde3 (<< 4:3.5.13)
 Breaks: network-manager-kde-kde3 (<< 4:3.5.13)
 Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/control.in b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
index 43adf3e33..43adf3e33 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/control.in
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/copyright b/ubuntu/maverick/applications/knetworkmanager8/debian/copyright
index 2490de254..2490de254 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/copyright
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/copyright
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/knetworkmanager.1 b/ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1
index 3cd261c89..3cd261c89 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/knetworkmanager.1
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/manpages b/ubuntu/maverick/applications/knetworkmanager8/debian/manpages
index e2859341f..e2859341f 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/manpages
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/manpages
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/menu b/ubuntu/maverick/applications/knetworkmanager8/debian/menu
index 9775e9c7c..9775e9c7c 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/menu
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/menu
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..9ae01a92b 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
index fdd4e51ca..fdd4e51ca 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/patches/series b/ubuntu/maverick/applications/knetworkmanager8/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/patches/series
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/rules b/ubuntu/maverick/applications/knetworkmanager8/debian/rules
index 97955e38b..97955e38b 100755
--- a/ubuntu/maverick/applications/knetworkmanager/debian/rules
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/rules
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/watch b/ubuntu/maverick/applications/knetworkmanager8/debian/watch
index ad7a7be91..ad7a7be91 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/watch
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/watch
diff --git a/ubuntu/maverick/applications/koffice/debian/control b/ubuntu/maverick/applications/koffice/debian/control
index 229b6d61f..5600dcbc0 100644
--- a/ubuntu/maverick/applications/koffice/debian/control
+++ b/ubuntu/maverick/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Ana Beatriz Guerrero Lopez <[email protected]>, Ral Snchez Siles <[email protected]>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, 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/piklab/debian/control b/ubuntu/maverick/applications/piklab/debian/control
index eb2f857ae..e2a7e9628 100644
--- a/ubuntu/maverick/applications/piklab/debian/control
+++ b/ubuntu/maverick/applications/piklab/debian/control
@@ -3,7 +3,7 @@ Section: electronics
 Priority: extra
 Maintainer: Timothy Pearson <[email protected]>
 Build-Depends: debhelper (>= 5), autotools-dev, quilt, chrpath,
- libusb-dev, kdelibs4-trinity-dev, libreadline5-dev, automake, autoconf, libtool, libltdl-dev
+ libusb-dev, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://piklab.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/smartcardauth/debian/control b/ubuntu/maverick/applications/smartcardauth/debian/control
index 40b44a195..aef949062 100644
--- a/ubuntu/maverick/applications/smartcardauth/debian/control
+++ b/ubuntu/maverick/applications/smartcardauth/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: extra
 Maintainer: Timothy Pearson <[email protected]>
 Uploaders: Timothy Pearson <[email protected]>
-Build-Depends: debhelper (>=5.0), cdbs, pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, libpar-packer-perl, libdb-dev (>= 4.7), libpam0g-dev, libssl-dev, libkrb5-dev
+Build-Depends: debhelper (>=5.0), cdbs, pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, libpar-packer-perl, libdb-dev (>= 4.7), libpam0g-dev, libssl-dev, libkrb5-dev, libtqtinterface-dev
 Standards-Version: 3.8.4
 
 Package: smartcardauth
diff --git a/ubuntu/maverick/dependencies/arts/debian/libartsc0-trinity-dev.install b/ubuntu/maverick/dependencies/arts/debian/libartsc0-trinity-dev.install
index 232640178..a13ee599c 100644
--- a/ubuntu/maverick/dependencies/arts/debian/libartsc0-trinity-dev.install
+++ b/ubuntu/maverick/dependencies/arts/debian/libartsc0-trinity-dev.install
@@ -3,6 +3,6 @@ debian/tmp/opt/trinity/include/artsc/artsc.h
 debian/tmp/opt/trinity/include/artsc/artsc_export.h
 debian/tmp/opt/trinity/lib/libartsc.la
 debian/tmp/opt/trinity/lib/libartsc.so
-debian/tmp/opt/trinity/lib/libgsl.a
+debian/tmp/opt/trinity/lib/libartsgsl.a
 
 debian/tmp/usr/lib/pkgconfig/arts.pc
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/changelog b/ubuntu/maverick/dependencies/avahi-tqt/debian/changelog
new file mode 100644
index 000000000..b5568caee
--- /dev/null
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/changelog
@@ -0,0 +1,6 @@
+avahi-tqt (0.6.30-0ubuntu0) maverick; urgency=low
+
+  * Initial build
+
+ -- Timothy Pearson <[email protected]>  Sat, 08 Oct 2011 22:38:00 -0600
+
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/compat b/ubuntu/maverick/dependencies/avahi-tqt/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/control b/ubuntu/maverick/dependencies/avahi-tqt/debian/control
new file mode 100644
index 000000000..607e76dd1
--- /dev/null
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/control
@@ -0,0 +1,55 @@
+Source: avahi-tqt
+Section: net
+Priority: optional
+Maintainer: Timothy Pearson <[email protected]>
+XSBC-Original-Maintainer: Ubuntu Developers <[email protected]>
+Uploaders: Timothy Pearson <[email protected]>
+Build-Depends: debhelper,
+               pkg-config,
+               python-support (>= 0.6),
+               libglib2.0-dev (>= 2.4),
+               libgtk2.0-dev (>= 2.14.0),
+               libexpat-dev,
+               libdbus-1-dev (>= 0.60),
+               python-gdbm (>= 2.4.3),
+               python-dbus,
+               python-gtk2 (>= 2.8.6-2),
+               libtqtinterface-dev,
+               intltool (>= 0.35.0),
+               libavahi-common-dev,
+               libavahi-client-dev
+Standards-Version: 3.9.1
+
+Package: libavahi-tqt-1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Avahi TQt integration library
+ Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+ It allows programs to publish and discover services and hosts
+ running on a local network with no specific configuration. For
+ example you can plug into a network and instantly find printers to
+ print to, files to look at and people to talk to.
+ .
+ This library contains the interface to integrate the Avahi libraries
+ into a TQt main loop application.
+
+Package: libavahi-tqt-dev
+Section: libdevel
+Architecture: any
+Depends: libavahi-tqt-1 (= ${binary:Version}),
+         ${misc:Depends},
+         libtqtinterface-dev,
+         libavahi-common-dev
+Description: Development headers for the Avahi TQt integration library
+ Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+ It allows programs to publish and discover services and hosts
+ running on a local network with no specific configuration. For
+ example you can plug into a network and instantly find printers to
+ print to, files to look at and people to talk to.
+ .
+ This package contains the development headers for the interface
+ to integrate the Avahi libraries  into a TQt main loop application.
\ No newline at end of file
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/copyright b/ubuntu/maverick/dependencies/avahi-tqt/debian/copyright
new file mode 100644
index 000000000..6771a11ab
--- /dev/null
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/copyright
@@ -0,0 +1,17 @@
+ License:
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This library 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+  See /usr/share/common-licenses/LGPL-2.1 on your debian system.
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.install b/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
new file mode 100644
index 000000000..50e360b80
--- /dev/null
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libavahi-tqt.so.*
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs b/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs
new file mode 100644
index 000000000..967448229
--- /dev/null
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs
@@ -0,0 +1 @@
+libavahi-tqt 1 libavahi-tqt-1 (>= 0.6.16)
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols b/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
new file mode 100644
index 000000000..e530241ba
--- /dev/null
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
@@ -0,0 +1,2 @@
+libavahi-tqt.so.1 libavahi-tqt-1 #MINVER#
+ avahi_qt_poll_get@Base 0.6.16
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install b/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
new file mode 100644
index 000000000..7f65054bd
--- /dev/null
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/include/avahi-tqt/qt-watch.h
+debian/tmp/usr/lib/libavahi-tqt.so
+debian/tmp/usr/lib/libavahi-tqt.la
+debian/tmp/usr/lib/libavahi-tqt.a
+debian/tmp/usr/lib/pkgconfig/avahi-tqt.pc
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/patches/.gitignore b/ubuntu/maverick/dependencies/avahi-tqt/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/patches/.gitignore
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/rules b/ubuntu/maverick/dependencies/avahi-tqt/debian/rules
new file mode 100755
index 000000000..c3ea0343f
--- /dev/null
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+# Ensure at build time that the library has no dependencies on undefined
+# symbols, and speed up loading.
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1
+
+override_dh_auto_configure:
+	./autogen.sh
+	dh_auto_configure -- $(CONFFLAGS) \
+		--enable-compat-libdns_sd \
+		--disable-mono --disable-monodoc \
+		--disable-gtk3 \
+		--with-systemdsystemunitdir=/lib/systemd/system
+
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/source/.gitignore b/ubuntu/maverick/dependencies/avahi-tqt/debian/source/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/source/.gitignore
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/control b/ubuntu/maverick/dependencies/tqtinterface/debian/control
index 249a1a548..8893caa29 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/control
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/control
@@ -2,7 +2,7 @@ Source: libtqtinterface
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
-Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, libavahi-qt3-dev, qt3-apps-dev, cmake, cdbs
+Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, libavahi-tqt-dev, qt3-apps-dev, cmake, cdbs
 Standards-Version: 3.8.4
 
 Package: libtqtinterface
@@ -22,7 +22,7 @@ Architecture: any
 Section: libs
 Replaces: libtqtinterface-dev (<< 4:3.5.13)
 Breaks: libtqtinterface-dev (<< 4:3.5.13)
-Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), libavahi-qt3-dev, qt3-apps-dev
+Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), libavahi-tqt-dev, qt3-apps-dev
 Description: The Trinity Qt Interface Libraries (Development Files)
  The Trinity Qt Interface is a library that abstracts Qt from Trinity
  This allows the Trinity code to rapidly port from one version of Qt to another.
diff --git a/ubuntu/maverick/kdeaddons/debian/control b/ubuntu/maverick/kdeaddons/debian/control
index b769e378e..8e6600157 100644
--- a/ubuntu/maverick/kdeaddons/debian/control
+++ b/ubuntu/maverick/kdeaddons/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Ana Beatriz Guerrero Lopez <[email protected]>, Christopher Martin <[email protected]>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.8++-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.8++-dev | libdb++-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdeaddons-trinity
diff --git a/ubuntu/maverick/kdebase/debian/control b/ubuntu/maverick/kdebase/debian/control
index d65baada1..f596d7587 100644
--- a/ubuntu/maverick/kdebase/debian/control
+++ b/ubuntu/maverick/kdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Ana Beatriz Guerrero Lopez <[email protected]>, Fathi Boudra <[email protected]>, Modestas Vainius <[email protected]>, Sune Vuorela <[email protected]>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, kdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, kdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, kdelibs4-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
@@ -15,7 +15,7 @@ Architecture: all
 Replaces: kdebase-kde3 (<< 4:3.5.13)
 Breaks: kdebase-kde3 (<< 4:3.5.13)
 Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), kdebase-trinity-bin (>= ${Source-Version}), kdebase-data-trinity (>= ${Source-Version}), kdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), kdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
-Recommends: kdm-trinity (>= ${Source-Version}), kdebase-runtime-data-common-trinity
+Recommends: kdm-trinity (>= ${Source-Version}), kdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: kdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -561,6 +561,16 @@ Description: core libraries for Konqueror
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
 
+Package: libtqt3-integration-trinity
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Integration library between TQt3 and TDE
+ These libraries allow you to use TDE dialogs in native TQt3 applications.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+
 Package: libkonq4-trinity-dev
 Section: libdevel
 Architecture: any
diff --git a/ubuntu/maverick/kdebase/debian/ksplash-trinity.install b/ubuntu/maverick/kdebase/debian/ksplash-trinity.install
index 5c77fa766..6865911fd 100644
--- a/ubuntu/maverick/kdebase/debian/ksplash-trinity.install
+++ b/ubuntu/maverick/kdebase/debian/ksplash-trinity.install
@@ -4,6 +4,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_ksplashthemes.la
 debian/tmp/opt/trinity/lib/trinity/kcm_ksplashthemes.so
 debian/tmp/opt/trinity/lib/trinity/ksplashdefault.la
 debian/tmp/opt/trinity/lib/trinity/ksplashdefault.so
+debian/tmp/opt/trinity/lib/trinity/ksplashunified.la
+debian/tmp/opt/trinity/lib/trinity/ksplashunified.so
 debian/tmp/opt/trinity/lib/trinity/ksplashredmond.la
 debian/tmp/opt/trinity/lib/trinity/ksplashredmond.so
 debian/tmp/opt/trinity/lib/trinity/ksplashstandard.la
@@ -29,6 +31,7 @@ debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_bottom.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_inactive_bar.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_top.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/Theme.rc
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/Unified/
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/None/Theme.rc
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Redmond/Background.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Redmond/Preview.png
@@ -42,6 +45,7 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksplashml/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksplashml/index.docbook
 debian/tmp/opt/trinity/share/services/ksplashdefault.desktop
 debian/tmp/opt/trinity/share/services/ksplash.desktop
+debian/tmp/opt/trinity/share/services/ksplashunified.desktop
 debian/tmp/opt/trinity/share/services/ksplashredmond.desktop
 debian/tmp/opt/trinity/share/services/ksplashstandard.desktop
 debian/tmp/opt/trinity/share/servicetypes/ksplashplugins.desktop
diff --git a/ubuntu/maverick/kdebase/debian/libtqt3-integration-trinity.install b/ubuntu/maverick/kdebase/debian/libtqt3-integration-trinity.install
new file mode 100644
index 000000000..9f747bbda
--- /dev/null
+++ b/ubuntu/maverick/kdebase/debian/libtqt3-integration-trinity.install
@@ -0,0 +1,7 @@
+debian/tmp/opt/trinity/lib/trinity/plugins/integration/libqtkde.la
+debian/tmp/opt/trinity/lib/trinity/plugins/integration/libqtkde.so
+debian/tmp/opt/trinity/lib/trinity/plugins/integration/libqtkde.so.0
+debian/tmp/opt/trinity/lib/trinity/plugins/integration/libqtkde.so.0.0.0
+debian/tmp/opt/trinity/share/services/kded/kdeintegration.desktop
+debian/tmp/opt/trinity/lib/trinity/kded_kdeintegration.la
+debian/tmp/opt/trinity/lib/trinity/kded_kdeintegration.so
diff --git a/ubuntu/maverick/kdenetwork/debian/control b/ubuntu/maverick/kdenetwork/debian/control
index 3b4acc580..36339e748 100644
--- a/ubuntu/maverick/kdenetwork/debian/control
+++ b/ubuntu/maverick/kdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Ana Beatriz Guerrero Lopez <[email protected]>, Christopher Martin <[email protected]>, Modestas Vainius <[email protected]>, Sarah Hobbs <[email protected]>, Sune Vuorela <[email protected]>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind, libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdenetwork-trinity
diff --git a/ubuntu/maverick/kdepim/debian/akregator-trinity.install b/ubuntu/maverick/kdepim/debian/akregator-trinity.install
index e67c9c91a..2dd23adc6 100644
--- a/ubuntu/maverick/kdepim/debian/akregator-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/akregator-trinity.install
@@ -5,6 +5,8 @@
 /opt/trinity/lib/trinity/libakregator_mk4storage_plugin.so
 /opt/trinity/lib/libakregatorprivate.la
 /opt/trinity/lib/libakregatorprivate.so
+/opt/trinity/lib/libakregatorprivate.so.0
+/opt/trinity/lib/libakregatorprivate.so.0.0.0
 /opt/trinity/share/applications/kde/akregator.desktop
 /opt/trinity/share/apps/akregator
 /opt/trinity/share/config.kcfg/akregator.kcfg
diff --git a/ubuntu/maverick/kdepim/debian/control b/ubuntu/maverick/kdepim/debian/control
index 095d8b75c..a9ac57109 100644
--- a/ubuntu/maverick/kdepim/debian/control
+++ b/ubuntu/maverick/kdepim/debian/control
@@ -8,7 +8,7 @@ Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31),
  cdparanoia, gawk, gettext, kdelibs4-trinity-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev, libogg-dev-la,
  libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-dev,
- libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev,
+ libpisock-dev, libreadline5-dev | libreadline6-dev, libsasl2-dev, libssl-dev,
  libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4),
  libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev,
  libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev,
diff --git a/ubuntu/maverick/kdesdk/debian/control b/ubuntu/maverick/kdesdk/debian/control
index 7e43b9135..cd3d6c8fa 100644
--- a/ubuntu/maverick/kdesdk/debian/control
+++ b/ubuntu/maverick/kdesdk/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ana Beatriz Guerrero Lopez <[email protected]>, Fathi Boudra <fboudra@fr
 Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
  gettext, pkg-config, kdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
  kdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10),
- libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev,
+ libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/maverick/kdeutils/debian/rules b/ubuntu/maverick/kdeutils/debian/rules
index 7a7ec3e66..f4ba23952 100755
--- a/ubuntu/maverick/kdeutils/debian/rules
+++ b/ubuntu/maverick/kdeutils/debian/rules
@@ -18,7 +18,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
 
 DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdeutils-trinity-dbg
+DEB_DH_STRIP_ARGS  := --exclude=examples --dbg-package=kdeutils-trinity-dbg
 
 PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity
 
diff --git a/ubuntu/maverick/kdevelop/debian/control b/ubuntu/maverick/kdevelop/debian/control
index f15d8b329..a5a40986f 100644
--- a/ubuntu/maverick/kdevelop/debian/control
+++ b/ubuntu/maverick/kdevelop/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Jeremy Lain <[email protected]>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdevelop-trinity
diff --git a/ubuntu/maverick/kdewebdev/debian/control b/ubuntu/maverick/kdewebdev/debian/control
index 7964421a2..40a7cdfdd 100644
--- a/ubuntu/maverick/kdewebdev/debian/control
+++ b/ubuntu/maverick/kdewebdev/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Adeodato Sim <[email protected]>, Ana Beatriz Guerrero Lopez <[email protected]>, Armin Berres <[email protected]>, Sune Vuorela <[email protected]>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/ubuntu/oneiric b/ubuntu/oneiric
new file mode 120000
index 000000000..5cb6e6000
--- /dev/null
+++ b/ubuntu/oneiric
@@ -0,0 +1 @@
+maverick
\ No newline at end of file