[Pkg-kde-commits] rev 1175 - in branches/kde-3.4.0/packages/kdemultimedia/debian: . patches

Christopher Martin chrsmrtn-guest@costa.debian.org
Tue, 31 May 2005 20:07:43 +0000


Author: chrsmrtn-guest
Date: 2005-05-31 20:07:41 +0000 (Tue, 31 May 2005)
New Revision: 1175

Added:
   branches/kde-3.4.0/packages/kdemultimedia/debian/patches/12_noatun_kconf.diff
Modified:
   branches/kde-3.4.0/packages/kdemultimedia/debian/noatun.install
   branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
Add a patch which move noatun's kconf update binary from /usr/share/
to /usr/lib, in compliance with the FHS. Update the noatun.install
and buildprep accordingly.


Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/noatun.install
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/noatun.install	2005-05-31 20:00:23 UTC (rev 1174)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/noatun.install	2005-05-31 20:07:41 UTC (rev 1175)
@@ -1,4 +1,5 @@
 debian/tmp/usr/bin/noatun
+debian/tmp/usr/lib/kconf_update_bin/noatun20update
 debian/tmp/usr/lib/kde3/noatun.la
 debian/tmp/usr/lib/kde3/noatun.so
 debian/tmp/usr/lib/kde3/noatun_dcopiface.la
@@ -72,7 +73,6 @@
 debian/tmp/usr/lib/mcop/winskinvis.mcoptype
 debian/tmp/usr/share/applications/kde/noatun.desktop
 debian/tmp/usr/share/apps/kconf_update/noatun.upd
-debian/tmp/usr/share/apps/kconf_update/noatun20update
 debian/tmp/usr/share/apps/noatun/dcopiface.plugin
 debian/tmp/usr/share/apps/noatun/eq.preset/preset.dance
 debian/tmp/usr/share/apps/noatun/eq.preset/preset.jazz

Added: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/12_noatun_kconf.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/12_noatun_kconf.diff	2005-05-31 20:00:23 UTC (rev 1174)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/12_noatun_kconf.diff	2005-05-31 20:07:41 UTC (rev 1175)
@@ -0,0 +1,13 @@
+--- kde.orig/noatun/Makefile.am
++++ kde.patched/noatun/Makefile.am
+@@ -11,7 +11,9 @@
+ 
+ updatedir = $(kde_datadir)/kconf_update
+ update_DATA = noatun.upd
+-update_PROGRAMS = noatun20update
++
++kconfdir = $(libdir)/kconf_update_bin
++kconf_PROGRAMS = noatun20update
+ 
+ noatun20update_SOURCES  = noatun20update.cpp
+ noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)

Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff	2005-05-31 20:00:23 UTC (rev 1174)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff	2005-05-31 20:07:41 UTC (rev 1175)
@@ -1,6 +1,6 @@
-diff -rua kdemultimedia-3.4.1.orig/acinclude.m4 kdemultimedia-3.4.1/acinclude.m4
---- kdemultimedia-3.4.1.orig/acinclude.m4	2005-05-23 18:02:50.000000000 +0200
-+++ kdemultimedia-3.4.1/acinclude.m4	2005-05-24 23:52:34.394953570 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/acinclude.m4 kdemultimedia-3.4.1/acinclude.m4
+--- kdemultimedia-3.4.1.orig/acinclude.m4	2005-05-23 12:02:50.000000000 -0400
++++ kdemultimedia-3.4.1/acinclude.m4	2005-05-31 15:22:29.000000000 -0400
 @@ -1690,15 +1690,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
@@ -1443,9 +1443,9 @@
  AC_MSG_RESULT([$SED])
  ])
  
-diff -rua kdemultimedia-3.4.1.orig/aclocal.m4 kdemultimedia-3.4.1/aclocal.m4
---- kdemultimedia-3.4.1.orig/aclocal.m4	2005-05-23 18:03:05.000000000 +0200
-+++ kdemultimedia-3.4.1/aclocal.m4	2005-05-24 23:52:46.886820744 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/aclocal.m4 kdemultimedia-3.4.1/aclocal.m4
+--- kdemultimedia-3.4.1.orig/aclocal.m4	2005-05-23 12:03:05.000000000 -0400
++++ kdemultimedia-3.4.1/aclocal.m4	2005-05-31 15:22:53.000000000 -0400
 @@ -522,6 +522,35 @@
  rmdir .tst 2>/dev/null
  AC_SUBST([am__leading_dot])])
@@ -1482,9 +1482,9 @@
  # Check to see how 'make' treats includes.	            -*- Autoconf -*-
  
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-diff -rua kdemultimedia-3.4.1.orig/akode/arts_plugin/Makefile.in kdemultimedia-3.4.1/akode/arts_plugin/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/arts_plugin/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/arts_plugin/Makefile.in	2005-05-24 23:53:57.489418399 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/akode/arts_plugin/Makefile.in kdemultimedia-3.4.1/akode/arts_plugin/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/arts_plugin/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/arts_plugin/Makefile.in	2005-05-31 15:25:23.000000000 -0400
 @@ -259,6 +259,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1516,9 +1516,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/akode/lib/Makefile.in kdemultimedia-3.4.1/akode/lib/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/lib/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/lib/Makefile.in	2005-05-24 23:53:57.502417220 +0200
+@@ -899,7 +902,7 @@
+ 
+ 
+ #>+ 2
+-KDE_DIST=akodeXiphPlayObject_impl.h Makefile.in akodeMPCPlayObject_impl.h akodeSpeexStreamPlayObject_impl.h akodearts.idl arts_inputstream.h akodePlayObject.mcopclass akodeMPEGPlayObject_impl.h Makefile.am akodeVorbisStreamPlayObject_impl.h 
++KDE_DIST=akodeXiphPlayObject_impl.h akodeMPCPlayObject_impl.h Makefile.in akodearts.idl akodeSpeexStreamPlayObject_impl.h akodePlayObject.mcopclass arts_inputstream.h akodeMPEGPlayObject_impl.h Makefile.am akodeVorbisStreamPlayObject_impl.h 
+ 
+ #>+ 3
+ clean-closures:
+diff -Nrua kdemultimedia-3.4.1.orig/akode/lib/Makefile.in kdemultimedia-3.4.1/akode/lib/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/lib/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/lib/Makefile.in	2005-05-31 15:25:23.000000000 -0400
 @@ -263,6 +263,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1550,9 +1559,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/akode/Makefile.in kdemultimedia-3.4.1/akode/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/Makefile.in	2005-05-24 23:53:57.476419577 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/akode/Makefile.in kdemultimedia-3.4.1/akode/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/Makefile.in	2005-05-31 15:25:23.000000000 -0400
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1584,9 +1593,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/akode/plugins/alsa_sink/Makefile.in kdemultimedia-3.4.1/akode/plugins/alsa_sink/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/plugins/alsa_sink/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/plugins/alsa_sink/Makefile.in	2005-05-24 23:53:57.520415588 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/akode/plugins/alsa_sink/Makefile.in kdemultimedia-3.4.1/akode/plugins/alsa_sink/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/alsa_sink/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/plugins/alsa_sink/Makefile.in	2005-05-31 15:25:23.000000000 -0400
 @@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1618,9 +1627,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/akode/plugins/jack_sink/Makefile.in kdemultimedia-3.4.1/akode/plugins/jack_sink/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/plugins/jack_sink/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/plugins/jack_sink/Makefile.in	2005-05-24 23:53:57.530414681 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/akode/plugins/jack_sink/Makefile.in kdemultimedia-3.4.1/akode/plugins/jack_sink/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/jack_sink/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/plugins/jack_sink/Makefile.in	2005-05-31 15:25:23.000000000 -0400
 @@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1652,9 +1661,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/akode/plugins/Makefile.in kdemultimedia-3.4.1/akode/plugins/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/plugins/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/plugins/Makefile.in	2005-05-24 23:53:57.510416495 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/akode/plugins/Makefile.in kdemultimedia-3.4.1/akode/plugins/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/plugins/Makefile.in	2005-05-31 15:25:23.000000000 -0400
 @@ -217,6 +217,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1686,9 +1695,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/akode/plugins/mpc_decoder/Makefile.in kdemultimedia-3.4.1/akode/plugins/mpc_decoder/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/plugins/mpc_decoder/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/plugins/mpc_decoder/Makefile.in	2005-05-24 23:53:57.540413775 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/akode/plugins/mpc_decoder/Makefile.in kdemultimedia-3.4.1/akode/plugins/mpc_decoder/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/mpc_decoder/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/plugins/mpc_decoder/Makefile.in	2005-05-31 15:25:23.000000000 -0400
 @@ -259,6 +259,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1720,9 +1729,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in kdemultimedia-3.4.1/akode/plugins/mpc_decoder/mppdec/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/plugins/mpc_decoder/mppdec/Makefile.in	2005-05-24 23:53:57.550412868 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in kdemultimedia-3.4.1/akode/plugins/mpc_decoder/mppdec/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/plugins/mpc_decoder/mppdec/Makefile.in	2005-05-31 15:25:23.000000000 -0400
 @@ -234,6 +234,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1754,9 +1763,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/akode/plugins/mpeg_decoder/Makefile.in kdemultimedia-3.4.1/akode/plugins/mpeg_decoder/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/plugins/mpeg_decoder/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/plugins/mpeg_decoder/Makefile.in	2005-05-24 23:53:57.560411961 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/akode/plugins/mpeg_decoder/Makefile.in kdemultimedia-3.4.1/akode/plugins/mpeg_decoder/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/mpeg_decoder/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/plugins/mpeg_decoder/Makefile.in	2005-05-31 15:25:23.000000000 -0400
 @@ -246,6 +246,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1788,9 +1797,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/akode/plugins/oss_sink/Makefile.in kdemultimedia-3.4.1/akode/plugins/oss_sink/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/plugins/oss_sink/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/plugins/oss_sink/Makefile.in	2005-05-24 23:53:57.570411054 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/akode/plugins/oss_sink/Makefile.in kdemultimedia-3.4.1/akode/plugins/oss_sink/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/oss_sink/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/plugins/oss_sink/Makefile.in	2005-05-31 15:25:23.000000000 -0400
 @@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1822,9 +1831,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/akode/plugins/polyp_sink/Makefile.in kdemultimedia-3.4.1/akode/plugins/polyp_sink/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/plugins/polyp_sink/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/plugins/polyp_sink/Makefile.in	2005-05-24 23:53:57.579410238 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/akode/plugins/polyp_sink/Makefile.in kdemultimedia-3.4.1/akode/plugins/polyp_sink/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/polyp_sink/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/plugins/polyp_sink/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1856,9 +1865,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/akode/plugins/src_resampler/Makefile.in kdemultimedia-3.4.1/akode/plugins/src_resampler/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/plugins/src_resampler/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/plugins/src_resampler/Makefile.in	2005-05-24 23:53:57.589409332 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/akode/plugins/src_resampler/Makefile.in kdemultimedia-3.4.1/akode/plugins/src_resampler/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/src_resampler/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/plugins/src_resampler/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -243,6 +243,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1890,9 +1899,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/akode/plugins/xiph_decoder/Makefile.in kdemultimedia-3.4.1/akode/plugins/xiph_decoder/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/plugins/xiph_decoder/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/plugins/xiph_decoder/Makefile.in	2005-05-24 23:53:57.600408334 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/akode/plugins/xiph_decoder/Makefile.in kdemultimedia-3.4.1/akode/plugins/xiph_decoder/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/xiph_decoder/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/plugins/xiph_decoder/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -253,6 +253,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1924,9 +1933,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/akode/test/Makefile.in kdemultimedia-3.4.1/akode/test/Makefile.in
