--- kaffeine-0.7.1.orig/debian/man/kaffeine.1
+++ kaffeine-0.7.1/debian/man/kaffeine.1
@@ -0,0 +1,188 @@
+.\" This file was generated by kdemangen.pl
+.TH KAFFEINE 1 "Apr 2005" "K Desktop Environment" "A media player for KDE 3"
+.SH NAME
+kaffeine
+- A media player for KDE 3 that can use multiple backends for playback.
+.SH SYNOPSIS
+kaffeine [Qt-options] [KDE-options] [options] [file] 
+.SH DESCRIPTION
+Kaffeine is a media player for KDE. 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-kde  
+Show KDE specific options
+.TP
+.B  --help-all  
+Show all options
+.TP
+.B  --author  
+Show author information
+.TP
+.B -v,  --version  
+Show version information
+.TP
+.B  --license  
+Show license information
+.TP
+.B  --  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  --caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  --icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  --miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  --config  <filename>
+Use alternative configuration file
+.TP
+.B  --dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  --nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  --waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  --style  <style>
+sets the application GUI style
+.TP
+.B  --geometry  <geometry>
+sets the client geometry of the main widget - 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 KDE 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@wanadoo.fr>
+.br
+
--- kaffeine-0.7.1.orig/debian/cdbs/debian-qt-kde.mk
+++ kaffeine-0.7.1/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,99 @@
+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:
+	if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \
+		$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; \
+	fi
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+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)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		meinproc $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+	done
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+
+endif
--- kaffeine-0.7.1.orig/debian/cdbs/kde.mk
+++ kaffeine-0.7.1/debian/cdbs/kde.mk
@@ -0,0 +1,93 @@
+# -*- 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., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+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}/kde3
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = 
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_COMPRESS_EXCLUDE := .bz2 .css .dcl .docbook -license .tag .sty .el
+
+cleanbuilddir::
+	-if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
+
+common-build-arch common-build-indep:: debian/stamp-apidox
+debian/stamp-apidox:
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) apidox; \
+	fi
+	touch debian/stamp-apidox
+
+common-post-build-arch::
+	mkdir -p po
+	XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages	
+
+common-install-arch common-install-indep:: install-apidox
+install-apidox::
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \
+	fi
+
+clean::
+	rm -f debian/stamp-apidox
+	rm -rf po/*.pot
+
+buildprep: clean apply-patches
+	make -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
--- kaffeine-0.7.1.orig/debian/cdbs/simple-patchsys.mk
+++ kaffeine-0.7.1/debian/cdbs/simple-patchsys.mk
@@ -0,0 +1,153 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: A sample patch system which uses separate files in debian/patches
+#  Patch suffix is specified by DEB_PATCH_SUFFIX. Defaults to .patch.
+#
+# 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., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_rules_patchsys
+_cdbs_rules_patchsys := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifeq ($(_cdbs_included_patchsys),)
+_cdbs_included_patchsys := 1
+
+_cdbs_patch_system_apply_rule := apply-patches
+_cdbs_patch_system_unapply_rule := reverse-patches
+
+# uu-encoded patches allowed - Bug ##305857
+DEB_PATCH_SUFFIX ?= .diff .diff.gz .diff.bz2 .diff.uu .patch .patch.gz .patch.bz2 .patch.uu
+DEB_PATCHDIRS ?= debian/patches
+close_parenthesis ?= )
+DEB_PATCHES := $(shell\
+for dir in $(DEB_PATCHDIRS) ; do \
+	for file in $$dir/* ; do \
+		for suffix in $(DEB_PATCH_SUFFIX) ; do \
+			case $$file in *$$suffix$(close_parenthesis) echo $$file ;; esac ; \
+		done ; \
+	done ; \
+done)
+
+# if we have any patches, check if some are patching config.{guess,sub,rpath}
+# and print a warning
+ifneq (, $(DEB_PATCHES))
+CDBS_BUILD_DEPENDS    := $(CDBS_BUILD_DEPENDS), patchutils
+evil_patches_that_do_nasty_things := $(shell\
+if lsdiff=`which lsdiff` ; then \
+  $$lsdiff -H $(DEB_PATCHES) \
+  | egrep "/config\.(guess|sub|rpath)$$" | tr "\n" " " ; \
+fi)
+ifneq (, $(evil_patches_that_do_nasty_things))
+$(warning ** WARNING **:  The following patches are modifiing auto-updated files.   Please exclude the following files from your patch:  $(evil_patches_that_do_nasty_things))
+endif
+endif
+
+post-patches:: apply-patches
+
+# clean up log files in all patch directories - Bug ##296984
+clean:: reverse-patches
+	for dir in $(DEB_PATCHDIRS) ; do \
+	  rm -f $$dir/*.log ; \
+	done
+
+# The patch subsystem 
+apply-patches: pre-build debian/stamp-patched
+debian/stamp-patched: $(DEB_PATCHES)
+debian/stamp-patched reverse-patches:
+	$(MAKE) -f debian/rules reverse-config
+	@echo "patches: $(DEB_PATCHES)"
+	@set -e ; reverse=""; patches="$(DEB_PATCHES)"; \
+	  if [ "$@" = "reverse-patches" ]; then \
+	    if [ ! -e debian/stamp-patched ]; then \
+	      echo "Not reversing not applied patches."; \
+	      exit 0; \
+	    fi; \
+	    reverse="-R"; \
+	    for patch in $$patches; do reversepatches="$$patch $$reversepatches"; done; \
+	    patches="$$reversepatches"; \
+	  fi; \
+	  for patch in $$patches; do \
+          case $$patch in \
+            *.gz) cat=zcat ;; \
+            *.bz2) cat=bzcat ;; \
+            *.uu) cat="uudecode -o -" ;; \
+            *) cat=cat ;; \
+          esac; \
+	  level=$$(head $$patch | egrep '^#DPATCHLEVEL=' | cut -f 2 -d '='); \
+	  reverse=""; \
+	  if [ "$@" = "reverse-patches" ]; then reverse="-R"; fi; \
+	  success=""; \
+	  if [ -z "$$level" ]; then \
+	    echo -n "Trying "; if test -n "$$reverse"; then echo -n "reversed "; fi; echo -n "patch $$patch at level "; \
+	    for level in 0 1 2; do \
+	      if test -z "$$success"; then \
+	        echo -n "$$level..."; \
+		if [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+		  logfile="/dev/null" ; \
+		else \
+		  logfile="$$patch.level-$$level.log" ; \
+		fi ; \
+	        if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --dry-run -p$$level 1>$$logfile 2>&1; then \
+	          if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 2>&1; then \
+	            success=yes; \
+	            touch debian/stamp-patch-$$(basename $$patch); \
+	            echo "success."; \
+                  fi; \
+	        fi; \
+	      fi; \
+            done; \
+	    if test -z "$$success"; then \
+	      if test -z "$$reverse"; then \
+	        echo "failure."; \
+	        exit 1; \
+	       else \
+	         echo "failure (ignored)."; \
+               fi \
+	    fi; \
+	  else \
+	    echo -n "Trying patch $$patch at level $$level..."; \
+	        echo -n "$$level..."; \
+	    if [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+	      logfile="/dev/null" ; \
+	    else \
+	      logfile="$$patch.log" ; \
+	    fi ; \
+	    if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 2>&1; then \
+              touch debian/stamp-patch-$$(basename $$patch); \
+	      echo "success."; \
+	    else \
+	      echo "failure:"; \
+	      cat $$logfile; \
+	      if test -z "$$reverse"; then exit 1; fi; \
+            fi; \
+	  fi; \
+	done
+	if [ "$@" = "debian/stamp-patched" ] ; then touch debian/stamp-patched ; \
+	elif [ "$@" = "reverse-patches" ] ; then rm -f debian/stamp-patch* ; \
+	fi
+	# eliminate update-config when reversing patches - Bug ##299010
+	if [ "$@" != "reverse-patches" ] ; then $(MAKE) -f debian/rules update-config ; fi
+
+endif
+
+endif
--- kaffeine-0.7.1.orig/debian/cdbs/versions.pl
+++ kaffeine-0.7.1/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/-[^-]+$//;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
--- kaffeine-0.7.1.orig/debian/control
+++ kaffeine-0.7.1/debian/control
@@ -0,0 +1,50 @@
+Source: kaffeine
+Section: kde
+Priority: optional
+Maintainer: Zack Cerza <zcerza@coe.neu.edu>
+Uploaders: Riku Voipio <riku.voipio@iki.fi>, Zack Cerza <zcerza@coe.neu.edu>
+Build-Depends: debhelper (>= 4.2.0), cdbs, automake1.8, autoconf, libqt3-compat-headers, kdelibs4-dev (>= 4:3.2.3-2), libxine-dev (>= 1-rc5-1), linux-kernel-headers, libgstreamer-plugins0.8-dev, g++-3.4 [arm m68k hppa]
+Standards-Version: 3.6.1.1
+
+Package: kaffeine
+Architecture: any
+Depends: ${shlibs:Depends}, kaffeine-gstreamer | kaffeine-xine
+Description: versatile media player for KDE 3
+ Kaffeine is a media player for KDE. 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.
+ .
+ Authors: Jürgen Kofler and Christophe Thommeret
+ Homepage: http://kaffeine.sourceforge.net
+
+Package: kaffeine-gstreamer
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: GStreamer engine for kaffeine media player
+ Kaffeine is a media player for KDE. 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.
+ .
+ This package provides the GStreamer playing engine for Kaffeine.
+ .
+ Authors: Jürgen Kofler and Christophe Thommeret
+ Homepage: http://kaffeine.sourceforge.net
+
+Package: kaffeine-xine
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Xine engine for kaffeine media player
+ Kaffeine is a media player for KDE. 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.
+ .
+ This package provides the Xine playing engine for Kaffeine.
+ .
+ Authors: Jürgen Kofler and Christophe Thommeret
+ Homepage: http://kaffeine.sourceforge.net
--- kaffeine-0.7.1.orig/debian/changelog
+++ kaffeine-0.7.1/debian/changelog
@@ -0,0 +1,314 @@
+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 kdelibs4c2. 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 Kubuntu'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 Kubuntu 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 kdelibs4-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/kde/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/kde3
+  * 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
+
--- kaffeine-0.7.1.orig/debian/rules
+++ kaffeine-0.7.1/debian/rules
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+GCC4_ICES_HERE := arm m68k hppa
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU),$(GCC4_ICES_HERE)))
+	export CC=gcc-3.4
+	export CPP=cpp-3.4
+	export CXX=g++-3.4
+endif
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# For some reason this is broken, at least for me.
+include debian/cdbs/debian-qt-kde.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath
+
+DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/
+DEB_COMPRESS_EXCLUDE := .docbook
+
+binary-post-install/kaffeine::
+	mkdir debian/kaffeine/usr/share/pixmaps
+	cp debian/kaffeine.xpm debian/kaffeine/usr/share/pixmaps/
+	#mkdir -p debian/kaffeine/usr/share/doc/kde
+	#mv debian/kaffeine/usr/share/doc/HTML debian/kaffeine/usr/share/doc/kde
+
--- kaffeine-0.7.1.orig/debian/dbg-packages.diff
+++ kaffeine-0.7.1/debian/dbg-packages.diff
@@ -0,0 +1,53 @@
+Index: control
+===================================================================
+--- control	(revision 59)
++++ control	(working copy)
+@@ -48,3 +48,34 @@
+  .
+  Authors: Jürgen Kofler and Christophe Thommeret
+  Homepage: http://kaffeine.sourceforge.net
++
++Package: kaffeine-dbg
++Section: devel
++Architecture: any
++Priority: extra
++Depends: kaffeine (= ${Source-Version})
++Description: debugging symbols for kaffeine
++ This package contains the debugging symbols associated with kaffeine.
++ They will automatically be used by gdb for debugging kaffeine-related
++ issues.
++
++Package: kaffeine-xine-dbg
++Section: libdevel
++Architecture: any
++Priority: extra
++Depends: kaffeine-xine (= ${Source-Version})
++Description: debugging symbols for kaffeine
++ This package contains the debugging symbols associated with kaffeine-xine.
++ They will automatically be used by gdb for debugging kaffeine-xine-related
++ issues.
++
++Package: kaffeine-gstreamer-dbg
++Section: libdevel
++Architecture: any
++Priority: extra
++Depends: kaffeine-gstreamer (= ${Source-Version})
++Description: debugging symbols for kaffeine
++ This package contains the debugging symbols associated with kaffeine-gstreamer.
++ They will automatically be used by gdb for debugging kaffeine-gstreamer-related
++ issues.
++
+Index: rules
+===================================================================
+--- rules	(revision 59)
++++ rules	(working copy)
+@@ -9,6 +9,9 @@
+ DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath
+ DEB_CONFIGURE_EXTRA_FLAGS += --with-xorg --with-xinit-workaround
+ 
++DEB_CONFIGURE_EXTRA_FLAGS += --enable-debug=full
++DEB_DH_STRIP_ARGS  := --dbg-package=kaffeine --dbg-package=kaffeine-xine --dbg-package=kaffeine-gstreamer
++
+ DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/
+ DEB_COMPRESS_EXCLUDE := .docbook
+ 
--- kaffeine-0.7.1.orig/debian/watch
+++ kaffeine-0.7.1/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://heanet.dl.sourceforge.net/sourceforge/kaffeine/kaffeine-([^m].*)\.tar\.bz2 debian uupdate
--- kaffeine-0.7.1.orig/debian/kaffeine.manpages
+++ kaffeine-0.7.1/debian/kaffeine.manpages
@@ -0,0 +1 @@
+debian/man/kaffeine.1
--- kaffeine-0.7.1.orig/debian/kaffeine.install
+++ kaffeine-0.7.1/debian/kaffeine.install
@@ -0,0 +1,10 @@
+debian/tmp/usr/bin
+debian/tmp/usr/lib/*.la
+debian/tmp/usr/lib/*.so*
+debian/tmp/usr/share/doc/
+debian/tmp/usr/share/man/
+debian/tmp/usr/share/apps/
+debian/tmp/usr/share/icons/
+debian/tmp/usr/share/applications/
+debian/tmp/usr/share/locale/
+debian/tmp/usr/share/mimelnk/
--- kaffeine-0.7.1.orig/debian/kaffeine-xine.install
+++ kaffeine-0.7.1/debian/kaffeine-xine.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/kde3/libkaffeinepart.la
+debian/tmp/usr/lib/kde3/libkaffeinepart.so
+debian/tmp/usr/share/services/kaffeine_part.desktop
--- kaffeine-0.7.1.orig/debian/kaffeine-gstreamer.install
+++ kaffeine-0.7.1/debian/kaffeine-gstreamer.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/kde3/libgstreamerpart.la
+debian/tmp/usr/lib/kde3/libgstreamerpart.so
+debian/tmp/usr/share/services/gstreamer_part.desktop
--- kaffeine-0.7.1.orig/debian/kaffeine.README.Debian
+++ kaffeine-0.7.1/debian/kaffeine.README.Debian
@@ -0,0 +1,19 @@
+Known bugs
+----------
+Issue: Kaffeine, using the Xine engine, will hang and use 100% of the CPU in the background instead of quitting.
+Workaround: Use the GStreamer engine.
+
+Building -dbg packages for debugging
+------------------------------------
+
+To build packages with debug information, you can follow a procedure like this one:
+
+mkdir /tmp/kaffeine_dbg
+cd /tmp/kaffeine_dbg
+apt-get source kaffeine
+cd kaffeine*/debian
+patch < dbg-packages.diff
+cd ..
+dpkg-buildpackage -rfakeroot -us -uc
+dpkg -i ../kaffeine*.deb
+
--- kaffeine-0.7.1.orig/debian/compat
+++ kaffeine-0.7.1/debian/compat
@@ -0,0 +1 @@
+4
--- kaffeine-0.7.1.orig/debian/kaffeine.TODO
+++ kaffeine-0.7.1/debian/kaffeine.TODO
@@ -0,0 +1,4 @@
+TODO
+----
+Fix some minor annoyances with the "Resume Playback" feature.
+
--- kaffeine-0.7.1.orig/debian/kaffeine.menu
+++ kaffeine-0.7.1/debian/kaffeine.menu
@@ -0,0 +1,7 @@
+?package(kaffeine):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="KDE"\
+	title="Kaffeine"\
+	command="/usr/bin/kaffeine"\
+	icon="/usr/share/pixmaps/kaffeine.xpm"
--- kaffeine-0.7.1.orig/debian/kaffeine.xpm
+++ kaffeine-0.7.1/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@= = = = = = =                 "};
--- kaffeine-0.7.1.orig/debian/old_patches/14_resume-playback.diff
+++ kaffeine-0.7.1/debian/old_patches/14_resume-playback.diff
@@ -0,0 +1,192 @@
+diff -Nrua kaffeine.orig/kaffeine.cpp kaffeine/kaffeine.cpp
+--- kaffeine.orig/kaffeine.cpp	2005-03-31 16:12:50.000000000 -0500
++++ kaffeine/kaffeine.cpp	2005-03-31 17:16:53.646706752 -0500
+@@ -210,6 +210,10 @@
+   KAccel* accel = new KAccel(this);
+   accel->insert("Escape Fullscreen", Key_Escape, this, SLOT(slotEscapeFullscreen()));
+ 
++  // If there are URLs, don't resume
++  if ( urls.count() ) 
++    m_resumePlayback = false;
++  
+   loadConfig();
+   slotChangeStatusbar(i18n("Kaffeine Player") + " " + VERSION);
+ 
+@@ -557,6 +561,18 @@
+   m_playlist->setRandom(m_shuffle->isChecked());
+ }
+ 
++void Kaffeine::slotTogglePause()
++{
++    pause();
++}
++
++void Kaffeine::slotSetPosition()
++{
++    if ( m_mediaPart )
++       m_mediaPart->slotSetPosition(uint(m_savedPosition));
++    return;
++}
++
+ void Kaffeine::slotMetaFromPlayer()
+ {
+   m_playlist->mergeMeta(m_mediaPart->mrl());
+@@ -640,6 +656,7 @@
+ #endif
+ 
+     m_playersMenu = new KActionMenu(i18n("&Player Engine"), actionCollection(), "options_player");
++    m_toggleResumePlayback =  new KToggleAction(i18n("Resume Playback on Start"), 0, 0, this, SLOT(slotToggleResumePlayback()), actionCollection(), "options_resume_playback");
+     KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection());
+     KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection());
+     KStdAction::preferences(this, SLOT(slotPreferences()), actionCollection(), "options_preferences");
+@@ -746,6 +763,49 @@
+   m_playlist->loadConfig(config);
+ 
+   applyMainWindowSettings(config, "Main Window");
++
++  // Resume playback on startup
++  config->setGroup("Playlist");
++  QString url = config->readEntry("Current Entry", "");
++  config->setGroup("Player Part");
++  m_resumePlayback = config->readBoolEntry("Resume Playback", false);
++  m_toggleResumePlayback->setChecked(m_resumePlayback);
++  bool m_playingAtExit = config->readBoolEntry("Playing at Exit", false);
++  bool m_pausedAtExit = config->readBoolEntry("Paused at Exit", false);
++  m_savedPosition =  config->readNumEntry("Position at Exit", 0);
++  // If url is a local file, check that it exists before playing.
++  QFileInfo file = QFileInfo("/");
++  if ( url.startsWith("/", false) )
++    file = QFileInfo(url);
++  kdDebug() << "Kaffeine: Loading " << url << " at " << m_savedPosition 
++    << ". Resume Playback: " << m_resumePlayback
++    << ". Exists: " << file.exists()
++    << ". Playing: " << m_playingAtExit
++    << ". Paused: " << m_pausedAtExit
++    << ".\n";
++  int t=1;
++  if ( m_playingAtExit && url && file.exists() && m_resumePlayback ) {
++    if ( m_savedPosition ) {
++//    // I have to mute here since I can't load a track without playing it.
++//    // FIXME: If we're already muted, it sucks. Hope nobody does this...
++//    kdDebug() << "Kaffeine: Muting\n";
++//    slotMute();
++      slotPlayRecent( KURL(url) );
++      // For some reason, timers were needed for this to work properly.
++      QTimer::singleShot(t, this, SLOT(slotSwitchToPlayerWindow()));
++      QTimer::singleShot(t, this, SLOT(slotTogglePause()));
++      if ( ! m_pausedAtExit ) {
++        play();
++      }
++      QTimer::singleShot(t, this, SLOT(slotSetPosition()));
++//    // Unmute.
++//    kdDebug() << "Kaffeine: Unmuting\n";
++//    QTimer::singleShot(t, this, SLOT(slotMute()));
++    } else {
++      slotPlayRecent( KURL(url) );
++      QTimer::singleShot(t, this, SLOT(slotSwitchToPlayerWindow()));
++    }
++  }
+ }
+ 
+ void Kaffeine::saveConfig()
+@@ -777,6 +837,20 @@
+   config->setGroup("Player Part");
+   config->writeEntry("Last Service Desktop Name", m_currentPartService);
+ 
++  // Remember player position on exit
++  // TODO: Should use absolute time, integer percentage too coarse
++  if ( isPlaying() ) {
++    m_savedPosition = m_mediaPart->position();
++  } else {
++    m_savedPosition = 0;
++  }
++  config->writeEntry("Position at Exit", m_savedPosition);
++  m_playingAtExit = isPlaying() && m_savedPosition < 100;
++  config->writeEntry("Playing at Exit", m_playingAtExit);
++  config->writeEntry("Paused at Exit", m_mediaPart->isPaused());
++  config->writeEntry("Resume Playback", m_resumePlayback);
++  kdDebug() << "Saving " << m_mediaPart->mrl().url() << " at " << m_mediaPart->position() << ". Playing: " << m_playingAtExit << endl;
++
+   m_recent->saveEntries(config, "Recent Files");
+ 
+   m_playlist->saveConfig(config);
+@@ -1194,6 +1268,11 @@
+   }
+ }
+ 
++void Kaffeine::slotToggleResumePlayback()
++{
++  m_resumePlayback = m_toggleResumePlayback->isChecked();
++}
++
+ void Kaffeine::hideToolbars(bool hide)
+ {
+   if (hide)
+@@ -1902,4 +1981,6 @@
+ }
+ 
+ 
+-
++/*
++ * vim: expandtab shiftwidth=2:
++ */
+diff -Nrua kaffeine.orig/kaffeine.h kaffeine/kaffeine.h
+--- kaffeine.orig/kaffeine.h	2005-03-31 16:12:50.000000000 -0500
++++ kaffeine/kaffeine.h	2005-03-31 17:12:21.665054248 -0500
+@@ -112,7 +112,9 @@
+ public slots:
+     void slotPlay(const MRL&);
+     void slotLoadURLS(const QStringList&);
++    void slotSetPosition();
+     void slotSwitchToPlayerWindow();
++    void slotTogglePause();
+ 
+ protected:
+     void showEvent(QShowEvent*);
+@@ -157,6 +159,7 @@
+     void slotToggleFullscreen();
+     void slotEscapeFullscreen();
+     void slotToggleMinimalMode();
++    void slotToggleResumePlayback();
+     void slotToggleTab();
+     void slotPreferences();
+     void slotOriginalAspect();
+@@ -228,6 +231,7 @@
+     
+     KRecentFilesAction* m_recent;
+     KToggleFullScreenAction* m_fullscreen;
++    KToggleAction* m_toggleResumePlayback;
+     KToggleAction* m_minimal;
+     KToggleAction* m_shuffle;
+     KToggleAction* m_repeat;
+@@ -244,6 +248,10 @@
+     QTimer m_screensaverTimer;
+     int m_screensaverTimeout;
+     int m_haveXTest, m_xTestKeycode;
++    bool m_resumePlayback;
++    bool m_playingAtExit;
++    bool m_pausedAtExit;
++    unsigned int m_savedPosition;
+ };
+ 
+ #include <ktabwidget.h>
+@@ -280,3 +288,7 @@
+ };  
+ 
+ #endif // _KAFFEINE_H_
++
++/*
++ * vim: expandtab shiftwidth=2:
++ */
+diff -Nrua kaffeine.orig/kaffeineui.rc kaffeine/kaffeineui.rc
+--- kaffeine.orig/kaffeineui.rc	2005-03-31 16:12:50.000000000 -0500
++++ kaffeine/kaffeineui.rc	2005-03-31 17:16:30.299256104 -0500
+@@ -65,6 +65,8 @@
+     <Merge name="StandardToolBarMenuHandler"/>
+     <Action name="options_show_statusbar"/>
+     <Separator/>
++    <Action name="options_resume_playback"/>
++    <Separator/>
+     <Action name="options_configure_keybinding"/>
+     <Action name="options_configure_toolbars"/>
+     <Separator/>
--- kaffeine-0.7.1.orig/debian/patches/kubuntu_01_kdepot.diff
+++ kaffeine-0.7.1/debian/patches/kubuntu_01_kdepot.diff
@@ -0,0 +1,20 @@
+--- kde/admin/cvs.sh	2005-11-26 02:42:02.000000000 +0000
++++ kde/admin/cvs.sh	2005-11-26 02:42:26.000000000 +0000
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+ 
++kdepotpath=/usr/include/kde/kde.pot
++
+ for subdir in $dirs; do
+   test -z "$VERBOSE" || echo "Making messages in $subdir"
+   (cd $subdir
+@@ -564,7 +564,7 @@
+    fi
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+ 
+-   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++   #kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+ 
+    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ 	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
--- kaffeine-0.7.1.orig/debian/patches/kubuntu_01_default_gstreamer.diff
+++ kaffeine-0.7.1/debian/patches/kubuntu_01_default_gstreamer.diff
@@ -0,0 +1,11 @@
+--- kaffeine/kaffeine/kaffeine.cpp	2005-08-08 17:22:11.838496984 +0000
++++ kaffeine/kaffeine/kaffeine.cpp	2005-08-08 17:21:26.093451288 +0000
+@@ -80,7 +80,7 @@
+ 
+ #define DEFAULT_FILTER "*.anx *.axa *.axv *.vob *.png *.y4m *.rm *.ram *.rmvb *.pva *.nsv *.ogg *.ogm *.spx *.png *.mng *.pes *.iff *.svx *.8svx *.16sv *.ilbm *.pic *.anim *.wav *.vox *.voc *.snd *.au *.ra *.nsf *.flac *.aif *.aiff *.aud *.flv *.fli *.flc *.avi *.asf *.wmv *.wma *.asx *.wvx *.wax *.mkv *.vmd *.4xm *.mjpg *.cpk *.cak *.film *.str *.iki *.ik2 *.dps *.dat *.xa *.xa1 *.xa2 *.xas *.xap *.roq *.mve *.vqa *.mve *.mv8 *.cin *.wve *.mov *.qt *.mp4 *.ts *.m2t *.trp *.mpg *.mpeg *.dv *.dif *.flac *.mp3 *.mp2 *.mpa *.mpega *.ac3 *.aac *.asc *. *.sub *.srt *.smi *.ssa *.mpv *.m4a *.mpc *.mp+ *.ANX *.AXA *.AXV *.VOB *.PNG *.Y4M *.RM *.RAM *.RMVB *.PVA *.NSV *.OGG *.OGM *.SPX *.PNG *.MNG *.PES *.IFF *.SVX *.8SVX *.16SV *.ILBM *.PIC *.ANIM *.WAV *.VOX *.VOC *.SND *.AU *.RA *.NSF *.FLAC *.AIF *.AIFF *.AUD *.FLV *.FLI *.FLC *.AVI *.ASF *.WMV *.WMA *.ASX *.WVX *.WAX *.MKV *.VMD *.4XM *.MJPG *.CPK *.CAK *.FILM *.STR *.IKI *.IK2 *.DPS *.DAT *.XA *.XA1 *.XA2 *.XAS *.XAP *.ROQ *.MVE *.VQA *.MVE *.MV8 *.CIN *.WVE *.MOV *.QT *.MP4 *.TS *.M2T *.TRP *.MPG *.MPEG *.DV *.DIF *.FLAC *.MP3 *.MP2 *.MPA *.MPEGA *.AC3 *.AAC *.ASC *. *.SUB *.SRT *.SMI *.SSA *.MPV *.M4A *.MPC *.MP+"
+ 
+-#define DEFAULT_PLAYER_PART "kaffeine_part"
++#define DEFAULT_PLAYER_PART "gstreamer_part"
+ 
+ #define LONG64
+ #ifdef HAVE_XTEST
--- kaffeine-0.7.1.orig/debian/patches/15_de.po-correction.diff
+++ kaffeine-0.7.1/debian/patches/15_de.po-correction.diff
@@ -0,0 +1,22 @@
+Index: po/de.po
+===================================================================
+--- po/de.po	(revision 46)
++++ po/de.po	(working copy)
+@@ -938,7 +938,7 @@
+ msgstr ""
+ "Ein Medienspieler für KDE 3. Kann verschiedene Backends zum Abspielen "
+ "benutzen,\n"
+-"standardmässig wird xine verwendet."
++"standardmäßig wird xine verwendet."
+ 
+ #: main.cpp:75
+ msgid "(c) 2003-2005, The Kaffeine Authors"
+@@ -1540,7 +1540,7 @@
+ 
+ #: playlist.cpp:1231
+ msgid "Remove '%1' from list and from disk?"
+-msgstr "'%1' aus Liste und und von der Festplatte entfernen?"
++msgstr "'%1' aus Liste und von der Festplatte entfernen?"
+ 
+ #: playlist.cpp:1256
+ msgid "Playlist name already exist"
--- kaffeine-0.7.1.orig/debian/patches/16_xine_stop.diff
+++ kaffeine-0.7.1/debian/patches/16_xine_stop.diff
@@ -0,0 +1,19 @@
+Index: kaffeine/player-parts/kaffeine-part/kxinewidget.cpp
+===================================================================
+--- kaffeine/player-parts/kaffeine-part/kxinewidget.cpp	(revision 46)
++++ kaffeine/player-parts/kaffeine-part/kxinewidget.cpp	(working copy)
+@@ -2689,13 +2689,7 @@
+ 	if ( m_lengthInfoTimer.isActive() ) m_lengthInfoTimer.stop();
+ 	//emit signalNewPosition(0, QTime());
+ 
+-	if ((m_logoFile.isNull()) && (isPlaying()))
+-		xine_stop(m_xineStream);
+-	else
+-	{
+-		appendToQueue(m_logoFile);
+-		QTimer::singleShot(0, this, SLOT(slotPlay()));
+-	}
++	xine_stop(m_xineStream);
+ 
+ 	emit signalXineStatus(i18n("Stop"));
+ }
--- kaffeine-0.7.1.orig/debian/patches/10_systray-off.diff
+++ kaffeine-0.7.1/debian/patches/10_systray-off.diff
@@ -0,0 +1,13 @@
+Index: kaffeine/kaffeine.cpp
+===================================================================
+--- kaffeine/kaffeine.cpp	(revision 46)
++++ kaffeine/kaffeine.cpp	(working copy)
+@@ -902,7 +902,7 @@
+ 	b = config->readBoolEntry("Original Aspect", false);
+ 	m_originalAspect->setChecked(b);
+ 
+-	m_embedSystemTray = config->readBoolEntry("Embed in System Tray", true);
++	m_embedSystemTray = config->readBoolEntry("Embed in System Tray", false);
+ 	if (m_embedSystemTray)
+ 		slotSystemTray(m_embedSystemTray);
+ 	m_osdDuration = config->readNumEntry("OSD Duration", 5);
--- kaffeine-0.7.1.orig/debian/patches/kubuntu_04_locate_wizard_stamp.diff
+++ kaffeine-0.7.1/debian/patches/kubuntu_04_locate_wizard_stamp.diff
@@ -0,0 +1,20 @@
+--- kaffeine/kaffeine/kaffeine.cpp	2005-10-28 03:14:09.000000000 +0000
++++ kaffeine/kaffeine/kaffeine.cpp	2005-10-28 03:17:17.000000000 +0000
+@@ -141,14 +141,15 @@
+ 	statusBar()->insertItem(i18n("Entries: %1, Playtime: %2").arg("0").arg("0:00:00"), 9, 0, true);
+ 	statusBar()->insertItem(i18n("No player"), 10, 0, true);
+ 
+-	QString stamp =  locateLocal("appdata", "wizard_stamp_v0.7.1");
++	QString stamp =  locate("appdata", "wizard_stamp_v0.7.1");
++	QString localStamp =  locateLocal("appdata", "wizard_stamp_v0.7.1");
+ 	if ((!QFile::exists(stamp)) || (wizard))
+ 	{
+ 		WizardDialog* wizardDlg = new WizardDialog( 0, "wizard" );
+ 		wizardDlg->exec();
+ 
+ 		KProcess process;
+-		process << "touch" << stamp;
++		process << "touch" << localStamp;
+ 		process.start(KProcess::Block, KProcess::Stderr);
+ 		process.clearArguments();
+ 	}
--- kaffeine-0.7.1.orig/debian/patches/11_playlist-remove.diff
+++ kaffeine-0.7.1/debian/patches/11_playlist-remove.diff
@@ -0,0 +1,12 @@
+Index: kaffeine/kaffeineui.rc
+===================================================================
+--- kaffeine/kaffeineui.rc	(revision 46)
++++ kaffeine/kaffeineui.rc	(working copy)
+@@ -80,6 +80,7 @@
+ </ToolBar>
+ <ToolBar name="playlistToolbar"><text>Playlist Toolbar</text>
+   <Action name="playlist_new"/>
++  <Action name="playlist_remove"/>
+   <Action name="playlist_selector"/>
+ </ToolBar>
+ <State name="no_media_part">
--- kaffeine-0.7.1.orig/debian/patches/12_gstreamer_service_menu.diff
+++ kaffeine-0.7.1/debian/patches/12_gstreamer_service_menu.diff
@@ -0,0 +1,20 @@
+Index: kaffeine/player-parts/gstreamer-part/gstreamer_part.desktop
+===================================================================
+--- kaffeine/player-parts/gstreamer-part/gstreamer_part.desktop	(revision 46)
++++ kaffeine/player-parts/gstreamer-part/gstreamer_part.desktop	(working copy)
+@@ -1,11 +1,12 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Icon=gstreamer
+ Name=GStreamerPart
+ Comment=A player part based on GStreamer.
+ Comment[de]=Ein auf GStreamer basierender player part.
+-MimeType=application/x-ogg;audio/x-mp3;audio/x-mpeg;audio/x-ogg;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/x-avi;application/x-kaffeine
++MimeType=application/x-ogg;audio/basic;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack;
+ ServiceTypes=KParts/ReadOnlyPart,KMediaPart
+ Type=Service
+ X-KDE-Library=libgstreamerpart
+-InitialPreference=1
+\ No newline at end of file
++InitialPreference=1
++
--- kaffeine-0.7.1.orig/debian/copyright
+++ kaffeine-0.7.1/debian/copyright
@@ -0,0 +1,25 @@
+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: Jürgen Kofler and Christophe Thommeret
+
+This software is copyright (c) the Kaffeine Project, the xine project,
+Giorgos Gousios, Miguel Freitas, and Dave Chapman.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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., 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 the file `/usr/share/common-licenses/GPL'.