DEB: use _base folder for a distro instead of specific distros (squeeze

and maverick).

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

27 files changed, 2649 insertions, 0 deletions

diff --git a/ubuntu/_base/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
new file mode 100644
index 000000000..1d06672c7
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -0,0 +1,9 @@
+kaffeine can't depend on libxine1-ffmpeg
+kaffeine does depend on kaffeine-xine, remove conflicts/replaces
+add kaffeine-gstreamer.install and description
+build-dep on libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev
+remove --without-gstreamer
+remove DEB_DESTDIR line
+install/kaffeine:: Debian additions
+install-codecs 755
+DEB_FIXPERMS_EXCLUDE := install-css.sh install-codecs
diff --git a/ubuntu/_base/applications/kaffeine/debian/README.Debian b/ubuntu/_base/applications/kaffeine/debian/README.Debian
new file mode 100644
index 000000000..74cac614e
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/README.Debian
@@ -0,0 +1,30 @@
+kaffeine for Debian
+-------------------
+
+The Gstreamer support is experimental and has been disabled.
+Due to patents problems, the Lame Mp3 encoding plugin isn't available.
+
+CSS issue
+=========
+
+CSS is sold by the DVD industry as a "copy protection", though it's more of a
+"view protection" as it makes DVDs unviewable with unlicensed players. To play
+these DVDs, a library is needed to decode them, libdvdcss. Due to possible
+legal issues, Debian cannot distribute libdvdcss, but it is available on other
+places on the internet. If it is legal in your country to use css, you can run
+
+        /usr/share/doc/kaffeine/install-css.sh
+
+at any time to download and install it.
+
+Thanks to Mikael Hedin <micce@debian.org> for the script.
+
+Region issue
+============
+
+With a brand new DVD drive, it is necessary to set (at least once) the
+region/zone setting, allowing it to decrypt the DVD's sold in this geographical
+zone. Be careful, hardware vendors often limit the number of such
+modifications. You can use regionset utility to achieve this.
+
+ -- Fathi Boudra <fboudra@free.fr>, Mon, 27 Mar 2006 09:44:19 +0200
diff --git a/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..9f8f97776
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,115 @@
+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
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/kaffeine/debian/cdbs/kde.mk b/ubuntu/_base/applications/kaffeine/debian/cdbs/kde.mk
new file mode 100644
index 000000000..1ac26c4b7
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/cdbs/kde.mk
@@ -0,0 +1,89 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final =
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-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
+
+# 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/_base/applications/kaffeine/debian/cdbs/versions.pl b/ubuntu/_base/applications/kaffeine/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/kaffeine/debian/changelog b/ubuntu/_base/applications/kaffeine/debian/changelog
new file mode 100644
index 000000000..ffbd93281
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/changelog
@@ -0,0 +1,795 @@
+kaffeine-trinity (0.8.6-0ubuntu6) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 Jul 2009 16:08:00 -0600
+
+kaffeine-trinity (0.8.6-0ubuntu5) intrepid; urgency=low
+
+  * Moved Trinity to /opt/trinity
+  * Integrated properly with KDE4.2+
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 04 March 2009 01:11:00 -0600
+
+kaffeine-trinity (0.8.6-0ubuntu3) intrepid; urgency=low
+
+  * Added -trinity suffix
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 04 Dec 2008 22:52:00 -0600
+
+kaffeine (0.8.6-0ubuntu8.3) hardy-proposed; urgency=low
+
+  * install-codecs: don't loop on unsupported media (LP: #210303)
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Mon, 22 Sep 2008 13:38:25 +0200
+
+kaffeine (0.8.6-0ubuntu8.1) hardy-proposed; urgency=low
+
+  * Change kaffeine_xine-install-dvdcss.desktop
+   - Revert the dvd codec autoinstalling (LP: #226475)
+  * In debian/rules install script install-css.sh
+  * Alter debian/install-codecs
+   - handle possible loop by ffmpeg autoinstallation (http://bugs.kde.org/show_bug.cgi?id=161592)
+  * Alter kxinewidget.cpp in kubuntu_07_codecs_installation.diff
+   - Hide extra error messagebox
+   - Handling of additional situations of the codecs absense
+
+ -- Sergey Rudchenko <sergey.rudchenko@gmail.com>  Wed, 30 Apr 2008 22:32:41 +0300
+
+kaffeine (0.8.6-0ubuntu8) hardy; urgency=low
+
+  * rewrite install-codecs script in python
+  * add i18n to codec installation procedure
+
+ -- Sergey Rudchenko <sergey.rudchenko@gmail.com>  Sun, 09 Mar 2008 12:02:46 +0200
+
+kaffeine (0.8.6-0ubuntu7) hardy; urgency=low
+
+  * fix 'dash' quoting issues
+  * handle XINE_MSG_ENCRYPTED SOURCE for dvdcss installation
+  * rebuild patches
+
+ -- Sergey Rudchenko <sergey.rudchenko@gmail.com>  Mon, 03 Mar 2008 14:24:45 +0200
+
+kaffeine (0.8.6-0ubuntu6) hardy; urgency=low
+
+  * Fix Recommends, add missing commas
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 27 Feb 2008 16:50:26 +0000
+
+kaffeine (0.8.6-0ubuntu5) hardy; urgency=low
+
+  * Refactor install-codecs script
+  * Implement libdvdcss installing
+
+ -- Sergey Rudchenko <sergey.rudchenko@gmail.com>  Tue, 26 Feb 2008 19:03:36 +0200
+
+kaffeine (0.8.6-0ubuntu4) hardy; urgency=low
+
+  * Adapt install-codecs script to dash shell syntax
+
+ -- Sergey Rudchenko <sergey.rudchenko@gmail.com>  Tue, 26 Feb 2008 12:58:33 +0200
+
+kaffeine (0.8.6-0ubuntu3) hardy; urgency=low
+
+  * Set fixperms exclude for install-codecs
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 22 Feb 2008 14:29:51 +0000
+
+kaffeine (0.8.6-0ubuntu2) hardy; urgency=low
+
+  * Make install-codecs executable in debian/rules
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 04 Feb 2008 14:39:57 +0000
+
+kaffeine (0.8.6-0ubuntu1) hardy; urgency=low
+
+  * New upstream release
+
+ -- Anthony Mercatante <tonio@kubuntu>  Tue, 22 Jan 2008 13:50:29 +0100
+
+kaffeine (0.8.5-1ubuntu2) hardy; urgency=low
+
+  * Remove depends on kaffeine-xine
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Nov 2007 20:37:29 +0000
+
+kaffeine (0.8.5-1ubuntu1) hardy; urgency=low
+
+  * Merge with Debian, remaining changes:
+    - kaffeine can't depend on libxine1-ffmpeg
+    - kaffeine does depend on kaffeine-xine, remove conflicts/replaces
+    - add kaffeine-gstreamer.install and description
+    - build-dep on libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev
+    - Debian patches in debian/patches/
+    - Remove --without-gstreamer
+    - Remove DEB_DESTDIR line in debian/rules
+  * Update kubuntu_07_codecs_installation.diff and add autocodec files to install/kaffeine::
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Nov 2007 19:01:00 +0000
+
+kaffeine (0.8.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Fathi Boudra <fboudra@free.fr>  Sat, 28 Jul 2007 19:59:41 +0200
+
+kaffeine (0.8.4-6) unstable; urgency=low
+
+  * Add patch to add AM_INIT_AUTOMAKE to configure.in.in. It fixes broken
+    modulename after relibtoolization. (Closes: #432112)
+
+ -- Fathi Boudra <fboudra@free.fr>  Wed, 18 Jul 2007 18:01:13 +0200
+
+kaffeine (0.8.4-5) unstable; urgency=low
+
+  [ Fathi Boudra ]
+  * Update desktop file for iso. It should be hidden. (Closes: #420127)
+    Thanks to Michael Biebl.
+  * Add version to xine build dependency.
+
+  [ Mark Purcell ]
+  * Update kaffeine-dbg Depends: kaffeine (= ${binary:Version}),
+    tdelibs-dbg
+
+ -- Mark Purcell <msp@debian.org>  Fri, 06 Jul 2007 10:22:19 +0100
+
+kaffeine (0.8.4-4) unstable; urgency=low
+
+  * Remove libxine1-kde recommends.
+  * Raise libxine1-ffmpeg relationship. (Closes: #426247)
+
+ -- Fathi Boudra <fboudra@free.fr>  Mon, 04 Jun 2007 22:17:33 +0200
+
+kaffeine (0.8.4-3) unstable; urgency=low
+
+  * Add libxcb1-dev and chrpath build-dependency.
+  * Add libxine1-ffmpeg and libxine1-kde recommends. (Closes: #427085)
+
+ -- Fathi Boudra <fboudra@free.fr>  Sun, 03 Jun 2007 22:10:26 +0200
+
+kaffeine (0.8.4-2) unstable; urgency=low
+
+  * Remove CMakeLists.txt
+    - Problem during upgrade: trying to overwrite
+    `/usr/share/doc/tde/HTML/en/doc/CMakeLists.txt' (Closes: #419477)
+
+ -- Mark Purcell <msp@debian.org>  Thu, 19 Apr 2007 05:50:00 +1000
+
+kaffeine (0.8.4-1) unstable; urgency=low
+
+  * New upstream release
+    - Ripping CD to OGG produces white noise on powerpc (probably
+    endianness issue) (Closes: #376025)
+    - debian/patches/Bug403749.diff removed - encorporated upstream
+    (Closes: #403749)
+    - fails to properly play files with names containing '#' character
+    (Closes: #362807)
+  * Build-Depends: libogg-dev
+  * Add /usr/share/applications/tde/kaffeine-iso.desktop
+    - play DVD ISO files on filesystem (rather than in DVD drive)
+    automatically (Closes: #402382)
+
+ -- Mark Purcell <msp@debian.org>  Sat, 14 Apr 2007 10:03:23 +0100
+
+kaffeine (0.8.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove patch for bug 390829, merged upstream
+  * Update copyright file
+  * Update lintian override
+
+ -- Fathi Boudra <fboudra@free.fr>  Mon, 27 Nov 2006 21:21:58 +0100
+
+kaffeine (0.8.2-2) unstable; urgency=low
+
+  * Kaffeine refuses to start completely (Closes: #390829)
+
+ -- Mark Purcell <msp@debian.org>  Sun,  8 Oct 2006 09:59:13 +1000
+
+kaffeine (0.8.2-1) unstable; urgency=low
+
+  [ Mark Purcell ]
+  * Update debian/watch & ~beta1
+  * New upstream release
+
+  [ Fathi Boudra ]
+  * New upstream release (Closes: #366993):
+    * DVB: cicam support for HLCI and LLCI interfaces
+    * Systray: reversed mouse wheel behaviour
+    * Playlist: added a KURLComboBox to file browser
+    * DVB: fixed fast zap lock
+    * fixed: reduced minimum window size
+    * Playlist: autoselect subtitle when unique
+  * Update copyright file
+  * Add patch to fix kaffeine_part crash, thanks to Olivier Trichet
+    (Closes: #338756)
+
+ -- Mark Purcell <msp@debian.org>  Tue, 12 Sep 2006 21:33:30 +0100
+
+kaffeine (0.8.1-3) unstable; urgency=low
+
+  [ Fathi Boudra ]
+  * Updated copyright file according to GFDL documentations
+  * Added hdparm to kaffeine Depends (Closes: #289895)
+  * Added informations about css and region setting in README.Debian
+  * Added install-css script taken from libdvdread3 package
+  * Removed x-mplayer2.desktop shipped by tdelibs (Closes: #372514)
+
+ -- Fathi Boudra <fboudra@free.fr>  Sat, 10 Jun 2006 00:25:04 +0200
+
+kaffeine (0.8.1-2) unstable; urgency=low
+
+  * Requires libxine-dev (>=1.1.1-2), various archs have build empty
+    .debs with old libxine...
+
+ -- Riku Voipio <riku.voipio@iki.fi>  Sat,  8 Apr 2006 11:26:20 +0300
+
+kaffeine (0.8.1-1) unstable; urgency=low
+
+  [ Fathi Boudra ]
+  * New upstream release
+  * Remove patch 10_gstreamer_service_menu.diff merged upstream
+  * Remove libqt3-compat-headers from Build-Depends
+
+ -- Fathi Boudra <fboudra@free.fr>  Mon,  3 Apr 2006 23:59:25 +0200
+
+kaffeine (0.8-1) experimental; urgency=low
+
+  [ Fathi Boudra ]
+  * New upstream release, Closes: #360393
+  * Clean up control
+  * Add libcdparanoia0-dev to Build-Depends
+  * Add libxtst-dev to Build-Depends (thanks to Jonathan Riddell)
+  * Disable gstreamer support, Closes: #346252, #328786
+  * Merge kaffeine-xine in kaffeine package
+
+  [ Riku Voipio ]
+  * The -dbg package feature needs cdbs (>= 0.4.37)
+  * Acknowledge NMU's: Closes: #329010, #329143, #329177, #328738
+    (Thanks to Adeodato Simó and LaMont Jones !)
+  * Remove build-dependency on g++-3.4 on selected archs, Closes: #342974
+  * Remove build-dependency on linux-kernel-headers, Closes: #328550
+  * Documentation link is correct now, Closes: #336738
+  * The new upstream version fixes a range of problems:
+  * Audio busy problem, and failure to fall back to another
+    audio sink: Closes: #328788, #336306, #358234
+  * Keyboard shortcuts no longer crash after playback, Closes: #329178
+  * Xine engine configuration dialog is now scrollable, Closes: #344093
+  * Upload to experimental since 0.8.1 is coming this week
+
+ -- Riku Voipio <riku.voipio@iki.fi>  Mon,  3 Apr 2006 23:16:16 +0300
+
+kaffeine (0.8.5-0ubuntu3) hardy; urgency=low
+
+  * Reuploaded as the buildd seems to be fixed
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 12 Nov 2007 14:09:56 +0100
+
+kaffeine (0.8.5-0ubuntu2) hardy; urgency=low
+
+  * Added kubuntu_07_codecs_installation.patch:
+    - Let kaffeine install missing codecs
+    - Patch from Sergey Rudchenko <sergey.rudchenko@gmail.com>
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 09 Nov 2007 14:06:07 +0100
+
+kaffeine (0.8.5-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 30 Jul 2007 13:01:45 +0200
+
+kaffeine (0.8.4-0ubuntu3) gutsy; urgency=low
+
+  * Removed kubuntu_07_player_parts_identification.diff
+    That patch is in the work, shouldn't have been upload,
+    as it creates a crash with the xine-part.
+    
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 28 Jun 2007 23:46:38 +0200
+
+kaffeine (0.8.4-0ubuntu2) gutsy; urgency=low
+
+  * Removed debian/tmp/usr/share/apps/kaffeine/xine_part from
+    kaffeine-xine.install - this is already being installed in kaffeine, and
+    fixes the file overwrite problem.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 06 Jun 2007 16:16:07 +1000
+
+kaffeine (0.8.4-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release.
+  * Added libxcb builddep.
+  * Added back kaffeine-gstreamer package
+  * Removed obsolete kubuntu_05_restore_contrast.diff
+  * Add kubuntu_06_tdeparts_mimetype_checking.diff:
+    - Makes it possible to select the engine to use.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 05 Mai 2007 11:02:23 +0100
+
+kaffeine (0.8.3-0ubuntu7) feisty; urgency=low
+
+  * Add kubuntu_05_restore_contrast.diff from SVN, fixes contrast restore
+    nice to those affected by XV on i810 washout problem
+    fixes http://bugs.kde.org/show_bug.cgi?id=138340
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Mar 2007 10:15:05 +0000
+
+kaffeine (0.8.3-0ubuntu6) feisty; urgency=low
+
+  * Added kubuntu_services_list.patch, lists the services with
+    avi mimetype instead of x-mp3.
+    Closes Malone #22902
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 14 Dec 2006 17:40:34 +0200
+
+kaffeine (0.8.3-0ubuntu5) feisty; urgency=low
+
+  * Include header files in kaffeine.install
+  * Add back kaffeineoggvorbis plugin
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 19 Jan 2007 13:33:10 +0000
+
+kaffeine (0.8.3-0ubuntu4) feisty; urgency=low
+
+  * Make sure kubuntu_04_locate_wizard_stamp.diff patch applies cleanly
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 15 Jan 2007 16:56:20 +0000
+
+kaffeine (0.8.3-0ubuntu3) feisty; urgency=low
+
+  * Add back kubuntu_04_locate_wizard_stamp.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 14 Jan 2007 13:34:26 +0000
+
+kaffeine (0.8.3-0ubuntu2) feisty; urgency=low
+
+  * Changed debian/control, kaffeine-xine depends on kaffeine
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 14 Dec 2006 17:40:34 +0200
+
+kaffeine (0.8.3-0ubuntu1) feisty; urgency=low
+
+  * New upstream release
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 12 Dec 2006 18:35:22 +0200
+
+kaffeine (0.8.2-2ubuntu1) feisty; urgency=low
+
+  * Merged packaging with debian
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 16 Nov 2006 02:42:34 +0200
+
+kaffeine (0.8.2-0ubuntu4) feisty; urgency=low
+
+  * Removed kubuntu_70_no_audiocd_features.patch.
+    This as been rediscussed and the choice is to keep the audio
+    features for the moment.
+    Codeine is an candidate for feisty as the default
+    video player.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 16 Nov 2006 02:42:34 +0200
+
+kaffeine (0.8.2-0ubuntu3) feisty; urgency=low
+
+  * Add kubuntu_70_no_audio_features.patch to remove audio features
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 20 Oct 2006 16:05:34 +0200
+
+kaffeine (0.8.2-0ubuntu2) edgy; urgency=low
+
+  * Add kubuntu_04_mimetypes.patch for complete mimetypes
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 11 Sep 2006 14:45:43 +0200
+
+kaffeine (0.8.2-0ubuntu1) edgy; urgency=low
+
+  * New upstream release (closed Malone #61860)
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 27 Sep 2006 02:37:43 +0200
+
+kaffeine (0.8.1-3ubuntu3) edgy; urgency=low
+
+  * Don't install x-mplayer2 mimetype, now part of KDE
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 26 Jul 2006 19:06:08 +0100
+
+kaffeine (0.8.1-3ubuntu2) edgy; urgency=low
+
+  * Added missing kaffeine-xine.install
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 18 Jul 2006 18:50:32 +0200
+
+kaffeine (0.8.1-3ubuntu1) edgy; urgency=low
+
+  * New upstream release.
+  * Removed obsolete patches.
+  * Porting existing and still required patches.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 03 Jul 2006 19:18:45 +0200
+
+kaffeine (0.7.1-1.3ubuntu10) dapper; urgency=low
+
+  * Add kubuntu_07_system_media.diff to fix the use of system:/ in kaffeine,
+    thanks to Bastian Holst (Closes: Malone #37131)
+
+ -- Raphaël Pinson <raphink@ubuntu.com>  Mon, 22 May 2006 17:24:59 +0200
+
+kaffeine (0.7.1-1.3ubuntu9) dapper; urgency=low
+
+  * debian/cdbs/kde.mk:
+    - added dh_iconcache.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Thu, 18 May 2006 20:59:38 +0200
+
+kaffeine (0.7.1-1.3ubuntu8) dapper; urgency=low
+
+  * Remove version on build-dep of libxine-dev so
+    Kaffeine can be backported 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Apr 2006 21:04:06 +0100
+
+kaffeine (0.7.1-1.3ubuntu7) dapper; urgency=low
+
+  * Add kubuntu_06_ioslave_protocols.diff, restrict protocols
+    KDE will pass to kaffeine, stop it copying system:/ files.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 12 Apr 2006 13:09:50 +0000
+
+kaffeine (0.7.1-1.3ubuntu6) dapper; urgency=low
+
+  * SECURITY UPDATE: fix buffer overflow
+  * Add kubuntu_05_buffer_overflow.diff
+  * Remotely supplied playlists can be used to execute 
+    arbitrary code on the local machine using a buffer 
+    overflow in http_peek() while creating HTTP requests
+  * kaffeine/player-parts/playlistimport.cpp: replace
+    custom made checks with those from KIO::NetAccess
+  * References:
+    CVE-2006-0051
+    http://www.kde.org/info/security/advisory-20060404-1.txt
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  6 Apr 2006 11:01:04 +0100
+
+kaffeine (0.7.1-1.3ubuntu5) dapper; urgency=low
+
+  * Add build-dep on libxtst-dev, should stop screensaver cutting in
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  2 Apr 2006 20:38:14 +0100
+
+kaffeine (0.7.1-1.3ubuntu4) dapper; urgency=low
+
+  * Remove GStreamer 0.8 build-dep and kaffeine-gstreamer package
+    (GStreamer 0.8 now unsupported upstream, waiting on 0.10 support)
+  * Remove debian/patches/kubuntu_01_default_gstreamer.diff
+  * Remove GCC 3.4 usage on hppa,arm,m68k
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  1 Feb 2006 12:01:23 +0000
+
+kaffeine (0.7.1-1.3ubuntu3) dapper; urgency=low
+
+  * rebuild to depend on libxine-main1 instead of libxine1c2 (and don't
+      break upgrades from breezy anymore)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 23 Jan 2006 10:50:15 +0100
+
+kaffeine (0.7.1-1.3ubuntu2) dapper; urgency=low
+
+  * Rebuild because libXft.la is gone
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sat, 14 Jan 2006 13:48:30 +0100
+
+kaffeine (0.7.1-1.3ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+  * Rebuild for libstdc++ transition
+  * Alter rules file for .pot generation and add kubuntu_01_kdepot.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 23:50:31 +0000
+
+kaffeine (0.7.1-1.3) unstable; urgency=low
+
+  * NMU with maintainer's approval. All changes come straight from a patch
+    sent by Modestas Vainius <geromanas@mailas.com> to the BTS. Thanks!
+
+  * Remove 13_xine_service_menu.diff, since it breaks loading of
+    libkaffeinepart (the name "Kaffeine" is hardcored in many places in the
+    code, so leave it). Closes: #328738
+
+  * Make kaffeine depend on kaffeine-xine | kaffeine-gstreamer instead of
+    backwards, so that the XINE engine (the only one it used to exist) gets
+    installed by default when upgrading from << 0.7 versions.
+
+  * Update 12_gstreamer_service_menu.diff to leave "Name" section unchanged;
+    no need to risk breaking things (like the bug above) in the future. Leave
+    "Icon" unchanged as well.
+
+ -- Adeodato Simó <dato@the-barrel.org>  Fri, 11 Nov 2005 00:06:35 +0100
+
+kaffeine (0.7.1-1.2ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+  * Fix kubuntu_04_locate_wizard_stamp.diff for http://bugzilla.ubuntu.com/17109
+    Kaffeine install wizard runs everytime I run kaffeine  
+  * Alter kaffeine.install to install /usr/lib/libkmediapart.so
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 28 Oct 2005 03:18:37 +0000
+
+kaffeine (0.7.1-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * work around gcc-4.0 FTBFS on some architectures
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 14 Oct 2005 19:28:28 +0000
+
+kaffeine (0.7.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+
+  * Make Kaffeine not crash at exist. For this, don't call ./configure with
+    --with-xorg and --with-xinit-workaround. Kudos to Christopher Martin for
+    diagnosing the issue. Closes: #329010, #329143
+
+  * Make Kaffeine not display the configuration wizard every time it starts.
+    For this, remove bogus patch kubuntu_04_locate_wizard_stamp.diff (bug:
+    even if locate() is used to check for system-wide configuration files, the
+    file to write must be obtained with locateLocal()). Closes: #329177
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Sun, 25 Sep 2005 20:08:28 +0200
+
+kaffeine (0.7.1-1) unstable; urgency=low
+
+  * New upstream release. Closes: #326491
+  * Built against tdelibs4c2. Closes: #325074
+  * Removed kubuntu_03_gstreamer_stop.diff, which was included upstream.
+  * Updated kubuntu_04_locate_wizard_stamp.diff.
+
+ -- Zack Cerza <zcerza@coe.neu.edu>  Sun, 11 Sep 2005 02:19:50 -0400
+
+kaffeine (0.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed code that moved the menu file, as dh_installmenu does it now.
+  * Removed patches that were included upstream.
+  * Updated patches that weren't.
+  * Moved 14_resume-playback.diff into old_patches/ - i.e. dropped it
+    (hopefully temporarily).
+  * Add DVB and GStreamer Build-Depends.
+  * Split playing engines into kaffeine-gstreamer and kaffeine-xine.
+  * Added Recommends and Suggests for several GStreamer plugins.
+  * Updated package description.
+  * Added 12_gstreamer_service_menu.diff, based on Debian's patch
+    kubuntu_02_gstreamer_service_menu.diff to change name, icon and MIME types
+  	of the GStreamer part.
+  * Added 13_xine_service_menu.diff to change name of the xine part.
+  * Added kubuntu_03_gstreamer_stop.diff from Debian to not attempt to play
+    the logo file when the stop button is pressed.
+  * Added 16_xine_stop.diff to not attempt to play the logo file when the stop
+    button is pressed.
+  * Re-added the logo files.
+  * Added dbg-packages.diff to source package in case users want to build -dbg
+    packages. They haven't helped me fix the bug I was trying to fix (the
+    100% CPU on exit bug), so I'm not shipping them at this time.
+  * Added a README to explain how to build the -dbg packages, and to note a
+    workaround for the 100%-CPU bug.
+  * Removed notes about kaffeine-dev from kaffeine.TODO, since they were
+    out-of-date and really just unnecessary.
+
+ -- Zack Cerza <zcerza@coe.neu.edu>  Tue,  9 Aug 2005 20:37:05 -0400
+
+kaffeine (0.6-2) unstable; urgency=low
+
+  * Fixed copyright holders in debian/copyright.
+  * Replaced GPL statement with the boilerplate one.
+  * Added an XPM icon for use in the Debian menu.
+  * Changed a 'mv -f' to 'mv' in debian/rules.
+  * Added patch from Jens Seidel <jensseidel@users.sf.net> to address some
+    typos. Closes: #314025
+  * Moved menu file from /usr/lib/menu to /usr/share/menu.
+
+ -- Zack Cerza <zcerza@coe.neu.edu>  Mon, 13 Jun 2005 18:07:12 -0400
+
+kaffeine (0.7-0ubuntu4) breezy; urgency=low
+
+  * Fix description of kaffeine-xine
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 12 Aug 2005 19:36:47 +0000
+
+kaffeine (0.7-0ubuntu3) breezy; urgency=low
+
+  * Update kubuntu_03_gstreamer_stop.diff, sync with CVS
+  * Add kubuntu_04_locate_wizard_stamp.diff so wizard can be turned off globally
+  * Sync changelog with Debian
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 12 Aug 2005 18:57:03 +0000
+
+kaffeine (0.7-0ubuntu2) breezy; urgency=low
+
+  * Add kubuntu_03_gstreamer_stop.diff to make a playing stop by stopping
+    not by playing the logo file
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 10 Aug 2005 22:27:53 +0000
+
+kaffeine (0.7-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Add DVB and GStreamer build-deps
+  * Split playing engines into kaffeine-gstreamer and kaffeine-xine
+  * Add kubuntu_01_default_gstreamer.diff to default to GStreamer
+  * Add kubuntu_02_gstreamer_service_menu.diff to use standard Kaffine icon for 
+    GStreamer engine and open same media mimetypes.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  8 Aug 2005 13:13:39 +0000
+
+kaffeine (0.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upstream added ability to disable the "Pause video when hidden"
+    setting. Closes: #298205
+  * Upstream fixed the bug causing the "Pause video when hidden" to unpause
+    kaffeine even when it was paused manually. Closes: #298204
+  * Upstream fixed the multiple xine error dialog bug. Closes: #293692
+  * Upstream kinda fixed the problem with opening m3u playlists. You have to
+    drag-and-drop the file onto kaffeine for it to work. Closes: #289460
+  * Xine provides libdvdread and libdvdnav functionality. Closes: #295068
+  * Forward-ported patches.
+  * Added a patch from CVS to make the "Append to Kaffeine Playlist service
+    menu only show up for mimetypes that kaffeine can actually use.
+  * Renamed "Save State" feature to "Resume Playback"
+  * Added icon to Debian menu entry.
+  * Updated the manpage.
+  * Updated authors in debian/control and debian/copyright.
+  * Moved HTML docs to the right place. I guess nobody missed them.
+  * Added an exclude to keep dh_compress from compressing .docbook files.
+
+  Riku Voipio:
+
+  * Add myself as uploader
+  * Fix kaffeine.menu
+
+ -- Zack Cerza <zcerza@coe.neu.edu>  Sun, 20 Mar 2005 12:29:08 -0500
+
+kaffeine (0.6-0ubuntu6) breezy; urgency=low
+
+  * Rebuild package for new C++ ABI.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 30 May 2005 20:06:33 +0000
+
+kaffeine (0.6-0ubuntu5) breezy; urgency=low
+
+  * added --with-xorg compile option, in same special cases
+    kaffeine hangs on start, it will fix this issue. 
+    
+ -- Andreas Mueller <amu@ubuntu.com>  Thu, 12 May 2005 19:53:27 +0200
+
+kaffeine (0.6-0ubuntu4) breezy; urgency=low
+
+  * merge with debian
+  
+ -- Andreas Mueller <amu@ubuntu.com>  Fri, 15 Apr 2005 22:58:03 +0200
+
+kaffeine (0.6-0ubuntu2) hoary; urgency=low
+
+  * added missing builddepend libqt3-compat-headers 
+
+ -- Andreas Mueller <amu@ubuntu.com>  Sun, 27 Mar 2005 23:26:34 +0000
+
+kaffeine (0.6-0ubuntu1) hoary; urgency=low
+
+  * New upstream release
+
+ -- Andreas Mueller <amu@ubuntu.com>  Wed, 23 Mar 2005 00:18:48 +0000
+
+kaffeine (0.5-1ubuntu1.1) hoary; urgency=low
+
+  * sync with debian 
+
+ -- Andreas Mueller <amu@ubuntu.com>  Sun, 13 Feb 2005 00:01:04 +0100
+
+kaffeine (0.5-1) unstable; urgency=low
+
+  * New upstream release. Closes: #289488
+  * Dropped patches that were included upstream.
+  * Updated patches that weren't.
+  * Refactored part of the save-state patch to better detect whether kaffeine
+    was playing and/or paused on exit.
+  * Added a toggle to the view menu: "Save State"
+  * Added a patch to re-add skip-ahead and skip-back.
+  * Added a patch to remove the broken, useless "preserve aspect" toggle.
+    Closes: #281188
+  * Split off *.h and *.so; not shipping kaffeine-dev at this time.
+  * Removed /usr/share/lintian/overrides/kaffeine
+  * Tweaked package description - it still needs work.
+  * Removed /usr/share/apps/kaffeine/logo .
+
+ -- Zack Cerza <zcerza@coe.neu.edu>  Thu,  6 Jan 2005 22:25:12 -0500
+
+kaffeine (0.4.92+0.5rc2-3) unstable; urgency=low
+
+  * Add suggests for libdvdread3 and libdvdnav4.
+  * Tightened build-depends for tdelibs4-dev.
+
+ -- Zack Cerza <zcerza@coe.neu.edu>  Mon, 13 Dec 2004 12:04:36 -0500
+
+kaffeine (0.4.92+0.5rc2-2) unstable; urgency=low
+
+  * Don't resume on startup if URLs are passed as command-line arguments.
+    Closes: #281192
+  * Remove all CVS dirs before building. Thanks suy!
+
+ -- Zack Cerza <zcerza@coe.neu.edu>  Sun, 14 Nov 2004 14:57:44 -0500
+
+kaffeine (0.4.92+0.5rc2-1) unstable; urgency=low
+
+  * New upstream release. Closes: #278832
+  * Upstream fixed buffer overflow.
+  * No longer crashes while playing audio streams. Closes: #249889, #253601
+  * Upstream added PlayAudioCD() DCOP function. Closes: #272246
+  * Upstream fixed stop functionality. Closes: #272355
+  * Verified that playlists can be saved. Closes: #279354
+  * Bookmarks don't exist anymore. Closes: #276710
+  * Added patch to fix HTTP_PROXY crash. Closes: #279748
+  * Added a patch to remember the position in the current file on exit,
+    and to return to that position on startup.
+  * Changed default UI a bit to make it less cluttered.
+  * Massive changes upstream broke debian/rules so I redid the packaging using
+    CDBS, and as little magic as possible.
+  * Made package description a little better.
+  * Added /usr/share/lintian/overrides/kaffeine until I make a decision on
+    if/how I will split kaffeine into multiple packages.
+
+ -- Zack Cerza <zcerza@coe.neu.edu>  Mon,  8 Nov 2004 11:22:38 -0500
+
+kaffeine (0.4.3.1-2) unstable; urgency=low
+
+  * Diverted user settings to '~/.kde/share/apps/kaffeine'. Closes: #261245
+  * Removed logo.avi - if this is a big problem, we can talk.
+  * Now build-depends on libxine-dev >= 1-rc5-1. Closes: #268819 
+
+ -- Zack Cerza <zcerza@coe.neu.edu>  Tue,  7 Sep 2004 23:11:30 -0400
+
+kaffeine (0.4.3.1-1) unstable; urgency=low
+
+  * This version corresponds to '0.4.3b' upstream.
+  * The mozilla plugin has been split at the source level upstream. Removed
+    all references to kaffeine-mozilla.
+  * upstream dropped the SuperKaramba theme. Removed related patches.
+  * /usr/share/mimelnk/application/x-mplayer2.desktop somehow got lost
+    during Chris' NMU. I put it back.
+
+ -- Zack Cerza <zcerza@coe.neu.edu>  Mon, 17 May 2004 11:22:39 -0400
+
+kaffeine (0.4.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Improved the manpage
+  * Thanks Chris. Closes: #245062
+  * SuperKaramba theme accidentally broken. Fixed.
+
+ -- Zack Cerza <zcerza@coe.neu.edu>  Mon,  3 May 2004 16:32:03 -0400
+
+kaffeine (0.4.2-1.1) unstable; urgency=low
+
+  * NMU.
+  * debian dir redone with permission of maintainer.
+  * Install docs into /usr/share/doc/tde/HTML. (Closes: #245062)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Thu, 22 Apr 2004 00:30:00 -0500
+
+kaffeine (0.4.2-1) unstable; urgency=low
+
+  * Initial Release.
+  * Generated manpage with help2man and tweaked it a bit
+  * Fixed a bug in kaffeine/Makefile.am that made libkaffeinepart.(so|la)
+     be installed into /usr/lib instead of /usr/lib/trinity
+  * Split into two packages: kaffeine and kaffeine-mozilla
+  * Fixed a bug in configure.in.in that made kaffeineplugin.(so|la) be
+     installed into /usr/lib. I put it in /usr/lib/mozilla/plugins and
+     symlinks to it in /usr/lib/mozilla-firefox/plugins and
+     /usr/lib/mozilla-snapshot/plugins.
+  * Had to remove debian/kaffeine/usr/share/services/mms.protocol and
+     debian/kaffeine/usr/share/mimelnk/video/x-ms-wmv.desktop (thanks grepper!)
+  * Put the SuperKaramba theme in /usr/share/superkaramba/themes/kaffeine_bw/
+
+ -- Zack Cerza <zcerza@coe.neu.edu>  Mon, 05 Apr 2004 22:41:00 -0500
+
diff --git a/ubuntu/_base/applications/kaffeine/debian/compat b/ubuntu/_base/applications/kaffeine/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/ubuntu/_base/applications/kaffeine/debian/control b/ubuntu/_base/applications/kaffeine/debian/control
new file mode 100644
index 000000000..32d29337b
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/control
@@ -0,0 +1,57 @@
+Source: kaffeine-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+Uploaders: Riku Voipio <riku.voipio@iki.fi>, Fathi Boudra <fboudra@free.fr>,
+ Mark Purcell <msp@debian.org>
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev,
+ libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev,
+ libxtst-dev, libgstreamer1.0-dev | libgstreamer0.10-dev,
+ libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev,
+ libcdio-cdda-dev, libcdio-paranoia-dev,
+ automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kaffeine-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, hdparm, libxine2-x | libxine1-x (<< 1.1.20) | libxine1 (<< 1.1.8-2)
+Replaces: kaffeine-kde3 (<< 4:14.0.0~), kaffeine-trinity (<< 4:14.0.0~)
+Breaks: kaffeine-kde3 (<< 4:14.0.0~), kaffeine-trinity (<< 4:14.0.0~)
+Description: versatile media player for TDE
+ Kaffeine is a media player for TDE. While it supports multiple player
+ engines, its default engine is Xine, giving Kaffeine a wide variety of
+ supported media types and letting Kaffeine access CDs, DVDs, and
+ network streams easily.
+ .
+ Kaffeine can keep track of multiple playlists simultaneously, and supports
+ autoloading of subtitles files for use while playing video.
+ .
+  Homepage: http://kaffeine.sourceforge.net
+
+Package: kaffeine-trinity-dbg
+Section: devel
+Architecture: any
+Replaces: kaffeine-kde3-dbg (<< 4:14.0.0~), kaffeine-trinity-dbg (<< 4:14.0.0~)
+Breaks: kaffeine-kde3-dbg (<< 4:14.0.0~), kaffeine-trinity-dbg (<< 4:14.0.0~)
+Priority: extra
+Depends: kaffeine-trinity (= ${binary:Version}), tdelibs-trinity-dbg
+Description: debugging symbols for kaffeine [Trinity]
+ This package contains the debugging symbols associated with kaffeine.
+ They will automatically be used by gdb for debugging kaffeine-related
+ issues.
+
+Package: kaffeine-gstreamer-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, kaffeine-trinity
+Replaces: kaffeine-gstreamer-kde3 (<< 4:14.0.0~), kaffeine-gstreamer-trinity (<< 4:14.0.0~)
+Breaks: kaffeine-gstreamer-kde3 (<< 4:14.0.0~), kaffeine-gstreamer-trinity (<< 4:14.0.0~)
+Description: Gstreamer engine for kaffeine media player [Trinity]
+ Kaffeine is a media player for TDE. While it supports multiple player
+ engines, its default engine is Gstreamer, giving Kaffeine a wide variety of
+ supported media types and letting Kaffeine access CDs, DVDs, and
+ network streams easily.
+ .
+ This package provides the Gstreamer playing engine for Kaffeine.
+ .
+ Homepage: http://kaffeine.sourceforge.net
diff --git a/ubuntu/_base/applications/kaffeine/debian/copyright b/ubuntu/_base/applications/kaffeine/debian/copyright
new file mode 100644
index 000000000..e1f37677a
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/copyright
@@ -0,0 +1,536 @@
+This package was debianized by Zack Cerza <zcerza@coe.neu.edu> on
+Sun, 28 Mar 2004 22:55:09 -0500.
+
+It was downloaded from http://kaffeine.sourceforge.net
+
+Upstream authors:
+   Christophe Thommeret <hftom@free.fr>
+   Christoph Pfister <christophpfister@gmail.com>
+   Jurgen Kofler <kaffeine@gmx.net>
+
+Copyright for tdemultitabbar:
+   (C) 2001-2003 Joseph Wenninger <jowenn@kde.org>
+
+Copyright for kaffeine_export copied from kat:
+   (C) 2005 Laurent Montel <montel@kde.org>
+
+Copyright for ts2pes copied from mjpegtools for the Siemens Fujitsu DVB PCI card:
+   (C) 2000-2001 Marcus Metzler <mocm@metzlerbros.de>
+
+Copyright for ts2rtp copied from dvbstream:
+   (C) 2001-2002 Dave Chapman <dave@dchapman.org>
+
+Copyright for cddb code:
+   (C) 2000 Michael Matz <matz@kde.org>
+
+Copyright for playlistitem and subtitle file import code:
+   (C) 2004-2005 Giorgos Gousios <gousiosg@cs.man.ac.uk>
+
+Copyright for position slider:
+   (C) 2004-2005 Giorgos Gousios <gousiosg@cs.man.ac.uk>
+   (C) 2004-2005 Jürgen Kofler <kaffeine@gmx.net>
+   (C) 2004-2005 Miguel Freitas <miguel@cetuc.puc-rio.br>
+
+Copyriht for xine postprocessing filters wrapper:
+   (C) 2003-2005 Jürgen Kofler <kaffeine@gmx.net>
+   (C) 2003-2005 Miguel Freitas <miguel@cetuc.puc-rio.br>
+
+Copyright for googlefetcher code:
+   (C) 2004 Nathan Toone <nathan@toonetown.com>
+   (C) 2006 Christophe Thommeret <hftom@free.fr>
+
+Copyright for xine post plugin handling:
+   (C) 2004-2005 Miguel Freitas <miguel@cetuc.puc-rio.br>
+
+Copyright for ca_zap:
+   (C) 2004-2005 Manu Abraham <manu@kromtek.com>
+   (C) 2006 Andrew de Quincey <adq_dvb@lidskialf.net>
+
+Copyright for libdvbfe:
+   (C) 2005 Manu Abraham <manu@kromtek.com>
+   (C) 2005 Andrew de Quincey <adq_dvb@lidskialf.net>
+   (C) 2005 Kenneth Aafloy <kenneth@linuxtv.org>
+
+Copyright for libdvbca:
+   (C) 2006 Andrew de Quincey <adq_dvb@lidskialf.net>
+
+Copyright for libdvbdemux:
+   (C) 2005 Andrew de Quincey <adq_dvb@lidskialf.net>
+
+Copyright for libdvbnet:
+   (C) 2005 Andrew de Quincey <adq_dvb@lidskialf.net>
+
+Copyright for libdvben50221:
+   (C) 2004-2005 Manu Abraham <manu@kromtek.com>
+   (C) 2006 Andrew de Quincey <adq_dvb@lidskialf.net>
+   
+Copyright for en50221 encoder:
+   (C) 2004-2005 Manu Abraham <manu@kromtek.com>
+   (C) 2005 Julian Scheel <julian@jusst.de>
+   (C) 2006 Andrew de Quincey <adq_dvb@lidskialf.net>
+
+Copyright for libdvbmisc:
+   (C) 2005 Manu Abraham <manu@kromtek.com>
+
+Copyright for crc32 calculation routines:
+   (C) 2005 by Andrew de Quincey <adq_dvb@lidskialf.net>
+
+Copyright for libucsi (section and descriptor parser):
+   (C) 2005 Kenneth Aafloy <kenneth@linuxtv.org>
+   (C) 2005 Andrew de Quincey <adq_dvb@lidskialf.net>
+   (C) 2005 Patrick Boettcher <pb@linuxtv.org>
+
+Copyright for logo animation licensed under LGPL:
+   (C) Dieter Zander
+
+Copyright for all coffee bean icons licensed under LGPL:
+   (C) 2003-2004 Jürgen Kofler <kaffeine@gmx.net>
+
+Copyright for record icons, taken from nuvola icon set licensed under LGPL:
+   (C) by David Vignoni
+
+Copyright for dvbcam:
+   (C) 2006 by Christoph Pfister <christophpfister@gmail.com>
+
+dvbcam code is based on ca_zap licensed under LGPL:
+
+    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.1 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
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+Kaffeine is licensed under GPL-2:
+
+   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; either version 2 of the License, or
+   (at your option) any later version.
+
+   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 systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+The documentations provided with kaffeine is distributed under
+the GNU Free Documentation License (FDL). They are considered free with
+regards to the Debian Free Software Guidelines (DFSG) because they don't
+contain any unmodifiable parts (invariant sections). The complete text of
+the GNU Free Documentation License can be found below:
+
+		GNU Free Documentation License
+		  Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+    Copyright (c)  YEAR  YOUR NAME.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+    with the Invariant Sections being LIST THEIR TITLES, with the
+    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+
diff --git a/ubuntu/_base/applications/kaffeine/debian/docs b/ubuntu/_base/applications/kaffeine/debian/docs
new file mode 100644
index 000000000..194085499
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/docs
@@ -0,0 +1,7 @@
+README
+TODO
+kaffeine/BUGS
+kaffeine/CREDITS
+kaffeine/README.atsc
+kaffeine/README.dvb
+kaffeine/README.gstreamer
diff --git a/ubuntu/_base/applications/kaffeine/debian/install-codecs b/ubuntu/_base/applications/kaffeine/debian/install-codecs
new file mode 100644
index 000000000..720dfcd4c
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/install-codecs
@@ -0,0 +1,145 @@
+#!/usr/bin/python
+import sys,os
+import gettext
+import apt
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+
+gettext.textdomain('kaffeine-install-codecs')
+
+def _(string):
+    return unicode(gettext.gettext(string), 'utf-8')
+
+if len(sys.argv) < 2:
+    sys.exit(1)
+
+class InstallerOpProgress(apt.OpProgress):
+    def __init__(self, installer):
+        self.installer = installer
+
+    def update(self, percent):
+        self.installer.progress.setValue(percent)
+        QApplication.processEvents()
+
+    def done(self):
+        self.installer.progress.setValue(100)
+        QApplication.processEvents()
+
+class CodecInstallerWidget(QDialog, apt.OpProgress):
+    def __init__(self):
+        QDialog.__init__(self)
+        self.setWindowTitle(_('Kaffeine codec installer'))
+        self.setModal(True)
+        self.status = QLabel()
+        self.status.setAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
+        self.progress = QProgressBar()
+        layout = QVBoxLayout()
+        layout.addWidget(self.status)
+        layout.addWidget(self.progress)
+        self.setLayout(layout)
+        self.setStatus(_('Initializing...'))
+
+        desktop = QApplication.desktop()
+        self.setMinimumWidth(desktop.width() / 3)
+        self.adjustSize()
+        self.move((desktop.width()-self.width()) / 2,
+                  (desktop.height()-self.height()) / 2)
+        self.show()
+        self.run()
+
+    def setStatus(self, text):
+        self.status.setText('<i>' + text + '</i>')
+        QApplication.processEvents()
+
+    def init_apt_cache(self):
+        self.setStatus(_('Preparing...'))
+        self.apt_cache = apt.Cache(InstallerOpProgress(self))
+
+    def run(self):
+        if sys.argv[1] == 'ffmpeg':
+            self.installer = self.install_ffmpeg
+        elif sys.argv[1] == 'dvdcss':
+            self.installer = self.install_dvdcss
+        else:
+            QMessageBox.critical(self, _('Error'), _('Unknown codec type'))
+            QApplication.exit(1)
+            return
+
+        if not self.installer():
+            QApplication.exit(1)
+            return
+
+        os.system('dcop kaffeine KaffeineIface reloadEngine')
+        os.system('dcop kaffeine KaffeineIface play')
+        QApplication.exit(0)
+
+    def check_already_installed(self, pkg):
+        if pkg and pkg.isInstalled:
+            QMessageBox.critical(self, _('Error'), _('Codec package is already installed'))
+            QApplication.exit(1)
+            return True
+        return False
+
+    def install_ffmpeg(self):
+        self.init_apt_cache()
+        pkg = self.search_pkg('libxine','-ffmpeg')
+
+        if self.check_already_installed(pkg):
+            return False
+
+        confirm = QMessageBox.question(self, _('Codec not found'),
+                                       _('Kaffeine does not have a codec '
+                                         'installed to play this file. '
+                                         'Do you want to install the codecs?'),
+                                      QMessageBox.Yes | QMessageBox.No)
+        if (confirm == QMessageBox.No):
+            QApplication.exit(1)
+            return False
+
+        self.setStatus(_('Installing...'))
+        QApplication.processEvents()
+        self.install_cache_package(pkg)
+        return True
+
+    def install_cache_package(self, pkg):
+        if os.system('tdesu -d \'adept_batch install ' + pkg.name + '\'') != 0:
+            QApplication.exit(1)
+            return
+
+    def search_pkg(self, prefix, suffix = ''):
+        for pkg in self.apt_cache:
+            if pkg.name.startswith(prefix) and pkg.name.endswith(suffix):
+                return pkg
+        return None
+
+    def install_dvdcss(self):
+        self.init_apt_cache()
+        pkg = self.search_pkg('libdvdcss')
+
+        if self.check_already_installed(pkg):
+            return False
+
+        answer = QMessageBox.question(self, _('Codec not found'),
+                                      _('LibDVDCSS (http://www.videolan.org/developers/libdvdcss.html) '
+                                        'is about to be installed, it allows you to watch encrypted DVD '
+                                        'videos.  This is illegal in some countries which '
+                                        'require decryption to be authorised by the copyright holder. '
+                                        'Do you want to install this package?'),
+                                      QMessageBox.Yes | QMessageBox.No)
+        if (answer == QMessageBox.No):
+            QApplication.exit(1)
+            return False
+
+        self.setStatus(_('Installing...'))
+        QApplication.processEvents()
+
+        distro_arch = os.popen('dpkg --print-installation-architecture').read()
+        distro_arch = distro_arch[:-1] # remove trailing newline
+        libdvdcss_url = 'http://kubuntu.org/packages/libdvdcss-' + distro_arch + '.deb'
+        os.system('kfmclient exec ' + libdvdcss_url)
+        return True
+
+app = QApplication(sys.argv)
+window = CodecInstallerWidget()
+window.exec_()
+
diff --git a/ubuntu/_base/applications/kaffeine/debian/install-css.sh b/ubuntu/_base/applications/kaffeine/debian/install-css.sh
new file mode 100644
index 000000000..f374562ff
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/install-css.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+set -e
+
+site=http://www.dtek.chalmers.se/groups/dvd/deb/
+arch=`dpkg --print-installation-architecture`
+
+soname=2
+uversion=1.2.5
+available="alpha amd64 hppa i386 ia64 powerpc s390 sparc"
+version=${uversion}-1
+
+if [ ! -e /usr/bin/wget ]
+then
+    echo "Install wget and run this script again"
+    exit 1
+fi
+
+for a in $available; do
+    if [  "$a" = "$arch" ]; then
+	wget ${site}libdvdcss${soname}_${version}_${arch}.deb -O /tmp/libdvdcss.deb
+	dpkg -i /tmp/libdvdcss.deb
+	exit $?
+    fi
+done
+
+echo "No binary deb available.  Will try to build and install it."
+echo "You need to have debhelper, dpkg-dev and fakeroot installed."
+echo "If not, interrupt now, install them and rerun this script."
+echo ""
+echo "This is higly experimental, look out for what happens below."
+echo "If you want to stop, interrupt now (control-c), else press"
+echo "return to proceed"
+read dum
+
+mkdir -p /tmp/dvd
+cd /tmp/dvd
+wget ${site}libdvdcss_${uversion}.orig.tar.gz
+wget ${site}libdvdcss_${version}.diff.gz
+wget ${site}libdvdcss_${version}.dsc
+dpkg-source -x libdvdcss_${version}.dsc
+cd libdvdcss-${uversion}
+fakeroot ./debian/rules binary
+echo "Any problems?  Interrupt now (control-c) and try to fix"
+echo "manually, else go on and install (return)."
+dpkg -i ../libdvdcss${soname}_${version}_${arch}.deb
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install b/ubuntu/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
new file mode 100644
index 000000000..cddfdc50f
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
@@ -0,0 +1,4 @@
+debian/tmp/opt/trinity/lib/trinity/libgstreamerpart.la
+debian/tmp/opt/trinity/lib/trinity/libgstreamerpart.so
+debian/tmp/opt/trinity/share/services/gstreamer_part.desktop
+debian/tmp/opt/trinity/share/apps/gstreamerpart/gstreamer_part.rc
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine-iso.desktop b/ubuntu/_base/applications/kaffeine/debian/kaffeine-iso.desktop
new file mode 100644
index 000000000..63cf8f167
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine-iso.desktop
@@ -0,0 +1,11 @@
+# this file is "/usr/share/applications/tde/kaffeine-iso.desktop"
+[Desktop Entry]
+Exec=kaffeine dvd:%f
+Icon=kaffeine
+MimeType=application/x-iso
+Name=kaffeine
+Name[en_US]=kaffeine
+StartupNotify=true
+Terminal=false
+Type=Application
+NoDisplay=true
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.install b/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.install
new file mode 100644
index 000000000..4777ef63c
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.install
@@ -0,0 +1,23 @@
+debian/tmp/opt/trinity/bin/
+debian/tmp/opt/trinity/lib/*.so*
+debian/tmp/opt/trinity/lib/*.la
+debian/tmp/opt/trinity/share/servicetypes/
+debian/tmp/opt/trinity/share/applications/
+debian/tmp/opt/trinity/share/apps/kaffeine/
+debian/tmp/opt/trinity/share/apps/profiles/kaffeine.profile.xml
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kaffeine_open_directory.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kaffeine_append_file.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kaffeine_play_dvd.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kaffeine_play_vcd.desktop
+debian/tmp/opt/trinity/share/doc/
+debian/tmp/opt/trinity/share/icons/
+debian/tmp/opt/trinity/share/mimelnk/application/x-kaffeine.desktop
+debian/tmp/opt/trinity/share/locale/
+debian/tmp/opt/trinity/include/tde/kaffeine/*h
+debian/tmp/opt/trinity/share/services/kaffeineoggvorbis.desktop
+debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.la
+debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.so
+debian/tmp/opt/trinity/lib/trinity/libxinepart.la
+debian/tmp/opt/trinity/lib/trinity/libxinepart.so
+debian/tmp/opt/trinity/share/services/xine_part.desktop
+
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides b/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides
new file mode 100644
index 000000000..2e7541445
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides
@@ -0,0 +1,8 @@
+kaffeine: manpage-has-errors-from-man usr/share/man/man1/kaffeine.1.gz 17: warning: can't find numbered character 195
+# It isn't a library or a development package and no other packages uses
+# libkaffeinedvbplugin0, libkaffeineaudioencoder0 and libkaffeinepart.
+# kaffeine needs them and maybe a split can happen later.
+kaffeine-trinity: package-name-doesnt-match-sonames libkaffeineaudioencoder0 libkaffeinedvbplugin0 libkaffeinepart
+kaffeine-trinity: non-dev-pkg-with-shlib-symlink usr/lib/libkaffeinedvbplugin.so.0.0.1 usr/lib/libkaffeinedvbplugin.so
+kaffeine-trinity: non-dev-pkg-with-shlib-symlink usr/lib/libkaffeineaudioencoder.so.0.0.1 usr/lib/libkaffeineaudioencoder.so
+kaffeine-trinity: shlib-missing-in-control-file libkaffeinepart.so for usr/lib/libkaffeinepart.so
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine.1 b/ubuntu/_base/applications/kaffeine/debian/kaffeine.1
new file mode 100644
index 000000000..0d66e29a8
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine.1
@@ -0,0 +1,187 @@
+.\" This file was generated by kdemangen.pl
+.TH KAFFEINE 1 "Apr 2005" "Trinity Desktop Environment" "A media player for TDE"
+.SH NAME
+kaffeine
+- A media player for TDE that can use multiple backends for playback.
+.SH SYNOPSIS
+kaffeine [Qt-options] [TDE-options] [options] [file] 
+.SH DESCRIPTION
+Kaffeine is a media player for TDE. While it supports multiple player
+engines, its default engine is Xine, giving Kaffeine a wide variety of
+supported media types and letting Kaffeine access CDs, DVDs, and
+network streams easily.
+
+Kaffeine can keep track of multiple playlists simultaneously, and supports
+autoloading of subtitles files for use while playing video.
+
+Author:   Jürgen Kofler
+Homepage: http://kaffeine.sourceforge.net
+
+
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B file
+File(s) to play. Can be a local file, a URL, a directory or 'DVD', 'VCD', 'AudioCD'.
+.SS Options:
+.TP
+.B -p,  --play  
+Start playing immediately
+.TP
+.B -f,  --fullscreen  
+Start in fullscreen mode
+.TP
+.B -a,  --audiodriver  <argument>
+Set audio driver [default]
+.TP
+.B -x,  --videodriver  <argument>
+Set video driver [default]
+.TP
+.B -d,  --device  <argument>
+Set Audio-CD/VCD/DVD device path. [default]
+.TP
+.B  --verbose  
+Output xine debug messages
+.TP
+.B -w,  --wizard  
+Run installation wizard
+.SS 
+.SS Generic options:
+.TP
+.B  --help  
+Show help about options
+.TP
+.B  --help-qt  
+Show Qt specific options
+.TP
+.B  --help-tde  
+Show TDE 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 TDE 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 - see man X for the argument format
+.TP
+.B  --nofork  
+Don't run in the background.
+.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 TDE Help Center.  You can also enter the URL
+.BR help:/kaffeine/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kaffeine/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+Jürgen Kofler <kaffeine@gmx.net>
+.br
+Christophe Thommeret <hftom@free.fr>
+.br
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine.xpm b/ubuntu/_base/applications/kaffeine/debian/kaffeine.xpm
new file mode 100644
index 000000000..255d651d9
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine.xpm
@@ -0,0 +1,463 @@
+/* XPM */
+static char * kaffeine_xpm[] = {
+"32 32 428 2",
+"  	c None",
+". 	c #030100",
+"+ 	c #1B0D00",
+"@ 	c #2A1300",
+"# 	c #361900",
+"$ 	c #472000",
+"% 	c #3D1C00",
+"& 	c #291300",
+"* 	c #1A0C00",
+"= 	c #000000",
+"- 	c #110800",
+"; 	c #502500",
+"> 	c #924300",
+", 	c #9E4900",
+"' 	c #753600",
+") 	c #532600",
+"! 	c #562800",
+"~ 	c #652E00",
+"{ 	c #662F00",
+"] 	c #883F00",
+"^ 	c #221000",
+"/ 	c #0B0500",
+"( 	c #351900",
+"_ 	c #AE5000",
+": 	c #D06100",
+"< 	c #A84E00",
+"[ 	c #5E2C00",
+"} 	c #3C1C00",
+"| 	c #6B3100",
+"1 	c #803B00",
+"2 	c #713400",
+"3 	c #C65C00",
+"4 	c #F57900",
+"5 	c #F39000",
+"6 	c #9A5900",
+"7 	c #180B00",
+"8 	c #522600",
+"9 	c #BF5900",
+"0 	c #E66A00",
+"a 	c #B45300",
+"b 	c #4A2200",
+"c 	c #3A1A00",
+"d 	c #482100",
+"e 	c #612D00",
+"f 	c #7B3900",
+"g 	c #853D00",
+"h 	c #DD6700",
+"i 	c #FD8600",
+"j 	c #FF9B00",
+"k 	c #F78000",
+"l 	c #944A00",
+"m 	c #0C0500",
+"n 	c #592900",
+"o 	c #E46B00",
+"p 	c #F67300",
+"q 	c #A14B00",
+"r 	c #401D00",
+"s 	c #351800",
+"t 	c #452000",
+"u 	c #672F00",
+"v 	c #783700",
+"w 	c #894000",
+"x 	c #683000",
+"y 	c #C25A00",
+"z 	c #EA7000",
+"A 	c #FE8F00",
+"B 	c #FF9600",
+"C 	c #FD7B00",
+"D 	c #F97F00",
+"E 	c #4F2800",
+"F 	c #3F1F00",
+"G 	c #CF6100",
+"H 	c #FC7800",
+"I 	c #C55C00",
+"J 	c #421F00",
+"K 	c #462000",
+"L 	c #5B2A00",
+"M 	c #833D00",
+"N 	c #8B4000",
+"O 	c #763700",
+"P 	c #D86400",
+"Q 	c #F67A00",
+"R 	c #FF9A00",
+"S 	c #FE8800",
+"T 	c #FD7D00",
+"U 	c #FD8200",
+"V 	c #A85D00",
+"W 	c #0D0800",
+"X 	c #1F0E00",
+"Y 	c #D76500",
+"Z 	c #FD8000",
+"` 	c #C96000",
+" .	c #4F2500",
+"..	c #371900",
+"+.	c #4C2300",
+"@.	c #632E00",
+"#.	c #833C00",
+"$.	c #843D00",
+"%.	c #9F4A00",
+"&.	c #E56B00",
+"*.	c #FB8500",
+"=.	c #FD7E00",
+"-.	c #FD8300",
+";.	c #E37D00",
+">.	c #392100",
+",.	c #0A0500",
+"'.	c #8C4100",
+").	c #FB7F00",
+"!.	c #F17800",
+"~.	c #6B3200",
+"{.	c #3B1B00",
+"].	c #512500",
+"^.	c #773700",
+"/.	c #823C00",
+"(.	c #914300",
+"_.	c #9D4800",
+":.	c #7B3800",
+"<.	c #BD5700",
+"[.	c #EF7500",
+"}.	c #FE9300",
+"|.	c #F68C00",
+"1.	c #5C3300",
+"2.	c #502600",
+"3.	c #E97900",
+"4.	c #F77F00",
+"5.	c #9E4C00",
+"6.	c #3E1D00",
+"7.	c #582800",
+"8.	c #6E3300",
+"9.	c #7D3900",
+"0.	c #873E00",
+"a.	c #9F4900",
+"b.	c #9C4800",
+"c.	c #DA6600",
+"d.	c #FD8100",
+"e.	c #FF9C00",
+"f.	c #FB7600",
+"g.	c #FD7F00",
+"h.	c #FD8500",
+"i.	c #FE9000",
+"j.	c #884F00",
+"k.	c #BA5B00",
+"l.	c #FC8700",
+"m.	c #D56B00",
+"n.	c #773600",
+"o.	c #813B00",
+"p.	c #954400",
+"q.	c #A54C00",
+"r.	c #7E3A00",
+"s.	c #AD5000",
+"t.	c #E16B00",
+"u.	c #FE8D00",
+"v.	c #F47500",
+"w.	c #FC7900",
+"x.	c #FE9400",
+"y.	c #9A5A00",
+"z.	c #532800",
+"A.	c #F98300",
+"B.	c #FA8800",
+"C.	c #703300",
+"D.	c #853E00",
+"E.	c #8F4200",
+"F.	c #9A4700",
+"G.	c #A44C00",
+"H.	c #A64D00",
+"I.	c #7C3900",
+"J.	c #D66300",
+"K.	c #F57B00",
+"L.	c #FF9900",
+"M.	c #FB8800",
+"N.	c #F17000",
+"O.	c #FA7500",
+"P.	c #FD7C00",
+"Q.	c #AE6600",
+"R.	c #140900",
+"S.	c #A15200",
+"T.	c #FE8A00",
+"U.	c #E47400",
+"V.	c #843C00",
+"W.	c #964500",
+"X.	c #A04900",
+"Y.	c #A34B00",
+"Z.	c #A64C00",
+"`.	c #AC4F00",
+" +	c #B15100",
+".+	c #DF6700",
+"++	c #FB8100",
+"@+	c #F37B00",
+"#+	c #EF6F00",
+"$+	c #F87400",
+"%+	c #A36000",
+"&+	c #3B1E00",
+"*+	c #E47900",
+"=+	c #F78900",
+"-+	c #BC5A00",
+";+	c #B55400",
+">+	c #B35300",
+",+	c #B25200",
+"'+	c #B45200",
+")+	c #B55300",
+"!+	c #E66E00",
+"~+	c #F99000",
+"{+	c #E56D00",
+"]+	c #ED6E00",
+"^+	c #F77300",
+"/+	c #FD7A00",
+"(+	c #FE8E00",
+"_+	c #925500",
+":+	c #643200",
+"<+	c #F88A00",
+"[+	c #E77800",
+"}+	c #A94F00",
+"|+	c #BC5700",
+"1+	c #BE5800",
+"2+	c #B85500",
+"3+	c #7A3800",
+"4+	c #C45B00",
+"5+	c #F87B00",
+"6+	c #EF7C00",
+"7+	c #DB6600",
+"8+	c #E86C00",
+"9+	c #FC7700",
+"0+	c #804900",
+"a+	c #C86800",
+"b+	c #FC8F00",
+"c+	c #BF5F00",
+"d+	c #7D3A00",
+"e+	c #A44B00",
+"f+	c #B65400",
+"g+	c #BF5800",
+"h+	c #C05900",
+"i+	c #8D4100",
+"j+	c #A04A00",
+"k+	c #D66400",
+"l+	c #DA6500",
+"m+	c #E36A00",
+"n+	c #F97500",
+"o+	c #F38300",
+"p+	c #543000",
+"q+	c #E67A00",
+"r+	c #FE9100",
+"s+	c #954600",
+"t+	c #693000",
+"u+	c #934300",
+"v+	c #783800",
+"w+	c #E76F00",
+"x+	c #FE9800",
+"y+	c #F38800",
+"z+	c #CE6000",
+"A+	c #D16200",
+"B+	c #DF6800",
+"C+	c #F06F00",
+"D+	c #FA7600",
+"E+	c #E57A00",
+"F+	c #3C2200",
+"G+	c #020100",
+"H+	c #F18300",
+"I+	c #FB8700",
+"J+	c #5A2900",
+"K+	c #5A2A00",
+"L+	c #934400",
+"M+	c #A74D00",
+"N+	c #B05100",
+"O+	c #893F00",
+"P+	c #C85D00",
+"Q+	c #F47E00",
+"R+	c #FD9A00",
+"S+	c #DB6E00",
+"T+	c #C75C00",
+"U+	c #CD5F00",
+"V+	c #D36200",
+"W+	c #E16900",
+"X+	c #F17100",
+"Y+	c #C46400",
+"Z+	c #1B1000",
+"`+	c #1D0D00",
+" @	c #F88B00",
+".@	c #EC7C00",
+"+@	c #3F1D00",
+"@@	c #763600",
+"#@	c #873F00",
+"$@	c #954500",
+"%@	c #9C4900",
+"&@	c #AB4F00",
+"*@	c #DB6900",
+"=@	c #FD8F00",
+"-@	c #F58E00",
+";@	c #BB5700",
+">@	c #C15A00",
+",@	c #C95D00",
+"'@	c #D16100",
+")@	c #994700",
+"!@	c #070300",
+"~@	c #582900",
+"{@	c #FA8D00",
+"]@	c #D46C00",
+"^@	c #2E1500",
+"/@	c #442000",
+"(@	c #652F00",
+"_@	c #743500",
+":@	c #E47200",
+"<@	c #C55B00",
+"[@	c #421E00",
+"}@	c #FA8B00",
+"|@	c #B85D00",
+"1@	c #2C1400",
+"2@	c #6F3300",
+"3@	c #7F3A00",
+"4@	c #8A4000",
+"5@	c #974600",
+"6@	c #8E4200",
+"7@	c #CA5E00",
+"8@	c #FE9700",
+"9@	c #D16300",
+"0@	c #C35A00",
+"a@	c #B15200",
+"b@	c #080400",
+"c@	c #5F2C00",
+"d@	c #F98900",
+"e@	c #A85400",
+"f@	c #4D2300",
+"g@	c #602C00",
+"h@	c #E56C00",
+"i@	c #FF9700",
+"j@	c #F38500",
+"k@	c #CC5E00",
+"l@	c #D06200",
+"m@	c #D46300",
+"n@	c #D96600",
+"o@	c #683100",
+"p@	c #2D1500",
+"q@	c #F88400",
+"r@	c #A14F00",
+"s@	c #7F3B00",
+"t@	c #753500",
+"u@	c #F27800",
+"v@	c #E17300",
+"w@	c #CF6000",
+"x@	c #DE6800",
+"y@	c #CF6500",
+"z@	c #2A1600",
+"A@	c #050200",
+"B@	c #F18100",
+"C@	c #A15100",
+"D@	c #622D00",
+"E@	c #FD8C00",
+"F@	c #F78F00",
+"G@	c #D06300",
+"H@	c #D76400",
+"I@	c #E46A00",
+"J@	c #EB6D00",
+"K@	c #FA7A00",
+"L@	c #643600",
+"M@	c #D86E00",
+"N@	c #B05800",
+"O@	c #4E2400",
+"P@	c #723400",
+"Q@	c #5D2B00",
+"R@	c #AF5100",
+"S@	c #EE7300",
+"T@	c #EB7A00",
+"U@	c #E36900",
+"V@	c #D06D00",
+"W@	c #904800",
+"X@	c #C96200",
+"Y@	c #331700",
+"Z@	c #451F00",
+"`@	c #FD8800",
+" #	c #FE9500",
+".#	c #D96900",
+"+#	c #D26200",
+"@#	c #E26900",
+"##	c #DF7900",
+"$#	c #412500",
+"%#	c #442100",
+"&#	c #301600",
+"*#	c #441F00",
+"=#	c #AC5000",
+"-#	c #FE8C00",
+";#	c #F98700",
+">#	c #F67200",
+",#	c #794600",
+"'#	c #080500",
+")#	c #120800",
+"!#	c #A24D00",
+"~#	c #662E00",
+"{#	c #411E00",
+"]#	c #4F2400",
+"^#	c #6D3200",
+"/#	c #F17900",
+"(#	c #E77300",
+"_#	c #F68000",
+":#	c #9C5900",
+"<#	c #311700",
+"[#	c #904300",
+"}#	c #2F1600",
+"|#	c #FB8600",
+"1#	c #FA8C00",
+"2#	c #D86700",
+"3#	c #EE6F00",
+"4#	c #A85A00",
+"5#	c #1E1100",
+"6#	c #361800",
+"7#	c #EB7600",
+"8#	c #EE7700",
+"9#	c #D36300",
+"0#	c #E96D00",
+"a#	c #F87500",
+"b#	c #F37800",
+"c#	c #9F5300",
+"d#	c #090500",
+"e#	c #2D1400",
+"f#	c #3C1B00",
+"g#	c #793800",
+"h#	c #DF6A00",
+"i#	c #F27000",
+"j#	c #F07100",
+"k#	c #723700",
+"l#	c #140A00",
+"m#	c #1B0C00",
+"n#	c #231000",
+"o#	c #522D00",
+"p#	c #DD7E00",
+"q#	c #CC5F00",
+"r#	c #8B4100",
+"s#	c #2A1400",
+"t#	c #3F2300",
+"u#	c #6A3400",
+"                          . + @ # $ % & + * = = = =             ",
+"                        - ; > , ' ) ! ~ { ] { ^ = = = =         ",
+"                    / ( _ : < [ } ; | 1 2 3 4 5 6 7 = = =       ",
+"                    8 9 0 a b c d e f 1 g h i j k l = = = =     ",
+"                m n o p q r s t u v w x y z A B C D E = = = =   ",
+"                F G H I J # K L 2 M N O P Q R S T U V W = = =   ",
+"              X Y Z `  ...+.@.2 #.> $.%.&.*.j Z =.-.;.>.= = =   ",
+"            ,.'.).!.~.{.].@.^./.(._.:.<.[.}.}.H =.-.|.1.= = =   ",
+"            2.3.4.5.6.7.8.9.0.> a.b.$.c.d.e.Z f.g.h.i.j.= = = = ",
+"          = k.l.m.[ e n.o.'.p._.q.r.s.t.u.j v.w.g.h.x.y.= = = = ",
+"          z.A.B.'.C.D.E.F.b.G.H.G.I.J.K.L.M.N.O.P.-.}.Q.= = = = ",
+"        R.S.T.U.V.W._.X.Y.Z.`. +W.E..+++e.@+#+$+C d.A %+= = = = ",
+"        &+*+=+-+;+>+a ,+,+,+'+)+1 >+!+}.~+{+]+^+/+Z (+_+= = = = ",
+"      = :+<+[+}+|+1+9 1+)+2+2+a 3+4+5+j 6+7+8+N.9+Z (+0+= = = = ",
+"      = a+b+c+d+e+a f+g+h+1+h+i+j+k+A j l+J.m+8+n+/+o+p+= = = = ",
+"      = q+r+s+t+u+e+_ )+2+<.f+v+<.w+x+y+z+A+k+B+C+D+E+F+= = = = ",
+"      G+H+I+J+K+1 L+, M+N+)+F.O+P+Q+R+S+y T+U+V+W+X+Y+Z+= = =   ",
+"      `+ @.@+@].@@#@$@%@H.&@r._.*@=@-@` ;@h+>@,@'@&.)@!@= = =   ",
+"      ~@{@]@^@/@(@_@] L+, , 2 ;+K.R :@<.<.<.2+|+<@U+[@= = = =   ",
+"      ~.}@|@1@{.J+2@3@4@5@f 6@7@S 8@9@h+y y 0@9 9 a@b@= = = =   ",
+"      c@d@e@1@s f@c@@@$.] g@;+h@i@j@0@,@k@G l@m@n@o@= = = = =   ",
+"      p@q@r@1@^@t K+C.s@_@t@,@u@i@v@,@w@'@c.x@8+y@z@= = = =     ",
+"      A@B@C@1@1@% ; x ^.D@L+n@E@F@G@z+H@I@J@p K@L@= = = = =     ",
+"      = M@N@1@1@..O@D@P@Q@R@S@}.T@U+V+U@#+^+C V@W = = = =       ",
+"      = W@X@1@1@Y@Z@c@7./.7@`@ #.#+#@#C+9+C ##$#= = = = =       ",
+"      = %#n@Y@1@&#*#~@b =#B+-#;#w@7+J@>#T U ,#'#= = = =         ",
+"      = )#!#~#1@&#{#]#^#4+/#i@(#V+m+p C _#:#= = = = =           ",
+"        = <#[#Y@}#6.b i+k+|#1#2#l+3#/+Z 4#5#= = = = =           ",
+"        = = 6#K }#[@7.R@7#A 8#9#0#a#b#c#d#= = = = =             ",
+"          = A@R.e#f#g#P+I+A h#n@i#j#k#l#= = = = =               ",
+"            = = !@m#n#o#p#o+q#9 r#s#= = = = = =                 ",
+"            = = = = = = t#u#+@1@b@= = = = = = =                 "};
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine_codecinstall.desktop b/ubuntu/_base/applications/kaffeine/debian/kaffeine_codecinstall.desktop
new file mode 100644
index 000000000..7f22f6b07
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine_codecinstall.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=ServiceType
+X-TDE-ServiceType=Kaffeine/CodecInstall
+
+# The unplayable codec
+[PropertyDef::X-TDE-Kaffeine-codec]
+Type=TQString
+
+[PropertyDef::X-TDE-Kaffeine-engine]
+Type=TQString
+
+[PropertyDef::Exec]
+Type=TQString
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop b/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
new file mode 100644
index 000000000..7192a4f53
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Service
+ServiceTypes=Kaffeine/CodecInstall
+X-TDE-Kaffeine-codec=dvdcss
+X-TDE-Kaffeine-engine=xine-engine
+Exec=kdialog --sorry "This DVD Video is encrypted.  To be able to watch it you will need to install libdvdcss by running from a console: sudo /usr/share/doc/kaffeine/install-css.sh.  In some countries it is illegal to install the decryption software without permission from the video copyright holder."
+
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop b/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
new file mode 100644
index 000000000..b32fcac45
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Service
+ServiceTypes=Kaffeine/CodecInstall
+X-TDE-Kaffeine-codec=ffmpeg
+X-TDE-Kaffeine-engine=xine-engine
+Exec=/opt/trinity/lib/kaffeine/install-codecs ffmpeg
+
diff --git a/ubuntu/_base/applications/kaffeine/debian/menu b/ubuntu/_base/applications/kaffeine/debian/menu
new file mode 100644
index 000000000..2a2ed2f01
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/menu
@@ -0,0 +1,7 @@
+?package(kaffeine-trinity):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="TDE"\
+	title="Kaffeine"\
+	command="/opt/trinity/bin/kaffeine"\
+	icon="/opt/trinity/share/pixmaps/kaffeine.xpm"
diff --git a/ubuntu/_base/applications/kaffeine/debian/patches/series b/ubuntu/_base/applications/kaffeine/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/patches/series
diff --git a/ubuntu/_base/applications/kaffeine/debian/rules b/ubuntu/_base/applications/kaffeine/debian/rules
new file mode 100755
index 000000000..01ea04305
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/rules
@@ -0,0 +1,58 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_CONFIGURE_EXTRA_FLAGS := --without-lame --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+DEB_INSTALL_MANPAGES_kaffeine-trinity := debian/kaffeine.1
+
+DEB_FIXPERMS_EXCLUDE := install-css.sh install-codecs
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	
+	make -f admin/Makefile.common cvs
+	touch debian/stamp-bootstrap
+
+install/kaffeine-trinity::
+	install -D -p -m0644 debian/kaffeine.xpm debian/$(cdbs_curpkg)/opt/trinity/share/pixmaps/kaffeine.xpm
+	install -D -p -m0644 debian/kaffeine-trinity.lintian-overrides debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
+	install -D -p -m0755 debian/install-css.sh debian/$(cdbs_curpkg)/opt/trinity/share/doc/kaffeine/install-css.sh
+	install -D -p -m0644 debian/kaffeine-iso.desktop debian/$(cdbs_curpkg)/opt/trinity/share/applications/tde/kaffeine-iso.desktop
+
+	#Debian additions
+	install -D -p -m0755 debian/install-codecs debian/$(cdbs_curpkg)/opt/trinity/lib/kaffeine/install-codecs
+	install -D -p -m0644 debian/kaffeine_xine-install-dvdcss.desktop debian/$(cdbs_curpkg)/opt/trinity/share/services/kaffeine_xine-install-dvdcss.desktop
+	install -D -p -m0644 debian/kaffeine_xine-install-ffmpeg.desktop debian/$(cdbs_curpkg)/opt/trinity/share/services/kaffeine_xine-install-ffmpeg.desktop
+	install -D -p -m0644 debian/kaffeine_codecinstall.desktop debian/$(cdbs_curpkg)/opt/trinity/share/servicetypes/kaffeine_codecinstall.desktop
+
+	# file shipped by tdelibs
+	rm -f debian/$(cdbs_curpkg)/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
+	# Bogus, shouldn't be shipped..
+	rm -f debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/doc/CMakeLists.txt
+
+binary-install/kaffeine-trinity::
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
diff --git a/ubuntu/_base/applications/kaffeine/debian/source/format b/ubuntu/_base/applications/kaffeine/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/kaffeine/debian/source/options b/ubuntu/_base/applications/kaffeine/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/kaffeine/debian/watch b/ubuntu/_base/applications/kaffeine/debian/watch
new file mode 100644
index 000000000..3f054ccd4
--- /dev/null
+++ b/ubuntu/_base/applications/kaffeine/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/kaffeine/kaffeine-([\d.].[\d.].[\d])\.tar\.bz2 debian svn-upgrade