---- kdemultimedia-3.4.1.orig/akode/test/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/akode/test/Makefile.in	2005-05-24 23:53:57.609407518 +0200
+@@ -839,7 +842,7 @@
+ 
+ 
+ #>+ 2
+-KDE_DIST=akodeVorbisStreamPlayObject.mcopclass akodeSpeexStreamPlayObject.mcopclass akodeXiphPlayObject.mcopclass Makefile.in xiph_decoder.h vorbis_decoder.h flac_decoder.h Makefile.am speex_decoder.h 
++KDE_DIST=akodeVorbisStreamPlayObject.mcopclass akodeSpeexStreamPlayObject.mcopclass akodeXiphPlayObject.mcopclass Makefile.in vorbis_decoder.h xiph_decoder.h flac_decoder.h Makefile.am speex_decoder.h 
+ 
+ #>+ 3
+ clean-closures:
+diff -Nrua kdemultimedia-3.4.1.orig/akode/test/Makefile.in kdemultimedia-3.4.1/akode/test/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/test/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/akode/test/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -235,6 +235,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1958,9 +1976,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/arts/builder/Makefile.in kdemultimedia-3.4.1/arts/builder/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/builder/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/builder/Makefile.in	2005-05-24 23:53:57.650403801 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/arts/builder/Makefile.in kdemultimedia-3.4.1/arts/builder/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/builder/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/builder/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -282,6 +282,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1992,9 +2010,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/arts/builder/pics/Makefile.in kdemultimedia-3.4.1/arts/builder/pics/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/builder/pics/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/builder/pics/Makefile.in	2005-05-24 23:53:57.662402713 +0200
+@@ -1101,7 +1104,7 @@
+ 	-rm -f  qttableview.moc interfacedlg.moc mwidget.moc portposdlg.moc main.moc execdlg.moc retrievedlg.moc propertypanel.moc menumaker.moc
+ 
+ #>+ 2
+-KDE_DIST=artsbuilder.desktop structureport.h interfacedlg.h drawutils.h portposdlg.h dirmanager.h artsbuilderui.rc autorouter.h retrievedlg.h execdlg.h main.h Makefile.in FullDuplexTest.arts session.h createtool.h scomponent.h x-artsbuilder.desktop module.h propertypanel.h propertypanelbase.ui structure.h Makefile.am menumaker.h mwidget.h 
++KDE_DIST=artsbuilder.desktop structureport.h interfacedlg.h portposdlg.h drawutils.h dirmanager.h artsbuilderui.rc autorouter.h retrievedlg.h execdlg.h main.h Makefile.in FullDuplexTest.arts session.h createtool.h scomponent.h x-artsbuilder.desktop module.h propertypanel.h propertypanelbase.ui structure.h Makefile.am menumaker.h mwidget.h 
+ 
+ #>+ 4
+ clean-ui:
+diff -Nrua kdemultimedia-3.4.1.orig/arts/builder/pics/Makefile.in kdemultimedia-3.4.1/arts/builder/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/builder/pics/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/builder/pics/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -223,6 +223,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2026,9 +2053,40 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/arts/examples/Makefile.in kdemultimedia-3.4.1/arts/examples/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/examples/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/examples/Makefile.in	2005-05-24 23:53:57.671401897 +0200
+@@ -684,7 +687,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Synth_MUL.xpm Synth_SHELVE_CUTOFF.xpm cr16-app-artscontrol.png cr16-action-artsbuilderexecute.png Synth_ATAN_SATURATE.xpm Synth_PLAY_WAV.xpm Synth_MOOG_VCF.xpm Synth_XFADE.xpm Synth_BUS_UPLINK.xpm Synth_ENVELOPE_ADSR.xpm Synth_FILEPLAY.xpm Synth_DIV.xpm Synth_WAVE_SQUARE.xpm cr22-action-artsbuilderexecute.png Synth_SEQUENCE_FREQ.png Synth_PLAY.xpm Synth_RC.xpm Synth_DEBUG.xpm cr16-app-artsbuilder.png Synth_SEQUENCE.xpm Synth_AMAN_PLAY.xpm Synth_PLAY_AKAIS.xpm crsc-app-artsbuilder.svgz Synth_MIDI_DEBUG.xpm Synth_EMPTY.xpm Makefile.in Synth_MIDI_ROUTER.xpm Synth_WAVE_TRI.xpm Synth_AUTOPANNER.xpm Synth_MULTI_ADD.xpm Synth_WAVE_SAW.xpm Synth_BUS_DOWNLINK.xpm Synth_ADD.xpm crsc-app-artscontrol.svgz Synth_PLAY_AKAI.xpm Makefile.am Synth_WAVE_SIN.xpm Synth_PSCALE.xpm 
++KDE_DIST=Synth_MUL.xpm Synth_SHELVE_CUTOFF.xpm Synth_ATAN_SATURATE.xpm cr16-app-artscontrol.png cr16-action-artsbuilderexecute.png Synth_PLAY_WAV.xpm Synth_MOOG_VCF.xpm Synth_XFADE.xpm Synth_BUS_UPLINK.xpm Synth_ENVELOPE_ADSR.xpm Synth_FILEPLAY.xpm Synth_DIV.xpm Synth_WAVE_SQUARE.xpm cr22-action-artsbuilderexecute.png Synth_SEQUENCE_FREQ.png Synth_PLAY.xpm Synth_DEBUG.xpm cr16-app-artsbuilder.png Synth_RC.xpm Synth_SEQUENCE.xpm Synth_AMAN_PLAY.xpm Synth_PLAY_AKAIS.xpm Synth_MIDI_DEBUG.xpm crsc-app-artsbuilder.svgz Synth_EMPTY.xpm Makefile.in Synth_MIDI_ROUTER.xpm Synth_WAVE_TRI.xpm Synth_AUTOPANNER.xpm Synth_MULTI_ADD.xpm Synth_WAVE_SAW.xpm Synth_BUS_DOWNLINK.xpm Synth_ADD.xpm crsc-app-artscontrol.svgz Synth_PLAY_AKAI.xpm Makefile.am Synth_WAVE_SIN.xpm Synth_PSCALE.xpm 
+ 
+ #>+ 2
+ docs-am:
+@@ -693,18 +696,18 @@
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-artsbuilder.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artsbuilder.svgz
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-artsbuilder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artsbuilder.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-artsbuilderexecute.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsbuilderexecute.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-artsbuilderexecute.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsbuilderexecute.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-artsbuilder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artsbuilder.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artsbuilder.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artsbuilder.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsbuilderexecute.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsbuilderexecute.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artsbuilder.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdemultimedia-3.4.1.orig/arts/examples/Makefile.in kdemultimedia-3.4.1/arts/examples/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/examples/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/examples/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -212,6 +212,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2060,9 +2118,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/arts/gui/common/Makefile.in kdemultimedia-3.4.1/arts/gui/common/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/gui/common/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/gui/common/Makefile.in	2005-05-24 23:53:57.691400083 +0200
+@@ -749,7 +752,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=example_cflanger.arts example_moog.arts instrument_slide.arts example_pulse.arts example_fm.arts example_tremolo.arts instrument_simple_square.arts example_play_wave.arts instrument_tri.arts instrument_nokind.arts example_multi_add.arts example_equalizer.arts example_pitchshift.arts mixer_element_eq.arts example_record.arts example_bus.arts instrument_neworgan.arts example_tri.arts example_cdelay.arts instrument_simple_sin.arts example_stereobeep.arts example_autopanner.arts instrument_full_square.arts template_Mixer_Element.arts effect_flanger_alone.arts example_atan_saturate.arts example_pscale.arts instrument_organ2.arts instrument_deepdrum.arts example_brickwall.arts example_dtmf1.arts example_square.arts example_capture_wav.arts instrument_flexible_slide.arts instrument_slide1.arts instrument_moog_vcf_tune.arts instrument_fm_horn.arts template_Instrument.arts instrument_square.arts instrument_chirpdrum.arts instrument_arts_all.arts-map checknames.sh Makefile.in instrument_flexible_slide_GUI.arts example_data.arts instrument_simple_tri.arts example_delay.arts example_noise.arts example_softsaw.arts example_shelve_cutoff.arts mixer_element_simple.arts example_sequence.arts effect_delay.arts template_Instrument_GUI.arts mixer_element_eqfx.arts instrument_hihat.arts template_Empty_Structure.arts instrument_moog_vcf_tune_GUI.arts example_freeverb.arts example_sine.arts effect_delay_alone.arts example_xfade.arts example_adsr.arts Makefile.am example_rc.arts 
++KDE_DIST=instrument_deepdrum.arts example_moog.arts example_brickwall.arts example_cflanger.arts instrument_slide.arts example_pulse.arts example_dtmf1.arts example_square.arts example_capture_wav.arts example_fm.arts example_tremolo.arts instrument_simple_square.arts instrument_slide1.arts instrument_flexible_slide.arts example_play_wave.arts instrument_tri.arts instrument_nokind.arts example_multi_add.arts instrument_moog_vcf_tune.arts example_equalizer.arts instrument_fm_horn.arts template_Instrument.arts example_pitchshift.arts example_record.arts mixer_element_eq.arts example_bus.arts instrument_neworgan.arts example_tri.arts instrument_square.arts example_cdelay.arts instrument_arts_all.arts-map instrument_chirpdrum.arts checknames.sh example_stereobeep.arts instrument_simple_sin.arts example_autopanner.arts Makefile.in instrument_flexible_slide_GUI.arts example_data.arts instrument_simple_tri.arts example_delay.arts example_noise.arts instrument_full_square.arts template_Mixer_Element.arts example_shelve_cutoff.arts example_softsaw.arts mixer_element_simple.arts effect_flanger_alone.arts example_atan_saturate.arts example_sequence.arts effect_delay.arts template_Instrument_GUI.arts mixer_element_eqfx.arts instrument_hihat.arts template_Empty_Structure.arts effect_delay_alone.arts instrument_moog_vcf_tune_GUI.arts example_freeverb.arts example_pscale.arts example_sine.arts example_xfade.arts example_adsr.arts instrument_organ2.arts Makefile.am example_rc.arts 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdemultimedia-3.4.1.orig/arts/gui/common/Makefile.in kdemultimedia-3.4.1/arts/gui/common/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/gui/common/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/gui/common/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -255,6 +255,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2094,9 +2161,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/arts/gui/kde/Makefile.in kdemultimedia-3.4.1/arts/gui/kde/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/gui/kde/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/gui/kde/Makefile.in	2005-05-24 23:53:57.720397454 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/arts/gui/kde/Makefile.in kdemultimedia-3.4.1/arts/gui/kde/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/gui/kde/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/gui/kde/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -293,6 +293,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2128,9 +2195,81 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/arts/gui/kde/mcopclass/Makefile.in kdemultimedia-3.4.1/arts/gui/kde/mcopclass/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/gui/kde/mcopclass/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/gui/kde/mcopclass/Makefile.in	2005-05-24 23:53:57.727396819 +0200
+@@ -1121,18 +1124,18 @@
+ mocs: kcombobox_impl.moc
+ 
+ #>+ 3
+-klevelmeter_normalbars.moc: $(srcdir)/klevelmeter_normalbars.h
+-	$(MOC) $(srcdir)/klevelmeter_normalbars.h -o klevelmeter_normalbars.moc
++klineedit_impl.moc: $(srcdir)/klineedit_impl.h
++	$(MOC) $(srcdir)/klineedit_impl.h -o klineedit_impl.moc
+ 
+ #>+ 2
+-mocs: klevelmeter_normalbars.moc
++mocs: klineedit_impl.moc
+ 
+ #>+ 3
+-klineedit_impl.moc: $(srcdir)/klineedit_impl.h
+-	$(MOC) $(srcdir)/klineedit_impl.h -o klineedit_impl.moc
++klevelmeter_normalbars.moc: $(srcdir)/klevelmeter_normalbars.h
++	$(MOC) $(srcdir)/klevelmeter_normalbars.h -o klevelmeter_normalbars.moc
+ 
+ #>+ 2
+-mocs: klineedit_impl.moc
++mocs: klevelmeter_normalbars.moc
+ 
+ #>+ 3
+ kbutton_impl.moc: $(srcdir)/kbutton_impl.h
+@@ -1156,18 +1159,18 @@
+ mocs: kpoti.moc
+ 
+ #>+ 3
+-kfader_impl.moc: $(srcdir)/kfader_impl.h
+-	$(MOC) $(srcdir)/kfader_impl.h -o kfader_impl.moc
++klevelmeter_linebars.moc: $(srcdir)/klevelmeter_linebars.h
++	$(MOC) $(srcdir)/klevelmeter_linebars.h -o klevelmeter_linebars.moc
+ 
+ #>+ 2
+-mocs: kfader_impl.moc
++mocs: klevelmeter_linebars.moc
+ 
+ #>+ 3
+-klevelmeter_linebars.moc: $(srcdir)/klevelmeter_linebars.h
+-	$(MOC) $(srcdir)/klevelmeter_linebars.h -o klevelmeter_linebars.moc
++kfader_impl.moc: $(srcdir)/kfader_impl.h
++	$(MOC) $(srcdir)/kfader_impl.h -o kfader_impl.moc
+ 
+ #>+ 2
+-mocs: klevelmeter_linebars.moc
++mocs: kfader_impl.moc
+ 
+ #>+ 3
+ kpoti_impl.moc: $(srcdir)/kpoti_impl.h
+@@ -1199,10 +1202,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  klabel_impl.moc kvolumefader_impl.moc klayoutbox_impl.moc kpopupbox_private.moc kspinbox_impl.moc klevelmeter_private.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klevelmeter_normalbars.moc klineedit_impl.moc kbutton_impl.moc dbtest.moc kpoti.moc kfader_impl.moc klevelmeter_linebars.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
++	-rm -f  klabel_impl.moc kvolumefader_impl.moc klayoutbox_impl.moc kpopupbox_private.moc kspinbox_impl.moc klevelmeter_private.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klineedit_impl.moc klevelmeter_normalbars.moc kbutton_impl.moc dbtest.moc kpoti.moc klevelmeter_linebars.moc kfader_impl.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
+ 
+ #>+ 2
+-KDE_DIST=dbtest.h kbutton_impl.h klevelmeter_linebars.h klevelmeter_firebars.h khbox_impl.h klevelmeter_normalbars.h kvbox_impl.h kpopupbox_impl.h kfader_impl.h klevelmeter_small.h klevelmeter_private.h kvolumefader_impl.h kgraph.h klevelmeter_template.h dbvolcalc.h klabel_impl.h kpopupbox_private.h kgraphline_impl.h ktickmarks_impl.h Makefile.in kfader.h klevelmeter_impl.h kpoti_impl.h kpoti.h kspinbox_impl.h kcombobox_impl.h Makefile.am klineedit_impl.h kgraph_impl.h 
++KDE_DIST=klevelmeter_private.h dbtest.h kbutton_impl.h kvolumefader_impl.h klevelmeter_linebars.h klevelmeter_firebars.h kgraph.h khbox_impl.h klevelmeter_template.h dbvolcalc.h klabel_impl.h klevelmeter_normalbars.h kpopupbox_private.h kvbox_impl.h kgraphline_impl.h kpopupbox_impl.h ktickmarks_impl.h Makefile.in kfader_impl.h kfader.h klevelmeter_small.h klevelmeter_impl.h kpoti_impl.h kpoti.h kspinbox_impl.h kcombobox_impl.h Makefile.am klineedit_impl.h kgraph_impl.h 
+ 
+ #>+ 3
+ clean-closures:
+@@ -1250,7 +1253,7 @@
+ 
+ 
+ #>+ 11
+-libartsgui_kde_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwidget_impl.cpp $(srcdir)/kbutton_impl.cpp $(srcdir)/kpoti_impl.cpp $(srcdir)/kpoti.cpp $(srcdir)/kwidgetrepo.cpp $(srcdir)/kartswidget.cpp $(srcdir)/klineedit_impl.cpp $(srcdir)/khbox_impl.cpp $(srcdir)/kvbox_impl.cpp $(srcdir)/kspinbox_impl.cpp $(srcdir)/kcombobox_impl.cpp $(srcdir)/kfader.cpp $(srcdir)/kfader_impl.cpp $(srcdir)/kgraph_impl.cpp $(srcdir)/kgraph.cpp $(srcdir)/kgraphline_impl.cpp $(srcdir)/kframe_impl.cpp $(srcdir)/klayoutbox_impl.cpp $(srcdir)/kpopupbox_impl.cpp $(srcdir)/klevelmeter_impl.cpp $(srcdir)/klevelmeter_small.cpp $(srcdir)/klevelmeter_linebars.cpp $(srcdir)/klevelmeter_normalbars.cpp $(srcdir)/klevelmeter_firebars.cpp $(srcdir)/ktickmarks_impl.cpp $(srcdir)/kvolumefader_impl.cpp $(srcdir)/klabel_impl.cpp  klayoutbox_impl.moc kvolumefader_impl.moc klabel_impl.moc kpopupbox_private.moc klevelmeter_private.moc kspinbox_impl.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klineedit_impl.moc klevelmeter_normalbars.moc kbutton_impl.moc kpoti.moc kfader_impl.moc klevelmeter_linebars.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
++libartsgui_kde_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwidget_impl.cpp $(srcdir)/kbutton_impl.cpp $(srcdir)/kpoti_impl.cpp $(srcdir)/kpoti.cpp $(srcdir)/kwidgetrepo.cpp $(srcdir)/kartswidget.cpp $(srcdir)/klineedit_impl.cpp $(srcdir)/khbox_impl.cpp $(srcdir)/kvbox_impl.cpp $(srcdir)/kspinbox_impl.cpp $(srcdir)/kcombobox_impl.cpp $(srcdir)/kfader.cpp $(srcdir)/kfader_impl.cpp $(srcdir)/kgraph_impl.cpp $(srcdir)/kgraph.cpp $(srcdir)/kgraphline_impl.cpp $(srcdir)/kframe_impl.cpp $(srcdir)/klayoutbox_impl.cpp $(srcdir)/kpopupbox_impl.cpp $(srcdir)/klevelmeter_impl.cpp $(srcdir)/klevelmeter_small.cpp $(srcdir)/klevelmeter_linebars.cpp $(srcdir)/klevelmeter_normalbars.cpp $(srcdir)/klevelmeter_firebars.cpp $(srcdir)/ktickmarks_impl.cpp $(srcdir)/kvolumefader_impl.cpp $(srcdir)/klabel_impl.cpp  klayoutbox_impl.moc kvolumefader_impl.moc klabel_impl.moc kpopupbox_private.moc klevelmeter_private.moc kspinbox_impl.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klevelmeter_normalbars.moc klineedit_impl.moc kbutton_impl.moc kpoti.moc klevelmeter_linebars.moc kfader_impl.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
+ 	@echo 'creating libartsgui_kde_la.all_cpp.cpp ...'; \
+ 	rm -f libartsgui_kde_la.all_cpp.files libartsgui_kde_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libartsgui_kde_la.all_cpp.final; \
+diff -Nrua kdemultimedia-3.4.1.orig/arts/gui/kde/mcopclass/Makefile.in kdemultimedia-3.4.1/arts/gui/kde/mcopclass/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/gui/kde/mcopclass/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/gui/kde/mcopclass/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2162,9 +2301,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/arts/gui/Makefile.in kdemultimedia-3.4.1/arts/gui/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/gui/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/gui/Makefile.in	2005-05-24 23:53:57.678401262 +0200
+@@ -664,7 +667,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=LevelMeter.mcopclass Button.mcopclass PopupBox.mcopclass HBox.mcopclass LineEdit.mcopclass Fader.mcopclass Widget.mcopclass VBox.mcopclass GraphLine.mcopclass Makefile.in Poti.mcopclass Graph.mcopclass Label.mcopclass LayoutBox.mcopclass Makefile.am SpinBox.mcopclass 
++KDE_DIST=LevelMeter.mcopclass Button.mcopclass Widget.mcopclass PopupBox.mcopclass HBox.mcopclass VBox.mcopclass GraphLine.mcopclass Makefile.in Poti.mcopclass LineEdit.mcopclass Graph.mcopclass Label.mcopclass LayoutBox.mcopclass Makefile.am SpinBox.mcopclass Fader.mcopclass 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdemultimedia-3.4.1.orig/arts/gui/Makefile.in kdemultimedia-3.4.1/arts/gui/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/gui/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/gui/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -215,6 +215,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2196,9 +2344,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/arts/Makefile.in kdemultimedia-3.4.1/arts/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/Makefile.in	2005-05-24 23:53:57.617406793 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/arts/Makefile.in kdemultimedia-3.4.1/arts/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -215,6 +215,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2230,9 +2378,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/arts/midi/Makefile.in kdemultimedia-3.4.1/arts/midi/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/midi/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/midi/Makefile.in	2005-05-24 23:53:57.746395097 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/arts/midi/Makefile.in kdemultimedia-3.4.1/arts/midi/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/midi/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/midi/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -311,6 +311,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2264,9 +2412,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/arts/midi/mcopclass/Makefile.in kdemultimedia-3.4.1/arts/midi/mcopclass/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/midi/mcopclass/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/midi/mcopclass/Makefile.in	2005-05-24 23:53:57.754394371 +0200
+@@ -1150,7 +1153,7 @@
+ 
+ 
+ #>+ 2
+-KDE_DIST=alsamidiport_impl.h midimanager_impl.h miditimercommon.h midimsg.h audiotimer.h midisyncgroup_impl.h midimanagerport_impl.h midisend.h README.midi audiosync_impl.h Makefile.in midiclient_impl.h timestampmath.h Makefile.am 
++KDE_DIST=midimanagerport_impl.h midisend.h alsamidiport_impl.h README.midi midimanager_impl.h miditimercommon.h midimsg.h audiosync_impl.h midiclient_impl.h Makefile.in timestampmath.h audiotimer.h midisyncgroup_impl.h Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+diff -Nrua kdemultimedia-3.4.1.orig/arts/midi/mcopclass/Makefile.in kdemultimedia-3.4.1/arts/midi/mcopclass/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/midi/mcopclass/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/midi/mcopclass/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2298,9 +2455,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/arts/modules/common/Makefile.in kdemultimedia-3.4.1/arts/modules/common/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/modules/common/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/modules/common/Makefile.in	2005-05-24 23:53:57.778392195 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/arts/modules/common/Makefile.in kdemultimedia-3.4.1/arts/modules/common/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/modules/common/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/modules/common/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -268,6 +268,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2332,9 +2489,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/arts/modules/effects/freeverb/Makefile.in kdemultimedia-3.4.1/arts/modules/effects/freeverb/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/modules/effects/freeverb/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/modules/effects/freeverb/Makefile.in	2005-05-24 23:53:57.806389656 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/arts/modules/effects/freeverb/Makefile.in kdemultimedia-3.4.1/arts/modules/effects/freeverb/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/modules/effects/freeverb/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/modules/effects/freeverb/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -235,6 +235,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2366,9 +2523,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/arts/modules/effects/Makefile.in kdemultimedia-3.4.1/arts/modules/effects/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/modules/effects/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/modules/effects/Makefile.in	2005-05-24 23:53:57.796390563 +0200
+@@ -757,7 +760,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=tuning.h readme.txt denormals.h comb.hpp revmodel.hpp Makefile.in allpass.hpp Makefile.am 
++KDE_DIST=tuning.h readme.txt revmodel.hpp Makefile.in denormals.h allpass.hpp Makefile.am comb.hpp 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdemultimedia-3.4.1.orig/arts/modules/effects/Makefile.in kdemultimedia-3.4.1/arts/modules/effects/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/modules/effects/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/modules/effects/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -291,6 +291,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2400,9 +2566,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/arts/modules/Makefile.in kdemultimedia-3.4.1/arts/modules/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/modules/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/modules/Makefile.in	2005-05-24 23:53:57.765393374 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/arts/modules/Makefile.in kdemultimedia-3.4.1/arts/modules/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/modules/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/modules/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -273,6 +273,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2434,9 +2600,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/arts/modules/mixers/Makefile.in kdemultimedia-3.4.1/arts/modules/mixers/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/modules/mixers/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/modules/mixers/Makefile.in	2005-05-24 23:53:57.818388568 +0200
+@@ -1022,7 +1025,7 @@
+ 
+ 
+ #>+ 2
+-KDE_DIST=README.subdirs README.modules Makefile.in README.environments Makefile.am 
++KDE_DIST=README.modules README.subdirs Makefile.in README.environments Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+diff -Nrua kdemultimedia-3.4.1.orig/arts/modules/mixers/Makefile.in kdemultimedia-3.4.1/arts/modules/mixers/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/modules/mixers/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/modules/mixers/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -266,6 +266,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2468,9 +2643,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/arts/modules/synth/Makefile.in kdemultimedia-3.4.1/arts/modules/synth/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/modules/synth/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/modules/synth/Makefile.in	2005-05-24 23:53:57.836386936 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/arts/modules/synth/Makefile.in kdemultimedia-3.4.1/arts/modules/synth/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/modules/synth/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/arts/modules/synth/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -296,6 +296,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2502,9 +2677,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/arts/runtime/Makefile.in kdemultimedia-3.4.1/arts/runtime/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/runtime/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/runtime/Makefile.in	2005-05-24 23:53:57.865384307 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/arts/runtime/Makefile.in kdemultimedia-3.4.1/arts/runtime/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/runtime/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/arts/runtime/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -263,6 +263,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2536,9 +2711,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/arts/tools/Makefile.in kdemultimedia-3.4.1/arts/tools/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/tools/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/tools/Makefile.in	2005-05-24 23:53:57.893381768 +0200
+@@ -913,7 +916,7 @@
+ 
+ 
+ #>+ 2
+-KDE_DIST=StructureDesc.mcopclass StructureBuilder.mcopclass ArtsBuilderLoader.mcopclass sequenceutils.h compatibility.h LocalFactory.mcopclass moduleinfo.h Makefile.in Makefile.am 
++KDE_DIST=LocalFactory.mcopclass moduleinfo.h Makefile.in StructureDesc.mcopclass StructureBuilder.mcopclass ArtsBuilderLoader.mcopclass sequenceutils.h compatibility.h Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+diff -Nrua kdemultimedia-3.4.1.orig/arts/tools/Makefile.in kdemultimedia-3.4.1/arts/tools/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/tools/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/arts/tools/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -299,6 +299,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2570,9 +2754,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/arts/tools/pics/Makefile.in kdemultimedia-3.4.1/arts/tools/pics/Makefile.in
---- kdemultimedia-3.4.1.orig/arts/tools/pics/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/arts/tools/pics/Makefile.in	2005-05-24 23:53:57.906380589 +0200
+@@ -1172,18 +1175,18 @@
+ mocs: audiomanager.moc
+ 
+ #>+ 3
+-artscontrolapplet.moc: $(srcdir)/artscontrolapplet.h
+-	$(MOC) $(srcdir)/artscontrolapplet.h -o artscontrolapplet.moc
++midimanagerview.moc: $(srcdir)/midimanagerview.h
++	$(MOC) $(srcdir)/midimanagerview.h -o midimanagerview.moc
+ 
+ #>+ 2
+-mocs: artscontrolapplet.moc
++mocs: midimanagerview.moc
+ 
+ #>+ 3
+-midimanagerview.moc: $(srcdir)/midimanagerview.h
+-	$(MOC) $(srcdir)/midimanagerview.h -o midimanagerview.moc
++artscontrolapplet.moc: $(srcdir)/artscontrolapplet.h
++	$(MOC) $(srcdir)/artscontrolapplet.h -o artscontrolapplet.moc
+ 
+ #>+ 2
+-mocs: midimanagerview.moc
++mocs: artscontrolapplet.moc
+ 
+ #>+ 3
+ choosebusdlg.moc: $(srcdir)/choosebusdlg.h
+@@ -1252,10 +1255,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  mediatypesview.moc statusview.moc templateview.moc artsactions.moc audiomanager.moc artscontrolapplet.moc midimanagerview.moc choosebusdlg.moc main.moc midiinstdlg.moc midiportdlg.moc environmentview.moc levelmeters.moc fftscopeview.moc artscontrolapplet_private.moc
++	-rm -f  mediatypesview.moc statusview.moc templateview.moc artsactions.moc audiomanager.moc midimanagerview.moc artscontrolapplet.moc choosebusdlg.moc main.moc midiinstdlg.moc midiportdlg.moc environmentview.moc levelmeters.moc fftscopeview.moc artscontrolapplet_private.moc
+ 
+ #>+ 2
+-KDE_DIST=artscontrolapplet_private.h midiportdlg.h artsactions.h artscontrol.desktop audiomanager.h levelmeters.h midiinstdlg.h main.h midimanagerdlg.ui artscontrolapplet.desktop midimanagerwidget.ui statusview.h artscontrolapplet.h environmentview.h templateview.h mediatypesview.h Makefile.in fftscopeview.h midimanagerview.h artsmidimanagerview.rc artscontrol.rc Makefile.am choosebusdlg.h 
++KDE_DIST=artscontrolapplet_private.h midiportdlg.h artscontrolapplet.h environmentview.h templateview.h artsactions.h artscontrol.desktop audiomanager.h levelmeters.h midiinstdlg.h main.h midimanagerdlg.ui mediatypesview.h Makefile.in fftscopeview.h midimanagerview.h artsmidimanagerview.rc artscontrol.rc midimanagerwidget.ui artscontrolapplet.desktop statusview.h Makefile.am choosebusdlg.h 
+ 
+ #>+ 5
+ clean-ui:
+diff -Nrua kdemultimedia-3.4.1.orig/arts/tools/pics/Makefile.in kdemultimedia-3.4.1/arts/tools/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/tools/pics/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/arts/tools/pics/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2604,9 +2826,196 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/audiofile_artsplugin/Makefile.in kdemultimedia-3.4.1/audiofile_artsplugin/Makefile.in
---- kdemultimedia-3.4.1.orig/audiofile_artsplugin/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/audiofile_artsplugin/Makefile.in	2005-05-24 23:53:57.918379501 +0200
+@@ -632,7 +635,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=crsc-action-artsmidimanager.svg cr64-action-artsaudiomanager.png cr22-action-artsfftscope.png cr22-action-artsenvironment.png cr32-action-artsfftscope.png cr22-action-artsmediatypes.png cr22-app-artscontrol.png cr48-action-artsmediatypes.png cr64-action-artsmediatypes.png cr64-action-artsfftscope.png cr48-action-artsfftscope.png cr128-action-artsenvironment.png cr32-action-artsmidimanager.png cr32-action-artsenvironment.png cr16-action-artsaudiomanager.png cr32-action-artsaudiomanager.png crsc-action-artsaudiomanager.svg cr64-action-artsenvironment.png cr48-action-artsaudiomanager.png cr16-action-artsmidimanager.png cr16-app-artscontrol.png cr16-action-artsenvironment.png crsc-action-artsfftscope.svg cr48-action-artsenvironment.png cr128-action-artsfftscope.png cr32-action-artsmediatypes.png cr64-action-artsmidimanager.png cr48-app-artscontrol.png cr32-app-artscontrol.png cr16-action-artsfftscope.png cr22-action-artsmidimanager.png crsc-action-artsmediatypes.svg cr128-action-artsaudiomanager.png Makefile.in cr48-action-artsmidimanager.png cr128-app-artscontrol.png crsc-app-artscontrol.svg cr16-action-artsmediatypes.png cr64-app-artscontrol.png cr128-action-artsmidimanager.png cr22-action-artsaudiomanager.png crsc-action-artsenvironment.svg Makefile.am cr128-action-artsmediatypes.png 
++KDE_DIST=crsc-action-artsmidimanager.svg cr48-action-artsaudiomanager.png cr16-action-artsmidimanager.png cr64-action-artsaudiomanager.png cr16-app-artscontrol.png cr16-action-artsenvironment.png cr22-action-artsfftscope.png crsc-action-artsfftscope.svg cr22-action-artsenvironment.png cr32-action-artsfftscope.png cr48-action-artsenvironment.png cr22-action-artsmediatypes.png cr128-action-artsfftscope.png cr22-app-artscontrol.png cr32-action-artsmediatypes.png cr64-action-artsmidimanager.png cr48-action-artsmediatypes.png cr48-app-artscontrol.png cr64-action-artsmediatypes.png cr32-app-artscontrol.png cr64-action-artsfftscope.png cr48-action-artsfftscope.png cr16-action-artsfftscope.png cr22-action-artsmidimanager.png cr128-action-artsenvironment.png cr32-action-artsmidimanager.png crsc-action-artsmediatypes.svg cr128-action-artsaudiomanager.png Makefile.in cr48-action-artsmidimanager.png cr128-app-artscontrol.png crsc-app-artscontrol.svg cr16-action-artsmediatypes.png cr32-action-artsenvironment.png cr64-app-artscontrol.png cr128-action-artsmidimanager.png cr32-action-artsaudiomanager.png cr16-action-artsaudiomanager.png crsc-action-artsaudiomanager.svg cr22-action-artsaudiomanager.png cr64-action-artsenvironment.png crsc-action-artsenvironment.svg Makefile.am cr128-action-artsmediatypes.png 
+ 
+ #>+ 2
+ docs-am:
+@@ -640,105 +643,105 @@
+ #>+ 102
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
++	$(INSTALL_DATA) $(srcdir)/crsc-action-artsmidimanager.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svg
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
++	$(INSTALL_DATA) $(srcdir)/cr64-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/artscontrol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/artscontrol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
+-	$(INSTALL_DATA) $(srcdir)/cr128-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/artscontrol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-artsaudiomanager.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svg
+-	$(INSTALL_DATA) $(srcdir)/cr128-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-artsaudiomanager.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svg
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
++	$(INSTALL_DATA) $(srcdir)/cr48-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsaudiomanager.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmediatypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsenvironment.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsenvironment.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
+-	$(INSTALL_DATA) $(srcdir)/cr64-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmediatypes.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/artscontrol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
++	$(INSTALL_DATA) $(srcdir)/cr128-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
++	$(INSTALL_DATA) $(srcdir)/cr64-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
++	$(INSTALL_DATA) $(srcdir)/cr128-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
++	$(INSTALL_DATA) $(srcdir)/cr128-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-artscontrol.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artscontrol.svg
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/artscontrol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/artscontrol.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmediatypes.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/artscontrol.png
++	$(INSTALL_DATA) $(srcdir)/cr128-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsenvironment.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsenvironment.png
++	$(INSTALL_DATA) $(srcdir)/cr64-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmediatypes.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artscontrol.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
++	$(INSTALL_DATA) $(srcdir)/cr128-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/artscontrol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-artsfftscope.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svg
++	$(INSTALL_DATA) $(srcdir)/cr22-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-action-artsenvironment.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svg
++	$(INSTALL_DATA) $(srcdir)/cr64-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-action-artsmediatypes.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svg
+-	$(INSTALL_DATA) $(srcdir)/cr64-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-artsfftscope.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svg
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-artsmidimanager.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svg
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svg
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/artscontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/artscontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/artscontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svg
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsaudiomanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artscontrol.svg
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/artscontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/artscontrol.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmediatypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/artscontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsenvironment.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsenvironment.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmediatypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/artscontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artscontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/artscontrol.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artscontrol.svg
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/artscontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artscontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svg
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svg
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svg
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svg
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svg
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdemultimedia-3.4.1.orig/audiofile_artsplugin/Makefile.in kdemultimedia-3.4.1/audiofile_artsplugin/Makefile.in
+--- kdemultimedia-3.4.1.orig/audiofile_artsplugin/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/audiofile_artsplugin/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -253,6 +253,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2638,9 +3047,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/configure kdemultimedia-3.4.1/configure
---- kdemultimedia-3.4.1.orig/configure	2005-05-23 18:04:37.000000000 +0200
-+++ kdemultimedia-3.4.1/configure	2005-05-24 23:54:01.952013739 +0200
+@@ -885,7 +888,7 @@
+ 
+ 
+ #>+ 2
+-KDE_DIST=audiofilearts.idl configure.in.in Makefile.in audiofilePlayObject.mcopclass Makefile.am 
++KDE_DIST=configure.in.in audiofilearts.idl Makefile.in audiofilePlayObject.mcopclass Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+diff -Nrua kdemultimedia-3.4.1.orig/configure kdemultimedia-3.4.1/configure
+--- kdemultimedia-3.4.1.orig/configure	2005-05-23 12:04:37.000000000 -0400
++++ kdemultimedia-3.4.1/configure	2005-05-31 15:25:34.000000000 -0400
 @@ -464,7 +464,7 @@
  # include <unistd.h>
  #endif"
