[Pkg-kde-commits] rev 1391 -
branches/kde-3.4.0/packages/kdemultimedia/debian/patches
Christopher Martin
chrsmrtn-guest at costa.debian.org
Fri Jul 29 03:57:46 UTC 2005
Author: chrsmrtn-guest
Date: 2005-07-29 03:57:43 +0000 (Fri, 29 Jul 2005)
New Revision: 1391
Added:
branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r438734.diff
Modified:
branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
branch diff and buildprep for kdemultimedia 3.4.2.
Added: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r438734.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r438734.diff 2005-07-29 03:56:41 UTC (rev 1390)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r438734.diff 2005-07-29 03:57:43 UTC (rev 1391)
@@ -0,0 +1,24 @@
+#DPATCHLEVEL=0
+--- kmix/kmixdockwidget.cpp (.../tags/KDE/3.4.2/kdemultimedia) (revision 438734)
++++ kmix/kmixdockwidget.cpp (.../branches/KDE/3.4/kdemultimedia) (revision 438734)
+@@ -86,10 +86,12 @@
+ if ( a ) a->plug( popupMenu );
+
+ // Put "Select Master Channel" dialog in context menu
++ if ( m_mixer != 0 ) {
+ (void)new KAction( i18n("Select Channel"), 0, this, SLOT(selectMaster()),
+ actionCollection(), "select_master");
+ KAction *a2 = actionCollection()->action( "select_master" );
+ if (a2) a2->plug( popupMenu );
++ }
+
+ // Setup volume preview
+ if ( _playBeepOnVolumeChange ) {
+--- kmix/version.h (.../tags/KDE/3.4.2/kdemultimedia) (revision 438734)
++++ kmix/version.h (.../branches/KDE/3.4/kdemultimedia) (revision 438734)
+@@ -18,4 +18,4 @@
+ * License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+-#define APP_VERSION "2.6"
++#define APP_VERSION "2.6.1"
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-07-29 03:56:41 UTC (rev 1390)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff 2005-07-29 03:57:43 UTC (rev 1391)
@@ -1,7 +1,7 @@
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/acinclude.m4 kdemultimedia-3.4.2/acinclude.m4
+--- kdemultimedia-3.4.2.orig/acinclude.m4 2005-07-20 20:10:24.000000000 +0000
++++ kdemultimedia-3.4.2/acinclude.m4 2005-07-27 16:53:36.534527208 +0000
+@@ -1688,15 +1688,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -17,7 +17,7 @@
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2139,9 +2130,6 @@
+@@ -2138,9 +2129,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27,7 +27,80 @@
AC_TRY_COMPILE([
$2
],
-@@ -5770,6 +5758,7 @@
+@@ -3288,39 +3276,39 @@
+
+ if test "x$GXX" = "xyes"; then
+ kde_have_gcc_visibility=no
+- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
+- [
+- kde_have_gcc_visibility=yes
+- AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
+- [
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
+-
+- safe_CXXFLAGS=$CXXFLAGS
+- CXXFLAGS="$CXXFLAGS $all_includes"
+-
+- AC_TRY_COMPILE(
+- [
+-#include <qglobal.h>
+-#if Q_EXPORT - 0 != 0
+-/* if this compiles, then Q_EXPORT is undefined */
+-/* if Q_EXPORT is nonempty, this will break compilation */
+-#endif
+- ], [/* elvis is alive */],
+- kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+-
+- CXXFLAGS=$safe_CXXFLAGS
+- AC_LANG_RESTORE
+- ]
+- )
+-
+- if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+- KDE_CHECK_VISIBILITY_GCC_BUG
+- HAVE_GCC_VISIBILITY=1
+- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+- fi
+- ])
++dnl KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
++dnl [
++dnl kde_have_gcc_visibility=yes
++dnl AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
++dnl [
++dnl AC_LANG_SAVE
++dnl AC_LANG_CPLUSPLUS
++dnl
++dnl safe_CXXFLAGS=$CXXFLAGS
++dnl CXXFLAGS="$CXXFLAGS $all_includes"
++dnl
++dnl AC_TRY_COMPILE(
++dnl [
++dnl #include <qglobal.h>
++dnl #if Q_EXPORT - 0 != 0
++dnl /* if this compiles, then Q_EXPORT is undefined */
++dnl /* if Q_EXPORT is nonempty, this will break compilation */
++dnl #endif
++dnl ], [/* elvis is alive */],
++dnl kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
++dnl
++dnl CXXFLAGS=$safe_CXXFLAGS
++dnl AC_LANG_RESTORE
++dnl ]
++dnl )
++dnl
++dnl if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++dnl CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++dnl KDE_CHECK_VISIBILITY_GCC_BUG
++dnl HAVE_GCC_VISIBILITY=1
++dnl AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
++dnl fi
++dnl ])
+ fi
+ ])
+
+@@ -5799,6 +5787,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -35,7 +108,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5829,7 +5818,7 @@
+@@ -5858,7 +5847,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -44,7 +117,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6243,12 +6232,11 @@
+@@ -6272,12 +6261,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -58,7 +131,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6260,7 +6248,6 @@
+@@ -6289,7 +6277,6 @@
esac
;;
*64-bit*)
@@ -66,7 +139,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6390,7 +6377,7 @@
+@@ -6419,7 +6406,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -75,7 +148,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6419,20 +6406,26 @@
+@@ -6448,20 +6435,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -107,7 +180,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -6582,7 +6575,7 @@
+@@ -6611,7 +6604,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -116,7 +189,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6671,13 +6664,6 @@
+@@ -6700,13 +6693,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -130,7 +203,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -6701,8 +6687,11 @@
+@@ -6730,8 +6716,11 @@
fi
fi
chmod u+w .
@@ -144,7 +217,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6819,7 +6808,7 @@
+@@ -6848,7 +6837,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -153,7 +226,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6832,7 +6821,7 @@
+@@ -6861,7 +6850,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -162,7 +235,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6842,7 +6831,20 @@
+@@ -6871,7 +6860,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -184,7 +257,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6907,7 +6909,7 @@
+@@ -6936,7 +6938,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -193,7 +266,7 @@
;;
beos*)
-@@ -6932,7 +6934,7 @@
+@@ -6961,7 +6963,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -202,7 +275,7 @@
need_version=no
need_lib_prefix=no
-@@ -6997,7 +6999,7 @@
+@@ -7026,7 +7028,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -211,7 +284,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7020,7 +7022,7 @@
+@@ -7049,7 +7051,7 @@
dynamic_linker=no
;;
@@ -220,7 +293,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7080,7 +7082,7 @@
+@@ -7109,7 +7111,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -229,7 +302,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7095,7 +7097,7 @@
+@@ -7124,7 +7126,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -238,7 +311,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7106,7 +7108,7 @@
+@@ -7135,7 +7137,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -247,7 +320,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7168,22 +7170,19 @@
+@@ -7197,22 +7199,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -276,7 +349,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -7193,6 +7192,30 @@
+@@ -7222,6 +7221,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -307,7 +380,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7202,7 +7225,7 @@
+@@ -7231,7 +7254,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -316,7 +389,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7231,7 +7254,7 @@
+@@ -7260,7 +7283,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -325,7 +398,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -7251,7 +7274,7 @@
+@@ -7280,7 +7303,7 @@
os2*)
libname_spec='$name'
@@ -334,7 +407,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7842,31 +7865,23 @@
+@@ -7871,31 +7894,23 @@
;;
cygwin*)
@@ -375,7 +448,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7905,42 +7920,21 @@
+@@ -7934,42 +7949,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -425,7 +498,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -7969,9 +7963,6 @@
+@@ -7998,9 +7992,6 @@
;;
osf3* | osf4* | osf5*)
@@ -435,7 +508,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7981,7 +7972,6 @@
+@@ -8010,7 +8001,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -443,7 +516,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8247,7 +8237,7 @@
+@@ -8276,7 +8266,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -452,7 +525,7 @@
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8297,7 +8287,7 @@
+@@ -8326,7 +8316,7 @@
fi
;;
@@ -461,7 +534,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8307,29 +8297,29 @@
+@@ -8336,29 +8326,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -505,7 +578,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8337,8 +8327,8 @@
+@@ -8366,8 +8356,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -516,7 +589,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8446,8 +8436,8 @@
+@@ -8475,8 +8465,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -527,7 +600,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8473,7 +8463,7 @@
+@@ -8502,7 +8492,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -536,7 +609,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8503,8 +8493,22 @@
+@@ -8532,8 +8522,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -561,7 +634,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8550,15 +8554,16 @@
+@@ -8579,15 +8583,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -582,7 +655,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -8567,13 +8572,12 @@
+@@ -8596,13 +8601,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -598,7 +671,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8588,7 +8592,7 @@
+@@ -8617,7 +8621,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -607,7 +680,7 @@
fi
fi
;;
-@@ -8605,12 +8609,12 @@
+@@ -8634,12 +8638,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -622,7 +695,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8619,7 +8623,7 @@
+@@ -8648,7 +8652,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -631,7 +704,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8630,20 +8634,20 @@
+@@ -8659,20 +8663,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -662,7 +735,7 @@
fi
;;
esac
-@@ -8653,19 +8657,19 @@
+@@ -8682,19 +8686,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -688,7 +761,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8700,7 +8704,7 @@
+@@ -8729,7 +8733,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -697,7 +770,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8722,7 +8726,7 @@
+@@ -8751,7 +8755,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -706,7 +779,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8731,11 +8735,11 @@
+@@ -8760,11 +8764,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -720,7 +793,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8792,7 +8796,7 @@
+@@ -8821,7 +8825,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -729,7 +802,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8813,7 +8817,7 @@
+@@ -8842,7 +8846,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -738,7 +811,7 @@
;;
esac
fi
-@@ -8828,7 +8832,7 @@
+@@ -8857,7 +8861,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -747,7 +820,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8839,9 +8843,9 @@
+@@ -8868,9 +8872,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -759,7 +832,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8858,8 +8862,8 @@
+@@ -8887,8 +8891,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -770,7 +843,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8881,16 +8885,16 @@
+@@ -8910,16 +8914,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -791,7 +864,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8928,7 +8932,7 @@
+@@ -8957,7 +8961,7 @@
;;
esac
;;
@@ -800,7 +873,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -8947,7 +8951,7 @@
+@@ -8976,7 +8980,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -809,7 +882,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8964,7 +8968,7 @@
+@@ -8993,7 +8997,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -818,7 +891,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8982,7 +8986,7 @@
+@@ -9011,7 +9015,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -827,7 +900,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9007,7 +9011,7 @@
+@@ -9036,7 +9040,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -836,7 +909,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9023,10 +9027,10 @@
+@@ -9052,10 +9056,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -849,7 +922,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9045,7 +9049,7 @@
+@@ -9074,7 +9078,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -858,7 +931,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9102,9 +9106,9 @@
+@@ -9131,9 +9135,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -870,7 +943,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9138,7 +9142,7 @@
+@@ -9167,7 +9171,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -879,7 +952,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9148,9 +9152,9 @@
+@@ -9177,9 +9181,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -891,7 +964,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9159,9 +9163,9 @@
+@@ -9188,9 +9192,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -903,7 +976,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9329,7 +9333,7 @@
+@@ -9358,7 +9362,7 @@
fi
;;
@@ -912,7 +985,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9438,7 +9442,7 @@
+@@ -9467,7 +9471,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -921,7 +994,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9580,11 +9584,12 @@
+@@ -9609,11 +9613,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -936,7 +1009,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9634,7 +9639,7 @@
+@@ -9663,7 +9668,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -945,7 +1018,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9765,7 +9770,7 @@
+@@ -9794,7 +9799,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -954,7 +1027,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9796,7 +9801,7 @@
+@@ -9825,7 +9830,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -963,7 +1036,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10040,7 +10045,10 @@
+@@ -10069,7 +10074,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -975,7 +1048,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10113,7 +10121,7 @@
+@@ -10142,7 +10150,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -984,7 +1057,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10131,7 +10139,7 @@
+@@ -10160,7 +10168,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -993,7 +1066,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10346,7 +10354,7 @@
+@@ -10375,7 +10383,7 @@
;;
esac
;;
@@ -1002,7 +1075,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10397,7 +10405,7 @@
+@@ -10426,7 +10434,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -1011,7 +1084,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10422,7 +10430,7 @@
+@@ -10451,7 +10459,7 @@
;;
esac
;;
@@ -1020,7 +1093,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10733,6 +10741,9 @@
+@@ -10762,6 +10770,9 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -1030,7 +1103,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10757,7 +10768,7 @@
+@@ -10786,7 +10797,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1039,7 +1112,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10831,7 +10842,7 @@
+@@ -10860,7 +10871,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1048,7 +1121,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10841,13 +10852,13 @@
+@@ -10870,13 +10881,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1064,7 +1137,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10856,19 +10867,19 @@
+@@ -10885,19 +10896,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1088,7 +1161,7 @@
fi
;;
-@@ -10886,8 +10897,8 @@
+@@ -10915,8 +10926,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1099,7 +1172,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10900,10 +10911,36 @@
+@@ -10929,10 +10940,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1138,7 +1211,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10953,9 +10990,20 @@
+@@ -10982,9 +11019,20 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -1161,7 +1234,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11001,29 +11049,29 @@
+@@ -11030,29 +11078,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1200,7 +1273,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11038,7 +11086,7 @@
+@@ -11067,7 +11115,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -1209,7 +1282,7 @@
fi
fi
;;
-@@ -11061,13 +11109,13 @@
+@@ -11090,13 +11138,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1226,7 +1299,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -11081,21 +11129,21 @@
+@@ -11110,21 +11158,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1261,7 +1334,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11104,26 +11152,26 @@
+@@ -11133,26 +11181,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1296,7 +1369,7 @@
;;
dgux*)
-@@ -11156,8 +11204,8 @@
+@@ -11185,8 +11233,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1307,7 +1380,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11165,7 +11213,7 @@
+@@ -11194,7 +11242,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1316,7 +1389,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -11183,10 +11231,10 @@
+@@ -11212,10 +11260,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1329,7 +1402,7 @@
;;
esac
else
-@@ -11233,7 +11281,7 @@
+@@ -11262,7 +11310,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1338,7 +1411,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11243,7 +11291,7 @@
+@@ -11272,7 +11320,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1347,7 +1420,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11266,7 +11314,7 @@
+@@ -11295,7 +11343,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -1356,7 +1429,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11276,7 +11324,7 @@
+@@ -11305,7 +11353,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1365,7 +1438,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11287,14 +11335,14 @@
+@@ -11316,14 +11364,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1382,7 +1455,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11306,7 +11354,7 @@
+@@ -11335,7 +11383,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1391,7 +1464,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11331,9 +11379,9 @@
+@@ -11360,9 +11408,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1403,7 +1476,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11353,7 +11401,7 @@
+@@ -11382,7 +11430,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -1412,7 +1485,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11413,9 +11461,9 @@
+@@ -11442,9 +11490,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1424,7 +1497,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11473,7 +11521,7 @@
+@@ -11502,7 +11550,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1433,7 +1506,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11632,8 +11680,8 @@
+@@ -11661,8 +11709,8 @@
fi
done
done
@@ -1443,9 +1516,9 @@
AC_MSG_RESULT([$SED])
])
-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
+diff -Nru kdemultimedia-3.4.2.orig/aclocal.m4 kdemultimedia-3.4.2/aclocal.m4
+--- kdemultimedia-3.4.2.orig/aclocal.m4 2005-07-20 20:10:40.000000000 +0000
++++ kdemultimedia-3.4.2/aclocal.m4 2005-07-27 16:54:00.847831024 +0000
@@ -522,6 +522,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -1482,10 +1555,10 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/arts_plugin/Makefile.in kdemultimedia-3.4.2/akode/arts_plugin/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/arts_plugin/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/arts_plugin/Makefile.in 2005-07-27 16:57:02.360236944 +0000
+@@ -260,6 +260,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1495,7 +1568,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -526,7 +529,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -1504,7 +1577,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -564,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1516,7 +1589,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -899,7 +902,7 @@
+@@ -900,7 +903,7 @@
#>+ 2
@@ -1525,10 +1598,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/lib/Makefile.in kdemultimedia-3.4.2/akode/lib/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/lib/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/lib/Makefile.in 2005-07-27 16:57:02.388232688 +0000
+@@ -264,6 +264,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1538,7 +1611,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1547,7 +1620,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1559,10 +1632,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/Makefile.in kdemultimedia-3.4.2/akode/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/Makefile.in 2005-07-27 16:57:02.332241200 +0000
+@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1572,7 +1645,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -467,7 +470,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -1581,7 +1654,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1593,10 +1666,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/alsa_sink/Makefile.in kdemultimedia-3.4.2/akode/plugins/alsa_sink/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/plugins/alsa_sink/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/plugins/alsa_sink/Makefile.in 2005-07-27 16:57:02.424227216 +0000
+@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1606,7 +1679,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
+@@ -499,7 +502,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1615,7 +1688,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +539,9 @@
+@@ -537,9 +540,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1627,10 +1700,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/jack_sink/Makefile.in kdemultimedia-3.4.2/akode/plugins/jack_sink/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/plugins/jack_sink/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/plugins/jack_sink/Makefile.in 2005-07-27 16:57:02.444224176 +0000
+@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1640,7 +1713,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
+@@ -499,7 +502,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1649,7 +1722,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +539,9 @@
+@@ -537,9 +540,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1661,10 +1734,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/Makefile.in kdemultimedia-3.4.2/akode/plugins/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/plugins/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/plugins/Makefile.in 2005-07-27 16:57:02.403230408 +0000
+@@ -218,6 +218,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1674,7 +1747,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -477,7 +480,7 @@
+@@ -478,7 +481,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -1683,7 +1756,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -515,9 +518,9 @@
+@@ -516,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1695,10 +1768,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/mpc_decoder/Makefile.in kdemultimedia-3.4.2/akode/plugins/mpc_decoder/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/plugins/mpc_decoder/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/plugins/mpc_decoder/Makefile.in 2005-07-27 16:57:02.468220528 +0000
+@@ -260,6 +260,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1708,7 +1781,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -519,7 +522,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1717,7 +1790,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1729,10 +1802,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in kdemultimedia-3.4.2/akode/plugins/mpc_decoder/mppdec/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-07-27 16:57:02.488217488 +0000
+@@ -235,6 +235,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1742,7 +1815,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -490,7 +493,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1751,7 +1824,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -528,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1763,10 +1836,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/mpeg_decoder/Makefile.in kdemultimedia-3.4.2/akode/plugins/mpeg_decoder/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/plugins/mpeg_decoder/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/plugins/mpeg_decoder/Makefile.in 2005-07-27 16:57:02.512213840 +0000
+@@ -247,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1776,7 +1849,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -505,7 +508,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1785,7 +1858,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -543,9 +546,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1797,10 +1870,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/oss_sink/Makefile.in kdemultimedia-3.4.2/akode/plugins/oss_sink/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/plugins/oss_sink/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/plugins/oss_sink/Makefile.in 2005-07-27 16:57:02.534210496 +0000
+@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1810,7 +1883,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
+@@ -499,7 +502,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1819,7 +1892,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +539,9 @@
+@@ -537,9 +540,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1831,10 +1904,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/polyp_sink/Makefile.in kdemultimedia-3.4.2/akode/plugins/polyp_sink/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/plugins/polyp_sink/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/plugins/polyp_sink/Makefile.in 2005-07-27 16:57:02.555207304 +0000
+@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1844,7 +1917,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
+@@ -499,7 +502,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1853,7 +1926,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +539,9 @@
+@@ -537,9 +540,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1865,10 +1938,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/src_resampler/Makefile.in kdemultimedia-3.4.2/akode/plugins/src_resampler/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/plugins/src_resampler/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/plugins/src_resampler/Makefile.in 2005-07-27 16:57:02.575204264 +0000
+@@ -244,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1878,7 +1951,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -500,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1887,7 +1960,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -538,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1899,10 +1972,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/xiph_decoder/Makefile.in kdemultimedia-3.4.2/akode/plugins/xiph_decoder/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/plugins/xiph_decoder/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/plugins/xiph_decoder/Makefile.in 2005-07-27 16:57:02.598200768 +0000
+@@ -254,6 +254,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1912,7 +1985,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -515,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1921,7 +1994,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -553,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1933,7 +2006,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -839,7 +842,7 @@
+@@ -840,7 +843,7 @@
#>+ 2
@@ -1942,10 +2015,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/akode/test/Makefile.in kdemultimedia-3.4.2/akode/test/Makefile.in
+--- kdemultimedia-3.4.2.orig/akode/test/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/akode/test/Makefile.in 2005-07-27 16:57:02.616198032 +0000
+@@ -236,6 +236,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1955,7 +2028,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -490,7 +493,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1964,7 +2037,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -528,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1976,10 +2049,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/builder/Makefile.in kdemultimedia-3.4.2/arts/builder/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/builder/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/builder/Makefile.in 2005-07-27 16:57:02.692186480 +0000
+@@ -283,6 +283,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1989,7 +2062,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -561,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1998,7 +2071,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -599,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2010,7 +2083,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1101,7 +1104,7 @@
+@@ -1102,7 +1105,7 @@
-rm -f qttableview.moc interfacedlg.moc mwidget.moc portposdlg.moc main.moc execdlg.moc retrievedlg.moc propertypanel.moc menumaker.moc
#>+ 2
@@ -2019,10 +2092,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/builder/pics/Makefile.in kdemultimedia-3.4.2/arts/builder/pics/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/builder/pics/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/builder/pics/Makefile.in 2005-07-27 16:57:02.735179944 +0000
+@@ -224,6 +224,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2032,7 +2105,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,7 +484,7 @@
+@@ -482,7 +485,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -2041,7 +2114,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +522,9 @@
+@@ -520,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2053,7 +2126,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -684,7 +687,7 @@
+@@ -685,7 +688,7 @@
.NOEXPORT:
#>+ 2
@@ -2062,7 +2135,7 @@
#>+ 2
docs-am:
-@@ -693,18 +696,18 @@
+@@ -694,18 +697,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
@@ -2084,10 +2157,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/examples/Makefile.in kdemultimedia-3.4.2/arts/examples/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/examples/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/examples/Makefile.in 2005-07-27 16:57:02.753177208 +0000
+@@ -213,6 +213,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2097,7 +2170,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -531,7 +534,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -2106,7 +2179,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -569,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2118,7 +2191,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -749,7 +752,7 @@
+@@ -750,7 +753,7 @@
.NOEXPORT:
#>+ 2
@@ -2127,10 +2200,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/gui/common/Makefile.in kdemultimedia-3.4.2/arts/gui/common/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/gui/common/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/gui/common/Makefile.in 2005-07-27 16:57:02.807169000 +0000
+@@ -256,6 +256,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2140,7 +2213,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -532,7 +535,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -2149,7 +2222,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -570,9 +573,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2161,10 +2234,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/gui/kde/Makefile.in kdemultimedia-3.4.2/arts/gui/kde/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/gui/kde/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/gui/kde/Makefile.in 2005-07-27 16:57:02.894155776 +0000
+@@ -294,6 +294,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2174,7 +2247,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -576,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -2183,7 +2256,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -614,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2195,7 +2268,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1121,18 +1124,18 @@
+@@ -1122,18 +1125,18 @@
mocs: kcombobox_impl.moc
#>+ 3
@@ -2220,7 +2293,7 @@
#>+ 3
kbutton_impl.moc: $(srcdir)/kbutton_impl.h
-@@ -1156,18 +1159,18 @@
+@@ -1157,18 +1160,18 @@
mocs: kpoti.moc
#>+ 3
@@ -2245,7 +2318,7 @@
#>+ 3
kpoti_impl.moc: $(srcdir)/kpoti_impl.h
-@@ -1199,10 +1202,10 @@
+@@ -1200,10 +1203,10 @@
#>+ 3
clean-metasources:
@@ -2258,7 +2331,7 @@
#>+ 3
clean-closures:
-@@ -1250,7 +1253,7 @@
+@@ -1251,7 +1254,7 @@
#>+ 11
@@ -2267,10 +2340,10 @@
@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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/gui/kde/mcopclass/Makefile.in kdemultimedia-3.4.2/arts/gui/kde/mcopclass/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/gui/kde/mcopclass/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/gui/kde/mcopclass/Makefile.in 2005-07-27 16:57:02.911153192 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2280,7 +2353,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -465,7 +468,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -2289,7 +2362,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -503,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2301,7 +2374,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -664,7 +667,7 @@
+@@ -665,7 +668,7 @@
.NOEXPORT:
#>+ 2
@@ -2310,10 +2383,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/gui/Makefile.in kdemultimedia-3.4.2/arts/gui/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/gui/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/gui/Makefile.in 2005-07-27 16:57:02.774174016 +0000
+@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2323,7 +2396,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -467,7 +470,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -2332,7 +2405,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2344,10 +2417,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/Makefile.in kdemultimedia-3.4.2/arts/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/Makefile.in 2005-07-27 16:57:02.631195752 +0000
+@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2357,7 +2430,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -467,7 +470,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -2366,7 +2439,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2378,10 +2451,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/midi/Makefile.in kdemultimedia-3.4.2/arts/midi/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/midi/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/midi/Makefile.in 2005-07-27 16:57:02.964145136 +0000
+@@ -312,6 +312,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2391,7 +2464,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -603,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -2400,7 +2473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2412,7 +2485,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1150,7 +1153,7 @@
+@@ -1151,7 +1154,7 @@
#>+ 2
@@ -2421,10 +2494,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/midi/mcopclass/Makefile.in kdemultimedia-3.4.2/arts/midi/mcopclass/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/midi/mcopclass/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/midi/mcopclass/Makefile.in 2005-07-27 16:57:02.980142704 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2434,7 +2507,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -461,7 +464,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -2443,7 +2516,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -499,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2455,10 +2528,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/modules/common/Makefile.in kdemultimedia-3.4.2/arts/modules/common/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/modules/common/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/modules/common/Makefile.in 2005-07-27 16:57:03.044132976 +0000
+@@ -269,6 +269,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2468,7 +2541,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -563,7 +566,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -2477,7 +2550,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -601,9 +604,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2489,10 +2562,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/modules/effects/freeverb/Makefile.in kdemultimedia-3.4.2/arts/modules/effects/freeverb/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/modules/effects/freeverb/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/modules/effects/freeverb/Makefile.in 2005-07-27 16:57:03.114122336 +0000
+@@ -236,6 +236,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2502,7 +2575,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -486,7 +489,7 @@
+@@ -487,7 +490,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -2511,7 +2584,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -524,9 +527,9 @@
+@@ -525,9 +528,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2523,7 +2596,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -757,7 +760,7 @@
+@@ -758,7 +761,7 @@
.NOEXPORT:
#>+ 2
@@ -2532,10 +2605,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/modules/effects/Makefile.in kdemultimedia-3.4.2/arts/modules/effects/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/modules/effects/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/modules/effects/Makefile.in 2005-07-27 16:57:03.091125832 +0000
+@@ -292,6 +292,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2545,7 +2618,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -2554,7 +2627,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2566,10 +2639,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/modules/Makefile.in kdemultimedia-3.4.2/arts/modules/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/modules/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/modules/Makefile.in 2005-07-27 16:57:03.011137992 +0000
+@@ -274,6 +274,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2579,7 +2652,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -573,7 +576,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -2588,7 +2661,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -611,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2600,7 +2673,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1022,7 +1025,7 @@
+@@ -1023,7 +1026,7 @@
#>+ 2
@@ -2609,10 +2682,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/modules/mixers/Makefile.in kdemultimedia-3.4.2/arts/modules/mixers/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/modules/mixers/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/modules/mixers/Makefile.in 2005-07-27 16:57:03.145117624 +0000
+@@ -267,6 +267,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2622,7 +2695,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -567,7 +570,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -2631,7 +2704,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -605,9 +608,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2643,10 +2716,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/modules/synth/Makefile.in kdemultimedia-3.4.2/arts/modules/synth/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/modules/synth/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/modules/synth/Makefile.in 2005-07-27 16:57:03.193110328 +0000
+@@ -297,6 +297,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2656,7 +2729,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -602,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -2665,7 +2738,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -640,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2677,10 +2750,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/runtime/Makefile.in kdemultimedia-3.4.2/arts/runtime/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/runtime/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/runtime/Makefile.in 2005-07-27 16:57:03.226105312 +0000
+@@ -264,6 +264,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2690,7 +2763,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -541,7 +544,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -2699,7 +2772,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2711,7 +2784,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -913,7 +916,7 @@
+@@ -914,7 +917,7 @@
#>+ 2
@@ -2720,10 +2793,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/tools/Makefile.in kdemultimedia-3.4.2/arts/tools/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/tools/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/tools/Makefile.in 2005-07-27 16:57:03.298094368 +0000
+@@ -300,6 +300,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2733,7 +2806,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -620,7 +623,7 @@
+@@ -621,7 +624,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -2742,7 +2815,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -658,9 +661,9 @@
+@@ -659,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2754,7 +2827,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1172,18 +1175,18 @@
+@@ -1173,18 +1176,18 @@
mocs: audiomanager.moc
#>+ 3
@@ -2779,7 +2852,7 @@
#>+ 3
choosebusdlg.moc: $(srcdir)/choosebusdlg.h
-@@ -1252,10 +1255,10 @@
+@@ -1253,10 +1256,10 @@
#>+ 3
clean-metasources:
@@ -2792,10 +2865,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/arts/tools/pics/Makefile.in kdemultimedia-3.4.2/arts/tools/pics/Makefile.in
+--- kdemultimedia-3.4.2.orig/arts/tools/pics/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/arts/tools/pics/Makefile.in 2005-07-27 16:57:03.336088592 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2805,7 +2878,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -450,7 +453,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -2814,7 +2887,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -488,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2826,7 +2899,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -632,7 +635,7 @@
+@@ -633,7 +636,7 @@
.NOEXPORT:
#>+ 2
@@ -2835,7 +2908,7 @@
#>+ 2
docs-am:
-@@ -640,105 +643,105 @@
+@@ -641,105 +644,105 @@
#>+ 102
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
@@ -3013,10 +3086,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/audiofile_artsplugin/Makefile.in kdemultimedia-3.4.2/audiofile_artsplugin/Makefile.in
+--- kdemultimedia-3.4.2.orig/audiofile_artsplugin/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/audiofile_artsplugin/Makefile.in 2005-07-27 16:57:03.367083880 +0000
+@@ -254,6 +254,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -3026,7 +3099,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -518,7 +521,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -3035,7 +3108,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -556,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3047,7 +3120,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -885,7 +888,7 @@
+@@ -886,7 +889,7 @@
#>+ 2
@@ -3056,15 +3129,15 @@
#>+ 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
+diff -Nru kdemultimedia-3.4.2.orig/configure kdemultimedia-3.4.2/configure
+--- kdemultimedia-3.4.2.orig/configure 2005-07-20 20:12:16.000000000 +0000
++++ kdemultimedia-3.4.2/configure 2005-07-27 16:57:14.572380416 +0000
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE TAGLIB_CONFIG taglib_includes taglib_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS VORBIS_INCS VORBIS_LIBS VORBIS_RPATH VORBISFILE_LIBS VORBISENC_LIBS CDPARANOIA PARANOIA_PRIV install_akode_artsplugin_TRUE install_akode_artsplugin_FALSE LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE LIBASOUND LIBOSSAUDIO PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS LIBLTDL use_libltdl_TRUE use_libltdl_FALSE include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE ARTS_LIBASOUND LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE CDPARANOIA_INCS CDPARANOIA_LIBS CDPARANOIA_RPATH include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE LAME_INCS LAME_LIBS LAME_RPATH KCM_AUDIOCD include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE compile_ogg_export_TRUE compile_ogg_export_FALSE compile_mp3_export_TRUE compile_mp3_export_FALSE LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE TAGLIB_CONFIG taglib_includes taglib_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS VORBIS_INCS VORBIS_LIBS VORBIS_RPATH VORBISFILE_LIBS VORBISENC_LIBS CDPARANOIA PARANOIA_PRIV install_akode_artsplugin_TRUE install_akode_artsplugin_FALSE LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE LIBASOUND LIBOSSAUDIO PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS LIBLTDL use_libltdl_TRUE use_libltdl_FALSE include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE ARTS_LIBASOUND LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE CDPARANOIA_INCS CDPARANOIA_LIBS CDPARANOIA_RPATH include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE LAME_INCS LAME_LIBS LAME_RPATH KCM_AUDIOCD include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE compile_ogg_export_TRUE compile_ogg_export_FALSE compile_mp3_export_TRUE compile_mp3_export_FALSE LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE TAGLIB_CONFIG taglib_includes taglib_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS VORBIS_INCS VORBIS_LIBS VORBIS_RPATH VORBISFILE_LIBS VORBISENC_LIBS CDPARANOIA PARANOIA_PRIV install_akode_artsplugin_TRUE install_akode_artsplugin_FALSE LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE LIBASOUND LIBOSSAUDIO PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS LIBLTDL use_libltdl_TRUE use_libltdl_FALSE include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE ARTS_LIBASOUND LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE CDPARANOIA_INCS CDPARANOIA_LIBS CDPARANOIA_RPATH include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE LAME_INCS LAME_LIBS LAME_RPATH KCM_AUDIOCD include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE compile_ogg_export_TRUE compile_ogg_export_FALSE compile_mp3_export_TRUE compile_mp3_export_FALSE LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE TAGLIB_CONFIG taglib_includes taglib_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS VORBIS_INCS VORBIS_LIBS VORBIS_RPATH VORBISFILE_LIBS VORBISENC_LIBS CDPARANOIA PARANOIA_PRIV install_akode_artsplugin_TRUE install_akode_artsplugin_FALSE LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE LIBASOUND LIBOSSAUDIO PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS LIBLTDL use_libltdl_TRUE use_libltdl_FALSE include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE ARTS_LIBASOUND LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE CDPARANOIA_INCS CDPARANOIA_LIBS CDPARANOIA_RPATH include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE LAME_INCS LAME_LIBS LAME_RPATH KCM_AUDIOCD include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE compile_ogg_export_TRUE compile_ogg_export_FALSE compile_mp3_export_TRUE compile_mp3_export_FALSE LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -7932,7 +8005,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28619,8 +28542,7 @@
+@@ -28622,8 +28545,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7942,7 +8015,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28695,8 +28617,7 @@
+@@ -28698,8 +28620,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7952,7 +8025,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28756,8 +28677,7 @@
+@@ -28759,8 +28680,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7962,7 +8035,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28840,8 +28760,7 @@
+@@ -28843,8 +28763,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7972,7 +8045,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28934,8 +28853,7 @@
+@@ -28937,8 +28856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7982,7 +8055,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29109,8 +29027,7 @@
+@@ -29112,8 +29030,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7992,7 +8065,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29208,8 +29125,7 @@
+@@ -29211,8 +29128,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8002,7 +8075,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29302,8 +29218,7 @@
+@@ -29305,8 +29221,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8012,7 +8085,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29386,8 +29301,7 @@
+@@ -29389,8 +29304,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8022,25 +8095,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29440,7 +29354,7 @@
+@@ -29443,7 +29357,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29443: $i/$j" >&5
-+ echo "configure: 29357: $i/$j" >&5
+- echo "configure: 29446: $i/$j" >&5
++ echo "configure: 29360: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29748,7 +29662,7 @@
+@@ -29746,7 +29660,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29751: $i/$j" >&5
-+ echo "configure: 29665: $i/$j" >&5
+- echo "configure: 29749: $i/$j" >&5
++ echo "configure: 29663: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30425,8 +30339,7 @@
+@@ -30423,8 +30337,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8050,39 +8123,39 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30585,7 +30498,7 @@
+@@ -30583,7 +30496,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30588: $i/$j" >&5
-+ echo "configure: 30501: $i/$j" >&5
+- echo "configure: 30586: $i/$j" >&5
++ echo "configure: 30499: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30615,7 +30528,7 @@
+@@ -30613,7 +30526,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30618: $i/$j" >&5
-+ echo "configure: 30531: $i/$j" >&5
+- echo "configure: 30616: $i/$j" >&5
++ echo "configure: 30529: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30633,7 +30546,7 @@
+@@ -30631,7 +30544,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30636: $i/$j" >&5
-+ echo "configure: 30549: $i/$j" >&5
+- echo "configure: 30634: $i/$j" >&5
++ echo "configure: 30547: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32151,7 +32064,7 @@
+@@ -32149,7 +32062,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32154: $i/$j" >&5
-+ echo "configure: 32067: $i/$j" >&5
+- echo "configure: 32152: $i/$j" >&5
++ echo "configure: 32065: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
@@ -8970,15 +9043,6 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42179,7 +42009,7 @@
- #define X11_DGA2 1
- _ACEOF
-
-- DGALIBS="-lXxf86dga"
-+ DGALIBS="-lXxf86dga_pic"
- fi
-
- echo "$as_me:$LINENO: checking for X11 video extension" >&5
@@ -42213,8 +42043,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8999,15 +9063,6 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42307,7 +42135,7 @@
- #define X11_XVIDMODE 1
- _ACEOF
-
-- XVIDMODELIBS="-lXxf86vm"
-+ XVIDMODELIBS="-lXxf86vm_pic"
- fi
-
-
@@ -42358,8 +42186,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9242,7 +9297,7 @@
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -46893,11 +46710,6 @@
+@@ -46894,11 +46711,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -9254,7 +9309,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -46936,6 +46748,12 @@
+@@ -46937,6 +46749,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -9267,40 +9322,22 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-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
+diff -Nru kdemultimedia-3.4.2.orig/configure.in kdemultimedia-3.4.2/configure.in
+--- kdemultimedia-3.4.2.orig/configure.in 2005-07-20 20:10:26.000000000 +0000
++++ kdemultimedia-3.4.2/configure.in 2005-07-27 16:53:38.018301640 +0000
@@ -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
+ AM_INIT_AUTOMAKE(kdemultimedia, "3.4.2") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-@@ -1800,7 +1802,7 @@
- AC_MSG_RESULT($x11_dga2)
- if test x$x11_dga2 = xyes; then
- AC_DEFINE(X11_DGA2,1,[Define if you have XFree4.0 DGA 2.0])
-- DGALIBS="-lXxf86dga"
-+ DGALIBS="-lXxf86dga_pic"
- fi
-
- AC_MSG_CHECKING(for X11 video extension)
-@@ -1830,7 +1832,7 @@
- AC_MSG_RESULT($x11_xvidmode)
- if test x$x11_xvidmode = xyes; then
- AC_DEFINE(X11_XVIDMODE,1,[Define if you have XVidModeextension])
-- XVIDMODELIBS="-lXxf86vm"
-+ XVIDMODELIBS="-lXxf86vm_pic"
- fi
-
-
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/doc/artsbuilder/images/Makefile.in kdemultimedia-3.4.2/doc/artsbuilder/images/Makefile.in
+--- kdemultimedia-3.4.2.orig/doc/artsbuilder/images/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/doc/artsbuilder/images/Makefile.in 2005-07-27 16:57:03.438073088 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9310,7 +9347,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9319,7 +9356,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9331,7 +9368,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,28 +638,28 @@
+@@ -636,28 +639,28 @@
.NOEXPORT:
#>+ 2
@@ -9365,10 +9402,10 @@
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 @@
+diff -Nru kdemultimedia-3.4.2.orig/doc/artsbuilder/Makefile.in kdemultimedia-3.4.2/doc/artsbuilder/Makefile.in
+--- kdemultimedia-3.4.2.orig/doc/artsbuilder/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/doc/artsbuilder/Makefile.in 2005-07-27 16:57:03.412077040 +0000
+@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9378,7 +9415,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -470,7 +473,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9387,7 +9424,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9399,7 +9436,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -802,10 +805,10 @@
+@@ -803,10 +806,10 @@
.NOEXPORT:
#>+ 2
@@ -9412,7 +9449,7 @@
@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 @@
+@@ -833,20 +836,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder
@@ -9436,10 +9473,10 @@
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 @@
+diff -Nru kdemultimedia-3.4.2.orig/doc/juk/Makefile.in kdemultimedia-3.4.2/doc/juk/Makefile.in
+--- kdemultimedia-3.4.2.orig/doc/juk/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/doc/juk/Makefile.in 2005-07-27 16:57:03.455070504 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9449,7 +9486,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9458,7 +9495,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9470,7 +9507,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,10 +638,10 @@
+@@ -636,10 +639,10 @@
.NOEXPORT:
#>+ 2
@@ -9483,7 +9520,7 @@
@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 @@
+@@ -666,20 +669,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk
@@ -9507,10 +9544,10 @@
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 @@
+diff -Nru kdemultimedia-3.4.2.orig/doc/kaboodle/Makefile.in kdemultimedia-3.4.2/doc/kaboodle/Makefile.in
+--- kdemultimedia-3.4.2.orig/doc/kaboodle/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/doc/kaboodle/Makefile.in 2005-07-27 16:57:03.471068072 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9520,7 +9557,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9529,7 +9566,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9541,7 +9578,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,7 +638,7 @@
+@@ -636,7 +639,7 @@
.NOEXPORT:
#>+ 2
@@ -9550,10 +9587,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/doc/kcontrol/kmixcfg/Makefile.in kdemultimedia-3.4.2/doc/kcontrol/kmixcfg/Makefile.in
+--- kdemultimedia-3.4.2.orig/doc/kcontrol/kmixcfg/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/doc/kcontrol/kmixcfg/Makefile.in 2005-07-27 16:57:03.503063208 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9563,7 +9600,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9572,7 +9609,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9584,7 +9621,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,7 +638,7 @@
+@@ -636,7 +639,7 @@
.NOEXPORT:
#>+ 2
@@ -9593,10 +9630,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/doc/kcontrol/Makefile.in kdemultimedia-3.4.2/doc/kcontrol/Makefile.in
+--- kdemultimedia-3.4.2.orig/doc/kcontrol/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/doc/kcontrol/Makefile.in 2005-07-27 16:57:03.488065488 +0000
+@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9606,7 +9643,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -470,7 +473,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9615,7 +9652,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9627,10 +9664,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/doc/kio_audiocd/Makefile.in kdemultimedia-3.4.2/doc/kio_audiocd/Makefile.in
+--- kdemultimedia-3.4.2.orig/doc/kio_audiocd/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/doc/kio_audiocd/Makefile.in 2005-07-27 16:57:03.518060928 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9640,7 +9677,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9649,7 +9686,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9661,10 +9698,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/doc/kmid/Makefile.in kdemultimedia-3.4.2/doc/kmid/Makefile.in
+--- kdemultimedia-3.4.2.orig/doc/kmid/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/doc/kmid/Makefile.in 2005-07-27 16:57:03.534058496 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9674,7 +9711,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9683,7 +9720,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9695,7 +9732,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,7 +638,7 @@
+@@ -636,7 +639,7 @@
.NOEXPORT:
#>+ 2
@@ -9704,10 +9741,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/doc/kmix/Makefile.in kdemultimedia-3.4.2/doc/kmix/Makefile.in
+--- kdemultimedia-3.4.2.orig/doc/kmix/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/doc/kmix/Makefile.in 2005-07-27 16:57:03.553055608 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9717,7 +9754,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9726,7 +9763,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9738,7 +9775,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,10 +638,10 @@
+@@ -636,10 +639,10 @@
.NOEXPORT:
#>+ 2
@@ -9751,7 +9788,7 @@
@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 @@
+@@ -666,20 +669,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix
@@ -9775,10 +9812,10 @@
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 @@
+diff -Nru kdemultimedia-3.4.2.orig/doc/krec/Makefile.in kdemultimedia-3.4.2/doc/krec/Makefile.in
+--- kdemultimedia-3.4.2.orig/doc/krec/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/doc/krec/Makefile.in 2005-07-27 16:57:03.571052872 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9788,7 +9825,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9797,7 +9834,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9809,7 +9846,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,10 +638,10 @@
+@@ -636,10 +639,10 @@
.NOEXPORT:
#>+ 2
@@ -9822,7 +9859,7 @@
@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 @@
+@@ -666,20 +669,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec
@@ -9846,10 +9883,10 @@
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 @@
+diff -Nru kdemultimedia-3.4.2.orig/doc/kscd/Makefile.in kdemultimedia-3.4.2/doc/kscd/Makefile.in
+--- kdemultimedia-3.4.2.orig/doc/kscd/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/doc/kscd/Makefile.in 2005-07-27 16:57:03.588050288 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9859,7 +9896,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9868,7 +9905,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9880,47 +9917,47 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,10 +638,10 @@
+@@ -636,10 +639,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
+-KDE_DIST=kscd18.png index.docbook kscd6.png kscd13.png kscd2.png kscd14.png kscdannounc.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 kscdannounc.png 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
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.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 kscdannounc.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 @@
+@@ -666,20 +669,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 \
+- @for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.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 kscdannounc.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 \
+- for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.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 kscdannounc.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 \
+- for file in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.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 kscdannounc.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 @@
+diff -Nru kdemultimedia-3.4.2.orig/doc/Makefile.in kdemultimedia-3.4.2/doc/Makefile.in
+--- kdemultimedia-3.4.2.orig/doc/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/doc/Makefile.in 2005-07-27 16:57:03.388080688 +0000
+@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9930,7 +9967,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,13 +466,13 @@
+@@ -464,13 +467,13 @@
KDE_DOCS = AUTO
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -9946,7 +9983,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9958,10 +9995,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/doc/noatun/Makefile.in kdemultimedia-3.4.2/doc/noatun/Makefile.in
+--- kdemultimedia-3.4.2.orig/doc/noatun/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/doc/noatun/Makefile.in 2005-07-27 16:57:03.603048008 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -9971,7 +10008,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9980,7 +10017,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9992,7 +10029,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,7 +638,7 @@
+@@ -636,7 +639,7 @@
.NOEXPORT:
#>+ 2
@@ -10001,10 +10038,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/juk/Makefile.in kdemultimedia-3.4.2/juk/Makefile.in
+--- kdemultimedia-3.4.2.orig/juk/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/juk/Makefile.in 2005-07-27 16:57:03.834012896 +0000
+@@ -326,6 +326,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10014,7 +10051,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -730,7 +733,7 @@
+@@ -732,7 +735,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10023,7 +10060,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -768,9 +771,9 @@
+@@ -770,9 +773,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10035,7 +10072,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1274,18 +1277,18 @@
+@@ -1276,18 +1279,18 @@
mocs: collectionlist.moc
#>+ 3
@@ -10060,7 +10097,7 @@
#>+ 3
artsplayer.moc: $(srcdir)/artsplayer.h
-@@ -1295,18 +1298,18 @@
+@@ -1297,18 +1300,18 @@
mocs: artsplayer.moc
#>+ 3
@@ -10085,7 +10122,7 @@
#>+ 3
directorylist.moc: $(srcdir)/directorylist.h
-@@ -1435,18 +1438,18 @@
+@@ -1437,18 +1440,18 @@
mocs: searchwidget.moc
#>+ 3
@@ -10110,7 +10147,7 @@
#>+ 3
playlistbox.moc: $(srcdir)/playlistbox.h
-@@ -1456,18 +1459,18 @@
+@@ -1458,18 +1461,18 @@
mocs: playlistbox.moc
#>+ 3
@@ -10135,7 +10172,7 @@
#>+ 3
gstreamerplayer.moc: $(srcdir)/gstreamerplayer.h
-@@ -1527,10 +1530,10 @@
+@@ -1529,10 +1532,10 @@
#>+ 3
clean-metasources:
@@ -10148,7 +10185,7 @@
#>+ 4
clean-idl:
-@@ -1555,23 +1558,23 @@
+@@ -1557,23 +1560,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
@@ -10178,10 +10215,10 @@
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/juk/pics/Makefile.in kdemultimedia-3.4.2/juk/pics/Makefile.in
+--- kdemultimedia-3.4.2.orig/juk/pics/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/juk/pics/Makefile.in 2005-07-27 16:57:03.848010768 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10191,7 +10228,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -461,7 +464,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10200,7 +10237,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -499,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10212,10 +10249,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kaboodle/actions/Makefile.in kdemultimedia-3.4.2/kaboodle/actions/Makefile.in
+--- kdemultimedia-3.4.2.orig/kaboodle/actions/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kaboodle/actions/Makefile.in 2005-07-27 16:57:03.918999976 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10225,7 +10262,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10234,7 +10271,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10246,7 +10283,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -640,14 +643,14 @@
+@@ -641,14 +644,14 @@
#>+ 10
install-kde-icons:
@@ -10264,10 +10301,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kaboodle/Makefile.in kdemultimedia-3.4.2/kaboodle/Makefile.in
+--- kdemultimedia-3.4.2.orig/kaboodle/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kaboodle/Makefile.in 2005-07-27 16:57:03.904002256 +0000
+@@ -291,6 +291,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10277,7 +10314,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -567,7 +570,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10286,7 +10323,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -605,9 +608,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10298,7 +10335,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1086,20 +1089,6 @@
+@@ -1087,20 +1090,6 @@
.NOEXPORT:
#>+ 3
@@ -10319,7 +10356,7 @@
userinterface.moc: $(srcdir)/userinterface.h
$(MOC) $(srcdir)/userinterface.h -o userinterface.moc
-@@ -1121,13 +1110,6 @@
+@@ -1122,13 +1111,6 @@
mocs: kaboodle_factory.moc
#>+ 3
@@ -10333,7 +10370,7 @@
player.moc: $(srcdir)/player.h
$(MOC) $(srcdir)/player.h -o player.moc
-@@ -1141,6 +1123,27 @@
+@@ -1142,6 +1124,27 @@
#>+ 2
mocs: conf.moc
@@ -10361,7 +10398,7 @@
#>+ 8
libkaboodlepart.la.closure: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES)
@echo "int main() {return 0;}" > libkaboodlepart_la_closure.cpp
-@@ -1152,10 +1155,10 @@
+@@ -1153,10 +1156,10 @@
#>+ 3
clean-metasources:
@@ -10374,7 +10411,7 @@
#>+ 3
clean-closures:
-@@ -1203,7 +1206,7 @@
+@@ -1204,7 +1207,7 @@
#>+ 11
@@ -10383,7 +10420,7 @@
@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 @@
+@@ -1266,8 +1269,8 @@
kaboodle_factory.lo: kaboodle_factory.moc
nmcheck:
conf.o: conf.moc
@@ -10393,10 +10430,10 @@
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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kaboodle/pics/Makefile.in kdemultimedia-3.4.2/kaboodle/pics/Makefile.in
+--- kdemultimedia-3.4.2.orig/kaboodle/pics/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kaboodle/pics/Makefile.in 2005-07-27 16:57:03.940996632 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10406,7 +10443,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -450,7 +453,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10415,7 +10452,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -488,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10427,7 +10464,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -639,26 +642,26 @@
+@@ -640,26 +643,26 @@
#>+ 22
install-kde-icons:
@@ -10463,10 +10500,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kappfinder-data/Makefile.in kdemultimedia-3.4.2/kappfinder-data/Makefile.in
+--- kdemultimedia-3.4.2.orig/kappfinder-data/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kappfinder-data/Makefile.in 2005-07-27 16:57:03.956994200 +0000
+@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10476,7 +10513,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -482,13 +485,13 @@
+@@ -483,13 +486,13 @@
EXTRA_DIST = $(kappfinder_multimedia_data_DATA)
xdg_directory_DATA = kde-multimedia-music.directory
xdg_mergedmenu_DATA = kde-multimedia-music.menu
@@ -10492,7 +10529,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +529,9 @@
+@@ -527,9 +530,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10504,10 +10541,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kaudiocreator/icons/Makefile.in kdemultimedia-3.4.2/kaudiocreator/icons/Makefile.in
+--- kdemultimedia-3.4.2.orig/kaudiocreator/icons/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kaudiocreator/icons/Makefile.in 2005-07-27 16:57:04.031982800 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10517,7 +10554,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -461,7 +464,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10526,7 +10563,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -499,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10538,10 +10575,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kaudiocreator/Makefile.in kdemultimedia-3.4.2/kaudiocreator/Makefile.in
+--- kdemultimedia-3.4.2.orig/kaudiocreator/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kaudiocreator/Makefile.in 2005-07-27 16:57:04.017984928 +0000
+@@ -280,6 +280,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10551,7 +10588,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -550,7 +553,7 @@
+@@ -551,7 +554,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10560,7 +10597,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -588,9 +591,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10572,7 +10609,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1057,13 +1060,6 @@
+@@ -1058,13 +1061,6 @@
.NOEXPORT:
#>+ 3
@@ -10586,7 +10623,7 @@
encodefileimp.moc: $(srcdir)/encodefileimp.h
$(MOC) $(srcdir)/encodefileimp.h -o encodefileimp.moc
-@@ -1071,18 +1067,18 @@
+@@ -1072,18 +1068,18 @@
mocs: encodefileimp.moc
#>+ 3
@@ -10611,7 +10648,7 @@
#>+ 3
kaudiocreator.moc: $(srcdir)/kaudiocreator.h
-@@ -1092,11 +1088,11 @@
+@@ -1093,11 +1089,11 @@
mocs: kaudiocreator.moc
#>+ 3
@@ -10626,7 +10663,7 @@
#>+ 3
ripper.moc: $(srcdir)/ripper.h
-@@ -1106,8 +1102,15 @@
+@@ -1107,8 +1103,15 @@
mocs: ripper.moc
#>+ 3
@@ -10643,7 +10680,7 @@
#>+ 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 @@
+@@ -1139,20 +1142,20 @@
#>+ 16
install-kde-icons:
@@ -10670,7 +10707,7 @@
#>+ 15
force-reedit:
-@@ -1192,7 +1195,7 @@
+@@ -1193,7 +1196,7 @@
#>+ 11
@@ -10679,7 +10716,7 @@
@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 @@
+@@ -1244,8 +1247,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
@@ -10689,7 +10726,7 @@
tracksimp.o: tracksimp.moc
encoder.o: encoder.moc
nmcheck:
-@@ -1254,8 +1257,8 @@
+@@ -1255,8 +1258,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
@@ -10699,10 +10736,10 @@
$(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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/au/Makefile.in kdemultimedia-3.4.2/kfile-plugins/au/Makefile.in
+--- kdemultimedia-3.4.2.orig/kfile-plugins/au/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kfile-plugins/au/Makefile.in 2005-07-27 16:57:04.072976568 +0000
+@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10712,7 +10749,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -513,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10721,7 +10758,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -551,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10733,10 +10770,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/avi/Makefile.in kdemultimedia-3.4.2/kfile-plugins/avi/Makefile.in
+--- kdemultimedia-3.4.2.orig/kfile-plugins/avi/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kfile-plugins/avi/Makefile.in 2005-07-27 16:57:04.100972312 +0000
+@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10746,7 +10783,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -513,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10755,7 +10792,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -551,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10767,10 +10804,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/flac/Makefile.in kdemultimedia-3.4.2/kfile-plugins/flac/Makefile.in
+--- kdemultimedia-3.4.2.orig/kfile-plugins/flac/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kfile-plugins/flac/Makefile.in 2005-07-27 16:57:04.131967600 +0000
+@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10780,7 +10817,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -513,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10789,7 +10826,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -551,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10801,10 +10838,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/m3u/Makefile.in kdemultimedia-3.4.2/kfile-plugins/m3u/Makefile.in
+--- kdemultimedia-3.4.2.orig/kfile-plugins/m3u/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kfile-plugins/m3u/Makefile.in 2005-07-27 16:57:04.155963952 +0000
+@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10814,7 +10851,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -513,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10823,7 +10860,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -551,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10835,10 +10872,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/Makefile.in kdemultimedia-3.4.2/kfile-plugins/Makefile.in
+--- kdemultimedia-3.4.2.orig/kfile-plugins/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kfile-plugins/Makefile.in 2005-07-27 16:57:04.047980368 +0000
+@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10848,7 +10885,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -473,7 +476,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -10857,7 +10894,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -511,9 +514,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10869,10 +10906,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/mp3/Makefile.in kdemultimedia-3.4.2/kfile-plugins/mp3/Makefile.in
+--- kdemultimedia-3.4.2.orig/kfile-plugins/mp3/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kfile-plugins/mp3/Makefile.in 2005-07-27 16:57:04.181960000 +0000
+@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10882,7 +10919,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -513,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10891,7 +10928,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -551,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10903,10 +10940,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/mpc/Makefile.in kdemultimedia-3.4.2/kfile-plugins/mpc/Makefile.in
+--- kdemultimedia-3.4.2.orig/kfile-plugins/mpc/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kfile-plugins/mpc/Makefile.in 2005-07-27 16:57:04.206956200 +0000
+@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10916,7 +10953,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -513,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10925,7 +10962,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -551,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10937,10 +10974,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/ogg/Makefile.in kdemultimedia-3.4.2/kfile-plugins/ogg/Makefile.in
+--- kdemultimedia-3.4.2.orig/kfile-plugins/ogg/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kfile-plugins/ogg/Makefile.in 2005-07-27 16:57:04.234951944 +0000
+@@ -260,6 +260,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10950,7 +10987,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -524,7 +527,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -10959,7 +10996,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -562,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10971,10 +11008,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/sid/Makefile.in kdemultimedia-3.4.2/kfile-plugins/sid/Makefile.in
+--- kdemultimedia-3.4.2.orig/kfile-plugins/sid/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kfile-plugins/sid/Makefile.in 2005-07-27 16:57:04.258948296 +0000
+@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10984,7 +11021,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -513,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10993,7 +11030,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -551,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11005,10 +11042,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/theora/Makefile.in kdemultimedia-3.4.2/kfile-plugins/theora/Makefile.in
+--- kdemultimedia-3.4.2.orig/kfile-plugins/theora/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kfile-plugins/theora/Makefile.in 2005-07-27 16:57:04.285944192 +0000
+@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11018,7 +11055,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -513,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11027,7 +11064,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -551,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11039,10 +11076,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/wav/Makefile.in kdemultimedia-3.4.2/kfile-plugins/wav/Makefile.in
+--- kdemultimedia-3.4.2.orig/kfile-plugins/wav/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kfile-plugins/wav/Makefile.in 2005-07-27 16:57:04.309940544 +0000
+@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11052,7 +11089,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -513,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11061,7 +11098,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -551,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11073,10 +11110,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/kcmaudiocd/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/kcmaudiocd/Makefile.in
+--- kdemultimedia-3.4.2.orig/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-07-27 16:57:04.377930208 +0000
+@@ -250,6 +250,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11086,7 +11123,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,7 +510,7 @@
+@@ -508,7 +511,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11095,7 +11132,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -545,9 +548,9 @@
+@@ -546,9 +549,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11107,10 +11144,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/Makefile.in
+--- kdemultimedia-3.4.2.orig/kioslave/audiocd/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kioslave/audiocd/Makefile.in 2005-07-27 16:57:04.351934160 +0000
+@@ -270,6 +270,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11120,7 +11157,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11129,7 +11166,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11141,10 +11178,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/flac/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/plugins/flac/Makefile.in
+--- kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/flac/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kioslave/audiocd/plugins/flac/Makefile.in 2005-07-27 16:57:04.425922912 +0000
+@@ -244,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11154,7 +11191,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -502,7 +505,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11163,7 +11200,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -540,9 +543,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11175,10 +11212,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/lame/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/plugins/lame/Makefile.in
+--- kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/lame/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kioslave/audiocd/plugins/lame/Makefile.in 2005-07-27 16:57:04.457918048 +0000
+@@ -251,6 +251,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11188,7 +11225,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -512,7 +515,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11197,7 +11234,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -550,9 +553,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11209,10 +11246,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/plugins/Makefile.in
+--- kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kioslave/audiocd/plugins/Makefile.in 2005-07-27 16:57:04.401926560 +0000
+@@ -264,6 +264,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11222,7 +11259,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -521,7 +524,7 @@
+@@ -522,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11231,7 +11268,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -559,9 +562,9 @@
+@@ -560,9 +563,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11243,10 +11280,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/vorbis/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/plugins/vorbis/Makefile.in
+--- kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/vorbis/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kioslave/audiocd/plugins/vorbis/Makefile.in 2005-07-27 16:57:04.486913640 +0000
+@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11256,7 +11293,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -513,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11265,7 +11302,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -551,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11277,10 +11314,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/wav/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/plugins/wav/Makefile.in
+--- kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/wav/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kioslave/audiocd/plugins/wav/Makefile.in 2005-07-27 16:57:04.510909992 +0000
+@@ -247,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11290,7 +11327,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -505,7 +508,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11299,7 +11336,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -543,9 +546,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11311,10 +11348,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kioslave/Makefile.in kdemultimedia-3.4.2/kioslave/Makefile.in
+--- kdemultimedia-3.4.2.orig/kioslave/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kioslave/Makefile.in 2005-07-27 16:57:04.325938112 +0000
+@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11324,7 +11361,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -467,7 +470,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11333,7 +11370,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11345,10 +11382,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kmid/examples/Makefile.in kdemultimedia-3.4.2/kmid/examples/Makefile.in
+--- kdemultimedia-3.4.2.orig/kmid/examples/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kmid/examples/Makefile.in 2005-07-27 16:57:04.634891144 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11358,7 +11395,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -464,7 +467,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11367,7 +11404,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -502,9 +505,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11379,10 +11416,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kmid/Makefile.in kdemultimedia-3.4.2/kmid/Makefile.in
+--- kdemultimedia-3.4.2.orig/kmid/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kmid/Makefile.in 2005-07-27 16:57:04.620893272 +0000
+@@ -302,6 +302,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11392,7 +11429,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -600,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11401,7 +11438,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -638,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11413,7 +11450,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1289,13 +1292,6 @@
+@@ -1290,13 +1293,6 @@
mocs: channelcfgdlg.moc
#>+ 3
@@ -11427,7 +11464,7 @@
kmid_part.moc: $(srcdir)/kmid_part.h
$(MOC) $(srcdir)/kmid_part.h -o kmid_part.moc
-@@ -1303,11 +1299,11 @@
+@@ -1304,11 +1300,11 @@
mocs: kmid_part.moc
#>+ 3
@@ -11442,7 +11479,7 @@
#>+ 3
qslidertime.moc: $(srcdir)/qslidertime.h
-@@ -1317,6 +1313,13 @@
+@@ -1318,6 +1314,13 @@
mocs: qslidertime.moc
#>+ 3
@@ -11456,7 +11493,7 @@
kmidframe.moc: $(srcdir)/kmidframe.h
$(MOC) $(srcdir)/kmidframe.h -o kmidframe.moc
-@@ -1341,7 +1344,7 @@
+@@ -1342,7 +1345,7 @@
#>+ 3
clean-metasources:
@@ -11465,7 +11502,7 @@
#>+ 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 @@
+@@ -1363,15 +1366,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
@@ -11484,7 +11521,7 @@
#>+ 15
force-reedit:
-@@ -1411,7 +1414,7 @@
+@@ -1412,7 +1415,7 @@
#>+ 11
@@ -11493,10 +11530,10 @@
@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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kmid/maps/Makefile.in kdemultimedia-3.4.2/kmid/maps/Makefile.in
+--- kdemultimedia-3.4.2.orig/kmid/maps/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kmid/maps/Makefile.in 2005-07-27 16:57:04.648889016 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11506,7 +11543,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -462,7 +465,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11515,7 +11552,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -500,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11527,10 +11564,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kmid/pics/Makefile.in kdemultimedia-3.4.2/kmid/pics/Makefile.in
+--- kdemultimedia-3.4.2.orig/kmid/pics/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kmid/pics/Makefile.in 2005-07-27 16:57:04.665886432 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11540,7 +11577,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11549,7 +11586,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11561,7 +11598,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -642,21 +645,21 @@
+@@ -643,21 +646,21 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions
$(INSTALL_DATA) $(srcdir)/cr22-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/piano.png
@@ -11587,10 +11624,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kmix/Makefile.in kdemultimedia-3.4.2/kmix/Makefile.in
+--- kdemultimedia-3.4.2.orig/kmix/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kmix/Makefile.in 2005-07-27 16:57:04.827861808 +0000
+@@ -332,6 +332,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11600,7 +11637,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -648,7 +651,7 @@
+@@ -653,7 +656,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11609,7 +11646,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -686,9 +689,9 @@
+@@ -691,9 +694,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11621,7 +11658,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1349,18 +1352,18 @@
+@@ -1356,18 +1359,18 @@
mocs: viewswitches.moc
#>+ 3
@@ -11646,7 +11683,7 @@
#>+ 3
ksmallslider.moc: $(srcdir)/ksmallslider.h
-@@ -1391,13 +1394,6 @@
+@@ -1398,13 +1401,6 @@
mocs: viewapplet.moc
#>+ 3
@@ -11660,7 +11697,7 @@
mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
$(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
-@@ -1405,11 +1401,11 @@
+@@ -1412,11 +1408,11 @@
mocs: mixdevicewidget.moc
#>+ 3
@@ -11675,7 +11712,7 @@
#>+ 3
dialogviewconfiguration.moc: $(srcdir)/dialogviewconfiguration.h
-@@ -1419,6 +1415,13 @@
+@@ -1426,6 +1422,13 @@
mocs: dialogviewconfiguration.moc
#>+ 3
@@ -11689,7 +11726,7 @@
kmixapplet.moc: $(srcdir)/kmixapplet.h
$(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc
-@@ -1440,18 +1443,18 @@
+@@ -1447,18 +1450,18 @@
mocs: kmix.moc
#>+ 3
@@ -11714,7 +11751,7 @@
#>+ 3
mixdevice.moc: $(srcdir)/mixdevice.h
-@@ -1475,18 +1478,18 @@
+@@ -1489,18 +1492,18 @@
mocs: viewsurround.moc
#>+ 3
@@ -11739,28 +11776,28 @@
#>+ 3
kledbutton.moc: $(srcdir)/kledbutton.h
-@@ -1522,7 +1525,7 @@
+@@ -1536,7 +1539,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
+- -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 dialogselectmaster.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 dialogselectmaster.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 @@
+@@ -1599,7 +1602,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
+-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)/mixer_backend.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 $(srcdir)/dialogselectmaster.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 dialogselectmaster.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)/mixer_backend.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 $(srcdir)/dialogselectmaster.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 dialogselectmaster.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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kmix/pics/Makefile.in kdemultimedia-3.4.2/kmix/pics/Makefile.in
+--- kdemultimedia-3.4.2.orig/kmix/pics/Makefile.in 2005-07-20 20:12:11.000000000 +0000
++++ kdemultimedia-3.4.2/kmix/pics/Makefile.in 2005-07-27 16:57:04.848858616 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11770,7 +11807,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -470,7 +473,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11779,7 +11816,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11791,7 +11828,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -679,23 +682,23 @@
+@@ -680,23 +683,23 @@
#>+ 19
install-kde-icons:
@@ -11824,10 +11861,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/krec/Makefile.in kdemultimedia-3.4.2/krec/Makefile.in
+--- kdemultimedia-3.4.2.orig/krec/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/krec/Makefile.in 2005-07-27 16:57:04.951842960 +0000
+@@ -326,6 +326,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11837,7 +11874,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -648,7 +651,7 @@
+@@ -649,7 +652,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11846,7 +11883,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -686,9 +689,9 @@
+@@ -687,9 +690,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11858,7 +11895,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1361,18 +1364,18 @@
+@@ -1362,18 +1365,18 @@
mocs: krecglobal.moc
#>+ 3
@@ -11883,7 +11920,7 @@
#>+ 3
krecconfig_files.moc: $(srcdir)/krecconfig_files.h
-@@ -1389,13 +1392,6 @@
+@@ -1390,13 +1393,6 @@
mocs: krecfileview.moc
#>+ 3
@@ -11897,7 +11934,7 @@
krecfilewidgets.moc: $(srcdir)/krecfilewidgets.h
$(MOC) $(srcdir)/krecfilewidgets.h -o krecfilewidgets.moc
-@@ -1403,11 +1399,11 @@
+@@ -1404,11 +1400,11 @@
mocs: krecfilewidgets.moc
#>+ 3
@@ -11912,7 +11949,7 @@
#>+ 3
krecconfigure.moc: $(srcdir)/krecconfigure.h
-@@ -1417,6 +1413,13 @@
+@@ -1418,6 +1414,13 @@
mocs: krecconfigure.moc
#>+ 3
@@ -11926,7 +11963,7 @@
krecconfig_fileswidget.moc: $(srcdir)/krecconfig_fileswidget.h
$(MOC) $(srcdir)/krecconfig_fileswidget.h -o krecconfig_fileswidget.moc
-@@ -1484,10 +1487,10 @@
+@@ -1485,10 +1488,10 @@
#>+ 3
clean-metasources:
@@ -11939,7 +11976,7 @@
#>+ 3
clean-closures:
-@@ -1498,26 +1501,26 @@
+@@ -1499,26 +1502,26 @@
#>+ 22
install-kde-icons:
@@ -11975,7 +12012,7 @@
#>+ 15
force-reedit:
-@@ -1558,7 +1561,7 @@
+@@ -1559,7 +1562,7 @@
#>+ 11
@@ -11984,7 +12021,7 @@
@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 @@
+@@ -1571,7 +1574,7 @@
rm -f libkdeinit_krec_la.all_cpp.final libkdeinit_krec_la.all_cpp.files
#>+ 11
@@ -11993,7 +12030,7 @@
@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 @@
+@@ -1651,11 +1654,11 @@
krecnewproperties.o: krecnewproperties.moc
krecexport_wave.lo: krecexport_wave.moc
krecconfig_files.o: krecconfig_files.moc
@@ -12007,10 +12044,10 @@
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 @@
+diff -Nru kdemultimedia-3.4.2.orig/krec/mp3_export/Makefile.in kdemultimedia-3.4.2/krec/mp3_export/Makefile.in
+--- kdemultimedia-3.4.2.orig/krec/mp3_export/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/krec/mp3_export/Makefile.in 2005-07-27 16:57:04.982838248 +0000
+@@ -247,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12020,7 +12057,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -514,7 +517,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12029,7 +12066,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -552,9 +555,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12041,10 +12078,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/krec/ogg_export/Makefile.in kdemultimedia-3.4.2/krec/ogg_export/Makefile.in
+--- kdemultimedia-3.4.2.orig/krec/ogg_export/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/krec/ogg_export/Makefile.in 2005-07-27 16:57:05.006834600 +0000
+@@ -247,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12054,7 +12091,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -514,7 +517,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12063,7 +12100,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -552,9 +555,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12075,10 +12112,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/krec/pics/Makefile.in kdemultimedia-3.4.2/krec/pics/Makefile.in
+--- kdemultimedia-3.4.2.orig/krec/pics/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/krec/pics/Makefile.in 2005-07-27 16:57:05.024831864 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12088,7 +12125,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12097,7 +12134,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12109,7 +12146,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -640,24 +643,24 @@
+@@ -641,24 +644,24 @@
#>+ 20
install-kde-icons:
@@ -12142,10 +12179,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kscd/bitmaps/Makefile.in kdemultimedia-3.4.2/kscd/bitmaps/Makefile.in
+--- kdemultimedia-3.4.2.orig/kscd/bitmaps/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/kscd/bitmaps/Makefile.in 2005-07-27 16:57:05.134815144 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12155,7 +12192,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -450,7 +453,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12164,7 +12201,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -488,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12176,10 +12213,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kscd/kscdmagic/Makefile.in kdemultimedia-3.4.2/kscd/kscdmagic/Makefile.in
+--- kdemultimedia-3.4.2.orig/kscd/kscdmagic/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/kscd/kscdmagic/Makefile.in 2005-07-27 16:57:05.159811344 +0000
+@@ -266,6 +266,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12189,7 +12226,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -533,7 +536,7 @@
+@@ -534,7 +537,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -12198,7 +12235,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -571,9 +574,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12210,10 +12247,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kscd/libwm/audio/Makefile.in kdemultimedia-3.4.2/kscd/libwm/audio/Makefile.in
+--- kdemultimedia-3.4.2.orig/kscd/libwm/audio/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/kscd/libwm/audio/Makefile.in 2005-07-27 16:57:05.211803440 +0000
+@@ -228,6 +228,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12223,7 +12260,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -480,7 +483,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -12232,7 +12269,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -518,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12244,10 +12281,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kscd/libwm/Makefile.in kdemultimedia-3.4.2/kscd/libwm/Makefile.in
+--- kdemultimedia-3.4.2.orig/kscd/libwm/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/kscd/libwm/Makefile.in 2005-07-27 16:57:05.187807088 +0000
+@@ -259,6 +259,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12257,7 +12294,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -521,7 +524,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -12266,7 +12303,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -559,9 +562,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12278,10 +12315,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/kscd/Makefile.in kdemultimedia-3.4.2/kscd/Makefile.in
+--- kdemultimedia-3.4.2.orig/kscd/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/kscd/Makefile.in 2005-07-27 16:57:05.119817424 +0000
+@@ -283,6 +283,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12291,7 +12328,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -572,7 +575,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12300,7 +12337,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -610,9 +613,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12312,7 +12349,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1173,7 +1176,7 @@
+@@ -1174,7 +1177,7 @@
-rm -f bwlednum.moc kscd.moc docking.moc ledlamp.moc configWidget.moc kvolumecontrol.moc cddbdlg.moc
#>+ 2
@@ -12321,7 +12358,7 @@
#>+ 4
clean-idl:
-@@ -1198,24 +1201,24 @@
+@@ -1199,24 +1202,24 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions
$(INSTALL_DATA) $(srcdir)/cr22-action-cdsmall.png $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.png
@@ -12355,10 +12392,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/libkcddb/kcmcddb/Makefile.in kdemultimedia-3.4.2/libkcddb/kcmcddb/Makefile.in
+--- kdemultimedia-3.4.2.orig/libkcddb/kcmcddb/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/libkcddb/kcmcddb/Makefile.in 2005-07-27 16:57:05.292791128 +0000
+@@ -250,6 +250,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12368,7 +12405,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -519,7 +522,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12377,7 +12414,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12389,7 +12426,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -886,7 +889,7 @@
+@@ -887,7 +890,7 @@
-rm -f cddbconfigwidget.moc kcmcddb.moc
#>+ 2
@@ -12398,10 +12435,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/libkcddb/Makefile.in kdemultimedia-3.4.2/libkcddb/Makefile.in
+--- kdemultimedia-3.4.2.orig/libkcddb/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/libkcddb/Makefile.in 2005-07-27 16:57:05.261795840 +0000
+@@ -277,6 +277,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12411,7 +12448,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -555,7 +558,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12420,7 +12457,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12432,7 +12469,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1010,32 +1013,32 @@
+@@ -1011,32 +1014,32 @@
.NOEXPORT:
#>+ 3
@@ -12477,7 +12514,7 @@
#>+ 3
asynchttplookup.moc: $(srcdir)/asynchttplookup.h
-@@ -1053,7 +1056,7 @@
+@@ -1054,7 +1057,7 @@
#>+ 3
clean-metasources:
@@ -12486,7 +12523,7 @@
#>+ 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 @@
+@@ -1111,7 +1114,7 @@
#>+ 11
@@ -12495,10 +12532,10 @@
@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 @@
+diff -Nru kdemultimedia-3.4.2.orig/libkcddb/test/Makefile.in kdemultimedia-3.4.2/libkcddb/test/Makefile.in
+--- kdemultimedia-3.4.2.orig/libkcddb/test/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/libkcddb/test/Makefile.in 2005-07-27 16:57:05.337784288 +0000
+@@ -300,6 +300,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12508,7 +12545,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -581,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12517,7 +12554,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -619,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12529,7 +12566,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -899,22 +902,22 @@
+@@ -900,22 +903,22 @@
mocs: asynccddblookuptest.moc
#>+ 3
@@ -12559,10 +12596,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/Makefile.in kdemultimedia-3.4.2/Makefile.in
+--- kdemultimedia-3.4.2.orig/Makefile.in 2005-07-20 20:12:10.000000000 +0000
++++ kdemultimedia-3.4.2/Makefile.in 2005-07-27 16:57:02.318243328 +0000
+@@ -234,6 +234,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12572,7 +12609,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -494,7 +497,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -12581,7 +12618,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,12 +538,12 @@
+@@ -536,12 +539,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -12596,7 +12633,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -552,7 +555,7 @@
+@@ -553,7 +556,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -12605,7 +12642,7 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -969,7 +972,7 @@
+@@ -970,7 +973,7 @@
.NOEXPORT:
#>+ 2
@@ -12614,10 +12651,10 @@
#>+ 2
docs-am:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/cddaplay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/cddaplay/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/cddaplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/cddaplay/Makefile.in 2005-07-27 16:57:05.388776536 +0000
+@@ -240,6 +240,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12627,7 +12664,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,7 +498,7 @@
+@@ -496,7 +499,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12636,7 +12673,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -533,9 +536,9 @@
+@@ -534,9 +537,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12648,10 +12685,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/Makefile.in kdemultimedia-3.4.2/mpeglib/example/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/Makefile.in 2005-07-27 16:57:05.369779424 +0000
+@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12661,7 +12698,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -466,7 +469,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -12670,7 +12707,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12682,10 +12719,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/mpgplay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/mpgplay/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/mpgplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/mpgplay/Makefile.in 2005-07-27 16:57:05.406773800 +0000
+@@ -240,6 +240,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12695,7 +12732,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -497,7 +500,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12704,7 +12741,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -535,9 +538,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12716,10 +12753,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/splay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/splay/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/splay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/splay/Makefile.in 2005-07-27 16:57:05.428770456 +0000
+@@ -245,6 +245,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12729,7 +12766,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -506,7 +509,7 @@
+@@ -507,7 +510,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12738,7 +12775,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -544,9 +547,9 @@
+@@ -545,9 +548,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12750,10 +12787,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/tplay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/tplay/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/tplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/tplay/Makefile.in 2005-07-27 16:57:05.453766656 +0000
+@@ -240,6 +240,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12763,7 +12800,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -497,7 +500,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12772,7 +12809,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -535,9 +538,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12784,10 +12821,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/yaf/Makefile.in 2005-07-27 16:57:05.469764224 +0000
+@@ -219,6 +219,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12797,7 +12834,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -471,7 +474,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -12806,7 +12843,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -509,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12818,10 +12855,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafcdda/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafcdda/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafcdda/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafcdda/Makefile.in 2005-07-27 16:57:05.489761184 +0000
+@@ -244,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12831,7 +12868,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -502,7 +505,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12840,7 +12877,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -540,9 +543,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12852,10 +12889,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafcore/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafcore/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafcore/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafcore/Makefile.in 2005-07-27 16:57:05.513757536 +0000
+@@ -257,6 +257,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12865,7 +12902,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -538,7 +541,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12874,7 +12911,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12886,10 +12923,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafmpgplay/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafmpgplay/Makefile.in 2005-07-27 16:57:05.533754496 +0000
+@@ -244,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12899,7 +12936,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -503,7 +506,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12908,7 +12945,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -541,9 +544,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12920,10 +12957,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafsplay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafsplay/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafsplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafsplay/Makefile.in 2005-07-27 16:57:05.552751608 +0000
+@@ -244,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12933,7 +12970,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -503,7 +506,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12942,7 +12979,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -541,9 +544,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12954,10 +12991,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yaftplay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yaftplay/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yaftplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/yaf/yaftplay/Makefile.in 2005-07-27 16:57:05.571748720 +0000
+@@ -244,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12967,7 +13004,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -502,7 +505,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12976,7 +13013,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -540,9 +543,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12988,10 +13025,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafvorbis/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafvorbis/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafvorbis/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafvorbis/Makefile.in 2005-07-27 16:57:05.591745680 +0000
+@@ -244,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13001,7 +13038,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -504,7 +507,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13010,7 +13047,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -542,9 +545,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13022,10 +13059,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafxplayer/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafxplayer/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafxplayer/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafxplayer/Makefile.in 2005-07-27 16:57:05.615742032 +0000
+@@ -256,6 +256,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13035,7 +13072,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -530,7 +533,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13044,7 +13081,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13056,10 +13093,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafyuv/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafyuv/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafyuv/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafyuv/Makefile.in 2005-07-27 16:57:05.634739144 +0000
+@@ -244,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13069,7 +13106,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -503,7 +506,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13078,7 +13115,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -541,9 +544,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13090,10 +13127,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/decoder/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/decoder/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/decoder/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/decoder/Makefile.in 2005-07-27 16:57:05.686731240 +0000
+@@ -253,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13103,7 +13140,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -517,7 +520,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13112,7 +13149,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -555,9 +558,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13124,10 +13161,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/frame/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/frame/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/frame/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/frame/Makefile.in 2005-07-27 16:57:05.725725312 +0000
+@@ -253,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13137,7 +13174,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -517,7 +520,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13146,7 +13183,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -555,9 +558,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13158,10 +13195,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/input/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/input/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/input/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/input/Makefile.in 2005-07-27 16:57:05.750721512 +0000
+@@ -259,6 +259,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13171,7 +13208,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13180,7 +13217,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13192,10 +13229,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/Makefile.in 2005-07-27 16:57:05.663734736 +0000
+@@ -264,6 +264,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13205,7 +13242,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -538,7 +541,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13214,7 +13251,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13226,10 +13263,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/mpegplay/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/mpegplay/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/mpegplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/mpegplay/Makefile.in 2005-07-27 16:57:05.779717104 +0000
+@@ -274,6 +274,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13239,7 +13276,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -564,7 +567,7 @@
.SUFFIXES:
.SUFFIXES: .S .cpp .lo .o .obj
@@ -13248,7 +13285,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -602,9 +605,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13260,10 +13297,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/mpgplayer/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/mpgplayer/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/mpgplayer/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/mpgplayer/Makefile.in 2005-07-27 16:57:05.800713912 +0000
+@@ -246,6 +246,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13273,7 +13310,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -500,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13282,7 +13319,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -538,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13294,10 +13331,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/oggvorbis/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/oggvorbis/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/oggvorbis/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/oggvorbis/Makefile.in 2005-07-27 16:57:05.825710112 +0000
+@@ -251,6 +251,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13307,7 +13344,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -509,7 +512,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13316,7 +13353,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -547,9 +550,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13328,10 +13365,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/output/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/output/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/output/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/output/Makefile.in 2005-07-27 16:57:05.852706008 +0000
+@@ -257,6 +257,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13341,7 +13378,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -528,7 +531,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13350,7 +13387,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -566,9 +569,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13362,10 +13399,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/splay/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/splay/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/splay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/splay/Makefile.in 2005-07-27 16:57:05.888700536 +0000
+@@ -259,6 +259,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13375,7 +13412,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13384,7 +13421,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13396,10 +13433,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/tplay/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/tplay/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/tplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/tplay/Makefile.in 2005-07-27 16:57:05.909697344 +0000
+@@ -241,6 +241,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13409,7 +13446,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -497,7 +500,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13418,7 +13455,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -535,9 +538,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13430,10 +13467,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/abstract/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/abstract/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/util/abstract/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/util/abstract/Makefile.in 2005-07-27 16:57:05.960689592 +0000
+@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13443,7 +13480,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -503,7 +506,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13452,7 +13489,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -541,9 +544,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13464,10 +13501,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/audio/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/audio/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/util/audio/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/util/audio/Makefile.in 2005-07-27 16:57:05.981686400 +0000
+@@ -241,6 +241,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13477,7 +13514,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
+@@ -499,7 +502,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13486,7 +13523,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +539,9 @@
+@@ -537,9 +540,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13498,10 +13535,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/file/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/file/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/util/file/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/util/file/Makefile.in 2005-07-27 16:57:06.002683208 +0000
+@@ -246,6 +246,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13511,7 +13548,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -501,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13520,7 +13557,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -539,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13532,10 +13569,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/util/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/util/Makefile.in 2005-07-27 16:57:05.939692784 +0000
+@@ -267,6 +267,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13545,7 +13582,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13554,7 +13591,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13566,10 +13603,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/mmx/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/mmx/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/util/mmx/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/util/mmx/Makefile.in 2005-07-27 16:57:06.021680320 +0000
+@@ -242,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13579,7 +13616,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -498,7 +501,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -13588,7 +13625,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -536,9 +539,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13600,10 +13637,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/dither/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/render/dither/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/dither/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/util/render/dither/Makefile.in 2005-07-27 16:57:06.068673176 +0000
+@@ -247,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13613,7 +13650,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -514,7 +517,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13622,7 +13659,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -552,9 +555,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13634,10 +13671,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/render/dither2YUV/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/util/render/dither2YUV/Makefile.in 2005-07-27 16:57:06.089669984 +0000
+@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13647,7 +13684,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -501,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13656,7 +13693,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -539,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13668,10 +13705,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/render/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/util/render/Makefile.in 2005-07-27 16:57:06.046676520 +0000
+@@ -267,6 +267,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13681,7 +13718,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -533,7 +536,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13690,7 +13727,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -571,9 +574,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13702,10 +13739,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/sdl/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/render/sdl/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/sdl/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/util/render/sdl/Makefile.in 2005-07-27 16:57:06.109666944 +0000
+@@ -241,6 +241,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13715,7 +13752,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -494,7 +497,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13724,7 +13761,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -531,9 +534,9 @@
+@@ -532,9 +535,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13736,10 +13773,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/x11/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/render/x11/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/x11/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/util/render/x11/Makefile.in 2005-07-27 16:57:06.136662840 +0000
+@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13749,7 +13786,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -503,7 +506,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13758,7 +13795,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -541,9 +544,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13770,10 +13807,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/yuv/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/yuv/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/lib/yuv/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/lib/yuv/Makefile.in 2005-07-27 16:57:06.156659800 +0000
+@@ -246,6 +246,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13783,7 +13820,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -501,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13792,7 +13829,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -539,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13804,10 +13841,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib/Makefile.in kdemultimedia-3.4.2/mpeglib/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib/Makefile.in 2005-07-20 20:12:12.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib/Makefile.in 2005-07-27 16:57:05.353781856 +0000
+@@ -220,6 +220,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13817,7 +13854,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -472,7 +475,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13826,7 +13863,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -510,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13838,10 +13875,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpeglib_artsplug/Makefile.in kdemultimedia-3.4.2/mpeglib_artsplug/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpeglib_artsplug/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpeglib_artsplug/Makefile.in 2005-07-27 16:57:06.188654936 +0000
+@@ -287,6 +287,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13851,7 +13888,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -612,7 +615,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -13860,7 +13897,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -650,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13872,7 +13909,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1017,7 +1020,7 @@
+@@ -1018,7 +1021,7 @@
.NOEXPORT:
#>+ 2
@@ -13881,10 +13918,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpg123_artsplugin/Makefile.in kdemultimedia-3.4.2/mpg123_artsplugin/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpg123_artsplugin/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpg123_artsplugin/Makefile.in 2005-07-27 16:57:06.217650528 +0000
+@@ -278,6 +278,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13894,7 +13931,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -542,7 +545,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -13903,7 +13940,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13915,10 +13952,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/mpg123_artsplugin/mpg123/Makefile.in kdemultimedia-3.4.2/mpg123_artsplugin/mpg123/Makefile.in
+--- kdemultimedia-3.4.2.orig/mpg123_artsplugin/mpg123/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/mpg123_artsplugin/mpg123/Makefile.in 2005-07-27 16:57:06.262643688 +0000
+@@ -315,6 +315,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13928,7 +13965,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -593,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj .s
@@ -13937,7 +13974,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -631,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13949,10 +13986,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/app/Makefile.in kdemultimedia-3.4.2/noatun/app/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/app/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/app/Makefile.in 2005-07-27 16:57:06.319635024 +0000
+@@ -258,6 +258,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13962,7 +13999,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -518,7 +521,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13971,7 +14008,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -556,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13983,10 +14020,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/library/Makefile.in kdemultimedia-3.4.2/noatun/library/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/library/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/library/Makefile.in 2005-07-27 16:57:06.442616328 +0000
+@@ -301,6 +301,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13996,7 +14033,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -604,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14005,7 +14042,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -642,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14017,7 +14054,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1101,18 +1104,18 @@
+@@ -1102,18 +1105,18 @@
mocs: mimetypetree.moc
#>+ 3
@@ -14042,7 +14079,7 @@
#>+ 3
vequalizer.moc: $(srcdir)/noatun/vequalizer.h
-@@ -1206,18 +1209,18 @@
+@@ -1207,18 +1210,18 @@
mocs: playlist.moc
#>+ 3
@@ -14067,7 +14104,7 @@
#>+ 3
effectview.moc: $(srcdir)/effectview.h
-@@ -1251,7 +1254,7 @@
+@@ -1252,7 +1255,7 @@
#>+ 3
clean-metasources:
@@ -14076,7 +14113,7 @@
#>+ 2
KDE_DIST=pluginmodule.h noatunlistview.h Makefile.in titleproxy.h equalizerwidget.ui spline.h globalvideo.h Makefile.am
-@@ -1307,7 +1310,7 @@
+@@ -1308,7 +1311,7 @@
#>+ 11
@@ -14085,10 +14122,10 @@
@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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/library/noatun/Makefile.in kdemultimedia-3.4.2/noatun/library/noatun/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/library/noatun/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/library/noatun/Makefile.in 2005-07-27 16:57:06.459613744 +0000
+@@ -214,6 +214,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14098,7 +14135,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -470,7 +473,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14107,7 +14144,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14119,10 +14156,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/library/noatunarts/Makefile.in kdemultimedia-3.4.2/noatun/library/noatunarts/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/library/noatunarts/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/library/noatunarts/Makefile.in 2005-07-27 16:57:06.492608728 +0000
+@@ -262,6 +262,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14132,7 +14169,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -533,7 +536,7 @@
+@@ -534,7 +537,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -14141,7 +14178,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -571,9 +574,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14153,10 +14190,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/library/noatuntags/Makefile.in kdemultimedia-3.4.2/noatun/library/noatuntags/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/library/noatuntags/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/library/noatuntags/Makefile.in 2005-07-27 16:57:06.515605232 +0000
+@@ -246,6 +246,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14166,7 +14203,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -503,7 +506,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14175,7 +14212,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -541,9 +544,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14187,9 +14224,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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
+diff -Nru kdemultimedia-3.4.2.orig/noatun/Makefile.in kdemultimedia-3.4.2/noatun/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/Makefile.in 2005-07-27 16:57:06.290639432 +0000
@@ -41,7 +41,7 @@
build_triplet = @build@
host_triplet = @host@
@@ -14213,7 +14250,7 @@
am_noatun20update_OBJECTS = noatun20update.$(OBJEXT)
#>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS)
#>+ 1
-@@ -262,6 +262,9 @@
+@@ -263,6 +263,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14223,7 +14260,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,6 +516,7 @@
+@@ -514,6 +517,7 @@
presets_DATA = preset.dance preset.jazz preset.metal preset.trance preset.zero
updatedir = $(kde_datadir)/kconf_update
update_DATA = noatun.upd
@@ -14231,7 +14268,7 @@
noatun20update_SOURCES = noatun20update.cpp
noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)
noatun20update_LDADD = $(LIB_QT)
-@@ -522,7 +526,7 @@
+@@ -523,7 +527,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14240,7 +14277,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -560,34 +564,34 @@
+@@ -561,34 +565,34 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14288,7 +14325,7 @@
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
-@@ -865,7 +869,7 @@
+@@ -866,7 +870,7 @@
all-am: Makefile $(PROGRAMS) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
@@ -14297,7 +14334,7 @@
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
-@@ -896,10 +900,10 @@
+@@ -897,10 +901,10 @@
#>+ 1
clean: kde-rpo-clean clean-recursive
@@ -14310,7 +14347,7 @@
mostlyclean-am
distclean: distclean-recursive
-@@ -918,11 +922,11 @@
+@@ -919,11 +923,11 @@
info-am:
@@ -14326,7 +14363,7 @@
install-exec-am:
-@@ -950,32 +954,33 @@
+@@ -951,32 +955,33 @@
ps-am:
@@ -14372,7 +14409,7 @@
messages:
-@@ -1000,26 +1005,26 @@
+@@ -1001,26 +1006,26 @@
#>+ 22
install-kde-icons:
@@ -14408,10 +14445,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/artseffects/Makefile.in kdemultimedia-3.4.2/noatun/modules/artseffects/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/artseffects/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/artseffects/Makefile.in 2005-07-27 16:57:06.555599152 +0000
+@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14421,7 +14458,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -515,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14430,7 +14467,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -553,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14442,10 +14479,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/dcopiface/Makefile.in kdemultimedia-3.4.2/noatun/modules/dcopiface/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/dcopiface/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/dcopiface/Makefile.in 2005-07-27 16:57:06.581595200 +0000
+@@ -253,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14455,7 +14492,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -515,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14464,7 +14501,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -553,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14476,10 +14513,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/excellent/Makefile.in kdemultimedia-3.4.2/noatun/modules/excellent/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/excellent/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/excellent/Makefile.in 2005-07-27 16:57:06.609590944 +0000
+@@ -254,6 +254,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14489,7 +14526,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14498,7 +14535,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14510,10 +14547,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/htmlexport/Makefile.in kdemultimedia-3.4.2/noatun/modules/htmlexport/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/htmlexport/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/htmlexport/Makefile.in 2005-07-27 16:57:06.636586840 +0000
+@@ -250,6 +250,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14523,7 +14560,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -512,7 +515,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14532,7 +14569,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -550,9 +553,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14544,10 +14581,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/infrared/Makefile.in kdemultimedia-3.4.2/noatun/modules/infrared/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/infrared/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/infrared/Makefile.in 2005-07-27 16:57:06.666582280 +0000
+@@ -253,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14557,7 +14594,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -515,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14566,7 +14603,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -553,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14578,10 +14615,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kaiman/Makefile.in kdemultimedia-3.4.2/noatun/modules/kaiman/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/kaiman/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/kaiman/Makefile.in 2005-07-27 16:57:06.743570576 +0000
+@@ -269,6 +269,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14591,7 +14628,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -541,7 +544,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14600,7 +14637,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14612,7 +14649,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -983,22 +986,22 @@
+@@ -984,22 +987,22 @@
mocs: userinterface.moc
#>+ 3
@@ -14642,7 +14679,7 @@
#>+ 2
KDE_DIST=kaimanui.rc Makefile.in kaiman.plugin SKIN-SPECS Makefile.am
-@@ -1049,7 +1052,7 @@
+@@ -1050,7 +1053,7 @@
#>+ 11
@@ -14651,7 +14688,7 @@
@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 @@
+@@ -1093,8 +1096,8 @@
nmcheck:
userinterface.lo: userinterface.moc
nmcheck-am: nmcheck
@@ -14661,10 +14698,10 @@
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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in kdemultimedia-3.4.2/noatun/modules/kaiman/skins/car-preset/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/kaiman/skins/car-preset/Makefile.in 2005-07-27 16:57:06.775565712 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14674,7 +14711,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -468,7 +471,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14683,7 +14720,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -506,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14695,10 +14732,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/circle/Makefile.in kdemultimedia-3.4.2/noatun/modules/kaiman/skins/circle/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/circle/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/kaiman/skins/circle/Makefile.in 2005-07-27 16:57:06.791563280 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14708,7 +14745,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -470,7 +473,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14717,7 +14754,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14729,10 +14766,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/k9/Makefile.in kdemultimedia-3.4.2/noatun/modules/kaiman/skins/k9/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/k9/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/kaiman/skins/k9/Makefile.in 2005-07-27 16:57:06.807560848 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14742,7 +14779,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -469,7 +472,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14751,7 +14788,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14763,7 +14800,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -667,7 +670,7 @@
+@@ -668,7 +671,7 @@
.NOEXPORT:
#>+ 2
@@ -14772,10 +14809,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/Makefile.in kdemultimedia-3.4.2/noatun/modules/kaiman/skins/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/kaiman/skins/Makefile.in 2005-07-27 16:57:06.759568144 +0000
+@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14785,7 +14822,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -467,7 +470,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14794,7 +14831,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14806,10 +14843,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/keyz/Makefile.in kdemultimedia-3.4.2/noatun/modules/keyz/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/keyz/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/keyz/Makefile.in 2005-07-27 16:57:06.832557048 +0000
+@@ -250,6 +250,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14819,7 +14856,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -509,7 +512,7 @@
+@@ -510,7 +513,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14828,7 +14865,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -547,9 +550,9 @@
+@@ -548,9 +551,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14840,10 +14877,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/Makefile.in kdemultimedia-3.4.2/noatun/modules/kjofol-skin/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/kjofol-skin/Makefile.in 2005-07-27 16:57:06.889548384 +0000
+@@ -275,6 +275,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14853,7 +14890,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -569,7 +572,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14862,7 +14899,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -607,9 +610,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14874,10 +14911,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in 2005-07-27 16:57:06.903546256 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14887,7 +14924,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -465,7 +468,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14896,7 +14933,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -503,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14908,10 +14945,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in 2005-07-27 16:57:06.935541392 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14921,7 +14958,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -468,7 +471,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14930,7 +14967,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -506,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14942,7 +14979,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -666,7 +669,7 @@
+@@ -667,7 +670,7 @@
.NOEXPORT:
#>+ 2
@@ -14951,10 +14988,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/Makefile.in kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/Makefile.in 2005-07-27 16:57:06.919543824 +0000
+@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14964,7 +15001,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -466,7 +469,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14973,7 +15010,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14985,10 +15022,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/phong/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/phong/Makefile.in 2005-07-27 16:57:06.949539264 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14998,7 +15035,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -465,7 +468,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15007,7 +15044,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -503,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15019,10 +15056,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in 2005-07-27 16:57:06.964536984 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15032,7 +15069,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -465,7 +468,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15041,7 +15078,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -503,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15053,10 +15090,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/Makefile.in kdemultimedia-3.4.2/noatun/modules/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/Makefile.in 2005-07-27 16:57:06.531602800 +0000
+@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15066,7 +15103,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -470,7 +473,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -15075,7 +15112,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15087,10 +15124,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/marquis/Makefile.in kdemultimedia-3.4.2/noatun/modules/marquis/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/marquis/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/marquis/Makefile.in 2005-07-27 16:57:06.991532880 +0000
+@@ -253,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15100,7 +15137,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -515,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15109,7 +15146,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -553,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15121,10 +15158,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/metatag/Makefile.in kdemultimedia-3.4.2/noatun/modules/metatag/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/metatag/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/metatag/Makefile.in 2005-07-27 16:57:07.024527864 +0000
+@@ -254,6 +254,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15134,7 +15171,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -516,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15143,7 +15180,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -554,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15155,10 +15192,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/monoscope/Makefile.in kdemultimedia-3.4.2/noatun/modules/monoscope/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/monoscope/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/monoscope/Makefile.in 2005-07-27 16:57:07.051523760 +0000
+@@ -250,6 +250,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15168,7 +15205,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -512,7 +515,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15177,7 +15214,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -550,9 +553,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15189,10 +15226,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/net/Makefile.in kdemultimedia-3.4.2/noatun/modules/net/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/net/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/net/Makefile.in 2005-07-27 16:57:07.076519960 +0000
+@@ -250,6 +250,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15202,7 +15239,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -509,7 +512,7 @@
+@@ -510,7 +513,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15211,7 +15248,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -547,9 +550,9 @@
+@@ -548,9 +551,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15223,10 +15260,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/noatunui/Makefile.in kdemultimedia-3.4.2/noatun/modules/noatunui/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/noatunui/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/noatunui/Makefile.in 2005-07-27 16:57:07.103515856 +0000
+@@ -254,6 +254,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15236,7 +15273,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -517,7 +520,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15245,7 +15282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -555,9 +558,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15257,10 +15294,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/simple/Makefile.in kdemultimedia-3.4.2/noatun/modules/simple/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/simple/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/simple/Makefile.in 2005-07-27 16:57:07.134511144 +0000
+@@ -253,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15270,7 +15307,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -516,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15279,7 +15316,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -554,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15291,10 +15328,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/splitplaylist/Makefile.in kdemultimedia-3.4.2/noatun/modules/splitplaylist/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/splitplaylist/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/splitplaylist/Makefile.in 2005-07-27 16:57:07.174505064 +0000
+@@ -258,6 +258,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15304,7 +15341,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15313,7 +15350,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15325,10 +15362,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/systray/Makefile.in kdemultimedia-3.4.2/noatun/modules/systray/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/systray/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/systray/Makefile.in 2005-07-27 16:57:07.207500048 +0000
+@@ -255,6 +255,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15338,7 +15375,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15347,7 +15384,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15359,7 +15396,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -876,7 +879,7 @@
+@@ -877,7 +880,7 @@
-rm -f kitsystemtray.moc systray.moc cmodule.moc
#>+ 2
@@ -15368,10 +15405,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/voiceprint/Makefile.in kdemultimedia-3.4.2/noatun/modules/voiceprint/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/voiceprint/Makefile.in 2005-07-20 20:12:13.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/voiceprint/Makefile.in 2005-07-27 16:57:07.240495032 +0000
+@@ -253,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15381,7 +15418,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -513,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15390,7 +15427,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -551,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15402,10 +15439,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/winskin/Makefile.in kdemultimedia-3.4.2/noatun/modules/winskin/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/winskin/Makefile.in 2005-07-20 20:12:14.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/winskin/Makefile.in 2005-07-27 16:57:07.302485608 +0000
+@@ -274,6 +274,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15415,7 +15452,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -594,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15424,7 +15461,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -632,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15436,7 +15473,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1118,18 +1121,18 @@
+@@ -1119,18 +1122,18 @@
mocs: waJumpSlider.moc
#>+ 3
@@ -15461,7 +15498,7 @@
#>+ 3
waButton.moc: $(srcdir)/waButton.h
-@@ -1174,18 +1177,18 @@
+@@ -1175,18 +1178,18 @@
mocs: waBalanceSlider.moc
#>+ 3
@@ -15486,7 +15523,7 @@
#>+ 3
waSkinManager.moc: $(srcdir)/waSkinManager.h
-@@ -1196,10 +1199,10 @@
+@@ -1197,10 +1200,10 @@
#>+ 3
clean-metasources:
@@ -15499,7 +15536,7 @@
#>+ 4
clean-idl:
-@@ -1252,7 +1255,7 @@
+@@ -1253,7 +1256,7 @@
#>+ 11
@@ -15508,10 +15545,10 @@
@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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in kdemultimedia-3.4.2/noatun/modules/winskin/mimetypes/interface/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in 2005-07-20 20:12:14.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/winskin/mimetypes/interface/Makefile.in 2005-07-27 16:57:07.338480136 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15521,7 +15558,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -462,7 +465,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15530,7 +15567,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -500,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15542,10 +15579,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/winskin/mimetypes/Makefile.in kdemultimedia-3.4.2/noatun/modules/winskin/mimetypes/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/winskin/mimetypes/Makefile.in 2005-07-20 20:12:14.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/winskin/mimetypes/Makefile.in 2005-07-27 16:57:07.321482720 +0000
+@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15555,7 +15592,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -466,7 +469,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -15564,7 +15601,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15576,10 +15613,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/winskin/skins/Makefile.in kdemultimedia-3.4.2/noatun/modules/winskin/skins/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/winskin/skins/Makefile.in 2005-07-20 20:12:14.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/winskin/skins/Makefile.in 2005-07-27 16:57:07.353477856 +0000
+@@ -219,6 +219,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15589,7 +15626,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -468,7 +471,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -15598,7 +15635,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -506,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15610,10 +15647,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/winskin/skins/winamp/Makefile.in kdemultimedia-3.4.2/noatun/modules/winskin/skins/winamp/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/winskin/skins/winamp/Makefile.in 2005-07-20 20:12:14.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/winskin/skins/winamp/Makefile.in 2005-07-27 16:57:07.368475576 +0000
+@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15623,7 +15660,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -466,7 +469,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15632,7 +15669,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15644,10 +15681,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/winskin/vis/Makefile.in kdemultimedia-3.4.2/noatun/modules/winskin/vis/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/modules/winskin/vis/Makefile.in 2005-07-20 20:12:14.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/modules/winskin/vis/Makefile.in 2005-07-27 16:57:07.394471624 +0000
+@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15657,7 +15694,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -524,7 +527,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -15666,7 +15703,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -562,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15678,10 +15715,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/noatun/pics/Makefile.in kdemultimedia-3.4.2/noatun/pics/Makefile.in
+--- kdemultimedia-3.4.2.orig/noatun/pics/Makefile.in 2005-07-20 20:12:14.000000000 +0000
++++ kdemultimedia-3.4.2/noatun/pics/Makefile.in 2005-07-27 16:57:07.424467064 +0000
+@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15691,7 +15728,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15700,7 +15737,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15712,7 +15749,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -633,89 +636,89 @@
+@@ -634,89 +637,89 @@
.NOEXPORT:
#>+ 2
@@ -15856,10 +15893,10 @@
#>+ 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 @@
+diff -Nru kdemultimedia-3.4.2.orig/oggvorbis_artsplugin/Makefile.in kdemultimedia-3.4.2/oggvorbis_artsplugin/Makefile.in
+--- kdemultimedia-3.4.2.orig/oggvorbis_artsplugin/Makefile.in 2005-07-20 20:12:14.000000000 +0000
++++ kdemultimedia-3.4.2/oggvorbis_artsplugin/Makefile.in 2005-07-27 16:57:07.449463264 +0000
+@@ -254,6 +254,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15869,7 +15906,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -517,7 +520,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -15878,7 +15915,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -555,9 +558,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15890,10 +15927,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/xine_artsplugin/Makefile.in kdemultimedia-3.4.2/xine_artsplugin/Makefile.in
+--- kdemultimedia-3.4.2.orig/xine_artsplugin/Makefile.in 2005-07-20 20:12:14.000000000 +0000
++++ kdemultimedia-3.4.2/xine_artsplugin/Makefile.in 2005-07-27 16:57:07.476459160 +0000
+@@ -276,6 +276,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15903,7 +15940,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -541,7 +544,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -15912,7 +15949,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15924,10 +15961,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/xine_artsplugin/tools/Makefile.in kdemultimedia-3.4.2/xine_artsplugin/tools/Makefile.in
+--- kdemultimedia-3.4.2.orig/xine_artsplugin/tools/Makefile.in 2005-07-20 20:12:14.000000000 +0000
++++ kdemultimedia-3.4.2/xine_artsplugin/tools/Makefile.in 2005-07-27 16:57:07.492456728 +0000
+@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15937,7 +15974,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -466,7 +469,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -15946,7 +15983,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15958,10 +15995,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+diff -Nru kdemultimedia-3.4.2.orig/xine_artsplugin/tools/thumbnail/Makefile.in kdemultimedia-3.4.2/xine_artsplugin/tools/thumbnail/Makefile.in
+--- kdemultimedia-3.4.2.orig/xine_artsplugin/tools/thumbnail/Makefile.in 2005-07-20 20:12:14.000000000 +0000
++++ kdemultimedia-3.4.2/xine_artsplugin/tools/thumbnail/Makefile.in 2005-07-27 16:57:07.523452016 +0000
+@@ -255,6 +255,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15971,7 +16008,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -516,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15980,7 +16017,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -554,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
More information about the Pkg-kde-commits
mailing list