@@ -8849,9 +9267,9 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-diff -rua kdemultimedia-3.4.1.orig/configure.in kdemultimedia-3.4.1/configure.in
---- kdemultimedia-3.4.1.orig/configure.in	2005-05-23 18:02:52.000000000 +0200
-+++ kdemultimedia-3.4.1/configure.in	2005-05-24 23:52:35.273873864 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/configure.in kdemultimedia-3.4.1/configure.in
+--- kdemultimedia-3.4.1.orig/configure.in	2005-05-23 12:02:52.000000000 -0400
++++ kdemultimedia-3.4.1/configure.in	2005-05-31 15:22:30.000000000 -0400
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
  AM_INIT_AUTOMAKE(kdemultimedia, "3.4.1") dnl searches for some needed programs
@@ -8879,9 +9297,9 @@
  fi
  
  
-diff -rua kdemultimedia-3.4.1.orig/doc/artsbuilder/images/Makefile.in kdemultimedia-3.4.1/doc/artsbuilder/images/Makefile.in
---- kdemultimedia-3.4.1.orig/doc/artsbuilder/images/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/doc/artsbuilder/images/Makefile.in	2005-05-24 23:53:57.946376962 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/doc/artsbuilder/images/Makefile.in kdemultimedia-3.4.1/doc/artsbuilder/images/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/artsbuilder/images/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/doc/artsbuilder/images/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8913,9 +9331,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/doc/artsbuilder/Makefile.in kdemultimedia-3.4.1/doc/artsbuilder/Makefile.in
---- kdemultimedia-3.4.1.orig/doc/artsbuilder/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/doc/artsbuilder/Makefile.in	2005-05-24 23:53:57.936377869 +0200
+@@ -635,28 +638,28 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Interface_MIDI_NOTE.png Gui_PANEL.png Synth_RC.png Synth_SHELVE_CUTOFF.png Synth_MUL.png Synth_ENVELOPE_ADSR.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_ADD.png Synth_SEQUENCE_FREQ.png Synth_PSCALE.png Gui_SLIDER.png Synth_BUS_DOWNLINK.png Synth_STD_EQUALIZER.png Synth_PLAY_WAV.png Synth_SEQUENCE.png Synth_STRUCT_KILL.png Gui_POTI.png schema4.png Synth_DEBUG.png Synth_DELAY.png Gui_WINDOW.png Synth_WAVE_TRI.png Gui_AUDIO_MANAGER.png Gui_LABEL.png schema3.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Synth_MIDI_ROUTER.png Synth_CDELAY.png Synth_NIL.png Gui_INSTRUMENT_MAPPER.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_XFADE.png Synth_COMPRESSOR.png Makefile.in Synth_BUS_UPLINK.png Synth_WAVE_SQUARE.png Gui_SUBPANEL.png Synth_MIDI_DEBUG.png schema1.png Synth_WAVE_SIN.png Synth_DIV.png Gui_MIXER.png Synth_ATAN_SATURATE.png Doc_MODUL.png Makefile.am schema2.png 
++KDE_DIST=Gui_AUDIO_MANAGER.png Gui_LABEL.png Interface_MIDI_NOTE.png schema3.png Synth_PLAY_AKAIS.png Gui_PANEL.png Synth_FREQUENCY.png Synth_MIDI_ROUTER.png Synth_RC.png Synth_SHELVE_CUTOFF.png Synth_CDELAY.png Synth_MUL.png Synth_NIL.png Synth_ENVELOPE_ADSR.png Gui_INSTRUMENT_MAPPER.png Synth_PLAY.png Synth_FILEPLAY.png Synth_SEQUENCE_FREQ.png Synth_PLAY_AKAI.png Synth_ADD.png Synth_XFADE.png Synth_FM_SOURCE.png Synth_PSCALE.png Synth_COMPRESSOR.png Synth_BUS_UPLINK.png Makefile.in Gui_SLIDER.png Synth_WAVE_SQUARE.png Gui_SUBPANEL.png Synth_MIDI_DEBUG.png schema1.png Synth_WAVE_SIN.png Synth_BUS_DOWNLINK.png Synth_STD_EQUALIZER.png Synth_SEQUENCE.png Synth_PLAY_WAV.png Synth_DIV.png Gui_MIXER.png Synth_STRUCT_KILL.png Gui_POTI.png schema4.png Synth_ATAN_SATURATE.png Synth_DEBUG.png Synth_DELAY.png Doc_MODUL.png Makefile.am Gui_WINDOW.png Synth_WAVE_TRI.png schema2.png 
+ 
+ #>+ 2
+-docs-am: Gui_INSTRUMENT_MAPPER.png Gui_AUDIO_MANAGER.png Synth_STD_EQUALIZER.png Synth_PLAY_AKAIS.png Synth_WAVE_TRI.png Synth_MIDI_ROUTER.png Synth_WAVE_SQUARE.png Synth_SEQUENCE_FREQ.png Synth_DEBUG.png Gui_WINDOW.png Synth_XFADE.png Synth_COMPRESSOR.png Synth_SHELVE_CUTOFF.png Synth_DELAY.png Gui_LABEL.png Synth_STRUCT_KILL.png Synth_CDELAY.png Gui_SLIDER.png Synth_RC.png Synth_PLAY.png Synth_PSCALE.png Synth_SEQUENCE.png Synth_BUS_UPLINK.png Synth_WAVE_SIN.png Gui_PANEL.png Doc_MODUL.png Synth_NIL.png Synth_FM_SOURCE.png Synth_DIV.png Synth_PLAY_WAV.png Synth_ENVELOPE_ADSR.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png Synth_ADD.png Synth_PLAY_AKAI.png Gui_POTI.png Synth_ATAN_SATURATE.png schema1.png Synth_MUL.png schema2.png Synth_BUS_DOWNLINK.png schema3.png schema4.png Synth_FREQUENCY.png Interface_MIDI_NOTE.png Gui_MIXER.png Synth_FILEPLAY.png 
++docs-am: Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png 
+ 
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images
+-	@for base in Gui_INSTRUMENT_MAPPER.png Gui_AUDIO_MANAGER.png Synth_STD_EQUALIZER.png Synth_PLAY_AKAIS.png Synth_WAVE_TRI.png Synth_MIDI_ROUTER.png Synth_WAVE_SQUARE.png Synth_SEQUENCE_FREQ.png Synth_DEBUG.png Gui_WINDOW.png Synth_XFADE.png Synth_COMPRESSOR.png Synth_SHELVE_CUTOFF.png Synth_DELAY.png Gui_LABEL.png Synth_STRUCT_KILL.png Synth_CDELAY.png Gui_SLIDER.png Synth_RC.png Synth_PLAY.png Synth_PSCALE.png Synth_SEQUENCE.png Synth_BUS_UPLINK.png Synth_WAVE_SIN.png Gui_PANEL.png Doc_MODUL.png Synth_NIL.png Synth_FM_SOURCE.png Synth_DIV.png Synth_PLAY_WAV.png Synth_ENVELOPE_ADSR.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png Synth_ADD.png Synth_PLAY_AKAI.png Gui_POTI.png Synth_ATAN_SATURATE.png schema1.png Synth_MUL.png schema2.png Synth_BUS_DOWNLINK.png schema3.png schema4.png Synth_FREQUENCY.png Interface_MIDI_NOTE.png Gui_MIXER.png Synth_FILEPLAY.png ; do \
++	@for base in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in Gui_INSTRUMENT_MAPPER.png Gui_AUDIO_MANAGER.png Synth_STD_EQUALIZER.png Synth_PLAY_AKAIS.png Synth_WAVE_TRI.png Synth_MIDI_ROUTER.png Synth_WAVE_SQUARE.png Synth_SEQUENCE_FREQ.png Synth_DEBUG.png Gui_WINDOW.png Synth_XFADE.png Synth_COMPRESSOR.png Synth_SHELVE_CUTOFF.png Synth_DELAY.png Gui_LABEL.png Synth_STRUCT_KILL.png Synth_CDELAY.png Gui_SLIDER.png Synth_RC.png Synth_PLAY.png Synth_PSCALE.png Synth_SEQUENCE.png Synth_BUS_UPLINK.png Synth_WAVE_SIN.png Gui_PANEL.png Doc_MODUL.png Synth_NIL.png Synth_FM_SOURCE.png Synth_DIV.png Synth_PLAY_WAV.png Synth_ENVELOPE_ADSR.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png Synth_ADD.png Synth_PLAY_AKAI.png Gui_POTI.png Synth_ATAN_SATURATE.png schema1.png Synth_MUL.png schema2.png Synth_BUS_DOWNLINK.png schema3.png schema4.png Synth_FREQUENCY.png Interface_MIDI_NOTE.png Gui_MIXER.png Synth_FILEPLAY.png ; do \
++	for base in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in Gui_INSTRUMENT_MAPPER.png Gui_AUDIO_MANAGER.png Synth_STD_EQUALIZER.png Synth_PLAY_AKAIS.png Synth_WAVE_TRI.png Synth_MIDI_ROUTER.png Synth_WAVE_SQUARE.png Synth_SEQUENCE_FREQ.png Synth_DEBUG.png Gui_WINDOW.png Synth_XFADE.png Synth_COMPRESSOR.png Synth_SHELVE_CUTOFF.png Synth_DELAY.png Gui_LABEL.png Synth_STRUCT_KILL.png Synth_CDELAY.png Gui_SLIDER.png Synth_RC.png Synth_PLAY.png Synth_PSCALE.png Synth_SEQUENCE.png Synth_BUS_UPLINK.png Synth_WAVE_SIN.png Gui_PANEL.png Doc_MODUL.png Synth_NIL.png Synth_FM_SOURCE.png Synth_DIV.png Synth_PLAY_WAV.png Synth_ENVELOPE_ADSR.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png Synth_ADD.png Synth_PLAY_AKAI.png Gui_POTI.png Synth_ATAN_SATURATE.png schema1.png Synth_MUL.png schema2.png Synth_BUS_DOWNLINK.png schema3.png schema4.png Synth_FREQUENCY.png Interface_MIDI_NOTE.png Gui_MIXER.png Synth_FILEPLAY.png ; do \
++	for file in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdemultimedia-3.4.1.orig/doc/artsbuilder/Makefile.in kdemultimedia-3.4.1/doc/artsbuilder/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/artsbuilder/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/doc/artsbuilder/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8947,9 +9399,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/doc/juk/Makefile.in kdemultimedia-3.4.1/doc/juk/Makefile.in
---- kdemultimedia-3.4.1.orig/doc/juk/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/doc/juk/Makefile.in	2005-05-24 23:53:57.954376237 +0200
+@@ -802,10 +805,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=future.docbook index.docbook arts-structure.png porting.docbook glossary.docbook helping.docbook artsbuilder.docbook detail.docbook midiintro.docbook mcop.docbook modules.docbook gui.docbook faq.docbook index.cache.bz2 midi.docbook tools.docbook Makefile.in digitalaudio.docbook references.docbook apis.docbook Makefile.am 
++KDE_DIST=future.docbook midi.docbook tools.docbook index.docbook arts-structure.png porting.docbook glossary.docbook helping.docbook detail.docbook artsbuilder.docbook midiintro.docbook Makefile.in digitalaudio.docbook mcop.docbook modules.docbook gui.docbook references.docbook apis.docbook faq.docbook Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) arts-structure.png tools.docbook detail.docbook glossary.docbook index.docbook faq.docbook modules.docbook future.docbook artsbuilder.docbook references.docbook midi.docbook porting.docbook gui.docbook helping.docbook apis.docbook midiintro.docbook mcop.docbook digitalaudio.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -832,20 +835,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder
+-	@for base in arts-structure.png tools.docbook detail.docbook glossary.docbook index.docbook faq.docbook modules.docbook future.docbook artsbuilder.docbook references.docbook midi.docbook porting.docbook gui.docbook helping.docbook apis.docbook midiintro.docbook mcop.docbook digitalaudio.docbook ; do \
++	@for base in modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in arts-structure.png tools.docbook detail.docbook glossary.docbook index.docbook faq.docbook modules.docbook future.docbook artsbuilder.docbook references.docbook midi.docbook porting.docbook gui.docbook helping.docbook apis.docbook midiintro.docbook mcop.docbook digitalaudio.docbook ; do \
++	for base in modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in arts-structure.png tools.docbook detail.docbook glossary.docbook index.docbook faq.docbook modules.docbook future.docbook artsbuilder.docbook references.docbook midi.docbook porting.docbook gui.docbook helping.docbook apis.docbook midiintro.docbook mcop.docbook digitalaudio.docbook ; do \
++	for file in modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdemultimedia-3.4.1.orig/doc/juk/Makefile.in kdemultimedia-3.4.1/doc/juk/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/juk/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/doc/juk/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8981,9 +9470,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/doc/kaboodle/Makefile.in kdemultimedia-3.4.1/doc/kaboodle/Makefile.in
---- kdemultimedia-3.4.1.orig/doc/kaboodle/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/doc/kaboodle/Makefile.in	2005-05-24 23:53:57.961375602 +0200
+@@ -635,10 +638,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=juk-adv-search.png search-playlist.png index.docbook juk-main.png juk-file-renamer.png juk-tag-guesser.png index.cache.bz2 history-playlist.png normal-playlist.png Makefile.in toolbar.png Makefile.am 
++KDE_DIST=juk-adv-search.png history-playlist.png index.docbook search-playlist.png normal-playlist.png juk-file-renamer.png juk-main.png Makefile.in toolbar.png Makefile.am juk-tag-guesser.png index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) juk-file-renamer.png juk-tag-guesser.png history-playlist.png toolbar.png index.docbook juk-adv-search.png search-playlist.png normal-playlist.png juk-main.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -665,20 +668,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk
+-	@for base in juk-file-renamer.png juk-tag-guesser.png history-playlist.png toolbar.png index.docbook juk-adv-search.png search-playlist.png normal-playlist.png juk-main.png ; do \
++	@for base in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in juk-file-renamer.png juk-tag-guesser.png history-playlist.png toolbar.png index.docbook juk-adv-search.png search-playlist.png normal-playlist.png juk-main.png ; do \
++	for base in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in juk-file-renamer.png juk-tag-guesser.png history-playlist.png toolbar.png index.docbook juk-adv-search.png search-playlist.png normal-playlist.png juk-main.png ; do \
++	for file in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdemultimedia-3.4.1.orig/doc/kaboodle/Makefile.in kdemultimedia-3.4.1/doc/kaboodle/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kaboodle/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/doc/kaboodle/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9015,9 +9541,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/doc/kcontrol/kmixcfg/Makefile.in kdemultimedia-3.4.1/doc/kcontrol/kmixcfg/Makefile.in
---- kdemultimedia-3.4.1.orig/doc/kcontrol/kmixcfg/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/doc/kcontrol/kmixcfg/Makefile.in	2005-05-24 23:53:57.976374242 +0200
+@@ -635,7 +638,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am 
++KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
+diff -Nrua kdemultimedia-3.4.1.orig/doc/kcontrol/kmixcfg/Makefile.in kdemultimedia-3.4.1/doc/kcontrol/kmixcfg/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kcontrol/kmixcfg/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/doc/kcontrol/kmixcfg/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9049,9 +9584,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/doc/kcontrol/Makefile.in kdemultimedia-3.4.1/doc/kcontrol/Makefile.in
---- kdemultimedia-3.4.1.orig/doc/kcontrol/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/doc/kcontrol/Makefile.in	2005-05-24 23:53:57.969374877 +0200
+@@ -635,7 +638,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am 
++KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
+diff -Nrua kdemultimedia-3.4.1.orig/doc/kcontrol/Makefile.in kdemultimedia-3.4.1/doc/kcontrol/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kcontrol/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/doc/kcontrol/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9083,9 +9627,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/doc/kio_audiocd/Makefile.in kdemultimedia-3.4.1/doc/kio_audiocd/Makefile.in
---- kdemultimedia-3.4.1.orig/doc/kio_audiocd/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/doc/kio_audiocd/Makefile.in	2005-05-24 23:53:57.984373517 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/doc/kio_audiocd/Makefile.in kdemultimedia-3.4.1/doc/kio_audiocd/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kio_audiocd/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/doc/kio_audiocd/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9117,9 +9661,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/doc/kmid/Makefile.in kdemultimedia-3.4.1/doc/kmid/Makefile.in
---- kdemultimedia-3.4.1.orig/doc/kmid/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/doc/kmid/Makefile.in	2005-05-24 23:53:57.992372792 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/doc/kmid/Makefile.in kdemultimedia-3.4.1/doc/kmid/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kmid/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/doc/kmid/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9151,9 +9695,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/doc/kmix/Makefile.in kdemultimedia-3.4.1/doc/kmix/Makefile.in
---- kdemultimedia-3.4.1.orig/doc/kmix/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/doc/kmix/Makefile.in	2005-05-24 23:53:57.999372157 +0200
+@@ -635,7 +638,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am 
++KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
+diff -Nrua kdemultimedia-3.4.1.orig/doc/kmix/Makefile.in kdemultimedia-3.4.1/doc/kmix/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kmix/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/doc/kmix/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9185,9 +9738,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/doc/krec/Makefile.in kdemultimedia-3.4.1/doc/krec/Makefile.in
---- kdemultimedia-3.4.1.orig/doc/krec/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/doc/krec/Makefile.in	2005-05-24 23:53:58.007371432 +0200
+@@ -635,10 +638,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=index.docbook kmix-window.png index.cache.bz2 kmix-channel-record.png Makefile.in kmix-channel-playback.png Makefile.am 
++KDE_DIST=index.docbook Makefile.in kmix-window.png kmix-channel-playback.png Makefile.am index.cache.bz2 kmix-channel-record.png 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kmix-window.png index.docbook kmix-channel-playback.png kmix-channel-record.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -665,20 +668,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix
+-	@for base in kmix-window.png index.docbook kmix-channel-playback.png kmix-channel-record.png ; do \
++	@for base in kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in kmix-window.png index.docbook kmix-channel-playback.png kmix-channel-record.png ; do \
++	for base in kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in kmix-window.png index.docbook kmix-channel-playback.png kmix-channel-record.png ; do \
++	for file in kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdemultimedia-3.4.1.orig/doc/krec/Makefile.in kdemultimedia-3.4.1/doc/krec/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/krec/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/doc/krec/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9219,9 +9809,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/doc/kscd/Makefile.in kdemultimedia-3.4.1/doc/kscd/Makefile.in
---- kdemultimedia-3.4.1.orig/doc/kscd/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/doc/kscd/Makefile.in	2005-05-24 23:53:58.015370706 +0200
+@@ -635,10 +638,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=krec-keramik.png index.docbook krec-configuration.png krec-hicolor.png index.cache.bz2 Makefile.in krec-new_file_properties.png Makefile.am 
++KDE_DIST=krec-keramik.png index.docbook krec-configuration.png krec-hicolor.png Makefile.in krec-new_file_properties.png Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) krec-hicolor.png index.docbook krec-keramik.png krec-new_file_properties.png krec-configuration.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -665,20 +668,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec
+-	@for base in krec-hicolor.png index.docbook krec-keramik.png krec-new_file_properties.png krec-configuration.png ; do \
++	@for base in krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in krec-hicolor.png index.docbook krec-keramik.png krec-new_file_properties.png krec-configuration.png ; do \
++	for base in krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in krec-hicolor.png index.docbook krec-keramik.png krec-new_file_properties.png krec-configuration.png ; do \
++	for file in krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdemultimedia-3.4.1.orig/doc/kscd/Makefile.in kdemultimedia-3.4.1/doc/kscd/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kscd/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/doc/kscd/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9253,9 +9880,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/doc/Makefile.in kdemultimedia-3.4.1/doc/Makefile.in
---- kdemultimedia-3.4.1.orig/doc/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/doc/Makefile.in	2005-05-24 23:53:57.926378776 +0200
+@@ -635,10 +638,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=kscd18.png index.docbook kscd6.png kscd13.png kscd2.png kscd14.png index.cache.bz2 kscd5.png kscd12.png kscd16.png kscd11.png kscd19.png kscd9.png kscd3.png kscd.png Makefile.in Makefile.am 
++KDE_DIST=kscd18.png kscd5.png kscd12.png index.docbook kscd16.png kscd11.png kscd9.png kscd19.png kscd6.png kscd3.png kscd.png kscd13.png Makefile.in kscd2.png kscd14.png Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -665,20 +668,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd
+-	@for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
++	@for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
++	for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
++	for file in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdemultimedia-3.4.1.orig/doc/Makefile.in kdemultimedia-3.4.1/doc/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/doc/Makefile.in	2005-05-31 15:25:24.000000000 -0400
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9266,7 +9930,14 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -463,13 +466,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. artsbuilder kaboodle kmid krec kscd noatun kmix juk kio_audiocd kcontrol
++SUBDIRS =. juk kmid kmix krec kscd kaboodle kio_audiocd kcontrol artsbuilder noatun
+ #>- all: all-recursive
+ #>+ 1
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -9287,9 +9958,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/doc/noatun/Makefile.in kdemultimedia-3.4.1/doc/noatun/Makefile.in
---- kdemultimedia-3.4.1.orig/doc/noatun/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/doc/noatun/Makefile.in	2005-05-24 23:53:58.022370072 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/doc/noatun/Makefile.in kdemultimedia-3.4.1/doc/noatun/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/noatun/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/doc/noatun/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9321,9 +9992,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/juk/Makefile.in kdemultimedia-3.4.1/juk/Makefile.in
---- kdemultimedia-3.4.1.orig/juk/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/juk/Makefile.in	2005-05-24 23:53:58.170356652 +0200
+@@ -635,7 +638,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am 
++KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
+diff -Nrua kdemultimedia-3.4.1.orig/juk/Makefile.in kdemultimedia-3.4.1/juk/Makefile.in
+--- kdemultimedia-3.4.1.orig/juk/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/juk/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -325,6 +325,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9355,9 +10035,152 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/juk/pics/Makefile.in kdemultimedia-3.4.1/juk/pics/Makefile.in
---- kdemultimedia-3.4.1.orig/juk/pics/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/juk/pics/Makefile.in	2005-05-24 23:53:58.177356018 +0200
+@@ -1274,18 +1277,18 @@
+ mocs: collectionlist.moc
+ 
+ #>+ 3
+-googlefetcherdialog.moc: $(srcdir)/googlefetcherdialog.h
+-	$(MOC) $(srcdir)/googlefetcherdialog.h -o googlefetcherdialog.moc
++deletedialog.moc: $(srcdir)/deletedialog.h
++	$(MOC) $(srcdir)/deletedialog.h -o deletedialog.moc
+ 
+ #>+ 2
+-mocs: googlefetcherdialog.moc
++mocs: deletedialog.moc
+ 
+ #>+ 3
+-deletedialog.moc: $(srcdir)/deletedialog.h
+-	$(MOC) $(srcdir)/deletedialog.h -o deletedialog.moc
++googlefetcherdialog.moc: $(srcdir)/googlefetcherdialog.h
++	$(MOC) $(srcdir)/googlefetcherdialog.h -o googlefetcherdialog.moc
+ 
+ #>+ 2
+-mocs: deletedialog.moc
++mocs: googlefetcherdialog.moc
+ 
+ #>+ 3
+ artsplayer.moc: $(srcdir)/artsplayer.h
+@@ -1295,18 +1298,18 @@
+ mocs: artsplayer.moc
+ 
+ #>+ 3
+-googlefetcher.moc: $(srcdir)/googlefetcher.h
+-	$(MOC) $(srcdir)/googlefetcher.h -o googlefetcher.moc
++viewmode.moc: $(srcdir)/viewmode.h
++	$(MOC) $(srcdir)/viewmode.h -o viewmode.moc
+ 
+ #>+ 2
+-mocs: googlefetcher.moc
++mocs: viewmode.moc
+ 
+ #>+ 3
+-viewmode.moc: $(srcdir)/viewmode.h
+-	$(MOC) $(srcdir)/viewmode.h -o viewmode.moc
++googlefetcher.moc: $(srcdir)/googlefetcher.h
++	$(MOC) $(srcdir)/googlefetcher.h -o googlefetcher.moc
+ 
+ #>+ 2
+-mocs: viewmode.moc
++mocs: googlefetcher.moc
+ 
+ #>+ 3
+ directorylist.moc: $(srcdir)/directorylist.h
+@@ -1435,18 +1438,18 @@
+ mocs: searchwidget.moc
+ 
+ #>+ 3
+-tagtransactionmanager.moc: $(srcdir)/tagtransactionmanager.h
+-	$(MOC) $(srcdir)/tagtransactionmanager.h -o tagtransactionmanager.moc
++keydialog.moc: $(srcdir)/keydialog.h
++	$(MOC) $(srcdir)/keydialog.h -o keydialog.moc
+ 
+ #>+ 2
+-mocs: tagtransactionmanager.moc
++mocs: keydialog.moc
+ 
+ #>+ 3
+-keydialog.moc: $(srcdir)/keydialog.h
+-	$(MOC) $(srcdir)/keydialog.h -o keydialog.moc
++tagtransactionmanager.moc: $(srcdir)/tagtransactionmanager.h
++	$(MOC) $(srcdir)/tagtransactionmanager.h -o tagtransactionmanager.moc
+ 
+ #>+ 2
+-mocs: keydialog.moc
++mocs: tagtransactionmanager.moc
+ 
+ #>+ 3
+ playlistbox.moc: $(srcdir)/playlistbox.h
+@@ -1456,18 +1459,18 @@
+ mocs: playlistbox.moc
+ 
+ #>+ 3
+-folderplaylist.moc: $(srcdir)/folderplaylist.h
+-	$(MOC) $(srcdir)/folderplaylist.h -o folderplaylist.moc
++filerenamer.moc: $(srcdir)/filerenamer.h
++	$(MOC) $(srcdir)/filerenamer.h -o filerenamer.moc
+ 
+ #>+ 2
+-mocs: folderplaylist.moc
++mocs: filerenamer.moc
+ 
+ #>+ 3
+-filerenamer.moc: $(srcdir)/filerenamer.h
+-	$(MOC) $(srcdir)/filerenamer.h -o filerenamer.moc
++folderplaylist.moc: $(srcdir)/folderplaylist.h
++	$(MOC) $(srcdir)/folderplaylist.h -o folderplaylist.moc
+ 
+ #>+ 2
+-mocs: filerenamer.moc
++mocs: folderplaylist.moc
+ 
+ #>+ 3
+ gstreamerplayer.moc: $(srcdir)/gstreamerplayer.h
+@@ -1527,10 +1530,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  collectionlist.moc googlefetcherdialog.moc deletedialog.moc artsplayer.moc googlefetcher.moc viewmode.moc directorylist.moc dynamicplaylist.moc treeviewitemplaylist.moc exampleoptions.moc filerenameroptions.moc statuslabel.moc tracksequencemanager.moc tagguesserconfigdlg.moc systemtray.moc filerenamerconfigdlg.moc playlistcollection.moc akodeplayer.moc historyplaylist.moc playlistsplitter.moc searchplaylist.moc nowplaying.moc tageditor.moc searchwidget.moc tagtransactionmanager.moc keydialog.moc playlistbox.moc folderplaylist.moc filerenamer.moc gstreamerplayer.moc playlist.moc juk.moc trackpickerdialog.moc advancedsearchdialog.moc slideraction.moc k3bexporter.moc playermanager.moc
++	-rm -f  collectionlist.moc deletedialog.moc googlefetcherdialog.moc artsplayer.moc viewmode.moc googlefetcher.moc directorylist.moc dynamicplaylist.moc treeviewitemplaylist.moc exampleoptions.moc filerenameroptions.moc statuslabel.moc tracksequencemanager.moc tagguesserconfigdlg.moc systemtray.moc filerenamerconfigdlg.moc playlistcollection.moc akodeplayer.moc historyplaylist.moc playlistsplitter.moc searchplaylist.moc nowplaying.moc tageditor.moc searchwidget.moc keydialog.moc tagtransactionmanager.moc playlistbox.moc filerenamer.moc folderplaylist.moc gstreamerplayer.moc playlist.moc juk.moc trackpickerdialog.moc advancedsearchdialog.moc slideraction.moc k3bexporter.moc playermanager.moc
+ 
+ #>+ 2
+-KDE_DIST=jukui.rc cr32-app-juk.png trackpickerdialogbase.ui actioncollection.h filehandle.h filehandleproperties.h ktrm.h jukui-rtl.rc categoryreaderinterface.h directorylistbase.ui tagrenameroptions.h playlistbox.h artsplayer.h deletedialogbase.ui musicbrainzquery.h jukservicemenu.desktop tagguesser.h treeviewitemplaylist.h playlistitem.h stringhash.h filerenameroptions.h tagguesserconfigdlg.h mediafiles.h filerenamerconfigdlg.h tageditor.h player.h viewmode.h directorylist.h googlefetcherdialog.h Makefile.in tracksequenceiterator.h juk.h advancedsearchdialog.h gstreamerplayer.h googlefetcher.h tracksequencemanager.h coverinfo.h playlistinterface.h tagguesserconfigdlgwidget.ui cr16-app-juk.png configure.in.bot playlistexporter.h upcomingplaylist.h filerenamer.h filerenamerbase.ui nowplaying.h HACKING playlistcollection.h searchwidget.h playlistsearch.h cr128-app-juk.png stringshare.h cr22-action-juk_dock.png statuslabel.h filerenameroptionsbase.ui exampleoptionsbase.ui slideraction.h k3bexporter.h cr64-app-juk.png tag.h playlist.h systemtray.h jukIface.h keydialog.h juk.desktop tagtransactionmanager.h sortedstringlist.h akodeplayer.h configure.in.in dynamicplaylist.h splashscreen.h exampleoptions.h cache.h deletedialog.h folderplaylist.h playlistsplitter.h playermanager.h collectionlist.h trackpickerdialog.h searchplaylist.h cr48-app-juk.png Makefile.am historyplaylist.h 
++KDE_DIST=jukui.rc cr32-app-juk.png trackpickerdialogbase.ui actioncollection.h filehandle.h filehandleproperties.h ktrm.h jukui-rtl.rc categoryreaderinterface.h directorylistbase.ui tagrenameroptions.h playlistbox.h artsplayer.h deletedialogbase.ui musicbrainzquery.h jukservicemenu.desktop tagguesser.h treeviewitemplaylist.h stringhash.h playlistitem.h filerenameroptions.h tagguesserconfigdlg.h mediafiles.h filerenamerconfigdlg.h player.h tageditor.h viewmode.h directorylist.h googlefetcherdialog.h Makefile.in tracksequenceiterator.h juk.h advancedsearchdialog.h gstreamerplayer.h googlefetcher.h tracksequencemanager.h coverinfo.h playlistinterface.h cr16-app-juk.png tagguesserconfigdlgwidget.ui configure.in.bot playlistexporter.h upcomingplaylist.h filerenamer.h nowplaying.h filerenamerbase.ui HACKING playlistcollection.h searchwidget.h playlistsearch.h cr128-app-juk.png stringshare.h cr22-action-juk_dock.png statuslabel.h filerenameroptionsbase.ui exampleoptionsbase.ui slideraction.h k3bexporter.h tag.h cr64-app-juk.png playlist.h systemtray.h jukIface.h keydialog.h juk.desktop tagtransactionmanager.h sortedstringlist.h akodeplayer.h configure.in.in splashscreen.h dynamicplaylist.h exampleoptions.h cache.h deletedialog.h folderplaylist.h playlistsplitter.h playermanager.h collectionlist.h trackpickerdialog.h searchplaylist.h cr48-app-juk.png Makefile.am historyplaylist.h 
+ 
+ #>+ 4
+ clean-idl:
+@@ -1555,23 +1558,23 @@
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/juk.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/juk.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/juk.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-juk_dock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/juk_dock.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/juk.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/juk.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/juk.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/juk.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/juk.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/juk.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/juk.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/juk_dock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/juk.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/juk.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/juk.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/juk.png
+ 
+ #>+ 15
+diff -Nrua kdemultimedia-3.4.1.orig/juk/pics/Makefile.in kdemultimedia-3.4.1/juk/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/juk/pics/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/juk/pics/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9389,9 +10212,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/kaboodle/actions/Makefile.in kdemultimedia-3.4.1/kaboodle/actions/Makefile.in
---- kdemultimedia-3.4.1.orig/kaboodle/actions/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kaboodle/actions/Makefile.in	2005-05-24 23:53:58.207353298 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kaboodle/actions/Makefile.in kdemultimedia-3.4.1/kaboodle/actions/Makefile.in
+--- kdemultimedia-3.4.1.orig/kaboodle/actions/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kaboodle/actions/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9423,9 +10246,27 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/kaboodle/Makefile.in kdemultimedia-3.4.1/kaboodle/Makefile.in
---- kdemultimedia-3.4.1.orig/kaboodle/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kaboodle/Makefile.in	2005-05-24 23:53:58.199354023 +0200
+@@ -640,14 +643,14 @@
+ 
+ #>+ 10
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions/kaboodleloop.png
++	$(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/cr16-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+ 	-rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions/kaboodleloop.png
++	-rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdemultimedia-3.4.1.orig/kaboodle/Makefile.in kdemultimedia-3.4.1/kaboodle/Makefile.in
+--- kdemultimedia-3.4.1.orig/kaboodle/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kaboodle/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -290,6 +290,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9457,9 +10298,104 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kaboodle/pics/Makefile.in kdemultimedia-3.4.1/kaboodle/pics/Makefile.in
---- kdemultimedia-3.4.1.orig/kaboodle/pics/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kaboodle/pics/Makefile.in	2005-05-24 23:53:58.215352572 +0200
+@@ -1086,20 +1089,6 @@
+ .NOEXPORT:
+ 
+ #>+ 3
+-engine.moc: $(srcdir)/engine.h
+-	$(MOC) $(srcdir)/engine.h -o engine.moc
+-
+-#>+ 2
+-mocs: engine.moc
+-
+-#>+ 3
+-view.moc: $(srcdir)/view.h
+-	$(MOC) $(srcdir)/view.h -o view.moc
+-
+-#>+ 2
+-mocs: view.moc
+-
+-#>+ 3
+ userinterface.moc: $(srcdir)/userinterface.h
+ 	$(MOC) $(srcdir)/userinterface.h -o userinterface.moc
+ 
+@@ -1121,13 +1110,6 @@
+ mocs: kaboodle_factory.moc
+ 
+ #>+ 3
+-controls.moc: $(srcdir)/controls.h
+-	$(MOC) $(srcdir)/controls.h -o controls.moc
+-
+-#>+ 2
+-mocs: controls.moc
+-
+-#>+ 3
+ player.moc: $(srcdir)/player.h
+ 	$(MOC) $(srcdir)/player.h -o player.moc
+ 
+@@ -1141,6 +1123,27 @@
+ #>+ 2
+ mocs: conf.moc
+ 
++#>+ 3
++engine.moc: $(srcdir)/engine.h
++	$(MOC) $(srcdir)/engine.h -o engine.moc
++
++#>+ 2
++mocs: engine.moc
++
++#>+ 3
++view.moc: $(srcdir)/view.h
++	$(MOC) $(srcdir)/view.h -o view.moc
++
++#>+ 2
++mocs: view.moc
++
++#>+ 3
++controls.moc: $(srcdir)/controls.h
++	$(MOC) $(srcdir)/controls.h -o controls.moc
++
++#>+ 2
++mocs: controls.moc
++
+ #>+ 8
+ libkaboodlepart.la.closure: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES)
+ 	@echo "int main() {return 0;}" > libkaboodlepart_la_closure.cpp
+@@ -1152,10 +1155,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  engine.moc view.moc userinterface.moc kaboodleapp.moc kaboodle_factory.moc controls.moc player.moc conf.moc
++	-rm -f  userinterface.moc kaboodleapp.moc kaboodle_factory.moc player.moc conf.moc engine.moc view.moc controls.moc
+ 
+ #>+ 2
+-KDE_DIST=engine.h kaboodle_factory.h conf.h controls.h player.h kaboodleui.rc kaboodle.desktop view.h Makefile.in kaboodlepartui.rc kaboodleengine.desktop kaboodleapp.h userinterface.h configure.in.in Makefile.am kaboodle_component.desktop 
++KDE_DIST=engine.h kaboodle_factory.h controls.h conf.h player.h kaboodleui.rc kaboodle.desktop view.h Makefile.in kaboodlepartui.rc kaboodleengine.desktop kaboodleapp.h userinterface.h configure.in.in Makefile.am kaboodle_component.desktop 
+ 
+ #>+ 3
+ clean-closures:
+@@ -1203,7 +1206,7 @@
+ 
+ 
+ #>+ 11
+-libkaboodle_noinst_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/player.cpp $(srcdir)/view.cpp $(srcdir)/kaboodle_factory.cpp  engine.moc view.moc kaboodle_factory.moc player.moc controls.moc conf.moc
++libkaboodle_noinst_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/player.cpp $(srcdir)/view.cpp $(srcdir)/kaboodle_factory.cpp  kaboodle_factory.moc player.moc conf.moc engine.moc view.moc controls.moc
+ 	@echo 'creating libkaboodle_noinst_la.all_cpp.cpp ...'; \
+ 	rm -f libkaboodle_noinst_la.all_cpp.files libkaboodle_noinst_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkaboodle_noinst_la.all_cpp.final; \
+@@ -1265,8 +1268,8 @@
+ kaboodle_factory.lo: kaboodle_factory.moc 
+ nmcheck: 
+ conf.o: conf.moc 
+-view.lo: view.moc 
+ player.o: player.moc 
++view.lo: view.moc 
+ nmcheck-am: nmcheck
+ player.lo: player.moc 
+ userinterface.o: userinterface.moc 
+diff -Nrua kdemultimedia-3.4.1.orig/kaboodle/pics/Makefile.in kdemultimedia-3.4.1/kaboodle/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/kaboodle/pics/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kaboodle/pics/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9491,9 +10427,45 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/kappfinder-data/Makefile.in kdemultimedia-3.4.1/kappfinder-data/Makefile.in
---- kdemultimedia-3.4.1.orig/kappfinder-data/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kappfinder-data/Makefile.in	2005-05-24 23:53:58.223351847 +0200
+@@ -639,26 +642,26 @@
+ 
+ #>+ 22
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kaboodle.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kaboodle.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdemultimedia-3.4.1.orig/kappfinder-data/Makefile.in kdemultimedia-3.4.1/kappfinder-data/Makefile.in
+--- kdemultimedia-3.4.1.orig/kappfinder-data/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kappfinder-data/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -215,6 +215,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9532,9 +10504,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/kaudiocreator/icons/Makefile.in kdemultimedia-3.4.1/kaudiocreator/icons/Makefile.in
---- kdemultimedia-3.4.1.orig/kaudiocreator/icons/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kaudiocreator/icons/Makefile.in	2005-05-24 23:53:58.261348401 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kaudiocreator/icons/Makefile.in kdemultimedia-3.4.1/kaudiocreator/icons/Makefile.in
+--- kdemultimedia-3.4.1.orig/kaudiocreator/icons/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kaudiocreator/icons/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9566,9 +10538,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/kaudiocreator/Makefile.in kdemultimedia-3.4.1/kaudiocreator/Makefile.in
---- kdemultimedia-3.4.1.orig/kaudiocreator/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kaudiocreator/Makefile.in	2005-05-24 23:53:58.254349036 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kaudiocreator/Makefile.in kdemultimedia-3.4.1/kaudiocreator/Makefile.in
+--- kdemultimedia-3.4.1.orig/kaudiocreator/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kaudiocreator/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -279,6 +279,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9600,9 +10572,136 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/au/Makefile.in kdemultimedia-3.4.1/kfile-plugins/au/Makefile.in
---- kdemultimedia-3.4.1.orig/kfile-plugins/au/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kfile-plugins/au/Makefile.in	2005-05-24 23:53:58.282346497 +0200
+@@ -1057,13 +1060,6 @@
+ .NOEXPORT:
+ 
+ #>+ 3
+-encoder.moc: $(srcdir)/encoder.h
+-	$(MOC) $(srcdir)/encoder.h -o encoder.moc
+-
+-#>+ 2
+-mocs: encoder.moc
+-
+-#>+ 3
+ encodefileimp.moc: $(srcdir)/encodefileimp.h
+ 	$(MOC) $(srcdir)/encodefileimp.h -o encodefileimp.moc
+ 
+@@ -1071,18 +1067,18 @@
+ mocs: encodefileimp.moc
+ 
+ #>+ 3
+-encoderconfigimp.moc: $(srcdir)/encoderconfigimp.h
+-	$(MOC) $(srcdir)/encoderconfigimp.h -o encoderconfigimp.moc
++encoder.moc: $(srcdir)/encoder.h
++	$(MOC) $(srcdir)/encoder.h -o encoder.moc
+ 
+ #>+ 2
+-mocs: encoderconfigimp.moc
++mocs: encoder.moc
+ 
+ #>+ 3
+-tracksimp.moc: $(srcdir)/tracksimp.h
+-	$(MOC) $(srcdir)/tracksimp.h -o tracksimp.moc
++encoderconfigimp.moc: $(srcdir)/encoderconfigimp.h
++	$(MOC) $(srcdir)/encoderconfigimp.h -o encoderconfigimp.moc
+ 
+ #>+ 2
+-mocs: tracksimp.moc
++mocs: encoderconfigimp.moc
+ 
+ #>+ 3
+ kaudiocreator.moc: $(srcdir)/kaudiocreator.h
+@@ -1092,11 +1088,11 @@
+ mocs: kaudiocreator.moc
+ 
+ #>+ 3
+-jobqueimp.moc: $(srcdir)/jobqueimp.h
+-	$(MOC) $(srcdir)/jobqueimp.h -o jobqueimp.moc
++tracksimp.moc: $(srcdir)/tracksimp.h
++	$(MOC) $(srcdir)/tracksimp.h -o tracksimp.moc
+ 
+ #>+ 2
+-mocs: jobqueimp.moc
++mocs: tracksimp.moc
+ 
+ #>+ 3
+ ripper.moc: $(srcdir)/ripper.h
+@@ -1106,8 +1102,15 @@
+ mocs: ripper.moc
+ 
+ #>+ 3
++jobqueimp.moc: $(srcdir)/jobqueimp.h
++	$(MOC) $(srcdir)/jobqueimp.h -o jobqueimp.moc
++
++#>+ 2
++mocs: jobqueimp.moc
++
++#>+ 3
+ clean-metasources:
+-	-rm -f  encoder.moc encodefileimp.moc encoderconfigimp.moc tracksimp.moc kaudiocreator.moc jobqueimp.moc ripper.moc
++	-rm -f  encodefileimp.moc encoder.moc encoderconfigimp.moc kaudiocreator.moc tracksimp.moc ripper.moc jobqueimp.moc
+ 
+ #>+ 2
+ KDE_DIST=encoderedit.ui prefs.kcfgc lo16-app-kaudiocreator.png eventsrc encoderconfig.ui.h encoder_prefs.kcfgc encoderoutput.ui encoderconfig.ui kaudiocreator_encoders.kcfg wizard.ui.h ripconfig.ui Makefile.in job.h encoder_prefs_addons.h kaudiocreator-meta.upd general.ui.h kaudiocreator.kcfg upgrade-kaudiocreator-metadata.sh cdconfig.ui tracks.ui jobque.ui kaudiocreatorui.rc encodefile.ui kaudiocreator_workman.h cr32-app-kaudiocreator.png wizard.ui cr16-app-kaudiocreator.png kaudiocreator-libkcddb.upd configure.in.in general.ui infodialog.ui lo32-app-kaudiocreator.png Makefile.am 
+@@ -1138,20 +1141,20 @@
+ 
+ #>+ 16
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/lo32-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/lo16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaudiocreator.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/lo16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaudiocreator.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/lo32-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaudiocreator.png
++	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaudiocreator.png
++	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1192,7 +1195,7 @@
+ 
+ 
+ #>+ 11
+-kaudiocreator.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaudiocreator.cpp $(srcdir)/encoder.cpp $(srcdir)/encoderconfigimp.cpp $(srcdir)/job.cpp $(srcdir)/jobqueimp.cpp $(srcdir)/ripper.cpp $(srcdir)/tracksimp.cpp $(srcdir)/encodefileimp.cpp encoderedit.cpp jobque.cpp tracks.cpp infodialog.cpp wizard.cpp general.cpp cdconfig.cpp ripconfig.cpp encoderoutput.cpp encoderconfig.cpp encodefile.cpp prefs.cpp encoder_prefs.cpp  general.moc encodefileimp.moc tracks.moc encoderoutput.moc kaudiocreator.moc infodialog.moc encoder.moc ripconfig.moc tracksimp.moc encoderconfigimp.moc encodefile.moc encoderconfig.moc wizard.moc ripper.moc jobqueimp.moc jobque.moc cdconfig.moc encoderedit.moc
++kaudiocreator.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaudiocreator.cpp $(srcdir)/encoder.cpp $(srcdir)/encoderconfigimp.cpp $(srcdir)/job.cpp $(srcdir)/jobqueimp.cpp $(srcdir)/ripper.cpp $(srcdir)/tracksimp.cpp $(srcdir)/encodefileimp.cpp encoderedit.cpp jobque.cpp tracks.cpp infodialog.cpp wizard.cpp general.cpp cdconfig.cpp ripconfig.cpp encoderoutput.cpp encoderconfig.cpp encodefile.cpp prefs.cpp encoder_prefs.cpp  general.moc encodefileimp.moc tracks.moc encoderoutput.moc kaudiocreator.moc infodialog.moc encoder.moc ripconfig.moc tracksimp.moc encoderconfigimp.moc encodefile.moc encoderconfig.moc wizard.moc jobqueimp.moc ripper.moc jobque.moc cdconfig.moc encoderedit.moc
+ 	@echo 'creating kaudiocreator.all_cpp.cpp ...'; \
+ 	rm -f kaudiocreator.all_cpp.files kaudiocreator.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kaudiocreator.all_cpp.final; \
+@@ -1243,8 +1246,8 @@
+ encodefileimp.lo: encodefileimp.moc 
+ kaudiocreator.lo: kaudiocreator.moc 
+ $(srcdir)/tracksimp.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h 
+-ripper.o: ripper.moc 
+ jobqueimp.o: jobqueimp.moc 
++ripper.o: ripper.moc 
+ tracksimp.o: tracksimp.moc 
+ encoder.o: encoder.moc 
+ nmcheck: 
+@@ -1254,8 +1257,8 @@
+ nmcheck-am: nmcheck
+ $(srcdir)/encoder.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h 
+ ripper.lo: ripper.moc 
+-tracksimp.lo: tracksimp.moc 
+ encoderconfigimp.o: encoderconfigimp.moc 
++tracksimp.lo: tracksimp.moc 
+ $(srcdir)/job.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h 
+ 
+ #>+ 177
+diff -Nrua kdemultimedia-3.4.1.orig/kfile-plugins/au/Makefile.in kdemultimedia-3.4.1/kfile-plugins/au/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/au/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kfile-plugins/au/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9634,9 +10733,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/avi/Makefile.in kdemultimedia-3.4.1/kfile-plugins/avi/Makefile.in
---- kdemultimedia-3.4.1.orig/kfile-plugins/avi/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kfile-plugins/avi/Makefile.in	2005-05-24 23:53:58.296345228 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kfile-plugins/avi/Makefile.in kdemultimedia-3.4.1/kfile-plugins/avi/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/avi/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kfile-plugins/avi/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9668,9 +10767,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/flac/Makefile.in kdemultimedia-3.4.1/kfile-plugins/flac/Makefile.in
---- kdemultimedia-3.4.1.orig/kfile-plugins/flac/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kfile-plugins/flac/Makefile.in	2005-05-24 23:53:58.308344140 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kfile-plugins/flac/Makefile.in kdemultimedia-3.4.1/kfile-plugins/flac/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/flac/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kfile-plugins/flac/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9702,9 +10801,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/m3u/Makefile.in kdemultimedia-3.4.1/kfile-plugins/m3u/Makefile.in
---- kdemultimedia-3.4.1.orig/kfile-plugins/m3u/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kfile-plugins/m3u/Makefile.in	2005-05-24 23:53:58.319343142 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kfile-plugins/m3u/Makefile.in kdemultimedia-3.4.1/kfile-plugins/m3u/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/m3u/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kfile-plugins/m3u/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9736,9 +10835,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/Makefile.in kdemultimedia-3.4.1/kfile-plugins/Makefile.in
---- kdemultimedia-3.4.1.orig/kfile-plugins/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kfile-plugins/Makefile.in	2005-05-24 23:53:58.270347585 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kfile-plugins/Makefile.in kdemultimedia-3.4.1/kfile-plugins/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kfile-plugins/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9770,9 +10869,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/mp3/Makefile.in kdemultimedia-3.4.1/kfile-plugins/mp3/Makefile.in
---- kdemultimedia-3.4.1.orig/kfile-plugins/mp3/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kfile-plugins/mp3/Makefile.in	2005-05-24 23:53:58.332341964 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kfile-plugins/mp3/Makefile.in kdemultimedia-3.4.1/kfile-plugins/mp3/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/mp3/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kfile-plugins/mp3/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9804,9 +10903,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/mpc/Makefile.in kdemultimedia-3.4.1/kfile-plugins/mpc/Makefile.in
---- kdemultimedia-3.4.1.orig/kfile-plugins/mpc/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kfile-plugins/mpc/Makefile.in	2005-05-24 23:53:58.344340876 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kfile-plugins/mpc/Makefile.in kdemultimedia-3.4.1/kfile-plugins/mpc/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/mpc/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kfile-plugins/mpc/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9838,9 +10937,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/ogg/Makefile.in kdemultimedia-3.4.1/kfile-plugins/ogg/Makefile.in
---- kdemultimedia-3.4.1.orig/kfile-plugins/ogg/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kfile-plugins/ogg/Makefile.in	2005-05-24 23:53:58.357339697 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kfile-plugins/ogg/Makefile.in kdemultimedia-3.4.1/kfile-plugins/ogg/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/ogg/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kfile-plugins/ogg/Makefile.in	2005-05-31 15:25:25.000000000 -0400
 @@ -259,6 +259,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9872,9 +10971,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/sid/Makefile.in kdemultimedia-3.4.1/kfile-plugins/sid/Makefile.in
---- kdemultimedia-3.4.1.orig/kfile-plugins/sid/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kfile-plugins/sid/Makefile.in	2005-05-24 23:53:58.369338609 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kfile-plugins/sid/Makefile.in kdemultimedia-3.4.1/kfile-plugins/sid/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/sid/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kfile-plugins/sid/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9906,9 +11005,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/theora/Makefile.in kdemultimedia-3.4.1/kfile-plugins/theora/Makefile.in
---- kdemultimedia-3.4.1.orig/kfile-plugins/theora/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kfile-plugins/theora/Makefile.in	2005-05-24 23:53:58.382337430 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kfile-plugins/theora/Makefile.in kdemultimedia-3.4.1/kfile-plugins/theora/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/theora/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kfile-plugins/theora/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9940,9 +11039,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/wav/Makefile.in kdemultimedia-3.4.1/kfile-plugins/wav/Makefile.in
---- kdemultimedia-3.4.1.orig/kfile-plugins/wav/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kfile-plugins/wav/Makefile.in	2005-05-24 23:53:58.394336342 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kfile-plugins/wav/Makefile.in kdemultimedia-3.4.1/kfile-plugins/wav/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/wav/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kfile-plugins/wav/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9974,9 +11073,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/kcmaudiocd/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/kcmaudiocd/Makefile.in
---- kdemultimedia-3.4.1.orig/kioslave/audiocd/kcmaudiocd/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kioslave/audiocd/kcmaudiocd/Makefile.in	2005-05-24 23:53:58.425333531 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kioslave/audiocd/kcmaudiocd/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/kcmaudiocd/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/kcmaudiocd/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kioslave/audiocd/kcmaudiocd/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -249,6 +249,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10008,9 +11107,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/Makefile.in
---- kdemultimedia-3.4.1.orig/kioslave/audiocd/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kioslave/audiocd/Makefile.in	2005-05-24 23:53:58.414334529 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kioslave/audiocd/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kioslave/audiocd/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -269,6 +269,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10042,9 +11141,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/flac/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/flac/Makefile.in
---- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/flac/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/flac/Makefile.in	2005-05-24 23:53:58.447331537 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/flac/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/flac/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/flac/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/flac/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -243,6 +243,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10076,9 +11175,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/lame/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/lame/Makefile.in
---- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/lame/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/lame/Makefile.in	2005-05-24 23:53:58.460330358 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/lame/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/lame/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/lame/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/lame/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -250,6 +250,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10110,9 +11209,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/Makefile.in
---- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/Makefile.in	2005-05-24 23:53:58.437332443 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -263,6 +263,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10144,9 +11243,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/vorbis/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/vorbis/Makefile.in
---- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/vorbis/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/vorbis/Makefile.in	2005-05-24 23:53:58.472329270 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/vorbis/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/vorbis/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/vorbis/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/vorbis/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -251,6 +251,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10178,9 +11277,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/wav/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/wav/Makefile.in
---- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/wav/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/wav/Makefile.in	2005-05-24 23:53:58.483328273 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/wav/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/wav/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/wav/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/wav/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -246,6 +246,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10212,9 +11311,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kioslave/Makefile.in kdemultimedia-3.4.1/kioslave/Makefile.in
---- kdemultimedia-3.4.1.orig/kioslave/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kioslave/Makefile.in	2005-05-24 23:53:58.402335617 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kioslave/Makefile.in kdemultimedia-3.4.1/kioslave/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kioslave/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10246,9 +11345,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/kmid/examples/Makefile.in kdemultimedia-3.4.1/kmid/examples/Makefile.in
---- kdemultimedia-3.4.1.orig/kmid/examples/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kmid/examples/Makefile.in	2005-05-24 23:53:58.557321563 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kmid/examples/Makefile.in kdemultimedia-3.4.1/kmid/examples/Makefile.in
+--- kdemultimedia-3.4.1.orig/kmid/examples/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kmid/examples/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10280,9 +11379,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/kmid/Makefile.in kdemultimedia-3.4.1/kmid/Makefile.in
---- kdemultimedia-3.4.1.orig/kmid/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kmid/Makefile.in	2005-05-24 23:53:58.549322288 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kmid/Makefile.in kdemultimedia-3.4.1/kmid/Makefile.in
+--- kdemultimedia-3.4.1.orig/kmid/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kmid/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -301,6 +301,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10314,9 +11413,89 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kmid/maps/Makefile.in kdemultimedia-3.4.1/kmid/maps/Makefile.in
---- kdemultimedia-3.4.1.orig/kmid/maps/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kmid/maps/Makefile.in	2005-05-24 23:53:58.564320928 +0200
+@@ -1289,13 +1292,6 @@
+ mocs: channelcfgdlg.moc
+ 
+ #>+ 3
+-kdisptext.moc: $(srcdir)/kdisptext.h
+-	$(MOC) $(srcdir)/kdisptext.h -o kdisptext.moc
+-
+-#>+ 2
+-mocs: kdisptext.moc
+-
+-#>+ 3
+ kmid_part.moc: $(srcdir)/kmid_part.h
+ 	$(MOC) $(srcdir)/kmid_part.h -o kmid_part.moc
+ 
+@@ -1303,11 +1299,11 @@
+ mocs: kmid_part.moc
+ 
+ #>+ 3
+-ktrianglebutton.moc: $(srcdir)/ktrianglebutton.h
+-	$(MOC) $(srcdir)/ktrianglebutton.h -o ktrianglebutton.moc
++kdisptext.moc: $(srcdir)/kdisptext.h
++	$(MOC) $(srcdir)/kdisptext.h -o kdisptext.moc
+ 
+ #>+ 2
+-mocs: ktrianglebutton.moc
++mocs: kdisptext.moc
+ 
+ #>+ 3
+ qslidertime.moc: $(srcdir)/qslidertime.h
+@@ -1317,6 +1313,13 @@
+ mocs: qslidertime.moc
+ 
+ #>+ 3
++ktrianglebutton.moc: $(srcdir)/ktrianglebutton.h
++	$(MOC) $(srcdir)/ktrianglebutton.h -o ktrianglebutton.moc
++
++#>+ 2
++mocs: ktrianglebutton.moc
++
++#>+ 3
+ kmidframe.moc: $(srcdir)/kmidframe.h
+ 	$(MOC) $(srcdir)/kmidframe.h -o kmidframe.moc
+ 
+@@ -1341,7 +1344,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kdisptext.moc kmid_part.moc ktrianglebutton.moc qslidertime.moc kmidframe.moc kmidclient.moc
++	-rm -f  klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kmid_part.moc kdisptext.moc qslidertime.moc ktrianglebutton.moc kmidframe.moc kmidclient.moc
+ 
+ #>+ 2
+ KDE_DIST=kmidbutton.h audiomidi.desktop PEOPLE std.sb kmidIface.h drums.sb instrname.i18n button1.xpm Makefile.in kmid.lsm kmid.desktop kmid_partui.rc x-karaoke.desktop cr16-app-kmid.png instrfilter.awk kmid.spec kmidui.rc history.txt configure.in.in button2.xpm cr32-app-kmid.png version.h keyboard.xpm cr48-app-kmid.png Makefile.am 
+@@ -1362,15 +1365,15 @@
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmid.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmid.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmid.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmid.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmid.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmid.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmid.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmid.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1411,7 +1414,7 @@
+ 
+ 
+ #>+ 11
+-libkmidlib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmidframe.cpp $(srcdir)/kmidclient.cpp $(srcdir)/kdisptext.cpp $(srcdir)/qslidertime.cpp $(srcdir)/klcdnumber.cpp $(srcdir)/ktrianglebutton.cpp $(srcdir)/midicfgdlg.cpp $(srcdir)/collectdlg.cpp $(srcdir)/randomlist.cpp $(srcdir)/channelview.cpp $(srcdir)/channel.cpp $(srcdir)/channel3d.cpp $(srcdir)/channel4d.cpp $(srcdir)/channelcfgdlg.cpp $(srcdir)/instrname.cpp $(srcdir)/rhythmview.cpp $(srcdir)/songlist.cpp $(srcdir)/slman.cpp $(srcdir)/kmid_part.cpp kmidIface_skel.cpp  klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kdisptext.moc kmid_part.moc qslidertime.moc ktrianglebutton.moc kmidframe.moc kmidclient.moc
++libkmidlib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmidframe.cpp $(srcdir)/kmidclient.cpp $(srcdir)/kdisptext.cpp $(srcdir)/qslidertime.cpp $(srcdir)/klcdnumber.cpp $(srcdir)/ktrianglebutton.cpp $(srcdir)/midicfgdlg.cpp $(srcdir)/collectdlg.cpp $(srcdir)/randomlist.cpp $(srcdir)/channelview.cpp $(srcdir)/channel.cpp $(srcdir)/channel3d.cpp $(srcdir)/channel4d.cpp $(srcdir)/channelcfgdlg.cpp $(srcdir)/instrname.cpp $(srcdir)/rhythmview.cpp $(srcdir)/songlist.cpp $(srcdir)/slman.cpp $(srcdir)/kmid_part.cpp kmidIface_skel.cpp  klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kmid_part.moc kdisptext.moc ktrianglebutton.moc qslidertime.moc kmidframe.moc kmidclient.moc
+ 	@echo 'creating libkmidlib_la.all_cpp.cpp ...'; \
+ 	rm -f libkmidlib_la.all_cpp.files libkmidlib_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkmidlib_la.all_cpp.final; \
+diff -Nrua kdemultimedia-3.4.1.orig/kmid/maps/Makefile.in kdemultimedia-3.4.1/kmid/maps/Makefile.in
+--- kdemultimedia-3.4.1.orig/kmid/maps/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kmid/maps/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10348,9 +11527,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/kmid/pics/Makefile.in kdemultimedia-3.4.1/kmid/pics/Makefile.in
---- kdemultimedia-3.4.1.orig/kmid/pics/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kmid/pics/Makefile.in	2005-05-24 23:53:58.572320203 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kmid/pics/Makefile.in kdemultimedia-3.4.1/kmid/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/kmid/pics/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kmid/pics/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10382,9 +11561,35 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/kmix/Makefile.in kdemultimedia-3.4.1/kmix/Makefile.in
---- kdemultimedia-3.4.1.orig/kmix/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kmix/Makefile.in	2005-05-24 23:53:58.644313675 +0200
+@@ -642,21 +645,21 @@
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/piano.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/volume.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/piano.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/volume.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/piano.png
+-	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
+-	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
+ 	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/volume.png
+ 	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/piano.png
++	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
+ 	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/volume.png
++	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdemultimedia-3.4.1.orig/kmix/Makefile.in kdemultimedia-3.4.1/kmix/Makefile.in
+--- kdemultimedia-3.4.1.orig/kmix/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kmix/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -329,6 +329,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10416,9 +11621,145 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kmix/pics/Makefile.in kdemultimedia-3.4.1/kmix/pics/Makefile.in
---- kdemultimedia-3.4.1.orig/kmix/pics/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/kmix/pics/Makefile.in	2005-05-24 23:53:58.655312677 +0200
+@@ -1349,18 +1352,18 @@
+ mocs: viewswitches.moc
+ 
+ #>+ 3
+-viewdockareapopup.moc: $(srcdir)/viewdockareapopup.h
+-	$(MOC) $(srcdir)/viewdockareapopup.h -o viewdockareapopup.moc
++kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h
++	$(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc
+ 
+ #>+ 2
+-mocs: viewdockareapopup.moc
++mocs: kmixdockwidget.moc
+ 
+ #>+ 3
+-kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h
+-	$(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc
++viewdockareapopup.moc: $(srcdir)/viewdockareapopup.h
++	$(MOC) $(srcdir)/viewdockareapopup.h -o viewdockareapopup.moc
+ 
+ #>+ 2
+-mocs: kmixdockwidget.moc
++mocs: viewdockareapopup.moc
+ 
+ #>+ 3
+ ksmallslider.moc: $(srcdir)/ksmallslider.h
+@@ -1391,13 +1394,6 @@
+ mocs: viewapplet.moc
+ 
+ #>+ 3
+-kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h
+-	$(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc
+-
+-#>+ 2
+-mocs: kmixprefdlg.moc
+-
+-#>+ 3
+ mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
+ 	$(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
+ 
+@@ -1405,11 +1401,11 @@
+ mocs: mixdevicewidget.moc
+ 
+ #>+ 3
+-KMixApp.moc: $(srcdir)/KMixApp.h
+-	$(MOC) $(srcdir)/KMixApp.h -o KMixApp.moc
++kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h
++	$(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc
+ 
+ #>+ 2
+-mocs: KMixApp.moc
++mocs: kmixprefdlg.moc
+ 
+ #>+ 3
+ dialogviewconfiguration.moc: $(srcdir)/dialogviewconfiguration.h
+@@ -1419,6 +1415,13 @@
+ mocs: dialogviewconfiguration.moc
+ 
+ #>+ 3
++KMixApp.moc: $(srcdir)/KMixApp.h
++	$(MOC) $(srcdir)/KMixApp.h -o KMixApp.moc
++
++#>+ 2
++mocs: KMixApp.moc
++
++#>+ 3
+ kmixapplet.moc: $(srcdir)/kmixapplet.h
+ 	$(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc
+ 
+@@ -1440,18 +1443,18 @@
+ mocs: kmix.moc
+ 
+ #>+ 3
+-mdwswitch.moc: $(srcdir)/mdwswitch.h
+-	$(MOC) $(srcdir)/mdwswitch.h -o mdwswitch.moc
++viewsliders.moc: $(srcdir)/viewsliders.h
++	$(MOC) $(srcdir)/viewsliders.h -o viewsliders.moc
+ 
+ #>+ 2
+-mocs: mdwswitch.moc
++mocs: viewsliders.moc
+ 
+ #>+ 3
+-viewsliders.moc: $(srcdir)/viewsliders.h
+-	$(MOC) $(srcdir)/viewsliders.h -o viewsliders.moc
++mdwswitch.moc: $(srcdir)/mdwswitch.h
++	$(MOC) $(srcdir)/mdwswitch.h -o mdwswitch.moc
+ 
+ #>+ 2
+-mocs: viewsliders.moc
++mocs: mdwswitch.moc
+ 
+ #>+ 3
+ mixdevice.moc: $(srcdir)/mixdevice.h
+@@ -1475,18 +1478,18 @@
+ mocs: viewsurround.moc
+ 
+ #>+ 3
+-kmixerwidget.moc: $(srcdir)/kmixerwidget.h
+-	$(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
++mixer.moc: $(srcdir)/mixer.h
++	$(MOC) $(srcdir)/mixer.h -o mixer.moc
+ 
+ #>+ 2
+-mocs: kmixerwidget.moc
++mocs: mixer.moc
+ 
+ #>+ 3
+-mixer.moc: $(srcdir)/mixer.h
+-	$(MOC) $(srcdir)/mixer.h -o mixer.moc
++kmixerwidget.moc: $(srcdir)/kmixerwidget.h
++	$(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
+ 
+ #>+ 2
+-mocs: mixer.moc
++mocs: kmixerwidget.moc
+ 
+ #>+ 3
+ kledbutton.moc: $(srcdir)/kledbutton.h
+@@ -1522,7 +1525,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  viewswitches.moc viewdockareapopup.moc kmixdockwidget.moc ksmallslider.moc viewinput.moc mdwenum.moc viewapplet.moc kmixprefdlg.moc mixdevicewidget.moc KMixApp.moc dialogviewconfiguration.moc kmixapplet.moc mdwslider.moc kmix.moc mdwswitch.moc viewsliders.moc mixdevice.moc viewbase.moc viewsurround.moc kmixerwidget.moc mixer.moc kledbutton.moc viewoutput.moc
++	-rm -f  viewswitches.moc kmixdockwidget.moc viewdockareapopup.moc ksmallslider.moc viewinput.moc mdwenum.moc viewapplet.moc mixdevicewidget.moc kmixprefdlg.moc dialogviewconfiguration.moc KMixApp.moc kmixapplet.moc mdwslider.moc kmix.moc viewsliders.moc mdwswitch.moc mixdevice.moc viewbase.moc viewsurround.moc mixer.moc kmixerwidget.moc kledbutton.moc viewoutput.moc
+ 
+ #>+ 2
+ KDE_DIST=kmix.desktop resource.h kmixui.rc kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop viewapplet.h mixer_irix.cpp mixer_sun.cpp kmixctrl_restore.desktop Makefile.in restore_kmix_volumes.desktop TestCases mixer_hpux.h mixer_irix.h mixer_none.cpp configure.in.in mixer_oss.cpp mixer_none.h mixer_alsa9.cpp Makefile.am mixer_oss.h 
+@@ -1585,7 +1588,7 @@
+ 
+ 
+ #>+ 11
+-libkdeinit_kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/viewbase.cpp $(srcdir)/viewoutput.cpp $(srcdir)/viewinput.cpp $(srcdir)/viewswitches.cpp $(srcdir)/viewsurround.cpp $(srcdir)/viewdockareapopup.cpp $(srcdir)/viewsliders.cpp $(srcdir)/mixdevicewidget.cpp $(srcdir)/mdwslider.cpp $(srcdir)/mdwswitch.cpp $(srcdir)/mdwenum.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/mixer.cpp $(srcdir)/mixset.cpp $(srcdir)/mixdevice.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/verticaltext.cpp $(srcdir)/kmixtoolbox.cpp $(srcdir)/mixertoolbox.cpp $(srcdir)/dialogviewconfiguration.cpp $(srcdir)/KMixApp.cpp mixerIface_skel.cpp  viewswitches.moc kmixdockwidget.moc viewdockareapopup.moc ksmallslider.moc viewinput.moc mdwenum.moc mixdevicewidget.moc kmixprefdlg.moc KMixApp.moc dialogviewconfiguration.moc mdwslider.moc kmix.moc mdwswitch.moc viewsliders.moc mixdevice.moc viewbase.moc viewsurround.moc mixer.moc kmixerwidget.moc kledbutton.moc viewoutput.moc
++libkdeinit_kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/viewbase.cpp $(srcdir)/viewoutput.cpp $(srcdir)/viewinput.cpp $(srcdir)/viewswitches.cpp $(srcdir)/viewsurround.cpp $(srcdir)/viewdockareapopup.cpp $(srcdir)/viewsliders.cpp $(srcdir)/mixdevicewidget.cpp $(srcdir)/mdwslider.cpp $(srcdir)/mdwswitch.cpp $(srcdir)/mdwenum.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/mixer.cpp $(srcdir)/mixset.cpp $(srcdir)/mixdevice.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/verticaltext.cpp $(srcdir)/kmixtoolbox.cpp $(srcdir)/mixertoolbox.cpp $(srcdir)/dialogviewconfiguration.cpp $(srcdir)/KMixApp.cpp mixerIface_skel.cpp  viewswitches.moc viewdockareapopup.moc kmixdockwidget.moc ksmallslider.moc viewinput.moc mdwenum.moc kmixprefdlg.moc mixdevicewidget.moc dialogviewconfiguration.moc KMixApp.moc mdwslider.moc kmix.moc viewsliders.moc mdwswitch.moc mixdevice.moc viewbase.moc viewsurround.moc kmixerwidget.moc mixer.moc kledbutton.moc viewoutput.moc
+ 	@echo 'creating libkdeinit_kmix_la.all_cpp.cpp ...'; \
+ 	rm -f libkdeinit_kmix_la.all_cpp.files libkdeinit_kmix_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kmix_la.all_cpp.final; \
+diff -Nrua kdemultimedia-3.4.1.orig/kmix/pics/Makefile.in kdemultimedia-3.4.1/kmix/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/kmix/pics/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/kmix/pics/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10450,9 +11791,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/krec/Makefile.in kdemultimedia-3.4.1/krec/Makefile.in
---- kdemultimedia-3.4.1.orig/krec/Makefile.in	2005-05-23 18:04:32.000000000 +0200
-+++ kdemultimedia-3.4.1/krec/Makefile.in	2005-05-24 23:53:58.693309232 +0200
+@@ -679,23 +682,23 @@
+ 
+ #>+ 19
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmix.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmix.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmix.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmix.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmix.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmix.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmix.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmix.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmix.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmix.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmix.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmix.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmix.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmix.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmix.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmix.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdemultimedia-3.4.1.orig/krec/Makefile.in kdemultimedia-3.4.1/krec/Makefile.in
+--- kdemultimedia-3.4.1.orig/krec/Makefile.in	2005-05-23 12:04:32.000000000 -0400
++++ kdemultimedia-3.4.1/krec/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -325,6 +325,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10484,9 +11858,158 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/krec/mp3_export/Makefile.in kdemultimedia-3.4.1/krec/mp3_export/Makefile.in
---- kdemultimedia-3.4.1.orig/krec/mp3_export/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/krec/mp3_export/Makefile.in	2005-05-24 23:53:58.705308144 +0200
+@@ -1361,18 +1364,18 @@
+ mocs: krecglobal.moc
+ 
+ #>+ 3
+-krecord.moc: $(srcdir)/krecord.h
+-	$(MOC) $(srcdir)/krecord.h -o krecord.moc
++krecord_private.moc: $(srcdir)/krecord_private.h
++	$(MOC) $(srcdir)/krecord_private.h -o krecord_private.moc
+ 
+ #>+ 2
+-mocs: krecord.moc
++mocs: krecord_private.moc
+ 
+ #>+ 3
+-krecord_private.moc: $(srcdir)/krecord_private.h
+-	$(MOC) $(srcdir)/krecord_private.h -o krecord_private.moc
++krecord.moc: $(srcdir)/krecord.h
++	$(MOC) $(srcdir)/krecord.h -o krecord.moc
+ 
+ #>+ 2
+-mocs: krecord_private.moc
++mocs: krecord.moc
+ 
+ #>+ 3
+ krecconfig_files.moc: $(srcdir)/krecconfig_files.h
+@@ -1389,13 +1392,6 @@
+ mocs: krecfileview.moc
+ 
+ #>+ 3
+-krecexport_template.moc: $(srcdir)/krecexport_template.h
+-	$(MOC) $(srcdir)/krecexport_template.h -o krecexport_template.moc
+-
+-#>+ 2
+-mocs: krecexport_template.moc
+-
+-#>+ 3
+ krecfilewidgets.moc: $(srcdir)/krecfilewidgets.h
+ 	$(MOC) $(srcdir)/krecfilewidgets.h -o krecfilewidgets.moc
+ 
+@@ -1403,11 +1399,11 @@
+ mocs: krecfilewidgets.moc
+ 
+ #>+ 3
+-krecexport_wave.moc: $(srcdir)/krecexport_wave.h
+-	$(MOC) $(srcdir)/krecexport_wave.h -o krecexport_wave.moc
++krecexport_template.moc: $(srcdir)/krecexport_template.h
++	$(MOC) $(srcdir)/krecexport_template.h -o krecexport_template.moc
+ 
+ #>+ 2
+-mocs: krecexport_wave.moc
++mocs: krecexport_template.moc
+ 
+ #>+ 3
+ krecconfigure.moc: $(srcdir)/krecconfigure.h
+@@ -1417,6 +1413,13 @@
+ mocs: krecconfigure.moc
+ 
+ #>+ 3
++krecexport_wave.moc: $(srcdir)/krecexport_wave.h
++	$(MOC) $(srcdir)/krecexport_wave.h -o krecexport_wave.moc
++
++#>+ 2
++mocs: krecexport_wave.moc
++
++#>+ 3
+ krecconfig_fileswidget.moc: $(srcdir)/krecconfig_fileswidget.h
+ 	$(MOC) $(srcdir)/krecconfig_fileswidget.h -o krecconfig_fileswidget.moc
+ 
+@@ -1484,10 +1487,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  krecnewproperties.moc krecglobal.moc krecord.moc krecord_private.moc krecconfig_files.moc krecfileview.moc krecexport_template.moc krecfilewidgets.moc krecexport_wave.moc krecconfigure.moc krecconfig_fileswidget.moc krecfile.moc krecfileviewhelpers.moc
++	-rm -f  krecnewproperties.moc krecglobal.moc krecord_private.moc krecord.moc krecconfig_files.moc krecfileview.moc krecfilewidgets.moc krecexport_template.moc krecconfigure.moc krecexport_wave.moc krecconfig_fileswidget.moc krecfile.moc krecfileviewhelpers.moc
+ 
+ #>+ 2
+-KDE_DIST=krec_exportwave.desktop cr128-app-krec.png cr16-app-krec.png globals.h krec.desktop cr32-app-krec.png krecconfig_files.h tips krecexport_template.h kcm_krec_files.desktop krecnewproperties.h Makefile.in krecfilewidgets.h krecconfig_fileswidget.h cr64-app-krec.png krecfileviewhelpers.h krecfileview.h krecconfigure.h krecfile.h krecord_private.h krecord.h krecglobal.h cr22-app-krec.png krecui.rc configure.in.in krec_exportitem.desktop krecexport_wave.h kcm_krec.desktop cr48-app-krec.png Makefile.am 
++KDE_DIST=krec_exportwave.desktop cr128-app-krec.png cr16-app-krec.png globals.h krec.desktop cr32-app-krec.png krecconfig_files.h tips krecexport_template.h kcm_krec_files.desktop krecnewproperties.h Makefile.in krecfilewidgets.h krecconfig_fileswidget.h cr64-app-krec.png krecfileviewhelpers.h krecfileview.h krecconfigure.h krecord_private.h krecfile.h krecord.h cr22-app-krec.png krecglobal.h krecui.rc configure.in.in krec_exportitem.desktop krecexport_wave.h kcm_krec.desktop cr48-app-krec.png Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -1498,26 +1501,26 @@
+ 
+ #>+ 22
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krec.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krec.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/krec.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/krec.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krec.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krec.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/krec.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krec.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krec.png
+ 
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krec.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krec.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/krec.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/krec.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krec.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krec.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/krec.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krec.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krec.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1558,7 +1561,7 @@
+ 
+ 
+ #>+ 11
+-libkdeinit_krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp  krecnewproperties.moc krecord_private.moc krecord.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
++libkdeinit_krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp  krecnewproperties.moc krecord.moc krecord_private.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
+ 	@echo 'creating libkdeinit_krec_la.all_cpp.cpp ...'; \
+ 	rm -f libkdeinit_krec_la.all_cpp.files libkdeinit_krec_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdeinit_krec_la.all_cpp.final; \
+@@ -1570,7 +1573,7 @@
+ 	rm -f libkdeinit_krec_la.all_cpp.final libkdeinit_krec_la.all_cpp.files
+ 
+ #>+ 11
+-krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp  krecnewproperties.moc krecord_private.moc krecord.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
++krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp  krecnewproperties.moc krecord.moc krecord_private.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
+ 	@echo 'creating krec_la.all_cpp.cpp ...'; \
+ 	rm -f krec_la.all_cpp.files krec_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> krec_la.all_cpp.final; \
+@@ -1650,11 +1653,11 @@
+ krecnewproperties.o: krecnewproperties.moc 
+ krecexport_wave.lo: krecexport_wave.moc 
+ krecconfig_files.o: krecconfig_files.moc 
+-krecord.o: krecord.moc krecord_private.moc 
++krecord.o: krecord_private.moc krecord.moc 
+ krecfileviewhelpers.o: krecfileviewhelpers.moc 
+ nmcheck: 
+ krecfile.o: krecfile.moc 
+-krecord.lo: krecord.moc krecord_private.moc 
++krecord.lo: krecord_private.moc krecord.moc 
+ krecexport_template.lo: krecexport_template.moc 
+ krecfileview.lo: krecfileview.moc 
+ krecconfig_files.lo: krecconfig_files.moc 
+diff -Nrua kdemultimedia-3.4.1.orig/krec/mp3_export/Makefile.in kdemultimedia-3.4.1/krec/mp3_export/Makefile.in
+--- kdemultimedia-3.4.1.orig/krec/mp3_export/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/krec/mp3_export/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -246,6 +246,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10518,9 +12041,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/krec/ogg_export/Makefile.in kdemultimedia-3.4.1/krec/ogg_export/Makefile.in
---- kdemultimedia-3.4.1.orig/krec/ogg_export/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/krec/ogg_export/Makefile.in	2005-05-24 23:53:58.716307146 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/krec/ogg_export/Makefile.in kdemultimedia-3.4.1/krec/ogg_export/Makefile.in
+--- kdemultimedia-3.4.1.orig/krec/ogg_export/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/krec/ogg_export/Makefile.in	2005-05-31 15:25:26.000000000 -0400
 @@ -246,6 +246,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10552,9 +12075,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/krec/pics/Makefile.in kdemultimedia-3.4.1/krec/pics/Makefile.in
---- kdemultimedia-3.4.1.orig/krec/pics/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/krec/pics/Makefile.in	2005-05-24 23:53:58.724306421 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/krec/pics/Makefile.in kdemultimedia-3.4.1/krec/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/krec/pics/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/krec/pics/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10586,9 +12109,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/kscd/bitmaps/Makefile.in kdemultimedia-3.4.1/kscd/bitmaps/Makefile.in
---- kdemultimedia-3.4.1.orig/kscd/bitmaps/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/kscd/bitmaps/Makefile.in	2005-05-24 23:53:58.787300709 +0200
+@@ -640,24 +643,24 @@
+ 
+ #>+ 20
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes
+-	$(INSTALL_DATA) $(srcdir)/cr32-mime-krec_fileempty.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
+-	$(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/actions/krec_record.png
++	$(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes
+ 	$(INSTALL_DATA) $(srcdir)/cr32-mime-krec_fileplay.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileplay.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-krec_filerec.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_filerec.png
++	$(INSTALL_DATA) $(srcdir)/cr32-mime-krec_fileempty.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions/krec_record.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-mime-krec_filerec.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_filerec.png
++	$(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/cr22-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
+-	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
+ 	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/actions/krec_record.png
+ 	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileplay.png
+-	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions/krec_record.png
+ 	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_filerec.png
++	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
++	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions/krec_record.png
++	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdemultimedia-3.4.1.orig/kscd/bitmaps/Makefile.in kdemultimedia-3.4.1/kscd/bitmaps/Makefile.in
+--- kdemultimedia-3.4.1.orig/kscd/bitmaps/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/kscd/bitmaps/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10620,9 +12176,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/kscd/kscdmagic/Makefile.in kdemultimedia-3.4.1/kscd/kscdmagic/Makefile.in
---- kdemultimedia-3.4.1.orig/kscd/kscdmagic/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/kscd/kscdmagic/Makefile.in	2005-05-24 23:53:58.798299711 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kscd/kscdmagic/Makefile.in kdemultimedia-3.4.1/kscd/kscdmagic/Makefile.in
+--- kdemultimedia-3.4.1.orig/kscd/kscdmagic/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/kscd/kscdmagic/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -265,6 +265,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10654,9 +12210,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/kscd/libwm/audio/Makefile.in kdemultimedia-3.4.1/kscd/libwm/audio/Makefile.in
---- kdemultimedia-3.4.1.orig/kscd/libwm/audio/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/kscd/libwm/audio/Makefile.in	2005-05-24 23:53:58.819297807 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kscd/libwm/audio/Makefile.in kdemultimedia-3.4.1/kscd/libwm/audio/Makefile.in
+--- kdemultimedia-3.4.1.orig/kscd/libwm/audio/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/kscd/libwm/audio/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -227,6 +227,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10688,9 +12244,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/kscd/libwm/Makefile.in kdemultimedia-3.4.1/kscd/libwm/Makefile.in
---- kdemultimedia-3.4.1.orig/kscd/libwm/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/kscd/libwm/Makefile.in	2005-05-24 23:53:58.810298623 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kscd/libwm/Makefile.in kdemultimedia-3.4.1/kscd/libwm/Makefile.in
+--- kdemultimedia-3.4.1.orig/kscd/libwm/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/kscd/libwm/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -258,6 +258,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10722,9 +12278,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/kscd/Makefile.in kdemultimedia-3.4.1/kscd/Makefile.in
---- kdemultimedia-3.4.1.orig/kscd/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/kscd/Makefile.in	2005-05-24 23:53:58.780301344 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/kscd/Makefile.in kdemultimedia-3.4.1/kscd/Makefile.in
+--- kdemultimedia-3.4.1.orig/kscd/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/kscd/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -282,6 +282,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10756,9 +12312,52 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/libkcddb/kcmcddb/Makefile.in kdemultimedia-3.4.1/libkcddb/kcmcddb/Makefile.in
---- kdemultimedia-3.4.1.orig/libkcddb/kcmcddb/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/libkcddb/kcmcddb/Makefile.in	2005-05-24 23:53:58.856294453 +0200
+@@ -1173,7 +1176,7 @@
+ 	-rm -f  bwlednum.moc kscd.moc docking.moc ledlamp.moc configWidget.moc kvolumecontrol.moc cddbdlg.moc
+ 
+ #>+ 2
+-KDE_DIST=cr48-app-kscd.png audiocd_play.desktop panel.ui prefs.kcfgc CDQuery.txt kscd.desktop Makefile.in cr128-app-kscd.png xmcd.desktop configWidgetUI.ui kscd-script kscd.lsm cr16-app-kscd.png cddaslave.c kscd.kcfg cr64-app-kscd.png cr22-action-cdsmall.png workman2cddb.pl kscd.profile.xml configure.in.in cddbdlg.h cr32-app-kscd.png Makefile.am 
++KDE_DIST=cr48-app-kscd.png audiocd_play.desktop prefs.kcfgc panel.ui CDQuery.txt kscd.desktop Makefile.in cr128-app-kscd.png xmcd.desktop configWidgetUI.ui kscd-script kscd.lsm cr16-app-kscd.png cddaslave.c kscd.kcfg cr64-app-kscd.png cr22-action-cdsmall.png workman2cddb.pl kscd.profile.xml configure.in.in cddbdlg.h cr32-app-kscd.png Makefile.am 
+ 
+ #>+ 4
+ clean-idl:
+@@ -1198,24 +1201,24 @@
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-cdsmall.png $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscd.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscd.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscd.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscd.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscd.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscd.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscd.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscd.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdemultimedia-3.4.1.orig/libkcddb/kcmcddb/Makefile.in kdemultimedia-3.4.1/libkcddb/kcmcddb/Makefile.in
+--- kdemultimedia-3.4.1.orig/libkcddb/kcmcddb/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/libkcddb/kcmcddb/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -249,6 +249,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10790,9 +12389,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/libkcddb/Makefile.in kdemultimedia-3.4.1/libkcddb/Makefile.in
---- kdemultimedia-3.4.1.orig/libkcddb/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/libkcddb/Makefile.in	2005-05-24 23:53:58.843295631 +0200
+@@ -886,7 +889,7 @@
+ 	-rm -f  cddbconfigwidget.moc kcmcddb.moc
+ 
+ #>+ 2
+-KDE_DIST=cddbconfigwidget.h Makefile.in kcmcddb-emailsettings.upd libkcddb.desktop kcmcddb.h cddbconfigwidgetbase.ui Makefile.am 
++KDE_DIST=cddbconfigwidget.h Makefile.in kcmcddb-emailsettings.upd libkcddb.desktop cddbconfigwidgetbase.ui kcmcddb.h Makefile.am 
+ 
+ #>+ 4
+ clean-ui:
+diff -Nrua kdemultimedia-3.4.1.orig/libkcddb/Makefile.in kdemultimedia-3.4.1/libkcddb/Makefile.in
+--- kdemultimedia-3.4.1.orig/libkcddb/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/libkcddb/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -276,6 +276,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10824,9 +12432,72 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/libkcddb/test/Makefile.in kdemultimedia-3.4.1/libkcddb/test/Makefile.in
---- kdemultimedia-3.4.1.orig/libkcddb/test/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/libkcddb/test/Makefile.in	2005-05-24 23:53:58.877292549 +0200
+@@ -1010,32 +1013,32 @@
+ .NOEXPORT:
+ 
+ #>+ 3
+-httplookup.moc: $(srcdir)/httplookup.h
+-	$(MOC) $(srcdir)/httplookup.h -o httplookup.moc
++client.moc: $(srcdir)/client.h
++	$(MOC) $(srcdir)/client.h -o client.moc
+ 
+ #>+ 2
+-mocs: httplookup.moc
++mocs: client.moc
+ 
+ #>+ 3
+-asynccddbplookup.moc: $(srcdir)/asynccddbplookup.h
+-	$(MOC) $(srcdir)/asynccddbplookup.h -o asynccddbplookup.moc
++httplookup.moc: $(srcdir)/httplookup.h
++	$(MOC) $(srcdir)/httplookup.h -o httplookup.moc
+ 
+ #>+ 2
+-mocs: asynccddbplookup.moc
++mocs: httplookup.moc
+ 
+ #>+ 3
+-client.moc: $(srcdir)/client.h
+-	$(MOC) $(srcdir)/client.h -o client.moc
++asyncsmtpsubmit.moc: $(srcdir)/asyncsmtpsubmit.h
++	$(MOC) $(srcdir)/asyncsmtpsubmit.h -o asyncsmtpsubmit.moc
+ 
+ #>+ 2
+-mocs: client.moc
++mocs: asyncsmtpsubmit.moc
+ 
+ #>+ 3
+-asyncsmtpsubmit.moc: $(srcdir)/asyncsmtpsubmit.h
+-	$(MOC) $(srcdir)/asyncsmtpsubmit.h -o asyncsmtpsubmit.moc
++asynccddbplookup.moc: $(srcdir)/asynccddbplookup.h
++	$(MOC) $(srcdir)/asynccddbplookup.h -o asynccddbplookup.moc
+ 
+ #>+ 2
+-mocs: asyncsmtpsubmit.moc
++mocs: asynccddbplookup.moc
+ 
+ #>+ 3
+ asynchttplookup.moc: $(srcdir)/asynchttplookup.h
+@@ -1053,7 +1056,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  httplookup.moc asynccddbplookup.moc client.moc asyncsmtpsubmit.moc asynchttplookup.moc asynchttpsubmit.moc
++	-rm -f  client.moc httplookup.moc asyncsmtpsubmit.moc asynccddbplookup.moc asynchttplookup.moc asynchttpsubmit.moc
+ 
+ #>+ 2
+ KDE_DIST=categories.h httplookup.h configbase.kcfgc asynccddbplookup.h asynchttplookup.h synchttplookup.h asyncsmtpsubmit.h genres.h Makefile.in lookup.h sites.h libkcddb.kcfg cdinfodialogbase.ui.h smtpsubmit.h asynchttpsubmit.h httpsubmit.h synchttpsubmit.h submit.h cdinfodialogbase.ui cddbplookup.h synccddbplookup.h syncsmtpsubmit.h Makefile.am 
+@@ -1110,7 +1113,7 @@
+ 
+ 
+ #>+ 11
+-libkcddb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cache.cpp $(srcdir)/cdinfo.cpp $(srcdir)/config.cpp $(srcdir)/client.cpp $(srcdir)/cddb.cpp $(srcdir)/lookup.cpp $(srcdir)/cddbplookup.cpp $(srcdir)/synccddbplookup.cpp $(srcdir)/asynccddbplookup.cpp $(srcdir)/httplookup.cpp $(srcdir)/synchttplookup.cpp $(srcdir)/asynchttplookup.cpp $(srcdir)/smtpsubmit.cpp $(srcdir)/asyncsmtpsubmit.cpp $(srcdir)/syncsmtpsubmit.cpp $(srcdir)/submit.cpp $(srcdir)/sites.cpp $(srcdir)/httpsubmit.cpp $(srcdir)/asynchttpsubmit.cpp $(srcdir)/synchttpsubmit.cpp $(srcdir)/categories.cpp $(srcdir)/genres.cpp cdinfodialogbase.cpp configbase.cpp  asyncsmtpsubmit.moc client.moc asynccddbplookup.moc httplookup.moc cdinfodialogbase.moc asynchttpsubmit.moc asynchttplookup.moc
++libkcddb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cache.cpp $(srcdir)/cdinfo.cpp $(srcdir)/config.cpp $(srcdir)/client.cpp $(srcdir)/cddb.cpp $(srcdir)/lookup.cpp $(srcdir)/cddbplookup.cpp $(srcdir)/synccddbplookup.cpp $(srcdir)/asynccddbplookup.cpp $(srcdir)/httplookup.cpp $(srcdir)/synchttplookup.cpp $(srcdir)/asynchttplookup.cpp $(srcdir)/smtpsubmit.cpp $(srcdir)/asyncsmtpsubmit.cpp $(srcdir)/syncsmtpsubmit.cpp $(srcdir)/submit.cpp $(srcdir)/sites.cpp $(srcdir)/httpsubmit.cpp $(srcdir)/asynchttpsubmit.cpp $(srcdir)/synchttpsubmit.cpp $(srcdir)/categories.cpp $(srcdir)/genres.cpp cdinfodialogbase.cpp configbase.cpp  asynccddbplookup.moc asyncsmtpsubmit.moc httplookup.moc client.moc cdinfodialogbase.moc asynchttpsubmit.moc asynchttplookup.moc
+ 	@echo 'creating libkcddb_la.all_cpp.cpp ...'; \
+ 	rm -f libkcddb_la.all_cpp.files libkcddb_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkcddb_la.all_cpp.final; \
+diff -Nrua kdemultimedia-3.4.1.orig/libkcddb/test/Makefile.in kdemultimedia-3.4.1/libkcddb/test/Makefile.in
+--- kdemultimedia-3.4.1.orig/libkcddb/test/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/libkcddb/test/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -299,6 +299,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10858,9 +12529,39 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -rua kdemultimedia-3.4.1.orig/Makefile.in kdemultimedia-3.4.1/Makefile.in
---- kdemultimedia-3.4.1.orig/Makefile.in	2005-05-23 18:04:31.000000000 +0200
-+++ kdemultimedia-3.4.1/Makefile.in	2005-05-24 23:53:57.469420212 +0200
+@@ -899,22 +902,22 @@
+ mocs: asynccddblookuptest.moc
+ 
+ #>+ 3
+-asynchttplookuptest.moc: $(srcdir)/asynchttplookuptest.h
+-	$(MOC) $(srcdir)/asynchttplookuptest.h -o asynchttplookuptest.moc
++asyncsmtpsubmittest.moc: $(srcdir)/asyncsmtpsubmittest.h
++	$(MOC) $(srcdir)/asyncsmtpsubmittest.h -o asyncsmtpsubmittest.moc
+ 
+ #>+ 2
+-mocs: asynchttplookuptest.moc
++mocs: asyncsmtpsubmittest.moc
+ 
+ #>+ 3
+-asyncsmtpsubmittest.moc: $(srcdir)/asyncsmtpsubmittest.h
+-	$(MOC) $(srcdir)/asyncsmtpsubmittest.h -o asyncsmtpsubmittest.moc
++asynchttplookuptest.moc: $(srcdir)/asynchttplookuptest.h
++	$(MOC) $(srcdir)/asynchttplookuptest.h -o asynchttplookuptest.moc
+ 
+ #>+ 2
+-mocs: asyncsmtpsubmittest.moc
++mocs: asynchttplookuptest.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  asynchttpsubmittest.moc asynccddblookuptest.moc asynchttplookuptest.moc asyncsmtpsubmittest.moc
++	-rm -f  asynchttpsubmittest.moc asynccddblookuptest.moc asyncsmtpsubmittest.moc asynchttplookuptest.moc
+ 
+ #>+ 2
+ KDE_DIST=asynccddblookuptest.h asynchttplookuptest.h asyncsmtpsubmittest.h Makefile.in asynchttpsubmittest.h Makefile.am 
+diff -Nrua kdemultimedia-3.4.1.orig/Makefile.in kdemultimedia-3.4.1/Makefile.in
+--- kdemultimedia-3.4.1.orig/Makefile.in	2005-05-23 12:04:31.000000000 -0400
++++ kdemultimedia-3.4.1/Makefile.in	2005-05-31 15:25:23.000000000 -0400
 @@ -233,6 +233,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10909,13 +12610,13 @@
  
  #>+ 2
 -KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in aclocal.m4 configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in 
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
  
  #>+ 2
  docs-am:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/cddaplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/cddaplay/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/cddaplay/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/cddaplay/Makefile.in	2005-05-24 23:53:58.901290372 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/cddaplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/cddaplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/cddaplay/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/cddaplay/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -239,6 +239,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10947,9 +12648,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/Makefile.in kdemultimedia-3.4.1/mpeglib/example/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/Makefile.in	2005-05-24 23:53:58.892291188 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/Makefile.in kdemultimedia-3.4.1/mpeglib/example/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10981,9 +12682,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/mpgplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/mpgplay/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/mpgplay/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/mpgplay/Makefile.in	2005-05-24 23:53:58.910289556 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/mpgplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/mpgplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/mpgplay/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/mpgplay/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -239,6 +239,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11015,9 +12716,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/splay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/splay/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/splay/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/splay/Makefile.in	2005-05-24 23:53:58.920288650 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/splay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/splay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/splay/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/splay/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -244,6 +244,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11049,9 +12750,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/tplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/tplay/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/tplay/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/tplay/Makefile.in	2005-05-24 23:53:58.929287834 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/tplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/tplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/tplay/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/tplay/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -239,6 +239,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11083,9 +12784,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/yaf/Makefile.in	2005-05-24 23:53:58.938287018 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -218,6 +218,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11117,9 +12818,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafcdda/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafcdda/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafcdda/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafcdda/Makefile.in	2005-05-24 23:53:58.947286202 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafcdda/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafcdda/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafcdda/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafcdda/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -243,6 +243,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11151,9 +12852,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafcore/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafcore/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafcore/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafcore/Makefile.in	2005-05-24 23:53:58.959285114 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafcore/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafcore/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafcore/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafcore/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -256,6 +256,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11185,9 +12886,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafmpgplay/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafmpgplay/Makefile.in	2005-05-24 23:53:58.968284298 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafmpgplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafmpgplay/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -243,6 +243,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11219,9 +12920,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafsplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafsplay/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafsplay/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafsplay/Makefile.in	2005-05-24 23:53:58.978283391 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafsplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafsplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafsplay/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafsplay/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -243,6 +243,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11253,9 +12954,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yaftplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yaftplay/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yaftplay/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/yaf/yaftplay/Makefile.in	2005-05-24 23:53:58.987282575 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yaftplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yaftplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yaftplay/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yaftplay/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -243,6 +243,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11287,9 +12988,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafvorbis/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafvorbis/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafvorbis/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafvorbis/Makefile.in	2005-05-24 23:53:58.996281759 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafvorbis/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafvorbis/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafvorbis/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafvorbis/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -243,6 +243,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11321,9 +13022,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafxplayer/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafxplayer/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafxplayer/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafxplayer/Makefile.in	2005-05-24 23:53:59.007280761 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafxplayer/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafxplayer/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafxplayer/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafxplayer/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -255,6 +255,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11355,9 +13056,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafyuv/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafyuv/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafyuv/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafyuv/Makefile.in	2005-05-24 23:53:59.016279945 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafyuv/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafyuv/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafyuv/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafyuv/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -243,6 +243,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11389,9 +13090,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/decoder/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/decoder/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/decoder/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/decoder/Makefile.in	2005-05-24 23:53:59.044277407 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/decoder/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/decoder/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/decoder/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/decoder/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -252,6 +252,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11423,9 +13124,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/frame/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/frame/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/frame/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/frame/Makefile.in	2005-05-24 23:53:59.061275865 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/frame/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/frame/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/frame/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/frame/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -252,6 +252,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11457,9 +13158,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/input/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/input/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/input/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/input/Makefile.in	2005-05-24 23:53:59.079274233 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/input/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/input/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/input/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/input/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -258,6 +258,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11491,9 +13192,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/Makefile.in	2005-05-24 23:53:59.027278948 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -263,6 +263,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11525,9 +13226,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/mpegplay/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/mpegplay/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/mpegplay/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/mpegplay/Makefile.in	2005-05-24 23:53:59.101272238 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/mpegplay/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/mpegplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/mpegplay/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/mpegplay/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -273,6 +273,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11559,9 +13260,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/mpgplayer/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/mpgplayer/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/mpgplayer/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/mpgplayer/Makefile.in	2005-05-24 23:53:59.113271150 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/mpgplayer/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/mpgplayer/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/mpgplayer/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/mpgplayer/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -245,6 +245,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11593,9 +13294,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/oggvorbis/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/oggvorbis/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/oggvorbis/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/oggvorbis/Makefile.in	2005-05-24 23:53:59.123270244 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/oggvorbis/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/oggvorbis/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/oggvorbis/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/oggvorbis/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -250,6 +250,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11627,9 +13328,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/output/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/output/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/output/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/output/Makefile.in	2005-05-24 23:53:59.135269156 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/output/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/output/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/output/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/output/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -256,6 +256,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11661,9 +13362,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/splay/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/splay/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/splay/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/splay/Makefile.in	2005-05-24 23:53:59.147268068 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/splay/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/splay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/splay/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/splay/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -258,6 +258,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11695,9 +13396,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/tplay/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/tplay/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/tplay/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/tplay/Makefile.in	2005-05-24 23:53:59.157267161 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/tplay/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/tplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/tplay/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/tplay/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -240,6 +240,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11729,9 +13430,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/abstract/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/abstract/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/util/abstract/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/util/abstract/Makefile.in	2005-05-24 23:53:59.178265257 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/util/abstract/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/abstract/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/abstract/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/util/abstract/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11763,9 +13464,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/audio/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/audio/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/util/audio/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/util/audio/Makefile.in	2005-05-24 23:53:59.188264350 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/util/audio/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/audio/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/audio/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/util/audio/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -240,6 +240,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11797,9 +13498,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/file/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/file/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/util/file/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/util/file/Makefile.in	2005-05-24 23:53:59.198263443 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/util/file/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/file/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/file/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/util/file/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -245,6 +245,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11831,9 +13532,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/util/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/util/Makefile.in	2005-05-24 23:53:59.168266164 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/util/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/util/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -266,6 +266,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11865,9 +13566,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/mmx/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/mmx/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/util/mmx/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/util/mmx/Makefile.in	2005-05-24 23:53:59.208262537 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/util/mmx/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/mmx/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/mmx/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/util/mmx/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -241,6 +241,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11899,9 +13600,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/dither/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/dither/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/dither/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/util/render/dither/Makefile.in	2005-05-24 23:53:59.230260542 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/dither/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/dither/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/dither/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/util/render/dither/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -246,6 +246,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11933,9 +13634,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/dither2YUV/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/util/render/dither2YUV/Makefile.in	2005-05-24 23:53:59.241259545 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/dither2YUV/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/util/render/dither2YUV/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11967,9 +13668,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/util/render/Makefile.in	2005-05-24 23:53:59.220261449 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/util/render/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -266,6 +266,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12001,9 +13702,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/sdl/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/sdl/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/sdl/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/util/render/sdl/Makefile.in	2005-05-24 23:53:59.250258729 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/sdl/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/sdl/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/sdl/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/util/render/sdl/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -240,6 +240,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12035,9 +13736,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/x11/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/x11/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/x11/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/util/render/x11/Makefile.in	2005-05-24 23:53:59.260257822 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/x11/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/x11/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/x11/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/util/render/x11/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12069,9 +13770,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/yuv/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/yuv/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/lib/yuv/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/lib/yuv/Makefile.in	2005-05-24 23:53:59.270256915 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/lib/yuv/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/yuv/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/yuv/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/lib/yuv/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -245,6 +245,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12103,9 +13804,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib/Makefile.in kdemultimedia-3.4.1/mpeglib/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib/Makefile.in	2005-05-24 23:53:58.885291823 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib/Makefile.in kdemultimedia-3.4.1/mpeglib/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib/Makefile.in	2005-05-31 15:25:27.000000000 -0400
 @@ -219,6 +219,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12137,9 +13838,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/mpeglib_artsplug/Makefile.in kdemultimedia-3.4.1/mpeglib_artsplug/Makefile.in
---- kdemultimedia-3.4.1.orig/mpeglib_artsplug/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpeglib_artsplug/Makefile.in	2005-05-24 23:53:59.285255555 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpeglib_artsplug/Makefile.in kdemultimedia-3.4.1/mpeglib_artsplug/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib_artsplug/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpeglib_artsplug/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -286,6 +286,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12171,9 +13872,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/mpg123_artsplugin/Makefile.in kdemultimedia-3.4.1/mpg123_artsplugin/Makefile.in
---- kdemultimedia-3.4.1.orig/mpg123_artsplugin/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpg123_artsplugin/Makefile.in	2005-05-24 23:53:59.299254286 +0200
+@@ -1017,7 +1020,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=CDDAPlayObject.mcopclass OGGPlayObject.mcopclass MP3PlayObject.mcopclass Makefile.in NULLPlayObject.mcopclass SplayPlayObject.mcopclass WAVPlayObject.mcopclass MPGPlayObject.mcopclass VCDPlayObject.mcopclass Makefile.am 
++KDE_DIST=CDDAPlayObject.mcopclass OGGPlayObject.mcopclass MP3PlayObject.mcopclass Makefile.in NULLPlayObject.mcopclass SplayPlayObject.mcopclass WAVPlayObject.mcopclass MPGPlayObject.mcopclass Makefile.am VCDPlayObject.mcopclass 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdemultimedia-3.4.1.orig/mpg123_artsplugin/Makefile.in kdemultimedia-3.4.1/mpg123_artsplugin/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpg123_artsplugin/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpg123_artsplugin/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -277,6 +277,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12205,9 +13915,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/mpg123_artsplugin/mpg123/Makefile.in kdemultimedia-3.4.1/mpg123_artsplugin/mpg123/Makefile.in
---- kdemultimedia-3.4.1.orig/mpg123_artsplugin/mpg123/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/mpg123_artsplugin/mpg123/Makefile.in	2005-05-24 23:53:59.319252472 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/mpg123_artsplugin/mpg123/Makefile.in kdemultimedia-3.4.1/mpg123_artsplugin/mpg123/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpg123_artsplugin/mpg123/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/mpg123_artsplugin/mpg123/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -314,6 +314,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12239,9 +13949,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/app/Makefile.in kdemultimedia-3.4.1/noatun/app/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/app/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/app/Makefile.in	2005-05-24 23:53:59.345250115 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/app/Makefile.in kdemultimedia-3.4.1/noatun/app/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/app/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/app/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -257,6 +257,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12273,9 +13983,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/library/Makefile.in kdemultimedia-3.4.1/noatun/library/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/library/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/library/Makefile.in	2005-05-24 23:53:59.423243043 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/library/Makefile.in kdemultimedia-3.4.1/noatun/library/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/library/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/library/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -300,6 +300,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12307,9 +14017,77 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/library/noatun/Makefile.in kdemultimedia-3.4.1/noatun/library/noatun/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/library/noatun/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/library/noatun/Makefile.in	2005-05-24 23:53:59.431242317 +0200
+@@ -1101,18 +1104,18 @@
+ mocs: mimetypetree.moc
+ 
+ #>+ 3
+-cmodule.moc: $(srcdir)/cmodule.h
+-	$(MOC) $(srcdir)/cmodule.h -o cmodule.moc
++pluginmodule.moc: $(srcdir)/pluginmodule.h
++	$(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
+ 
+ #>+ 2
+-mocs: cmodule.moc
++mocs: pluginmodule.moc
+ 
+ #>+ 3
+-pluginmodule.moc: $(srcdir)/pluginmodule.h
+-	$(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
++cmodule.moc: $(srcdir)/cmodule.h
++	$(MOC) $(srcdir)/cmodule.h -o cmodule.moc
+ 
+ #>+ 2
+-mocs: pluginmodule.moc
++mocs: cmodule.moc
+ 
+ #>+ 3
+ vequalizer.moc: $(srcdir)/noatun/vequalizer.h
+@@ -1206,18 +1209,18 @@
+ mocs: playlist.moc
+ 
+ #>+ 3
+-engine.moc: $(srcdir)/noatun/engine.h
+-	$(MOC) $(srcdir)/noatun/engine.h -o engine.moc
++plugin_deps.moc: $(srcdir)/plugin_deps.h
++	$(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
+ 
+ #>+ 2
+-mocs: engine.moc
++mocs: plugin_deps.moc
+ 
+ #>+ 3
+-plugin_deps.moc: $(srcdir)/plugin_deps.h
+-	$(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
++engine.moc: $(srcdir)/noatun/engine.h
++	$(MOC) $(srcdir)/noatun/engine.h -o engine.moc
+ 
+ #>+ 2
+-mocs: plugin_deps.moc
++mocs: engine.moc
+ 
+ #>+ 3
+ effectview.moc: $(srcdir)/effectview.h
+@@ -1251,7 +1254,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  downloader.moc stdaction.moc mimetypetree.moc cmodule.moc pluginmodule.moc vequalizer.moc titleproxy.moc controls.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc globalvideo.moc equalizer.moc playlist.moc engine.moc plugin_deps.moc effectview.moc equalizerview.moc scrollinglabel.moc
++	-rm -f  downloader.moc stdaction.moc mimetypetree.moc pluginmodule.moc cmodule.moc vequalizer.moc titleproxy.moc controls.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc globalvideo.moc equalizer.moc playlist.moc plugin_deps.moc engine.moc effectview.moc equalizerview.moc scrollinglabel.moc
+ 
+ #>+ 2
+ KDE_DIST=pluginmodule.h noatunlistview.h Makefile.in titleproxy.h equalizerwidget.ui spline.h globalvideo.h Makefile.am 
+@@ -1307,7 +1310,7 @@
+ 
+ 
+ #>+ 11
+-libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp $(srcdir)/vequalizer.cpp $(srcdir)/spline.cpp $(srcdir)/titleproxy.cpp equalizerwidget.cpp  downloader.moc stdaction.moc mimetypetree.moc pluginmodule.moc cmodule.moc vequalizer.moc titleproxy.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc equalizer.moc globalvideo.moc playlist.moc equalizerwidget.moc plugin_deps.moc engine.moc effectview.moc equalizerview.moc
++libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp $(srcdir)/vequalizer.cpp $(srcdir)/spline.cpp $(srcdir)/titleproxy.cpp equalizerwidget.cpp  downloader.moc stdaction.moc mimetypetree.moc cmodule.moc pluginmodule.moc vequalizer.moc titleproxy.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc equalizer.moc globalvideo.moc playlist.moc equalizerwidget.moc engine.moc plugin_deps.moc effectview.moc equalizerview.moc
+ 	@echo 'creating libnoatun_la.all_cpp.cpp ...'; \
+ 	rm -f libnoatun_la.all_cpp.files libnoatun_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libnoatun_la.all_cpp.final; \
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/library/noatun/Makefile.in kdemultimedia-3.4.1/noatun/library/noatun/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/library/noatun/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/library/noatun/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -213,6 +213,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12341,9 +14119,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/library/noatunarts/Makefile.in kdemultimedia-3.4.1/noatun/library/noatunarts/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/library/noatunarts/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/library/noatunarts/Makefile.in	2005-05-24 23:53:59.443241229 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/library/noatunarts/Makefile.in kdemultimedia-3.4.1/noatun/library/noatunarts/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/library/noatunarts/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/library/noatunarts/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -261,6 +261,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12375,9 +14153,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/library/noatuntags/Makefile.in kdemultimedia-3.4.1/noatun/library/noatuntags/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/library/noatuntags/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/library/noatuntags/Makefile.in	2005-05-24 23:53:59.454240232 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/library/noatuntags/Makefile.in kdemultimedia-3.4.1/noatun/library/noatuntags/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/library/noatuntags/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/library/noatuntags/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -245,6 +245,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12409,9 +14187,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/Makefile.in kdemultimedia-3.4.1/noatun/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/Makefile.in	2005-05-24 23:53:59.332251294 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/Makefile.in kdemultimedia-3.4.1/noatun/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/Makefile.in	2005-05-31 15:25:28.000000000 -0400
+@@ -41,7 +41,7 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-update_PROGRAMS = noatun20update$(EXEEXT)
++kconf_PROGRAMS = noatun20update$(EXEEXT)
+ subdir = noatun
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING TODO
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -52,10 +52,10 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(presetsdir)" \
++am__installdirs = "$(DESTDIR)$(kconfdir)" "$(DESTDIR)$(presetsdir)" \
+ 	"$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_appsdir)"
+-updatePROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(update_PROGRAMS)
++kconfPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++PROGRAMS = $(kconf_PROGRAMS)
+ am_noatun20update_OBJECTS = noatun20update.$(OBJEXT)
+ #>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS)
+ #>+ 1
 @@ -262,6 +262,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12422,7 +14223,15 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -522,7 +525,7 @@
+@@ -513,6 +516,7 @@
+ presets_DATA = preset.dance preset.jazz preset.metal preset.trance preset.zero
+ updatedir = $(kde_datadir)/kconf_update
+ update_DATA = noatun.upd
++kconfdir = $(libdir)/kconf_update_bin
+ noatun20update_SOURCES = noatun20update.cpp
+ noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ noatun20update_LDADD = $(LIB_QT)
+@@ -522,7 +526,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12431,7 +14240,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -560,9 +563,9 @@
+@@ -560,34 +564,34 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12441,11 +14250,167 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-updatePROGRAMS: $(update_PROGRAMS)
+-install-updatePROGRAMS: $(update_PROGRAMS)
++install-kconfPROGRAMS: $(kconf_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/artseffects/Makefile.in kdemultimedia-3.4.1/noatun/modules/artseffects/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/artseffects/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/artseffects/Makefile.in	2005-05-24 23:53:59.473238509 +0200
+-	test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+-	@list='$(update_PROGRAMS)'; for p in $$list; do \
++	test -z "$(kconfdir)" || $(mkdir_p) "$(DESTDIR)$(kconfdir)"
++	@list='$(kconf_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(updatePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(updatePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(updatedir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(kconfPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(kconfdir)/$$f'"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(kconfPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(kconfdir)/$$f" || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+-uninstall-updatePROGRAMS:
++uninstall-kconfPROGRAMS:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(update_PROGRAMS)'; for p in $$list; do \
++	@list='$(kconf_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(updatedir)/$$f"; \
++	  echo " rm -f '$(DESTDIR)$(kconfdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kconfdir)/$$f"; \
+ 	done
+ 
+-clean-updatePROGRAMS:
+-	@list='$(update_PROGRAMS)'; for p in $$list; do \
++clean-kconfPROGRAMS:
++	@list='$(kconf_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+@@ -865,7 +869,7 @@
+ all-am: Makefile $(PROGRAMS) $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	for dir in "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(presetsdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_appsdir)"; do \
++	for dir in "$(DESTDIR)$(kconfdir)" "$(DESTDIR)$(presetsdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_appsdir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+ install: install-recursive
+@@ -896,10 +900,10 @@
+ #>+ 1
+ clean: kde-rpo-clean  clean-recursive
+ 
+-#>- clean-am: clean-generic clean-libtool clean-updatePROGRAMS \
++#>- clean-am: clean-generic clean-kconfPROGRAMS clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-bcheck  clean-generic clean-libtool clean-updatePROGRAMS \
++clean-am: clean-bcheck  clean-generic clean-kconfPROGRAMS clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-recursive
+@@ -918,11 +922,11 @@
+ 
+ info-am:
+ 
+-#>- install-data-am: install-presetsDATA install-updateDATA \
+-#>- 	install-updatePROGRAMS install-xdg_appsDATA
++#>- install-data-am: install-kconfPROGRAMS install-presetsDATA \
++#>- 	install-updateDATA install-xdg_appsDATA
+ #>+ 2
+-install-data-am: install-kde-icons  install-presetsDATA install-updateDATA \
+-	install-updatePROGRAMS install-xdg_appsDATA
++install-data-am: install-kde-icons  install-kconfPROGRAMS install-presetsDATA \
++	install-updateDATA install-xdg_appsDATA
+ 
+ install-exec-am:
+ 
+@@ -950,32 +954,33 @@
+ 
+ ps-am:
+ 
+-#>- uninstall-am: uninstall-info-am uninstall-presetsDATA \
+-#>- 	uninstall-updateDATA uninstall-updatePROGRAMS \
++#>- uninstall-am: uninstall-info-am uninstall-kconfPROGRAMS \
++#>- 	uninstall-presetsDATA uninstall-updateDATA \
+ #>- 	uninstall-xdg_appsDATA
+ #>+ 3
+-uninstall-am: uninstall-kde-icons  uninstall-info-am uninstall-presetsDATA \
+-	uninstall-updateDATA uninstall-updatePROGRAMS \
++uninstall-am: uninstall-kde-icons  uninstall-info-am uninstall-kconfPROGRAMS \
++	uninstall-presetsDATA uninstall-updateDATA \
+ 	uninstall-xdg_appsDATA
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-libtool clean-recursive \
+-	clean-updatePROGRAMS ctags ctags-recursive distclean \
++	clean clean-generic clean-kconfPROGRAMS clean-libtool \
++	clean-recursive ctags ctags-recursive distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-recursive distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+ 	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-presetsDATA install-strip \
+-	install-updateDATA install-updatePROGRAMS install-xdg_appsDATA \
+-	installcheck installcheck-am installdirs installdirs-am \
+-	maintainer-clean maintainer-clean-generic \
++	install-info-am install-kconfPROGRAMS install-man \
++	install-presetsDATA install-strip install-updateDATA \
++	install-xdg_appsDATA installcheck installcheck-am installdirs \
++	installdirs-am maintainer-clean maintainer-clean-generic \
+ 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+-	uninstall-info-am uninstall-presetsDATA uninstall-updateDATA \
+-	uninstall-updatePROGRAMS uninstall-xdg_appsDATA
++	uninstall-info-am uninstall-kconfPROGRAMS \
++	uninstall-presetsDATA uninstall-updateDATA \
++	uninstall-xdg_appsDATA
+ 
+ 
+ messages:
+@@ -1000,26 +1005,26 @@
+ 
+ #>+ 22
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/noatun.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/noatun.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/noatun.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/noatun.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/noatun.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/noatun.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/noatun.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/cr22-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/noatun.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/noatun.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/noatun.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/noatun.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/noatun.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/noatun.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/noatun.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/artseffects/Makefile.in kdemultimedia-3.4.1/noatun/modules/artseffects/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/artseffects/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/artseffects/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12477,9 +14442,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/dcopiface/Makefile.in kdemultimedia-3.4.1/noatun/modules/dcopiface/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/dcopiface/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/dcopiface/Makefile.in	2005-05-24 23:53:59.485237421 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/dcopiface/Makefile.in kdemultimedia-3.4.1/noatun/modules/dcopiface/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/dcopiface/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/dcopiface/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -252,6 +252,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12511,9 +14476,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/excellent/Makefile.in kdemultimedia-3.4.1/noatun/modules/excellent/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/excellent/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/excellent/Makefile.in	2005-05-24 23:53:59.498236242 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/excellent/Makefile.in kdemultimedia-3.4.1/noatun/modules/excellent/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/excellent/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/excellent/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -253,6 +253,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12545,9 +14510,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/htmlexport/Makefile.in kdemultimedia-3.4.1/noatun/modules/htmlexport/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/htmlexport/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/htmlexport/Makefile.in	2005-05-24 23:53:59.511235064 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/htmlexport/Makefile.in kdemultimedia-3.4.1/noatun/modules/htmlexport/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/htmlexport/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/htmlexport/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -249,6 +249,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12579,9 +14544,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/infrared/Makefile.in kdemultimedia-3.4.1/noatun/modules/infrared/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/infrared/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/infrared/Makefile.in	2005-05-24 23:53:59.525233794 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/infrared/Makefile.in kdemultimedia-3.4.1/noatun/modules/infrared/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/infrared/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/infrared/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -252,6 +252,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12613,9 +14578,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/kaiman/Makefile.in	2005-05-24 23:53:59.564230258 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/kaiman/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -268,6 +268,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12647,9 +14612,58 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/skins/car-preset/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/kaiman/skins/car-preset/Makefile.in	2005-05-24 23:53:59.579228898 +0200
+@@ -983,22 +986,22 @@
+ mocs: userinterface.moc
+ 
+ #>+ 3
+-style.moc: $(srcdir)/style.h
+-	$(MOC) $(srcdir)/style.h -o style.moc
++pref.moc: $(srcdir)/pref.h
++	$(MOC) $(srcdir)/pref.h -o pref.moc
+ 
+ #>+ 2
+-mocs: style.moc
++mocs: pref.moc
+ 
+ #>+ 3
+-pref.moc: $(srcdir)/pref.h
+-	$(MOC) $(srcdir)/pref.h -o pref.moc
++style.moc: $(srcdir)/style.h
++	$(MOC) $(srcdir)/style.h -o style.moc
+ 
+ #>+ 2
+-mocs: pref.moc
++mocs: style.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  userinterface.moc style.moc pref.moc
++	-rm -f  userinterface.moc pref.moc style.moc
+ 
+ #>+ 2
+ KDE_DIST=kaimanui.rc Makefile.in kaiman.plugin SKIN-SPECS Makefile.am 
+@@ -1049,7 +1052,7 @@
+ 
+ 
+ #>+ 11
+-noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp  userinterface.moc pref.moc style.moc
++noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp  userinterface.moc style.moc pref.moc
+ 	@echo 'creating noatun_kaiman_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_kaiman_la.all_cpp.files noatun_kaiman_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_kaiman_la.all_cpp.final; \
+@@ -1092,8 +1095,8 @@
+ nmcheck: 
+ userinterface.lo: userinterface.moc 
+ nmcheck-am: nmcheck
+-pref.lo: pref.moc 
+ style.lo: style.moc 
++pref.lo: pref.moc 
+ userinterface.o: userinterface.moc 
+ style.o: style.moc 
+ pref.o: pref.moc 
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/skins/car-preset/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/kaiman/skins/car-preset/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12681,9 +14695,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/circle/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/skins/circle/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/circle/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/kaiman/skins/circle/Makefile.in	2005-05-24 23:53:59.587228173 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/circle/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/skins/circle/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/circle/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/kaiman/skins/circle/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12715,9 +14729,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/k9/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/skins/k9/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/k9/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/kaiman/skins/k9/Makefile.in	2005-05-24 23:53:59.595227448 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/k9/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/skins/k9/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/k9/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/kaiman/skins/k9/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12749,9 +14763,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/skins/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/kaiman/skins/Makefile.in	2005-05-24 23:53:59.571229624 +0200
+@@ -667,7 +670,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=shuffle.jpg next.jpg trans-pos.png play.jpg knine-nfont2.jpg knine-nfont2.png conf.jpg shuffle.png trans-slide.png status.png icon.jpg stop.jpg eject.jpg knine-nfont.png kill.png square.jpg square.png reverse.jpg small-k.jpg skindata Makefile.in mask.png knine-vfont.jpg icon.png status.jpg pause.jpg small-k.png long2.jpg kill.jpg newtext.jpg repeat.png knine-vfont.png pos_item.jpg repeat.jpg newtext.png knine-nfont.jpg knine-normal2.png Makefile.am conf.png knine-normal2.jpg 
++KDE_DIST=shuffle.jpg next.jpg trans-pos.png play.jpg knine-nfont2.jpg knine-nfont2.png conf.jpg shuffle.png trans-slide.png status.png icon.jpg stop.jpg eject.jpg knine-nfont.png kill.png square.jpg square.png reverse.jpg small-k.jpg skindata Makefile.in mask.png knine-vfont.jpg icon.png status.jpg pause.jpg small-k.png long2.jpg kill.jpg newtext.jpg repeat.png knine-vfont.png repeat.jpg pos_item.jpg newtext.png knine-normal2.png knine-nfont.jpg Makefile.am conf.png knine-normal2.jpg 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/skins/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/kaiman/skins/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12783,9 +14806,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/keyz/Makefile.in kdemultimedia-3.4.1/noatun/modules/keyz/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/keyz/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/keyz/Makefile.in	2005-05-24 23:53:59.607226359 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/keyz/Makefile.in kdemultimedia-3.4.1/noatun/modules/keyz/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/keyz/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/keyz/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -249,6 +249,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12817,9 +14840,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/Makefile.in	2005-05-24 23:53:59.629224365 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -274,6 +274,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12851,9 +14874,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in	2005-05-24 23:53:59.636223730 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12885,9 +14908,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in	2005-05-24 23:53:59.652222279 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12919,9 +14942,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/Makefile.in	2005-05-24 23:53:59.644223005 +0200
+@@ -666,7 +669,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=sgpres1.png sgdock.png kjofol.pl sgdock2.png sgvolpos.png sgpitchp.png sgplist2.png kjofol.rc sgdocksk.png sgeq.png kjofol.wsh sgplist.png sgpres3.png sg_text.png sg_seek.bmp kjofol.dck Makefile.in sgpitch.png sgwshvp.png sgwshad2.png sgwshvol.png sgwshad.png sg.png sgvolnum.png sg_num.png sg_seek.png sgpres2.png sgdockvp.png sgvol.png sgwshdsk.png Makefile.am 
++KDE_DIST=sgpres1.png sgdock.png kjofol.pl sgdock2.png sgvolpos.png kjofol.rc sgpitchp.png sgplist2.png sgdocksk.png sgeq.png kjofol.wsh sgplist.png sgpres3.png sg_text.png sg_seek.bmp kjofol.dck Makefile.in sgpitch.png sgwshvp.png sgwshad2.png sgwshvol.png sgwshad.png sg.png sgvolnum.png sg_num.png sg_seek.png sgpres2.png sgdockvp.png sgvol.png sgwshdsk.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12953,9 +14985,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/phong/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/phong/Makefile.in	2005-05-24 23:53:59.659221645 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/phong/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/phong/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12987,9 +15019,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in	2005-05-24 23:53:59.666221010 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13021,9 +15053,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/Makefile.in kdemultimedia-3.4.1/noatun/modules/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/Makefile.in	2005-05-23 18:04:33.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/Makefile.in	2005-05-24 23:53:59.462239507 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/Makefile.in kdemultimedia-3.4.1/noatun/modules/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/Makefile.in	2005-05-23 12:04:33.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/Makefile.in	2005-05-31 15:25:28.000000000 -0400
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13055,9 +15087,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/marquis/Makefile.in kdemultimedia-3.4.1/noatun/modules/marquis/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/marquis/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/marquis/Makefile.in	2005-05-24 23:53:59.678219922 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/marquis/Makefile.in kdemultimedia-3.4.1/noatun/modules/marquis/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/marquis/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/marquis/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -252,6 +252,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13089,9 +15121,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/metatag/Makefile.in kdemultimedia-3.4.1/noatun/modules/metatag/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/metatag/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/metatag/Makefile.in	2005-05-24 23:53:59.692218653 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/metatag/Makefile.in kdemultimedia-3.4.1/noatun/modules/metatag/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/metatag/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/metatag/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -253,6 +253,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13123,9 +15155,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/monoscope/Makefile.in kdemultimedia-3.4.1/noatun/modules/monoscope/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/monoscope/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/monoscope/Makefile.in	2005-05-24 23:53:59.704217564 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/monoscope/Makefile.in kdemultimedia-3.4.1/noatun/modules/monoscope/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/monoscope/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/monoscope/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -249,6 +249,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13157,9 +15189,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/net/Makefile.in kdemultimedia-3.4.1/noatun/modules/net/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/net/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/net/Makefile.in	2005-05-24 23:53:59.715216567 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/net/Makefile.in kdemultimedia-3.4.1/noatun/modules/net/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/net/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/net/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -249,6 +249,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13191,9 +15223,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/noatunui/Makefile.in kdemultimedia-3.4.1/noatun/modules/noatunui/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/noatunui/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/noatunui/Makefile.in	2005-05-24 23:53:59.728215388 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/noatunui/Makefile.in kdemultimedia-3.4.1/noatun/modules/noatunui/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/noatunui/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/noatunui/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -253,6 +253,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13225,9 +15257,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/simple/Makefile.in kdemultimedia-3.4.1/noatun/modules/simple/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/simple/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/simple/Makefile.in	2005-05-24 23:53:59.742214119 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/simple/Makefile.in kdemultimedia-3.4.1/noatun/modules/simple/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/simple/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/simple/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -252,6 +252,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13259,9 +15291,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/splitplaylist/Makefile.in kdemultimedia-3.4.1/noatun/modules/splitplaylist/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/splitplaylist/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/splitplaylist/Makefile.in	2005-05-24 23:53:59.764212124 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/splitplaylist/Makefile.in kdemultimedia-3.4.1/noatun/modules/splitplaylist/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/splitplaylist/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/splitplaylist/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -257,6 +257,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13293,9 +15325,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/systray/Makefile.in kdemultimedia-3.4.1/noatun/modules/systray/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/systray/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/systray/Makefile.in	2005-05-24 23:53:59.780210674 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/systray/Makefile.in kdemultimedia-3.4.1/noatun/modules/systray/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/systray/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/systray/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -254,6 +254,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13327,9 +15359,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/voiceprint/Makefile.in kdemultimedia-3.4.1/noatun/modules/voiceprint/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/voiceprint/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/voiceprint/Makefile.in	2005-05-24 23:53:59.793209495 +0200
+@@ -876,7 +879,7 @@
+ 	-rm -f  kitsystemtray.moc systray.moc cmodule.moc
+ 
+ #>+ 2
+-KDE_DIST=yhconfig.kcfg yhconfig.kcfgc yhconfigwidget.ui systrayui.rc Makefile.in systray.plugin Makefile.am 
++KDE_DIST=yhconfig.kcfg yhconfig.kcfgc systrayui.rc yhconfigwidget.ui Makefile.in systray.plugin Makefile.am 
+ 
+ #>+ 4
+ clean-ui:
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/voiceprint/Makefile.in kdemultimedia-3.4.1/noatun/modules/voiceprint/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/voiceprint/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/voiceprint/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -252,6 +252,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13361,9 +15402,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/winskin/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/winskin/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/winskin/Makefile.in	2005-05-24 23:53:59.823206775 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/winskin/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/winskin/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/winskin/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -273,6 +273,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13395,9 +15436,81 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/mimetypes/interface/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/winskin/mimetypes/interface/Makefile.in	2005-05-24 23:53:59.838205415 +0200
+@@ -1118,18 +1121,18 @@
+ mocs: waJumpSlider.moc
+ 
+ #>+ 3
+-waIndicator.moc: $(srcdir)/waIndicator.h
+-	$(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc
++guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h
++	$(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc
+ 
+ #>+ 2
+-mocs: waIndicator.moc
++mocs: guiSpectrumAnalyser.moc
+ 
+ #>+ 3
+-guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h
+-	$(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc
++waIndicator.moc: $(srcdir)/waIndicator.h
++	$(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc
+ 
+ #>+ 2
+-mocs: guiSpectrumAnalyser.moc
++mocs: waIndicator.moc
+ 
+ #>+ 3
+ waButton.moc: $(srcdir)/waButton.h
+@@ -1174,18 +1177,18 @@
+ mocs: waBalanceSlider.moc
+ 
+ #>+ 3
+-waStatus.moc: $(srcdir)/waStatus.h
+-	$(MOC) $(srcdir)/waStatus.h -o waStatus.moc
++waTitleBar.moc: $(srcdir)/waTitleBar.h
++	$(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
+ 
+ #>+ 2
+-mocs: waStatus.moc
++mocs: waTitleBar.moc
+ 
+ #>+ 3
+-waTitleBar.moc: $(srcdir)/waTitleBar.h
+-	$(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
++waStatus.moc: $(srcdir)/waStatus.h
++	$(MOC) $(srcdir)/waStatus.h -o waStatus.moc
+ 
+ #>+ 2
+-mocs: waTitleBar.moc
++mocs: waStatus.moc
+ 
+ #>+ 3
+ waSkinManager.moc: $(srcdir)/waSkinManager.h
+@@ -1196,10 +1199,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  waClutterbar.moc waVolumeSlider.moc waMain.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waLabel.moc waJumpSlider.moc waIndicator.moc guiSpectrumAnalyser.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waStatus.moc waTitleBar.moc waSkinManager.moc
++	-rm -f  waClutterbar.moc waVolumeSlider.moc waMain.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waLabel.moc waJumpSlider.moc guiSpectrumAnalyser.moc waIndicator.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waTitleBar.moc waStatus.moc waSkinManager.moc
+ 
+ #>+ 2
+-KDE_DIST=waSkinManager.h waMain.h waInfo.h waJumpSlider.h waWidget.h waLabel.h waTitleBar.h waBalanceSlider.h waClutterbar.h waVolumeSlider.h Makefile.in waDigit.h waSkinModel.h skinMap.h waSkin.h winskin.plugin waRegion.h guiSpectrumAnalyser.h waColor.h winSkinVis.h fileInfo.h waSkinMapping.h winSkinConfig.h waStatus.h waIndicator.h waSkins.h waSlider.h waShadeMapping.h waButton.h Makefile.am 
++KDE_DIST=waSkinManager.h waMain.h waInfo.h waJumpSlider.h waWidget.h waTitleBar.h waLabel.h waBalanceSlider.h waClutterbar.h waVolumeSlider.h Makefile.in waDigit.h waSkinModel.h skinMap.h waSkin.h winskin.plugin waRegion.h guiSpectrumAnalyser.h waColor.h winSkinVis.h fileInfo.h waSkinMapping.h winSkinConfig.h waStatus.h waIndicator.h waSkins.h waSlider.h waButton.h waShadeMapping.h Makefile.am 
+ 
+ #>+ 4
+ clean-idl:
+@@ -1252,7 +1255,7 @@
+ 
+ 
+ #>+ 11
+-noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp $(srcdir)/waSkinManager.cpp waSkinManager_skel.cpp  waClutterbar.moc waMain.moc waVolumeSlider.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waJumpSlider.moc waLabel.moc waIndicator.moc guiSpectrumAnalyser.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waTitleBar.moc waStatus.moc waSkinManager.moc
++noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp $(srcdir)/waSkinManager.cpp waSkinManager_skel.cpp  waClutterbar.moc waMain.moc waVolumeSlider.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waJumpSlider.moc waLabel.moc guiSpectrumAnalyser.moc waIndicator.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waStatus.moc waTitleBar.moc waSkinManager.moc
+ 	@echo 'creating noatun_winskin_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_winskin_la.all_cpp.files noatun_winskin_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_winskin_la.all_cpp.final; \
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/mimetypes/interface/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/winskin/mimetypes/interface/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13429,9 +15542,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/winskin/mimetypes/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/mimetypes/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/winskin/mimetypes/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/winskin/mimetypes/Makefile.in	2005-05-24 23:53:59.831206049 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/winskin/mimetypes/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/mimetypes/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/winskin/mimetypes/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/winskin/mimetypes/Makefile.in	2005-05-31 15:25:29.000000000 -0400
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13463,9 +15576,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/winskin/skins/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/skins/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/winskin/skins/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/winskin/skins/Makefile.in	2005-05-24 23:53:59.845204780 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/winskin/skins/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/skins/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/winskin/skins/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/winskin/skins/Makefile.in	2005-05-31 15:25:30.000000000 -0400
 @@ -218,6 +218,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13497,9 +15610,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/winskin/skins/winamp/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/skins/winamp/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/winskin/skins/winamp/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/winskin/skins/winamp/Makefile.in	2005-05-24 23:53:59.853204055 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/winskin/skins/winamp/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/skins/winamp/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/winskin/skins/winamp/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/winskin/skins/winamp/Makefile.in	2005-05-31 15:25:30.000000000 -0400
 @@ -210,6 +210,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13531,9 +15644,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/noatun/modules/winskin/vis/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/vis/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/modules/winskin/vis/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/modules/winskin/vis/Makefile.in	2005-05-24 23:53:59.865202967 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/modules/winskin/vis/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/vis/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/winskin/vis/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/modules/winskin/vis/Makefile.in	2005-05-31 15:25:30.000000000 -0400
 @@ -251,6 +251,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13565,9 +15678,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/noatun/pics/Makefile.in kdemultimedia-3.4.1/noatun/pics/Makefile.in
---- kdemultimedia-3.4.1.orig/noatun/pics/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/noatun/pics/Makefile.in	2005-05-24 23:53:59.876201969 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/noatun/pics/Makefile.in kdemultimedia-3.4.1/noatun/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/pics/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/noatun/pics/Makefile.in	2005-05-31 15:25:30.000000000 -0400
 @@ -200,6 +200,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13599,9 +15712,153 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/oggvorbis_artsplugin/Makefile.in kdemultimedia-3.4.1/oggvorbis_artsplugin/Makefile.in
---- kdemultimedia-3.4.1.orig/oggvorbis_artsplugin/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/oggvorbis_artsplugin/Makefile.in	2005-05-24 23:53:59.888200881 +0200
+@@ -633,89 +636,89 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=cr16-action-noatunplaylist.png cr22-action-noatunloopsong.png cr22-action-noatunstop.png cr48-action-effect.png cr32-action-equalizer.png cr16-action-playlist.png cr48-action-playlist.png cr16-action-noatunback.png cr16-action-noatunforward.png cr16-action-effect.png Makefile.in cr64-action-equalizer.png cr22-action-noatunpause.png cr22-action-noatunloopplaylist.png cr16-action-noatunplay.png cr32-action-playlist.png cr22-action-playlist.png cr22-action-noatunplaylist.png cr128-action-equalizer.png cr22-action-noatunplay.png cr16-action-equalizer.png cr16-action-noatunstop.png cr64-action-playlist.png cr22-action-noatunlooprandom.png cr32-action-effect.png cr48-action-equalizer.png cr22-action-equalizer.png cr22-action-noatunforward.png cr22-action-noatunback.png cr22-action-noatunfforward.png cr128-action-playlist.png cr22-action-noatuntiny.png cr16-action-noatunpause.png cr22-action-noatunloopnone.png cr22-action-noatunfback.png Makefile.am 
++KDE_DIST=cr16-action-noatunplaylist.png cr22-action-noatunloopsong.png cr22-action-noatunstop.png cr48-action-effect.png cr32-action-equalizer.png cr16-action-playlist.png cr48-action-playlist.png cr16-action-noatunback.png cr16-action-noatunforward.png cr16-action-effect.png Makefile.in cr64-action-equalizer.png cr22-action-noatunpause.png cr22-action-noatunloopplaylist.png cr16-action-noatunplay.png cr32-action-playlist.png cr22-action-playlist.png cr22-action-noatunplaylist.png cr128-action-equalizer.png cr22-action-noatunplay.png cr16-action-equalizer.png cr16-action-noatunstop.png cr64-action-playlist.png cr32-action-effect.png cr22-action-noatunlooprandom.png cr22-action-equalizer.png cr48-action-equalizer.png cr22-action-noatunforward.png cr22-action-noatunback.png cr22-action-noatunfforward.png cr128-action-playlist.png cr22-action-noatuntiny.png cr16-action-noatunpause.png cr22-action-noatunloopnone.png cr22-action-noatunfback.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+ 
+ #>+ 78
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopsong.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
++	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions
++	$(INSTALL_DATA) $(srcdir)/cr32-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
+ 	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunstop.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunstop.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
+-	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions
+-	$(INSTALL_DATA) $(srcdir)/cr128-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
++	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions
++	$(INSTALL_DATA) $(srcdir)/cr64-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
++	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopnone.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunforward.png
+-	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunlooprandom.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunlooprandom.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopsong.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
++	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions
++	$(INSTALL_DATA) $(srcdir)/cr48-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/playlist.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-noatuntiny.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunstop.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopnone.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
++	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr128-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/equalizer.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunpause.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunfforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfforward.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunfback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfback.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-noatuntiny.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunstop.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/playlist.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunpause.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunpause.png
+-	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunpause.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
+-	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions
++	$(INSTALL_DATA) $(srcdir)/cr22-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/equalizer.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
++	$(INSTALL_DATA) $(srcdir)/cr128-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
+ 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunstop.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
+ 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunforward.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
+ 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunlooprandom.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
+ 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/playlist.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
+ 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/equalizer.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
+ 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfforward.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
+ 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfback.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
+ 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/playlist.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
+ 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunpause.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
+ 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/equalizer.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
+-	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
++	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdemultimedia-3.4.1.orig/oggvorbis_artsplugin/Makefile.in kdemultimedia-3.4.1/oggvorbis_artsplugin/Makefile.in
+--- kdemultimedia-3.4.1.orig/oggvorbis_artsplugin/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/oggvorbis_artsplugin/Makefile.in	2005-05-31 15:25:30.000000000 -0400
 @@ -253,6 +253,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13633,9 +15890,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/xine_artsplugin/Makefile.in kdemultimedia-3.4.1/xine_artsplugin/Makefile.in
---- kdemultimedia-3.4.1.orig/xine_artsplugin/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/xine_artsplugin/Makefile.in	2005-05-24 23:53:59.901199703 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/xine_artsplugin/Makefile.in kdemultimedia-3.4.1/xine_artsplugin/Makefile.in
+--- kdemultimedia-3.4.1.orig/xine_artsplugin/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/xine_artsplugin/Makefile.in	2005-05-31 15:25:30.000000000 -0400
 @@ -275,6 +275,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13667,9 +15924,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdemultimedia-3.4.1.orig/xine_artsplugin/tools/Makefile.in kdemultimedia-3.4.1/xine_artsplugin/tools/Makefile.in
---- kdemultimedia-3.4.1.orig/xine_artsplugin/tools/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/xine_artsplugin/tools/Makefile.in	2005-05-24 23:53:59.908199068 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/xine_artsplugin/tools/Makefile.in kdemultimedia-3.4.1/xine_artsplugin/tools/Makefile.in
+--- kdemultimedia-3.4.1.orig/xine_artsplugin/tools/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/xine_artsplugin/tools/Makefile.in	2005-05-31 15:25:30.000000000 -0400
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13701,9 +15958,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdemultimedia-3.4.1.orig/xine_artsplugin/tools/thumbnail/Makefile.in kdemultimedia-3.4.1/xine_artsplugin/tools/thumbnail/Makefile.in
---- kdemultimedia-3.4.1.orig/xine_artsplugin/tools/thumbnail/Makefile.in	2005-05-23 18:04:34.000000000 +0200
-+++ kdemultimedia-3.4.1/xine_artsplugin/tools/thumbnail/Makefile.in	2005-05-24 23:53:59.922197798 +0200
+diff -Nrua kdemultimedia-3.4.1.orig/xine_artsplugin/tools/thumbnail/Makefile.in kdemultimedia-3.4.1/xine_artsplugin/tools/thumbnail/Makefile.in
+--- kdemultimedia-3.4.1.orig/xine_artsplugin/tools/thumbnail/Makefile.in	2005-05-23 12:04:34.000000000 -0400
++++ kdemultimedia-3.4.1/xine_artsplugin/tools/thumbnail/Makefile.in	2005-05-31 15:25:30.000000000 -0400
 @@ -254,6 +254,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@